diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3f066c7023..02f69d249f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,11 +1,11 @@
 version: 2
 updates:
-  - package-ecosystem: "maven"
+  - package-ecosystem: "gradle"
     directory: "/"
     schedule:
       interval: "weekly"
     groups:
-      maven-deps:
+      deps:
         patterns:
           - "*"      
   - package-ecosystem: "github-actions"
@@ -13,6 +13,6 @@ updates:
     schedule:
       interval: "weekly"
     groups:
-      gh-actions:
+      deps:
         patterns:
           - "*"
diff --git a/.github/workflows/formatting_check.yml b/.github/workflows/formatting_check.yml
index 2d56e97171..e643467f96 100644
--- a/.github/workflows/formatting_check.yml
+++ b/.github/workflows/formatting_check.yml
@@ -39,9 +39,9 @@ jobs:
         with:
           java-version: '21'
           distribution: 'zulu'
-          cache: 'maven'
+          cache: 'gradle'
       - name: Validate Project Checkstyle
-        run: ./mvnw -B checkstyle:check
+        run: ./gradlew checkstyleMain
 
   spotless_check:
     name: Spotless check
@@ -56,10 +56,10 @@ jobs:
         with:
           java-version: '21'
           distribution: 'zulu'
-          cache: 'maven'
+          cache: 'gradle'
       - name: Generate code and format
         run: |
-          ./run_core_metamodel_generator.sh
-          # ./run_core_generators.sh automatically runs ./mvnw spotless:apply
-          ./run_core_generators.sh
+          ./gradlew :jmlparser-metamodel-generators:run
+          ./gradlew :jmlparser-core-generators:run
+          ./gradlew spotlessCheck
           git diff --exit-code
diff --git a/.github/workflows/maven_tests.yml b/.github/workflows/gradle_tests.yml
similarity index 88%
rename from .github/workflows/maven_tests.yml
rename to .github/workflows/gradle_tests.yml
index 9a4ef95525..75f0b859b9 100644
--- a/.github/workflows/maven_tests.yml
+++ b/.github/workflows/gradle_tests.yml
@@ -35,7 +35,7 @@ jobs:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
         ## Different JDK versions have different implementations etc. -- test on all combinations (ideally 8 to latest).
         ### exclude pre-8 (min development version jdk8)
-        jdk: [ 21 ]
+        jdk: [ 21, 25 ]
 
 
     env:
@@ -58,7 +58,7 @@ jobs:
           distribution: 'zulu'              # v2 requires explicitly stating the distribution - `zulu` and `adopt` supported at time of writing
           java-version: ${{ matrix.jdk }}   # Use matrix to select which JDK level to use
           java-package: jdk                 # optional (jdk or jre) - defaults to jdk
-          cache: 'maven'
+          cache: 'gradle'
 
       ## Given that the build matrix only specifies the major version (configurable), output the precise version used.
       - name: Echo exact java version being used
@@ -79,16 +79,17 @@ jobs:
       ### test : run the maven lifecycle stage `test`
       ### -P,--activate-profiles : Comma-delimited list of profiles to activate
       ### AlsoSlowTests : by default, only quick tests are run - the profile `AlsoSlowTests` runs the full test suite
-      - name: Test with Maven (incl. slow tests)
+      - name: Test with Gradle (incl. slow tests)
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: "./mvnw --fail-at-end -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn --activate-profiles AlsoSlowTests  -B --errors clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=wadoon_jmlparser"
+        run: |
+          ./gradlew --continue --parallel test
 
       - name: Test reporting
         uses: dorny/test-reporter@v2
         if: success() || failure()
         with:
           name: Test Report
-          path: "**/target/surefire-reports/*.xml"
+          path: "**/build/reports/tests/test/**/*.xml"
           reporter: java-junit
diff --git a/.github/workflows/publish_pkg_github.yml b/.github/workflows/publish_pkg_github.yml
deleted file mode 100644
index 673e92dbf4..0000000000
--- a/.github/workflows/publish_pkg_github.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Publish package to GitHub Packages
-on:
-  workflow_dispatch:
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v6.0.2
-      - uses: actions/setup-java@v5
-        with:
-          java-version: '17'
-          distribution: 'adopt'
-      - name: Publish package
-        run: mvn --batch-mode -DskipTests deploy
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/qodana.yml b/.github/workflows/qodana.yml
deleted file mode 100644
index 80666d3392..0000000000
--- a/.github/workflows/qodana.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Qodana
-on:
-  workflow_dispatch:
-  pull_request:
-  push:
-    branches:
-      - main
-      - 'releases/*'
-
-jobs:
-  qodana:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6.0.2
-        with:
-          fetch-depth: 0
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@v2025.3.1
diff --git a/.gitignore b/.gitignore
index 94c98df27e..d312e75f4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ hs_err_pid*
 *.ipr
 *.iws
 build-*
+!build-logic
 *.asc
 build
 out
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index d83ee439c6..0000000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-image: maven:latest
-
-variables:
-  MAVEN_CLI_OPTS: "--batch-mode" # -s .m2/settings.xml
-  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
-
-cache:
-  paths:
-    - .m2/repository/
-    - target/
-
-build:
-  stage: build
-  script:
-    - mvn $MAVEN_CLI_OPTS compile
-
-test:
-  stage: test
-  script:
-    - mvn $MAVEN_CLI_OPTS --fail-at-end verify
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - "*/target/surefire-reports/TEST-*.xml"
-        - "*/target/failsafe-reports/TEST-*.xml"
-
-
-deploy:
-  stage: deploy
-  script:
-    - mvn $MAVEN_CLI_OPTS -s dev-files/settings.deploy.xml deploy
-  only:
-    - master
-
-force-deploy:
-  when: manual
-  stage: build
-  script:
-    - mvn $MAVEN_CLI_OPTS -P run-snapshot -Dmaven.test.skip=true -s dev-files/settings.deploy.xml deploy
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 60ab49acc2..0000000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,46 +0,0 @@
-pipeline {
-    agent {
-        docker {
-            image 'maven:latest'
-        }
-    }
-
-    environment {
-      // This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
-      //`showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
-      MAVEN_OPTS = "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
-      // As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
-      // when running from the command line.
-      // `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
-      MAVEN_CLI_OPTS = "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
-    }
-
-
-    stages {
-        stage('Clean') {
-            steps {
-                sh 'javac -version'
-                sh 'mvn $MAVEN_CLI_OPTS -version'
-                sh 'mvn $MAVEN_CLI_OPTS dependency:go-offline'
-                sh 'mvn clean'
-            }
-        }
-
-        stage('Compile') {
-            steps { 
-                sh 'mvn --offline $MAVEN_CLI_OPTS compile'
-            }
-        }
-
-        stage('Tests: JUnit') {
-            steps {
-                sh 'mvn --offline $MAVEN_CLI_OPTS -Dmaven.test.failure.ignore=true install'
-            }
-            post {
-                success {
-                    junit '*/target/surefire-reports/**/*.xml'
-                }
-            }
-        }
-    }
-}
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 9008921efe..0000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-version: '{build}'
-os: Windows Server 2012
-
-environment:
-  appveyor_build_worker_cloud: gce
-
-init:
-  # Setup autocrlf -- by default, appveyor uses autocrlf input
-  # ... This affects tests which expect resource files to have the systems's line separator.
-  - git config --global core.autocrlf true
-
-install:
-  # Download maven
-  - ps: |
-      Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\maven" )) {
-        (new-object System.Net.WebClient).DownloadFile(
-          'http://www.us.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip',
-          'C:\maven-bin.zip'
-        )
-        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
-      }
-  # Setup environment variables for Maven and Java
-  - cmd: SET JAVA_HOME=C:\Program Files\Java\jdk10
-  - cmd: SET M2_HOME=C:\maven\apache-maven-3.6.3
-  - cmd: SET MAVEN_OPTS=-Xmx1g
-  - cmd: SET JAVA_OPTS=-Xmx1g
-  - cmd: SET PATH=C:\maven\apache-maven-3.6.3\bin;%JAVA_HOME%\bin;%PATH%
-  # Output the git config re: autocrlf to verify the "current" setting
-  - cmd: git config core.autocrlf
-
-# Appveyor is used for testing only -- the build script is not required.
-build_script:
-  - echo ignore this
-
-test_script:
-  - mvn -B clean install --batch-mode
-
-# Use of the cache speeds up future tests, meaning that dependencies do not need to be re-downloaded on every run.
-cache:
-  - C:\maven\
-  - C:\Users\appveyor\.m2
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
new file mode 100644
index 0000000000..2ee1f19f20
--- /dev/null
+++ b/build-logic/build.gradle.kts
@@ -0,0 +1,28 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+
+val libs: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+plugins {
+    `kotlin-dsl`
+    `kotlin-dsl-precompiled-script-plugins`
+}
+
+repositories {
+    gradlePluginPortal()
+    mavenCentral()
+}
+
+dependencies {
+    implementation("com.diffplug.gradle.spotless:com.diffplug.gradle.spotless.gradle.plugin:8.4.0")
+    implementation("com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin:0.36.0")
+    add("implementation", libs.findLibrary("kotlin-gradle").get())
+
+    // https://github.com/Kotlin/dokka
+    // Dokka is a documentation engine for Kotlin like JavaDoc for Java
+    // add("implementation", libs.findLibrary("dokka-gradle").get())
+
+    // https://detekt.dev/docs/gettingstarted/gradle/
+    // A static code analyzer for Kotlin
+    // add("implementation", libs.findLibrary("detekt-gradle").get())
+}
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
new file mode 100644
index 0000000000..e963597518
--- /dev/null
+++ b/build-logic/settings.gradle.kts
@@ -0,0 +1,12 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+    @Suppress("UnstableApiUsage")
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
diff --git a/build-logic/src/main/kotlin/buildlogic.java-conventions.gradle.kts b/build-logic/src/main/kotlin/buildlogic.java-conventions.gradle.kts
new file mode 100644
index 0000000000..325802166d
--- /dev/null
+++ b/build-logic/src/main/kotlin/buildlogic.java-conventions.gradle.kts
@@ -0,0 +1,73 @@
+@file:Suppress("UnstableApiUsage")
+
+plugins {
+    `java-library`
+    id("test-report-aggregation")
+    id("com.diffplug.spotless")
+    checkstyle
+    signing
+}
+
+val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+group = "io.github.jmltoolkit"
+version = project.properties["version"] ?: "unspecified"
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+}
+
+// Apply a specific Java toolchain to ease working on different environments.
+
+java {
+    // Auto JDK setup
+    toolchain {
+        libs.findVersion("jdk").ifPresent {
+            languageVersion.set(JavaLanguageVersion.of(it.toString()))
+        }
+    }
+    //withSourcesJar()
+    //withJavadocJar()
+}
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+    options.compilerArgs.add("-parameters")
+}
+
+tasks.withType<Javadoc> {
+    val options = options as StandardJavadocDocletOptions
+    options.encoding = "UTF-8"
+    isFailOnError = false
+    options.addBooleanOption("Xdoclint:none", true)
+    options.addBooleanOption("html5", true)
+}
+
+testing {
+    suites {
+        val test by getting(JvmTestSuite::class) {
+            useJUnitJupiter()
+        }
+    }
+}
+
+configure<com.diffplug.gradle.spotless.SpotlessExtension> {
+    java {
+        removeUnusedImports()
+        val version = libs.findVersion("palantirJavaFormat").get().strictVersion
+        palantirJavaFormat(version).formatJavadoc(false).style("PALANTIR")
+    }
+}
+
+configure<CheckstyleExtension> {
+    toolVersion = libs.findVersion("checkstyleVersion").get().strictVersion
+    configFile = file("$rootDir/dev-files/JavaParser-CheckStyle.xml")
+    isShowViolations = true
+}
+
+tasks.checkstyleMain {
+    source("src/main/java")
+}
\ No newline at end of file
diff --git a/build-logic/src/main/kotlin/publish-convention.gradle.kts b/build-logic/src/main/kotlin/publish-convention.gradle.kts
new file mode 100644
index 0000000000..4928c29918
--- /dev/null
+++ b/build-logic/src/main/kotlin/publish-convention.gradle.kts
@@ -0,0 +1,83 @@
+import com.vanniktech.maven.publish.JavaLibrary
+import com.vanniktech.maven.publish.JavadocJar
+import com.vanniktech.maven.publish.SourcesJar
+import gradle.kotlin.dsl.accessors._b2e15ab532fa56af5145b0688116cfcb.signing
+
+plugins {
+    id("com.vanniktech.maven.publish")
+}
+
+
+publishing {
+    repositories {
+        maven {
+            name = "LOCAL"
+            url = uri("$rootDir/local")
+        }
+        maven {
+            // deployment to git.key-project.org/key-public/key
+            name = "KEYLAB"
+            url = uri("https://git.key-project.org/api/v4/projects/35/packages/maven")
+            credentials(HttpHeaderCredentials::class) {
+                val userToken = envOrPropertyValue("GITLAB_USER_TOKEN")
+                val deployToken = envOrPropertyValue("GITLAB_DEPLOY_TOKEN")
+                val ciToken = envOrPropertyValue("GITLAB_CIJOB_TOKEN")
+
+                if (userToken != "") {
+                    name = "Private-Token"
+                    value = userToken
+                } else if (deployToken != "") {
+                    name = "Deploy-Token"
+                    value = deployToken
+                } else {
+                    name = "Job-Token"
+                    value = ciToken
+                }
+            }
+            authentication {
+                create("basic", HttpHeaderAuthentication::class)
+            }
+        }
+    }
+}
+
+mavenPublishing {
+    publishToMavenCentral()
+    //signAllPublications()
+
+    configure(
+        JavaLibrary(
+            javadocJar = JavadocJar.Javadoc(),
+            sourcesJar = SourcesJar.Sources(),
+        ),
+    )
+
+    pom {
+        licenses {
+            license {
+                name = "The GNU General Public License 2"
+                url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
+            }
+        }
+        developers {
+        }
+        scm {
+            connection = "scm:git:git://example.com/my-library.git"
+            developerConnection = "scm:git:ssh://example.com/my-library.git"
+            url = "http://example.com/my-library/"
+        }
+    }
+}
+
+fun envOrPropertyValue(key: String): String =
+    if (key in System.getenv()) {
+        System.getenv(key)
+    } else {
+        project.properties[key]?.toString() ?: ""
+    }
+
+val emptyJavadocJar = tasks.findByName("plainJavadocJar")!!
+val meta = tasks.findByName("generateMetadataFileForMavenPublication")!!
+meta.dependsOn(emptyJavadocJar)
+
+signing { useGpgCmd() }
\ No newline at end of file
diff --git a/build-logic/src/main/kotlin/standard-kotlin.gradle.kts b/build-logic/src/main/kotlin/standard-kotlin.gradle.kts
new file mode 100644
index 0000000000..ec8b59f79a
--- /dev/null
+++ b/build-logic/src/main/kotlin/standard-kotlin.gradle.kts
@@ -0,0 +1,72 @@
+import com.vanniktech.maven.publish.JavadocJar
+import com.vanniktech.maven.publish.KotlinJvm
+import com.vanniktech.maven.publish.SourcesJar
+
+plugins {
+    kotlin("jvm")
+    id("buildlogic.java-conventions")
+}
+
+val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+dependencies {
+    api(project(":jmlparser-core"))
+    testImplementation(libs.findBundle("testing").get())
+    testRuntimeOnly(libs.findBundle("testing-runtime").get())
+}
+
+kotlin {
+    jvmToolchain(21)
+}
+
+tasks.named<Test>("test") {
+    useJUnitPlatform()
+
+    maxHeapSize = "1G"
+
+    testLogging {
+        events("passed")
+    }
+}
+
+testing {
+    suites {
+        val test by getting(JvmTestSuite::class) {
+            useJUnitJupiter()
+        }
+    }
+}
+
+tasks.compileJava {
+    // See: https://docs.oracle.com/en/java/javase/12/tools/javac.html
+    @Suppress("SpellCheckingInspection")
+    options.compilerArgs.addAll(
+        listOf(
+            "-Xlint:all", // Enables all recommended warnings.
+            "-Werror", // Terminates compilation when warnings occur.
+        ),
+    )
+    options.encoding = "UTF-8"
+}
+
+tasks.jar {
+    manifest {
+        attributes(
+            mapOf(
+                "Implementation-Title" to project.name,
+                "Implementation-Version" to project.version,
+            ),
+        )
+    }
+}
+
+/*
+mavenPublishing {
+    configure(
+        KotlinJvm(
+            javadocJar = JavadocJar.Dokka("dokkaHtml"),
+            sourcesJar = SourcesJar.Sources(),
+        ),
+    )
+}
+*/
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000..88a2a67878
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,4 @@
+plugins {
+    id("com.diffplug.spotless") version "8.4.0" apply false
+    id("standard-kotlin") apply false
+}
diff --git a/dev-files/JavaParser-CheckStyle.xml b/dev-files/JavaParser-CheckStyle.xml
index f9cc0b9dab..ffa14ab4ec 100644
--- a/dev-files/JavaParser-CheckStyle.xml
+++ b/dev-files/JavaParser-CheckStyle.xml
@@ -3,6 +3,11 @@
 		"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
 
+	<module name="SuppressionSingleFilter">
+		<property name="files" value="GeneratedJavaParser.java"/>
+	</module>
+
+
 	<!-- Based on documentation: https://github.com/javaparser/javaparser/wiki/Coding-Guidelines -->
 
 	<property name="fileExtensions" value="java"/>
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000000..b0f696cd47
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,12 @@
+version=3.28.0-J8.0-K13.5-SNAPSHOT
+
+mavenCentralPublishing=false
+signAllPublications=true
+
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties
+
+org.gradle.configuration-cache=true
+org.gradle.parallel=true
+org.gradle.caching=true
+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000000..69d55923af
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,79 @@
+# This file was generated by the Gradle 'init' task.
+# https://docs.gradle.org/current/userguide/version_catalogs.html#sec::toml-dependencies-format
+
+[versions]
+com-google-guava-guava = "33.5.0-jre"
+com-google-truth-truth = "1.4.5"
+com-squareup-okhttp3-okhttp = "5.3.2"
+com-squareup-okhttp3-okhttp-jvm = "5.3.2"
+jakarta-json-jakarta-json-api = "2.1.3"
+net-bytebuddy-byte-buddy-agent = "1.18.4"
+org-assertj-assertj-core = "3.27.7"
+org-checkerframework-checker-qual = "3.53.1"
+org-eclipse-parsson-parsson = "1.1.7"
+org-hamcrest-hamcrest = "3.0"
+org-hamcrest-hamcrest-library = "3.0"
+org-javassist-javassist = "3.30.2-GA"
+org-jbehave-jbehave-core = "5.2.0"
+org-jspecify-jspecify = "1.0.0"
+org-junit = "6.0.3"
+org-mockito-mockito-inline = "5.2.0"
+
+gson = "2.13.2"
+logback = "1.5.32"
+clickt = "5.1.0"
+kotlin = "2.2.21"
+ktor = "3.4.1"
+
+palantirJavaFormat = "2.86.0"
+checkstyleVersion = "13.1.0"
+
+jdk = "21"
+
+[libraries]
+com-google-guava-guava = { module = "com.google.guava:guava", version.ref = "com-google-guava-guava" }
+com-squareup-okhttp3-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "com-squareup-okhttp3-okhttp" }
+com-squareup-okhttp3-okhttp-jvm = { module = "com.squareup.okhttp3:okhttp-jvm", version.ref = "com-squareup-okhttp3-okhttp-jvm" }
+jakarta-json-jakarta-json-api = { module = "jakarta.json:jakarta.json-api", version.ref = "jakarta-json-jakarta-json-api" }
+net-bytebuddy-byte-buddy-agent = { module = "net.bytebuddy:byte-buddy-agent", version.ref = "net-bytebuddy-byte-buddy-agent" }
+org-checkerframework-checker-qual = { module = "org.checkerframework:checker-qual", version.ref = "org-checkerframework-checker-qual" }
+org-eclipse-parsson-parsson = { module = "org.eclipse.parsson:parsson", version.ref = "org-eclipse-parsson-parsson" }
+org-javassist-javassist = { module = "org.javassist:javassist", version.ref = "org-javassist-javassist" }
+org-jspecify-jspecify = { module = "org.jspecify:jspecify", version.ref = "org-jspecify-jspecify" }
+
+# JUnit
+org-junit-jupiter-junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "org-junit" }
+org-junit-jupiter-junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "org-junit" }
+org-junit-jupiter-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "org-junit" }
+#Testing
+org-assertj-assertj-core = { module = "org.assertj:assertj-core", version.ref = "org-assertj-assertj-core" }
+org-jbehave-jbehave-core = { module = "org.jbehave:jbehave-core", version.ref = "org-jbehave-jbehave-core" }
+org-mockito-mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "org-mockito-mockito-inline" }
+com-google-truth-truth = { module = "com.google.truth:truth", version.ref = "com-google-truth-truth" }
+org-hamcrest-hamcrest = { module = "org.hamcrest:hamcrest", version.ref = "org-hamcrest-hamcrest" }
+org-hamcrest-hamcrest-library = { module = "org.hamcrest:hamcrest-library", version.ref = "org-hamcrest-hamcrest-library" }
+
+clickt = { module = "com.github.ajalt.clikt:clikt", version.ref = "clickt" }
+gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
+logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
+lombok = { module = "org.projectlombok:lombok", version = "1.18.42" }
+snakeyaml = { module = "org.yaml:snakeyaml", version = "2.6" }
+kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+
+ktor-core = { module = "io.ktor:ktor-server-core", version.ref = "ktor" }
+ktor-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" }
+ktor-html = { module = "io.ktor:ktor-html-builder", version = "1.6.8" }
+ktor-statuspages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktor" }
+ktor-severhtml = { module = "io.ktor:ktor-server-html-builder", version.ref = "ktor" }
+
+
+[bundles]
+
+testing = ["org-junit-jupiter-junit-jupiter-params", "org-junit-jupiter-junit-jupiter-api", "org-assertj-assertj-core",
+    "org-mockito-mockito-inline", "org-hamcrest-hamcrest", "org-hamcrest-hamcrest-library", "com-google-truth-truth",
+    "org-jbehave-jbehave-core"]
+
+testing-runtime = ["org-junit-jupiter-junit-jupiter-engine"]
+
+[plugins]
+jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..61285a659d
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..37f78a6af8
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000000..adff685a03
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,248 @@
+#!/bin/sh
+
+#
+# Copyright © 2015 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000000..c4bdd3ab8e
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,93 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/javaparser-core-generators/build.gradle.kts b/javaparser-core-generators/build.gradle.kts
new file mode 100644
index 0000000000..eedbb06273
--- /dev/null
+++ b/javaparser-core-generators/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+    id("buildlogic.java-conventions")
+}
+
+dependencies {
+    api(project(":jmlparser-core"))
+    testImplementation(libs.bundles.testing)
+    testRuntimeOnly(libs.bundles.testing.runtime)
+}
+
+description = "io.github.jmltoolkit:jmlparser-core-generators"
+
+val run by tasks.registering(JavaExec::class) {
+    classpath = sourceSets.main.get().runtimeClasspath
+    mainClass = "com.github.javaparser.generator.core.CoreGenerator"
+    args = listOf("$projectDir")
+}
diff --git a/javaparser-core-generators/pom.xml b/javaparser-core-generators/pom.xml
index c272032cb4..7422cffc6e 100644
--- a/javaparser-core-generators/pom.xml
+++ b/javaparser-core-generators/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>jmlparser-parent</artifactId>
         <groupId>io.github.jmltoolkit</groupId>
-        <version>3.28.0-J8.0-K10.1-SNAPSHOT</version>
+        <version>3.28.0-J8.0-K13.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/CoreGenerator.java b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/CoreGenerator.java
index 0e1f1e55e4..82d73411c6 100644
--- a/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/CoreGenerator.java
+++ b/javaparser-core-generators/src/main/java/com/github/javaparser/generator/core/CoreGenerator.java
@@ -59,7 +59,7 @@ public static void main(String[] args) throws Exception {
         StaticJavaParser.setConfiguration(parserConfiguration);
 
         final Path generatedJavaCcRoot =
-                Paths.get(args[0], "..", "javaparser-core", "target", "generated-sources", "javacc");
+                Paths.get(args[0], "..", "javaparser-core", "build", "generated-src", "main", "javacc");
         final SourceRoot generatedJavaCcSourceRoot =
                 new SourceRoot(generatedJavaCcRoot.normalize(), parserConfiguration)
                 //                .setPrinter(LexicalPreservingPrinter::print)
diff --git a/javaparser-core-metamodel-generator/build.gradle.kts b/javaparser-core-metamodel-generator/build.gradle.kts
new file mode 100644
index 0000000000..fdcc969418
--- /dev/null
+++ b/javaparser-core-metamodel-generator/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    id("buildlogic.java-conventions")
+}
+
+dependencies {
+    api(project(":jmlparser-core"))
+}
+
+description = "io.github.jmltoolkit:jmlparser-core-metamodel-generator"
+
+val run by tasks.registering(JavaExec::class) {
+    classpath = sourceSets.main.get().runtimeClasspath
+    mainClass = "com.github.javaparser.generator.metamodel.MetaModelGenerator"
+    args = listOf("$projectDir")
+}
diff --git a/javaparser-core-metamodel-generator/pom.xml b/javaparser-core-metamodel-generator/pom.xml
index 0185c838c3..4b2ee527a9 100644
--- a/javaparser-core-metamodel-generator/pom.xml
+++ b/javaparser-core-metamodel-generator/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>jmlparser-parent</artifactId>
         <groupId>io.github.jmltoolkit</groupId>
-        <version>3.28.0-J8.0-K10.1-SNAPSHOT</version>
+        <version>3.28.0-J8.0-K13.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java b/javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java
index 255cc6ca3c..de9ddaa605 100644
--- a/javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java
+++ b/javaparser-core-metamodel-generator/src/main/java/com/github/javaparser/generator/metamodel/MetaModelGenerator.java
@@ -34,6 +34,7 @@
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -161,19 +162,6 @@ public class MetaModelGenerator extends AbstractGenerator {
             add(com.github.javaparser.ast.expr.MatchAllPatternExpr.class);
             add(com.github.javaparser.ast.expr.VariableDeclarationExpr.class);
 
-            add(JmlDoc.class);
-            add(JmlDocDeclaration.class);
-            add(JmlDocStmt.class);
-            add(JmlDocType.class);
-
-            add(JmlQuantifiedExpr.class);
-            add(JmlTypeExpr.class);
-            add(JmlBinaryInfixExpr.class);
-            add(JmlLetExpr.class);
-            add(JmlMultiCompareExpr.class);
-            add(JmlLabelExpr.class);
-            add(JmlSetComprehensionExpr.class);
-
             add(com.github.javaparser.ast.stmt.AssertStmt.class);
             add(com.github.javaparser.ast.stmt.BlockStmt.class);
             add(com.github.javaparser.ast.stmt.BreakStmt.class);
@@ -199,6 +187,36 @@ public class MetaModelGenerator extends AbstractGenerator {
             add(com.github.javaparser.ast.stmt.WhileStmt.class);
             add(com.github.javaparser.ast.stmt.YieldStmt.class);
 
+            add(com.github.javaparser.ast.type.ArrayType.class);
+            add(com.github.javaparser.ast.type.ClassOrInterfaceType.class);
+            add(com.github.javaparser.ast.type.IntersectionType.class);
+            add(com.github.javaparser.ast.type.PrimitiveType.class);
+            add(com.github.javaparser.ast.type.TypeParameter.class);
+            add(com.github.javaparser.ast.type.UnionType.class);
+            add(com.github.javaparser.ast.type.UnknownType.class);
+            add(com.github.javaparser.ast.type.VarType.class);
+            add(com.github.javaparser.ast.type.VoidType.class);
+            add(com.github.javaparser.ast.type.WildcardType.class);
+
+            add(com.github.javaparser.ast.modules.ModuleExportsDirective.class);
+            add(com.github.javaparser.ast.modules.ModuleOpensDirective.class);
+            add(com.github.javaparser.ast.modules.ModuleProvidesDirective.class);
+            add(com.github.javaparser.ast.modules.ModuleRequiresDirective.class);
+            add(com.github.javaparser.ast.modules.ModuleUsesDirective.class);
+
+            add(JmlDoc.class);
+            add(JmlDocDeclaration.class);
+            add(JmlDocStmt.class);
+            add(JmlDocType.class);
+
+            add(JmlQuantifiedExpr.class);
+            add(JmlTypeExpr.class);
+            add(JmlBinaryInfixExpr.class);
+            add(JmlLetExpr.class);
+            add(JmlMultiCompareExpr.class);
+            add(JmlLabelExpr.class);
+            add(JmlSetComprehensionExpr.class);
+
             add(JmlStatement.class);
             add(JmlGhostStmt.class);
             add(JmlExpressionStmt.class);
@@ -216,12 +234,13 @@ public class MetaModelGenerator extends AbstractGenerator {
             add(JmlMultiExprClause.class);
             add(JmlSignalsClause.class);
             add(JmlSignalsOnlyClause.class);
-            add(JmlClauseLabel.class);
+            add(JmlLabledClause.class);
             add(JmlForallClause.class);
             add(JmlOldClause.class);
             add(JmlCallableClause.class);
-            add(JmlClauseIf.class);
+            add(JmlConditionalClause.class);
             add(JmlMethodSignature.class);
+            add(JmlInfFlowClause.class);
             add(com.github.javaparser.ast.jml.clauses.JmlContract.class);
 
             // add(com.github.javaparser.ast.JmlBoundVariable.class);
@@ -230,41 +249,29 @@ public class MetaModelGenerator extends AbstractGenerator {
             add(JmlRepresentsDeclaration.class);
             add(JmlClassAccessibleDeclaration.class);
 
-            add(com.github.javaparser.ast.type.ArrayType.class);
-            add(com.github.javaparser.ast.type.ClassOrInterfaceType.class);
-            add(com.github.javaparser.ast.type.IntersectionType.class);
-            add(com.github.javaparser.ast.type.PrimitiveType.class);
-            add(com.github.javaparser.ast.type.TypeParameter.class);
-            add(com.github.javaparser.ast.type.UnionType.class);
-            add(com.github.javaparser.ast.type.UnknownType.class);
-            add(com.github.javaparser.ast.type.VarType.class);
-            add(com.github.javaparser.ast.type.VoidType.class);
-            add(com.github.javaparser.ast.type.WildcardType.class);
-
-            add(com.github.javaparser.ast.modules.ModuleExportsDirective.class);
-            add(com.github.javaparser.ast.modules.ModuleOpensDirective.class);
-            add(com.github.javaparser.ast.modules.ModuleProvidesDirective.class);
-            add(com.github.javaparser.ast.modules.ModuleRequiresDirective.class);
-            add(com.github.javaparser.ast.modules.ModuleUsesDirective.class);
-
             // KEY
             add(KeyAbstractExecutionContext.class);
-            add(KeyCatchAllStatement.class);
+            add(KeyCatchAllStmt.class);
             add(KeyCcatchBranch.class);
             add(KeyCcatchBreak.class);
             add(KeyCcatchContinue.class);
             add(KeyCcatchParameter.class);
             add(KeyCcatchReturn.class);
             add(KeyEscapeExpression.class);
-            add(KeyExecStatement.class);
+            add(KeyExecStmt.class);
             add(KeyExecutionContext.class);
-            add(KeyLoopScopeBlock.class);
-            add(KeyMergePointStatement.class);
+            add(KeyLoopScopeBlockStmt.class);
+            add(KeyMergePointStmt.class);
             add(KeyMethodBodyStatement.class);
-            add(KeyMethodCallStatement.class);
+            add(KeyMethodCallStmt.class);
             add(KeyMethodSignature.class);
-            add(KeyRangeExpression.class);
-            add(KeyTransactionStatement.class);
+            // add(KeyRangeExpression.class);
+            add(KeyTransactionStmt.class);
+            // add(JmlDoc.class);
+            // add(JmlDocsBodyDeclaration.class);
+            // add(JmlDocsTypeDeclaration.class);
+            // add(JmlDocsStatements.class);
+            add(KeYMarkerStatement.class);
             // add(KeyActiveCommentStatement.class);
 
             // KeY-Schema
diff --git a/javaparser-core-serialization/build.gradle.kts b/javaparser-core-serialization/build.gradle.kts
new file mode 100644
index 0000000000..55ed1164ed
--- /dev/null
+++ b/javaparser-core-serialization/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    id("buildlogic.java-conventions")
+    id("publish-convention")
+}
+
+dependencies {
+    api(project(":jmlparser-core"))
+    testImplementation(libs.bundles.testing)
+    testRuntimeOnly(libs.bundles.testing)
+
+    api(libs.jakarta.json.jakarta.json.api)
+    testImplementation(libs.org.eclipse.parsson.parsson)
+}
+
+description = "io.github.jmltoolkit:jmlparser-core-serialization"
diff --git a/javaparser-core-serialization/pom.xml b/javaparser-core-serialization/pom.xml
index 3147f939c4..55fcb2a29b 100644
--- a/javaparser-core-serialization/pom.xml
+++ b/javaparser-core-serialization/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>jmlparser-parent</artifactId>
 		<groupId>io.github.jmltoolkit</groupId>
-		<version>3.28.0-J8.0-K10.1-SNAPSHOT</version>
+		<version>3.28.0-J8.0-K13.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/javaparser-core-serialization/src/main/java/com/github/javaparser/serialization/JavaParserJsonDeserializer.java b/javaparser-core-serialization/src/main/java/com/github/javaparser/serialization/JavaParserJsonDeserializer.java
index 79505691b1..05d7fafcf7 100644
--- a/javaparser-core-serialization/src/main/java/com/github/javaparser/serialization/JavaParserJsonDeserializer.java
+++ b/javaparser-core-serialization/src/main/java/com/github/javaparser/serialization/JavaParserJsonDeserializer.java
@@ -30,6 +30,8 @@
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.comments.Comment;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
+import com.github.javaparser.ast.jml.doc.JmlDocModifier;
 import com.github.javaparser.metamodel.BaseNodeMetaModel;
 import com.github.javaparser.metamodel.PropertyMetaModel;
 import com.github.javaparser.utils.Log;
@@ -107,9 +109,15 @@ private Node deserializeObject(JsonObject nodeJson) {
                         parameters.put(name, Boolean.parseBoolean(nodeJson.getString(name)));
                     } else if (Enum.class.isAssignableFrom(type)) {
                         parameters.put(name, Enum.valueOf((Class<? extends Enum>) type, nodeJson.getString(name)));
-                    } else if (type == Modifier.DefaultKeyword.class) {
-                        // TODO weigl handle JmlDocModifier?
-                        parameters.put(name, Enum.valueOf(Modifier.DefaultKeyword.class, nodeJson.getString(name)));
+                    } else if (type == Modifier.Keyword.class) {
+                        Modifier.Keyword value;
+                        final var string = nodeJson.getString(name);
+                        try {
+                            value = Enum.valueOf(Modifier.DefaultKeyword.class, string);
+                        } catch (IllegalArgumentException e) {
+                            value = new JmlDocModifier(new NodeList<>(new JmlDoc(string)));
+                        }
+                        parameters.put(name, value);
                     } else {
                         throw new IllegalStateException("Don't know how to convert: " + type);
                     }
diff --git a/javaparser-core-testing-bdd/build.gradle.kts b/javaparser-core-testing-bdd/build.gradle.kts
new file mode 100644
index 0000000000..ab8d3838c0
--- /dev/null
+++ b/javaparser-core-testing-bdd/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    id("buildlogic.java-conventions")
+}
+
+dependencies {
+    api(project(":jmlparser-core"))
+    testImplementation(libs.bundles.testing)
+    testRuntimeOnly(libs.bundles.testing.runtime)
+}
+
+description = "io.github.jmltoolkit:jmlparser-core-testing-bdd"
diff --git a/javaparser-core-testing-bdd/pom.xml b/javaparser-core-testing-bdd/pom.xml
index e76caff15f..936230d266 100644
--- a/javaparser-core-testing-bdd/pom.xml
+++ b/javaparser-core-testing-bdd/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
         <artifactId>jmlparser-parent</artifactId>
         <groupId>io.github.jmltoolkit</groupId>
-		<version>3.28.0-J8.0-K10.1-SNAPSHOT</version>
+		<version>3.28.0-J8.0-K13.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/javaparser-core-testing/build.gradle.kts b/javaparser-core-testing/build.gradle.kts
new file mode 100644
index 0000000000..a306a1d224
--- /dev/null
+++ b/javaparser-core-testing/build.gradle.kts
@@ -0,0 +1,19 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This project uses @Incubating APIs which are subject to change.
+ */
+
+plugins {
+    id("buildlogic.java-conventions")
+}
+
+dependencies {
+    api(project(":jmlparser-core"))
+    testImplementation(libs.bundles.testing)
+    testRuntimeOnly(libs.bundles.testing.runtime)
+    testImplementation(libs.com.squareup.okhttp3.okhttp)
+    testImplementation(libs.com.squareup.okhttp3.okhttp.jvm)
+}
+
+description = "io.github.jmltoolkit:jmlparser-core-testing"
diff --git a/javaparser-core-testing/pom.xml b/javaparser-core-testing/pom.xml
index 0ca0e7007f..c72fd88093 100644
--- a/javaparser-core-testing/pom.xml
+++ b/javaparser-core-testing/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>jmlparser-parent</artifactId>
         <groupId>io.github.jmltoolkit</groupId>
-        <version>3.28.0-J8.0-K10.1-SNAPSHOT</version>
+        <version>3.28.0-J8.0-K13.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/JavaTokenTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/JavaTokenTest.java
index 4e2ed25a8a..edd00e8aaa 100644
--- a/javaparser-core-testing/src/test/java/com/github/javaparser/JavaTokenTest.java
+++ b/javaparser-core-testing/src/test/java/com/github/javaparser/JavaTokenTest.java
@@ -79,7 +79,7 @@ void testKindEnum() {
 
     @Test
     void testKindEnum2() {
-        final int tokenCount = GeneratedJavaParserConstants.tokenImage.length;
+        final int tokenCount = GeneratedJavaParserConstants.tokenImage.length - 1;
         for (int i = 0; i < tokenCount; i++) {
             System.out.println(i);
             JavaToken.Kind kind = JavaToken.Kind.valueOf(i);
@@ -98,7 +98,7 @@ void testKindEnum2() {
     @Test
     void test() throws NoSuchFieldException, IllegalAccessException {
 
-        final int tokenCount = GeneratedJavaParserConstants.tokenImage.length - 1;
+        final int tokenCount = GeneratedJavaParserConstants.tokenImage.length;
         assertEquals(tokenCount, JavaToken.Kind.values().length, "Error - mismatch between number of tokens.");
 
         // Iterate through the JP Tokens, and ensure that it matches the JavaCC tokens.
diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/TokenTypesTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/TokenTypesTest.java
index 93ff835803..c649ba792b 100644
--- a/javaparser-core-testing/src/test/java/com/github/javaparser/TokenTypesTest.java
+++ b/javaparser-core-testing/src/test/java/com/github/javaparser/TokenTypesTest.java
@@ -49,13 +49,13 @@ void everyTokenHasACategory() throws IOException {
         int switchEntries = tokenTypesCu.findAll(SwitchEntry.class).size() - 1;
 
         // The amount of "case XXX:" in TokenTypes.java should be equal to the amount of tokens JavaCC knows about:
-        assertEquals(tokenCount, switchEntries);
+        assertEquals(tokenCount + 1, switchEntries);
     }
 
     @TestFactory
     Stream<DynamicTest> everyTokenHasACategory0() {
         final int tokenCount = GeneratedJavaParserConstants.tokenImage.length;
-        return IntStream.range(0, tokenCount - 1)
+        return IntStream.range(0, tokenCount)
                 .mapToObj(it -> DynamicTest.dynamicTest("TokenType: " + it, () -> {
                     try {
                         TokenTypes.getCategory(it);
diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapterTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapterTest.java
index 786075784b..a921fe9298 100644
--- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapterTest.java
+++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapterTest.java
@@ -636,7 +636,7 @@ void visit_GivenConstructorDeclaration() {
 
         // Verify
         InOrder order = Mockito.inOrder(node);
-        order.verify(node).getBody();
+        order.verify(node, times(2)).getBody();
         order.verify(node).getModifiers();
         order.verify(node).getName();
         order.verify(node).getParameters();
diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/GenericVisitorAdapterTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/GenericVisitorAdapterTest.java
index 3de04bd487..35b1475a72 100644
--- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/GenericVisitorAdapterTest.java
+++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/GenericVisitorAdapterTest.java
@@ -634,7 +634,7 @@ void visit_GivenConstructorDeclaration() {
 
         // Verify
         InOrder order = Mockito.inOrder(node);
-        order.verify(node).getBody();
+        order.verify(node, times(2)).getBody();
         order.verify(node).getModifiers();
         order.verify(node).getName();
         order.verify(node).getParameters();
@@ -1832,7 +1832,6 @@ void visit_GivenThisExpr() {
         Mockito.when(node.getTypeName()).thenReturn(Optional.of(mock(Name.class)));
         Mockito.when(node.getComment()).thenReturn(Optional.of(mock(Comment.class)));
 
-
         // Then
         Object result = visitor.visit(node, argument);
 
diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/HashCodeVisitorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/HashCodeVisitorTest.java
index 4242729294..d46bdfdcbe 100644
--- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/HashCodeVisitorTest.java
+++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/HashCodeVisitorTest.java
@@ -272,7 +272,7 @@ void testVisitConditionalExpr() {
     void testVisitConstructorDeclaration() {
         ConstructorDeclaration node = spy(new ConstructorDeclaration());
         HashCodeVisitor.hashCode(node);
-        verify(node, times(1)).getBody();
+        verify(node, times(2)).getBody();
         verify(node, times(1)).getModifiers();
         verify(node, times(1)).getName();
         verify(node, times(1)).getParameters();
@@ -281,7 +281,8 @@ void testVisitConstructorDeclaration() {
         verify(node, times(1)).getTypeParameters();
         verify(node, times(1)).getAnnotations();
         verify(node, times(1)).getComment();
-        //JML
+
+        // JML
         verify(node, times(1)).getContracts();
     }
 
@@ -300,7 +301,7 @@ void testVisitDoStmt() {
         verify(node, times(1)).getBody();
         verify(node, times(1)).getCondition();
         verify(node, times(1)).getComment();
-        //JML
+        // JML
         verify(node, times(1)).getContracts();
     }
 
@@ -398,7 +399,7 @@ void testVisitForEachStmt() {
         verify(node, times(1)).getIterable();
         verify(node, times(1)).getVariable();
         verify(node, times(1)).getComment();
-        //JML
+        // JML
         verify(node, times(1)).getContracts();
     }
 
@@ -497,7 +498,7 @@ void testVisitLambdaExpr() {
         verify(node, times(1)).isEnclosingParameters();
         verify(node, times(1)).getParameters();
         verify(node, times(1)).getComment();
-        //JML
+        // JML
         verify(node, times(1)).getContracts();
     }
 
@@ -575,7 +576,7 @@ void testVisitMethodDeclaration() {
         verify(node, times(1)).getTypeParameters();
         verify(node, times(1)).getAnnotations();
         verify(node, times(1)).getComment();
-        //JML
+        // JML
         verify(node, times(1)).getContracts();
     }
 
diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitorTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitorTest.java
index 47f0e2ca9f..883bb7edf8 100644
--- a/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitorTest.java
+++ b/javaparser-core-testing/src/test/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitorTest.java
@@ -316,7 +316,7 @@ void testVisitConstructorDeclaration() {
         ConstructorDeclaration node = spy(new ConstructorDeclaration());
         NoCommentHashCodeVisitor.hashCode(node);
 
-        verify(node, times(1)).getBody();
+        verify(node, times(2)).getBody();
         verify(node, times(1)).getModifiers();
         verify(node, times(1)).getName();
         verify(node, times(1)).getParameters();
diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/issues/Issue2627Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/issues/Issue2627Test.java
index 227739acdd..b088259147 100644
--- a/javaparser-core-testing/src/test/java/com/github/javaparser/issues/Issue2627Test.java
+++ b/javaparser-core-testing/src/test/java/com/github/javaparser/issues/Issue2627Test.java
@@ -82,40 +82,6 @@ private MethodDeclaration getFirstMethodDeclarationByName(CompilationUnit cu, St
                 .get();
     }
 
-    //    @Test
-    //    public void cuLength_minimal() throws IOException {
-    //        CompilationUnit cu = StaticJavaParser.parseResource(RESOURCE_PATH_STRING_MINIMAL);
-    //
-    //        final Range cuRange = cu.getRange().get();
-    //
-    //        int lineCount = cuRange.end.line - cuRange.begin.line;
-    //
-    //    }
-
-    //    @Test
-    //    public void commentPositions_minimal() throws IOException {
-    //        CompilationUnit cu = StaticJavaParser.parseResource(RESOURCE_PATH_STRING_MINIMAL);
-    //
-    //        List<Comment> allComments = cu.getAllComments();
-    //        for (int i = 0; i < allComments.size(); i++) {
-    //            Comment comment = allComments.get(i);
-    //            Optional<Range> optionalRange = comment.getRange();
-    //            if (optionalRange.isPresent()) {
-    //                Range range = optionalRange.get();
-    //                final TokenRange tokens = comment.getTokenRange().get();
-    //                int tokenIndex = 0;
-    //                for (JavaToken token : tokens) {
-    //                    System.out.println("token " + tokenIndex + " = " + token);
-    //                    tokenIndex++;
-    //                }
-    //                System.out.println(tokens);
-    //            }
-    //        }
-    //
-    //
-    ////        assertNodeInExpectedLines(cu, 1, 288);
-    //    }
-
     @ParameterizedTest
     @MethodSource("arguments_minimal")
     public void method_minimal(String name, int expectedStart, int expectedEnd) throws IOException {
diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java
index eff2eb7869..d69616be60 100755
--- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java
+++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/Issue3761Test.java
@@ -43,7 +43,7 @@ class C {\s
         List<Modifier.Keyword> kws =
                 field.getModifiers().stream().map(Modifier::getKeyword).collect(Collectors.toList());
         kws.add(0, Modifier.DefaultKeyword.PROTECTED);
-        field.setModifiers();
+        field.setModifiers(kws);
 
         String expected = "class C { \r\n    protected static String S = \"s\";\r\n" + "}";
 
diff --git a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/MethodDeclarationTransformationsTest.java b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/MethodDeclarationTransformationsTest.java
index 82e5f71cf3..d33806c4f4 100644
--- a/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/MethodDeclarationTransformationsTest.java
+++ b/javaparser-core-testing/src/test/java/com/github/javaparser/printer/lexicalpreservation/transformations/ast/body/MethodDeclarationTransformationsTest.java
@@ -163,8 +163,8 @@ void replacingDuplicateMarkdownComment() {
                 + LineSeparator.SYSTEM + "  ///"
                 + LineSeparator.SYSTEM + "  public void oneMethod() {"
                 + LineSeparator.SYSTEM + "  }"
-                + LineSeparator.SYSTEM + LineSeparator.SYSTEM
-                + "  ///"
+                + LineSeparator.SYSTEM
+                + LineSeparator.SYSTEM + "  ///"
                 + LineSeparator.SYSTEM + "  /// Comment A"
                 + LineSeparator.SYSTEM + "  ///"
                 + LineSeparator.SYSTEM + "  public void anotherMethod() {"
diff --git a/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_generators_src_main_java.txt b/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_generators_src_main_java.txt
index 1ca4992f69..8a9fcbee58 100644
--- a/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_generators_src_main_java.txt
+++ b/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_generators_src_main_java.txt
@@ -1,97 +1 @@
-com/github/javaparser/generator/CompilationUnitGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/node/AcceptGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/node/CloneGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/node/GetMetaModelGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/node/MainConstructorGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/node/NodeModifierGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/node/PropertyGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/node/RemoveMethodGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/node/ReplaceMethodGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/node/TypeCastingGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/other/BndGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/other/TokenKindGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/quality/NotNullGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/utils/CodeUtils.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/CloneVisitorGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/EqualsVisitorGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/GenericListVisitorAdapterGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/GenericVisitorAdapterGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/GenericVisitorGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/GenericVisitorWithDefaultsGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/HashCodeVisitorGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/ModifierVisitorGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/NoCommentEqualsVisitorGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/NoCommentHashCodeVisitorGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/ObjectIdentityEqualsVisitorGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/ObjectIdentityHashCodeVisitorGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/VoidVisitorAdapterGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/VoidVisitorGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/core/visitor/VoidVisitorWithDefaultsGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/Generator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/NodeGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/VisitorGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-32 problems in 32 files
\ No newline at end of file
+0 problems in 0 files
\ No newline at end of file
diff --git a/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_metamodel_generator_src_main_java.txt b/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_metamodel_generator_src_main_java.txt
index 7ab454c7b4..8a9fcbee58 100644
--- a/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_metamodel_generator_src_main_java.txt
+++ b/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_metamodel_generator_src_main_java.txt
@@ -1,13 +1 @@
-com/github/javaparser/generator/AbstractGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/metamodel/AstTypeAnalysis.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/metamodel/MetaModelGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/generator/metamodel/NodeMetaModelGenerator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-4 problems in 4 files
\ No newline at end of file
+0 problems in 0 files
\ No newline at end of file
diff --git a/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_src_main_java.txt b/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_src_main_java.txt
index 060e6fa7d0..8a9fcbee58 100644
--- a/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_src_main_java.txt
+++ b/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_src_main_java.txt
@@ -1,1702 +1 @@
-com/github/javaparser/ast/AbstractModifier.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/AccessSpecifier.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/ArrayCreationLevel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/AnnotationDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/BodyDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/CallableDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/CompactConstructorDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/ConstructorDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/EnumConstantDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/EnumDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/FieldDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/InitializerDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/MethodDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/Parameter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/ReceiverParameter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/RecordDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/TypeDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/body/VariableDeclarator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/comments/BlockComment.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/comments/Comment.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/comments/CommentsCollection.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/comments/JavadocComment.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/comments/LineComment.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/comments/MarkdownComment.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/comments/TraditionalJavadocComment.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/CompilationUnit.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/AnnotationExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/ArrayAccessExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/ArrayCreationExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/ArrayInitializerExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/AssignExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/BinaryExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/BooleanLiteralExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/CastExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/CharLiteralExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/ClassExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/ComponentPatternExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/ConditionalExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/DoubleLiteralExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/EnclosedExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/Expression.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/FieldAccessExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/InstanceOfExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/IntegerLiteralExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/LambdaExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/LiteralExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/LiteralStringValueExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/LongLiteralExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/MatchAllPatternExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/MemberValuePair.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/MethodCallExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/MethodReferenceExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/Name.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/NameExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/NormalAnnotationExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/NullLiteralExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/ObjectCreationExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/PatternExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/RecordPatternExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/SimpleName.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/StringLiteralExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/SuperExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/SwitchExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/TextBlockLiteralExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/ThisExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/TypeExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/TypePatternExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/UnaryExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/expr/VariableDeclarationExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/ImportDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/ArbitraryNodeContainer.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/body/JmlClassAccessibleDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/body/JmlClassExprDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/body/JmlClassLevelDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/body/JmlFieldDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/body/JmlMethodDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/body/JmlRepresentsDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/ContractType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlCallableClause.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlClause.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlClauseIf.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlClauseKind.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlClauseLabel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlContract.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlForallClause.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlMethodSignature.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlMultiExprClause.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlOldClause.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlSignalsClause.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlSignalsOnlyClause.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/clauses/JmlSimpleExprClause.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/doc/JmlDoc.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/doc/JmlDocDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/doc/JmlDocModifier.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/doc/JmlDocStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/doc/JmlDocType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/expr/JmlBinaryInfixExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/expr/JmlLabelExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/expr/JmlLetExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/expr/JmlMultiCompareExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/expr/JmlQuantifiedExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/expr/JmlSetComprehensionExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/expr/JmlTypeExpr.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/JmlModelProgram.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/stmt/JmlBeginStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/stmt/JmlEndStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/stmt/JmlExpressionStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/stmt/JmlGhostStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/stmt/JmlLabelStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/stmt/JmlRefiningStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/stmt/JmlStatement.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/stmt/JmlUnreachableStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/jml/type/JmlLogicType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyAbstractExecutionContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyCatchAllStatement.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyCcatchBranch.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyCcatchBreak.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyCcatchContinue.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyCcatchParameter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyCcatchReturn.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyEscapeExpression.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyExecStatement.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyExecutionContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyLoopScopeBlock.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyMergePointStatement.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyMethodBodyStatement.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyMethodCallStatement.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyMethodSignature.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyPassiveExpression.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyRangeExpression.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/KeyTransactionStatement.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyCatchClauseSV.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyCcatchSV.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyContextStatementBlock.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyExecCtxtSV.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyExecutionContextSV.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyExpressionSV.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyJumpLabelSV.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyMetaConstruct.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyMetaConstructExpression.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyMetaConstructType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyMethodSignatureSV.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyProgramVariableSV.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyStatementSV.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/key/sv/KeyTypeSV.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/Modifier.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/modules/ModuleDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/modules/ModuleDirective.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/modules/ModuleExportsDirective.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/modules/ModuleOpensDirective.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/modules/ModuleProvidesDirective.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/modules/ModuleRequiresDirective.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/modules/ModuleUsesDirective.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/Node.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/NodeList.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/observer/ObservableProperty.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/PackageDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/AssertStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/Behavior.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/BlockStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/BreakStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/CatchClause.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/ContinueStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/DoStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/EmptyStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/ExpressionStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/ForEachStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/ForStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/IfStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/LabeledStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/LocalRecordDeclarationStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/ReturnStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/Statement.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/SwitchEntry.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/SwitchStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/SynchronizedStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/ThrowStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/TryStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/UnparsableStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/WhileStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/stmt/YieldStmt.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/ArrayType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/ClassOrInterfaceType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/IntersectionType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/LogicalType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/PrimitiveType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/ReferenceType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/Type.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/TypeParameter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/UnionType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/UnknownType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/VarType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/VoidType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/type/WildcardType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/chunks/CommonValidators.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/chunks/ModifierValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/chunks/VarValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java10PreviewValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java10Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java11PreviewValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java11Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java12PreviewValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java12Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java13PreviewValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java13Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java14PreviewValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java14Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java15PreviewValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java15Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java16PreviewValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java16Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java17PreviewValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java17Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java18Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java19Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java1_0Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java1_1Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java1_2Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java1_3Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java1_4Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java20Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java21Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java22Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java23Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java24Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java25Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java5Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java6Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java7Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java8Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/Java9Validator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/language_level_validations/UpgradeJavaMessage.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/postprocessors/Java10PostProcessor.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/postprocessors/PostProcessors.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/ProblemReporter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/RecordAsTypeIdentifierNotAllowed.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/ReservedKeywordValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/SimpleValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/SingleNodeTypeValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/TreeVisitorValidator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/validator/Validators.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/visitor/EqualsVisitor.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/visitor/HashCodeVisitor.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ast/visitor/NodeFinderVisitor.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/CommentsInserter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/javadoc/description/JavadocDescription.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/javadoc/description/JavadocInlineTag.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/javadoc/description/JavadocSnippet.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/javadoc/Javadoc.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/javadoc/JavadocBlockTag.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/JavaParser.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/JavaParserAdapter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/JavaToken.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/jml/impl/JmlAnnotationSupport.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/jml/JmlProcessor.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/jml/JmlUtility.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/jml/JmlWarnRemaingJmlDoc.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/LineEndingProcessingProvider.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/AnnotationDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/AnnotationExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/AnnotationMemberDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ArrayAccessExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ArrayCreationExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ArrayCreationLevelMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ArrayInitializerExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ArrayTypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/AssertStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/AssignExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/BaseNodeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/BinaryExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/BlockCommentMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/BlockStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/BodyDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/BooleanLiteralExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/BreaksClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/BreakStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/CallableClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/CallableDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/CallableMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/CastExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/CatchClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/CharLiteralExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ClassExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ClassInvariantClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ClassOrInterfaceDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ClassOrInterfaceTypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/CommentMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/CompactConstructorDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/CompilationUnitMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ComponentPatternExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ConditionalExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ConstructorDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ContinueStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/DoStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/DoubleLiteralExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/EmptyStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/EnclosedExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/EnumConstantDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/EnumDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ExplicitConstructorInvocationStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ExpressionMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ExpressionStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/FieldAccessExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/FieldDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ForallClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ForEachStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ForStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/IfStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ImportDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/InitializerDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/InstanceOfExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/IntegerLiteralExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/IntersectionTypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JavadocCommentMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JavaParserMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlAssertStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlBeginStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlBinaryInfixExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlBindingExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlCallableClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlClassAccessibleDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlClassExprDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlClassInvariantDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlClassLevelDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlClassLevelMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlClauseIfMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlClauseLabelMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlClauseLEMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlContractMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlDefaultClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlDocDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlDocMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlDocModifierMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlDocStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlDocTypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlEndStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlExpressionStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlFieldDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlForallClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlGhostStatementMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlGhostStatementsMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlGhostStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlLabelExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlLabelMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlLabelStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlLetExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlMethodDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlMethodSignatureMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlMultiCompareExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlMultiExprClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlOldClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlQuantifiedExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlRefiningStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlRepresentsDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlSetComprehensionExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlSetComprehensionMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlSignalsClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlSignalsOnlyClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlSimpleExprClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlStatementMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlStmtWithExpressionMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlTypeExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/JmlUnreachableStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyAbstractExecutionContextMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyCatchAllStatementMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeYCcatchBranchMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeYCcatchBreakMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeYCcatchContinueMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeYCcatchParameterMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeYCcatchReturnMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyCcatchSVMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyContextStatementBlockMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyEscapeExpressionMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyExecCtxtSVMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyExecStatementMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyExecutionContextMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyExecutionContextSVMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyExpressionSVMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyJumpLabelSVMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyLoopScopeBlockMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyMergePointStatementMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyMetaConstructExpressionMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyMetaConstructMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyMetaConstructTypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyMethodBodyStatementMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyMethodCallStatementMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyMethodSignatureMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyMethodSignatureSVMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyPassiveExpressionMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyProgramVariableSVMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyRangeExpressionMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyStatementSVMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyTransactionStatementMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/KeyTypeSVMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/LabeledStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/LambdaExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/LineCommentMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/LiteralExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/LiteralStringValueExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/LocalClassDeclarationStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/LocalRecordDeclarationStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/LongLiteralExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/MarkdownCommentMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/MarkerAnnotationExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/MatchAllPatternExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/MemberValuePairMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/MethodCallExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/MethodDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/MethodReferenceExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ModifierMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ModuleDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ModuleDirectiveMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ModuleExportsDirectiveMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ModuleOpensDirectiveMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ModuleProvidesDirectiveMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ModuleRequiresDirectiveMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ModuleUsesDirectiveMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/NameExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/NameMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/NodeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/NormalAnnotationExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/NullLiteralExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ObjectCreationExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/PackageDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ParameterMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/PatternExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/PrimitiveTypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/PropertyMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ReceiverParameterMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/RecordDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/RecordPatternExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ReferenceTypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ReturnStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/SignalsClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/SignalsMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/SignalsOnlyClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/SignalsOnlyMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/SimpleNameMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/SingleMemberAnnotationExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/StatementMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/StringLiteralExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/SuperExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/SwitchEntryMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/SwitchExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/SwitchStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/SynchronizedStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/TextBlockLiteralExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ThisExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/ThrowStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/TraditionalJavadocCommentMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/TryStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/TypeDeclarationMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/TypeExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/TypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/TypeParameterMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/TypePatternExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/UnaryExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/UnionTypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/UnknownTypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/UnparsableStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/UnreachableStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/VariableDeclarationExprMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/VariableDeclaratorMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/VarTypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/VoidTypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/WhileStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/WildcardTypeMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/WorkingSpaceClauseMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/metamodel/YieldStmtMetaModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ParseProblemException.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ParserConfiguration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/ParseResult.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/Position.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/ConcreteSyntaxModel.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/concretesyntaxmodel/CsmAttribute.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/concretesyntaxmodel/CsmChar.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/concretesyntaxmodel/CsmConditional.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/concretesyntaxmodel/CsmList.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/concretesyntaxmodel/CsmMix.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/concretesyntaxmodel/CsmSequence.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/concretesyntaxmodel/CsmSingleReference.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/concretesyntaxmodel/CsmString.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/concretesyntaxmodel/CsmTextBlock.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/concretesyntaxmodel/CsmToken.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/configuration/DefaultConfigurationOption.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/configuration/DefaultPrinterConfiguration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/configuration/Indentation.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/configuration/PrettyPrinterConfiguration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/DefaultPrettyPrinter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/DefaultPrettyPrinterVisitor.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/DotPrinter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/Added.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/changes/ListAdditionChange.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/changes/ListRemovalChange.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/changes/ListReplacementChange.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/changes/PropertyChange.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/ChildTextElement.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/Difference.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/Kept.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/LexicalPreservingVisitor.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/NodeText.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/PeekingIterator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/Removed.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/RemovedGroup.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/Reshuffled.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/ReshuffledDiffElementExtractor.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/TextElementIteratorsFactory.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/lexicalpreservation/TokenTextElement.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/PrettyPrinter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/PrettyPrintVisitor.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/SourcePrinter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/XmlPrinter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/YamlPrinter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/Problem.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/Providers.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/quality/Preconditions.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/Range.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/logic/ConflictingGenericTypesException.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/logic/FunctionalInterfaceLogic.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/logic/InferenceContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/logic/InferenceVariableType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/MethodAmbiguityException.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/MethodUsage.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/model/LambdaArgumentTypePlaceholder.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/model/SymbolReference.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/model/typesystem/LazyType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/model/typesystem/NullType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/model/typesystem/ReferenceTypeImpl.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/model/Value.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/Navigator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametersMap.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/types/ResolvedArrayType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/types/ResolvedIntersectionType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/types/ResolvedLambdaConstraintType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/types/ResolvedPrimitiveType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/types/ResolvedReferenceType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/types/ResolvedTypeVariable.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/types/ResolvedUnionType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/types/ResolvedVoidType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/types/ResolvedWildcard.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/resolution/UnsolvedSymbolException.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/StaticJavaParser.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/TokenRange.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/UnicodeEscapeProcessingProvider.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/CodeGenerationUtils.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/LineSeparator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/Pair.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/ParserCollectionStrategy.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/PositionUtils.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/ProjectRoot.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/SeparatedItemStringBuilder.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/SourceRoot.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/SourceZip.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/StringEscapeUtils.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/VisitorList.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/VisitorMap.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/utils/VisitorSet.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-567 problems in 567 files
\ No newline at end of file
+0 problems in 0 files
\ No newline at end of file
diff --git a/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_testing_src_test_java.txt b/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_testing_src_test_java.txt
index 7c43ade3b0..8a9fcbee58 100644
--- a/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_testing_src_test_java.txt
+++ b/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_core_testing_src_test_java.txt
@@ -1,7 +1 @@
-com/github/javaparser/metamodel/BaseNodeMetaModelTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/printer/TestVisitor.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-2 problems in 2 files
\ No newline at end of file
+0 problems in 0 files
\ No newline at end of file
diff --git a/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_symbol_solver_core_src_main_java.txt b/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_symbol_solver_core_src_main_java.txt
index 4b8b207340..8a9fcbee58 100644
--- a/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_symbol_solver_core_src_main_java.txt
+++ b/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_symbol_solver_core_src_main_java.txt
@@ -1,418 +1 @@
-com/github/javaparser/symbolsolver/cache/DefaultCacheStats.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/cache/GuavaCache.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/cache/InMemoryCache.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/declarations/common/MethodDeclarationCommonLogic.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractJavaParserContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractMethodLikeDeclarationContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnnotationDeclarationContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnonymousClassDeclarationContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/ArrayAccessExprContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/BinaryExprContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/BlockStmtContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/CatchClauseContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationExtendsContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConditionalExprContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConstructorContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/ContextHelper.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/DoStatementContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnclosedExprContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnumDeclarationContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/ExpressionContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/FieldAccessContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForEachStatementContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForStatementContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/IfStatementContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/InstanceOfExprContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/jml/JmlContractContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/jml/JmlLetExprContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/jml/JmlQuantifiedExprContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/jml/JmlSignalsClauseContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodReferenceExprContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/ObjectCreationContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/RecordDeclarationContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/StatementContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchEntryContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/TryWithResourceContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/UnaryExprContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/VariableDeclarationExprContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/VariableDeclaratorContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/contexts/WhileStatementContext.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/DefaultConstructorDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationMemberDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserConstructorDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumConstantDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserRecordDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeAdapter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypePatternDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserVariableDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarators/AbstractSymbolDeclarator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarators/FieldSymbolDeclarator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarators/NoSymbolDeclarator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarators/ParameterSymbolDeclarator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarators/TypePatternSymbolDeclarator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/declarators/VariableSymbolDeclarator.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/PatternVariableResult.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javaparsermodel/TypeExtractor.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/JavaRefersToJmlException.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationMemberDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistConstructorDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumConstantDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodLikeDeclarationAdapter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeParameter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/JavaSymbolSolver.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationMemberDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassAdapter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionConstructorDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumConstantDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionPatternDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionRecordDeclaration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTypeParameter.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/naming/NameCategory.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/promotion/BooleanConditionalExprHandler.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/promotion/NumericConditionalExprHandler.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/promotion/ReferenceConditionalExprHandler.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/SymbolSolver.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/bounds/CapturesBound.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/bounds/FalseBound.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/bounds/SameAsBound.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/bounds/SubtypeOfBound.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/bounds/ThrowsBound.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/BoundSet.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/ConstraintFormula.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/constraintformulas/ExpressionCompatibleWithType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/constraintformulas/TypeCompatibleWithType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/constraintformulas/TypeSameAsType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/constraintformulas/TypeSubtypeOfType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/ConstraintFormulaSet.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/ControlFlowLogic.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/InferenceVariable.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/InferenceVariableSubstitution.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/Instantiation.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/InstantiationSet.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/LeastUpperBoundLogic.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/MethodType.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/ProperLowerBound.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/ProperUpperBound.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/Substitution.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typeinference/TypeInference.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/AarTypeSolver.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/ClassLoaderTypeSolver.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/CombinedTypeSolver.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/JarTypeSolver.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/ReflectionTypeSolver.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/SourceFileInfoExtractor.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategy.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-139 problems in 139 files
\ No newline at end of file
+0 problems in 0 files
\ No newline at end of file
diff --git a/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_symbol_solver_testing_src_test_java.txt b/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_symbol_solver_testing_src_test_java.txt
deleted file mode 100644
index cc64860931..0000000000
--- a/javaparser-core-testing/src/test/resources/com/github/javaparser/bulk_test_results/javaparser_test_results_javaparser_symbol_solver_testing_src_test_java.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-com/github/javaparser/key/LogicalTypes.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/AbstractSymbolResolutionTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/DefaultPackageTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/AarTypeSolverTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/AbstractTypeSolverTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/ClassLoaderTypeSolverTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/CombinedTypeSolverTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/JarTypeSolverTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/JavaParserTypeSolverTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/MemoryTypeSolverTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/resolution/typesolvers/ReflectionTypeSolverTest.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-com/github/javaparser/symbolsolver/utils/LeanParserConfiguration.java
-Cannot invoke "com.github.javaparser.ast.NodeList.forEach(java.util.function.Consumer)" because the return value of "com.github.javaparser.ast.body.ConstructorDeclaration.getContracts()" is null
-
-14 problems in 14 files
\ No newline at end of file
diff --git a/javaparser-core/build.gradle.kts b/javaparser-core/build.gradle.kts
new file mode 100644
index 0000000000..7fd0476ad7
--- /dev/null
+++ b/javaparser-core/build.gradle.kts
@@ -0,0 +1,55 @@
+plugins {
+    id("buildlogic.java-conventions")
+    id("publish-convention")
+}
+
+description = "io.github.jmltoolkit:jmlparser-core"
+
+val javacc by configurations.creating
+
+dependencies {
+    api(libs.org.jspecify.jspecify)
+    api(libs.net.bytebuddy.byte.buddy.agent)
+    javacc("com.helger:parser-generator-cc:2.0.1")
+}
+
+val javaBuildFile by tasks.registering(Copy::class) {
+    from("src/main/java-templates/")
+    includeEmptyDirs = false
+
+    into(layout.buildDirectory.dir("generated-src/main/javacc/"))
+    expand(
+        "name" to project.name,
+        "version" to project.version,
+    )
+}
+tasks.compileJava { dependsOn(javaBuildFile) }
+tasks.sourcesJar { dependsOn(javaBuildFile) }
+
+val javaccOutput =
+    layout.buildDirectory
+        .dir("generated-src/main/javacc")
+        .get()
+        .asFile.absolutePath
+
+val javaccInput = "src/main/javacc/java.jj"
+
+val compileJavacc by tasks.registering(JavaExec::class) {
+    inputs.file(javaccInput).withPathSensitivity(PathSensitivity.RELATIVE)
+    outputs.dir(javaccOutput)
+    mainClass.set("com.helger.pgcc.parser.Main")
+    classpath(javacc)
+    args =
+        listOf(
+            "-OUTPUT_DIRECTORY=$javaccOutput/com/github/javaparser",
+            "src/main/javacc/java.jj",
+        )
+}
+tasks.compileJava { dependsOn(compileJavacc) }
+tasks.sourcesJar { dependsOn(compileJavacc) }
+
+sourceSets.main {
+    java {
+        srcDirs(javaccOutput, "src/main/javacc-support")
+    }
+}
diff --git a/javaparser-core/pom.xml b/javaparser-core/pom.xml
index 690072a4dd..0cc4f6a3b4 100644
--- a/javaparser-core/pom.xml
+++ b/javaparser-core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>jmlparser-parent</artifactId>
 		<groupId>io.github.jmltoolkit</groupId>
-		<version>3.28.0-J8.0-K10.1-SNAPSHOT</version>
+		<version>3.28.0-J8.0-K13.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/javaparser-core/src/main/java-templates/com/github/javaparser/JavaParserBuild.java b/javaparser-core/src/main/java-templates/com/github/javaparser/JavaParserBuild.java
index b6cbe6b6ae..689ceceb9c 100644
--- a/javaparser-core/src/main/java-templates/com/github/javaparser/JavaParserBuild.java
+++ b/javaparser-core/src/main/java-templates/com/github/javaparser/JavaParserBuild.java
@@ -24,7 +24,6 @@
  * Core information about this library.
  */
 public class JavaParserBuild {
-    public static final String PROJECT_VERSION = "${project.version}";
-    public static final String PROJECT_NAME = "${project.name}";
-    public static final String PROJECT_BUILD_FINAL_NAME = "${project.build.finalName}";
+    public static final String PROJECT_VERSION = "${version}";
+    public static final String PROJECT_NAME = "${name}";
 }
\ No newline at end of file
diff --git a/javaparser-core/src/main/java/com/github/javaparser/CommentsInserter.java b/javaparser-core/src/main/java/com/github/javaparser/CommentsInserter.java
index b09da15a58..eab7a28239 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/CommentsInserter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/CommentsInserter.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.ast.Node.NODE_BY_BEGIN_POSITION;
 import static java.util.stream.Collectors.toList;
-
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Modifier;
 import com.github.javaparser.ast.Node;
@@ -53,7 +52,8 @@ class CommentsInserter {
      * the comments.
      */
     private void insertComments(CompilationUnit cu, TreeSet<Comment> comments) {
-        if (comments.isEmpty()) return;
+        if (comments.isEmpty())
+            return;
         /* I should sort all the direct children and the comments, if a comment
         is the first thing then it is a comment to the CompilationUnit */
         // FIXME if there is no package it could be also a comment to the following class...
@@ -61,10 +61,7 @@ private void insertComments(CompilationUnit cu, TreeSet<Comment> comments) {
         // cases
         List<Node> children = cu.getChildNodes();
         Comment firstComment = comments.iterator().next();
-        if (cu.getPackageDeclaration().isPresent()
-                && (children.isEmpty()
-                        || PositionUtils.areInOrder(
-                                firstComment, cu.getPackageDeclaration().get()))) {
+        if (cu.getPackageDeclaration().isPresent() && (children.isEmpty() || PositionUtils.areInOrder(firstComment, cu.getPackageDeclaration().get()))) {
             cu.setComment(firstComment);
             comments.remove(firstComment);
         }
@@ -75,7 +72,8 @@ private void insertComments(CompilationUnit cu, TreeSet<Comment> comments) {
      * returns the node that were not attributed.
      */
     void insertComments(Node node, TreeSet<Comment> commentsToAttribute) {
-        if (commentsToAttribute.isEmpty()) return;
+        if (commentsToAttribute.isEmpty())
+            return;
         if (node instanceof CompilationUnit) {
             insertComments((CompilationUnit) node, commentsToAttribute);
         }
@@ -86,16 +84,11 @@ void insertComments(Node node, TreeSet<Comment> commentsToAttribute) {
         */
         // Never attribute comments to modifiers.
         List<Node> // Never attribute comments to modifiers.
-                children = node.getChildNodes().stream()
-                        .filter(n -> !(n instanceof Modifier))
-                        .collect(toList());
+        children = node.getChildNodes().stream().filter(n -> !(n instanceof Modifier)).collect(toList());
         boolean attributeToAnnotation = !(configuration.isIgnoreAnnotationsWhenAttributingComments());
         for (Node child : children) {
             TreeSet<Comment> commentsInsideChild = new TreeSet<>(NODE_BY_BEGIN_POSITION);
-            commentsInsideChild.addAll(commentsToAttribute.stream()
-                    .filter(comment -> comment.hasRange())
-                    .filter(comment -> PositionUtils.nodeContains(child, comment, !attributeToAnnotation))
-                    .collect(toList()));
+            commentsInsideChild.addAll(commentsToAttribute.stream().filter(comment -> comment.hasRange()).filter(comment -> PositionUtils.nodeContains(child, comment, !attributeToAnnotation)).collect(toList()));
             commentsToAttribute.removeAll(commentsInsideChild);
             insertComments(child, commentsInsideChild);
         }
@@ -117,8 +110,7 @@ void insertComments(Node node, TreeSet<Comment> commentsToAttribute) {
         childrenAndComments.addAll(children);
         commentsToAttribute.removeAll(attributedComments);
         childrenAndComments.addAll(commentsToAttribute);
-        PositionUtils.sortByBeginPosition(
-                childrenAndComments, configuration.isIgnoreAnnotationsWhenAttributingComments());
+        PositionUtils.sortByBeginPosition(childrenAndComments, configuration.isIgnoreAnnotationsWhenAttributingComments());
         for (Node thing : childrenAndComments) {
             if (thing instanceof Comment) {
                 previousComment = (Comment) thing;
@@ -127,8 +119,7 @@ void insertComments(Node node, TreeSet<Comment> commentsToAttribute) {
                 }
             } else {
                 if (previousComment != null && !thing.getComment().isPresent()) {
-                    if (!configuration.isDoNotAssignCommentsPrecedingEmptyLines()
-                            || !thereAreLinesBetween(previousComment, thing)) {
+                    if (!configuration.isDoNotAssignCommentsPrecedingEmptyLines() || !thereAreLinesBetween(previousComment, thing)) {
                         thing.setComment(previousComment);
                         attributedComments.add(previousComment);
                         previousComment = null;
@@ -149,19 +140,13 @@ private void attributeLineCommentsOnSameLine(TreeSet<Comment> commentsToAttribut
         /* I can attribute in line comments to elements preceeding them, if
         there is something contained in their line */
         List<Comment> attributedComments = new LinkedList<>();
-        commentsToAttribute.stream()
-                .filter(comment -> comment.hasRange())
-                .filter(Comment::isLineComment)
-                .forEach(comment -> children.stream()
-                        .filter(child -> child.hasRange())
-                        .forEach(child -> {
-                            Range commentRange = comment.getRange().get();
-                            Range childRange = child.getRange().get();
-                            if (childRange.end.line == commentRange.begin.line
-                                    && attributeLineCommentToNodeOrChild(child, comment.asLineComment())) {
-                                attributedComments.add(comment);
-                            }
-                        }));
+        commentsToAttribute.stream().filter(comment -> comment.hasRange()).filter(Comment::isLineComment).forEach(comment -> children.stream().filter(child -> child.hasRange()).forEach(child -> {
+            Range commentRange = comment.getRange().get();
+            Range childRange = child.getRange().get();
+            if (childRange.end.line == commentRange.begin.line && attributeLineCommentToNodeOrChild(child, comment.asLineComment())) {
+                attributedComments.add(comment);
+            }
+        }));
         commentsToAttribute.removeAll(attributedComments);
     }
 
@@ -171,8 +156,7 @@ private boolean attributeLineCommentToNodeOrChild(Node node, LineComment lineCom
         }
         // The node start and end at the same line as the comment,
         // let's give to it the comment
-        if (node.getBegin().get().line == lineComment.getBegin().get().line
-                && !node.getComment().isPresent()) {
+        if (node.getBegin().get().line == lineComment.getBegin().get().line && !node.getComment().isPresent()) {
             if (!(node instanceof Comment)) {
                 node.setComment(lineComment);
             }
@@ -204,7 +188,8 @@ private boolean thereAreLinesBetween(Node a, Node b) {
     }
 
     private boolean commentIsOnNextLine(Node a, Comment c) {
-        if (!c.hasRange() || !a.hasRange()) return false;
+        if (!c.hasRange() || !a.hasRange())
+            return false;
         return c.getRange().get().end.line + 1 == a.getRange().get().begin.line;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/HasParentNode.java b/javaparser-core/src/main/java/com/github/javaparser/HasParentNode.java
index 290cccf026..554de56e8b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/HasParentNode.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/HasParentNode.java
@@ -87,7 +87,8 @@ default <N> Optional<N> findAncestor(Class<N> type, Predicate<N> predicate) {
      * @param <N>
      */
     default <N> Optional<N> findAncestor(Predicate<N> predicate, Class<N>... types) {
-        if (!hasParentNode()) return Optional.empty();
+        if (!hasParentNode())
+            return Optional.empty();
         Node parent = getParentNode().get();
         for (Class<N> type : types) {
             if (type.isAssignableFrom(parent.getClass()) && predicate.test(type.cast(parent))) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java b/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
index 474b957422..e624f3fe67 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/JavaParser.java
@@ -26,7 +26,6 @@
 import static com.github.javaparser.Providers.resourceProvider;
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import static java.util.stream.Collectors.toList;
-
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.BodyDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
@@ -116,8 +115,7 @@ private GeneratedJavaParser getParserForProvider(Provider provider) {
     public <N extends Node> ParseResult<N> parse(ParseStart<N> start, Provider provider) {
         assertNotNull(start);
         assertNotNull(provider);
-        List<Processor> processors =
-                configuration.getProcessors().stream().map(Supplier::get).collect(toList());
+        List<Processor> processors = configuration.getProcessors().stream().map(Supplier::get).collect(toList());
         for (Processor processor : processors) {
             provider = processor.preProcess(provider);
         }
@@ -192,8 +190,7 @@ public ParseResult<CompilationUnit> parse(final File file, final Charset encodin
      * @throws FileNotFoundException the file was not found
      */
     public ParseResult<CompilationUnit> parse(final File file) throws FileNotFoundException {
-        ParseResult<CompilationUnit> result =
-                parse(COMPILATION_UNIT, provider(file, configuration.getCharacterEncoding()));
+        ParseResult<CompilationUnit> result = parse(COMPILATION_UNIT, provider(file, configuration.getCharacterEncoding()));
         result.getResult().ifPresent(cu -> cu.setStorage(file.toPath(), configuration.getCharacterEncoding()));
         return result;
     }
@@ -224,8 +221,7 @@ public ParseResult<CompilationUnit> parse(final Path path, final Charset encodin
      * @throws IOException the path could not be accessed
      */
     public ParseResult<CompilationUnit> parse(final Path path) throws IOException {
-        ParseResult<CompilationUnit> result =
-                parse(COMPILATION_UNIT, provider(path, configuration.getCharacterEncoding()));
+        ParseResult<CompilationUnit> result = parse(COMPILATION_UNIT, provider(path, configuration.getCharacterEncoding()));
         result.setSourcePath(path);
         result.getResult().ifPresent(cu -> cu.setStorage(path, configuration.getCharacterEncoding()));
         return result;
@@ -272,8 +268,7 @@ public ParseResult<CompilationUnit> parseResource(final String path, Charset enc
      * @deprecated set the encoding in the {@link ParserConfiguration}
      */
     @Deprecated
-    public ParseResult<CompilationUnit> parseResource(
-            final ClassLoader classLoader, final String path, Charset encoding) throws IOException {
+    public ParseResult<CompilationUnit> parseResource(final ClassLoader classLoader, final String path, Charset encoding) throws IOException {
         return parse(COMPILATION_UNIT, resourceProvider(classLoader, path, encoding));
     }
 
@@ -594,7 +589,6 @@ public ParseResult<NodeList<Statement>> parseStatements(String statements) {
         if (result.getResult().isPresent()) {
             s = result.getResult().get().getStatements();
         }
-        return new ParseResult<>(
-                s, result.getProblems(), result.getCommentsCollection().orElse(null));
+        return new ParseResult<>(s, result.getProblems(), result.getCommentsCollection().orElse(null));
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/JavaToken.java b/javaparser-core/src/main/java/com/github/javaparser/JavaToken.java
index 6649f4fc44..0451b0c7f7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/JavaToken.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/JavaToken.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.utils.LineSeparator;
 import java.util.List;
@@ -186,14 +185,8 @@ public TokenRange toTokenRange() {
 
     @Override
     public String toString() {
-        String text = getText()
-                .replace("\n", "\\n")
-                .replace("\r", "\\r")
-                .replace("\r\n", "\\r\\n")
-                .replace("\t", "\\t");
-        return f(
-                "\"%s\"   <%s>   %s",
-                text, getKind(), getRange().map(Range::toString).orElse("(?)-(?)"));
+        String text = getText().replace("\n", "\\n").replace("\r", "\\r").replace("\r\n", "\\r\\n").replace("\t", "\\t");
+        return f("\"%s\"   <%s>   %s", text, getKind(), getRange().map(Range::toString).orElse("(?)-(?)"));
     }
 
     /**
@@ -211,6 +204,7 @@ public boolean invalid() {
     }
 
     public enum Category {
+
         WHITESPACE_NO_EOL,
         EOL,
         COMMENT,
@@ -263,6 +257,7 @@ public boolean isOperator() {
 
     @Generated("com.github.javaparser.generator.core.other.TokenKindGenerator")
     public enum Kind {
+
         EOF(0),
         SPACE(1),
         WINDOWS_EOL(2),
@@ -277,387 +272,391 @@ public enum Kind {
         ACCESSIBLE_REDUNDANTLY(11),
         ALSO(12),
         ANTIVALENCE(13),
-        ASSERT_REDUNDANTLY(14),
-        ASSIGNABLE(15),
-        ASSIGNABLE_REDUNDANTLY(16),
-        ASSUME(17),
-        ASSUME_REDUNDANTLY(18),
-        AXIOM(19),
-        BEHAVIOR(20),
-        BEHAVIOUR(21),
-        BIGINT(22),
-        BIGINT_MATH(23),
-        BREAKS(24),
-        BREAKS_REDUNDANTLY(25),
-        BREAK_BEHAVIOR(26),
-        BREAK_BEHAVIOUR(27),
-        CALLABLE(28),
-        CALLABLE_REDUNDANTLY(29),
-        CAPTURES(30),
-        CAPTURES_REDUNDANTLY(31),
-        CHOOSE(32),
-        CHOOSE_IF(33),
-        CODE(34),
-        CODE_BIGINT_MATH(35),
-        CODE_JAVA_MATH(36),
-        CODE_SAFE_MATH(37),
-        IMMUTABLE(38),
-        CONSTRAINT(39),
-        CONSTRAINT_REDUNDANTLY(40),
-        CONSTRUCTOR(41),
-        CONTINUES(42),
-        CONTINUES_REDUNDANTLY(43),
-        CONTINUE_BEHAVIOR(44),
-        CONTINUE_BEHAVIOUR(45),
-        DECLASSIFIES(46),
-        DECREASES(47),
-        DECREASES_REDUNDANTLY(48),
-        DECREASING(49),
-        DECREASING_REDUNDANTLY(50),
-        DETERMINES(51),
-        DIVERGES(52),
-        DIVERGES_REDUNDANTLY(53),
-        DURATION(54),
-        DURATION_REDUNDANTLY(55),
-        ENSURES(56),
-        ENSURES_REDUNDANTLY(57),
-        ENSURES_FREE(58),
-        REQUIRES_FREE(59),
-        EQUIVALENCE(60),
-        IMPLICATION(61),
-        IMPLICATION_BACKWARD(62),
-        ERASES(63),
-        EXAMPLE(64),
-        EXCEPTIONAL_BEHAVIOR(65),
-        EXCEPTIONAL_BEHAVIOUR(66),
-        EXCEPTIONAL_EXAMPLE(67),
-        EXISTS(68),
-        EXSURES(69),
-        EXSURES_REDUNDANTLY(70),
-        EXTRACT(71),
-        FIELD(72),
-        FORALLQ(73),
-        LET(74),
-        FORALL(75),
-        FOR_EXAMPLE(76),
-        PEER(77),
-        REP(78),
-        READ_ONLY(79),
-        GHOST(80),
-        BEGIN(81),
-        END(82),
-        HELPER(83),
-        HENCE_BY(84),
-        HENCE_BY_REDUNDANTLY(85),
-        IMPLIES_THAT(86),
-        IN(87),
-        INITIALIZER(88),
-        INITIALLY(89),
-        INSTANCE(90),
-        TWO_STATE(91),
-        NO_STATE(92),
-        NON_NULL_BY_DEFAULT(93),
-        INVARIANT_REDUNDANTLY(94),
-        IN_REDUNDANTLY(95),
-        JAVA_MATH(96),
-        LBLNEG(97),
-        LBLPOS(98),
-        LBL(99),
-        LOOP_CONTRACT(100),
-        LOOP_INVARIANT(101),
-        LOOP_INVARIANT_FREE(102),
-        LOOP_INVARIANT_REDUNDANTLY(103),
-        MAINTAINING(104),
-        MAINTAINING_REDUNDANTLY(105),
-        MAPS(106),
-        MAPS_REDUNDANTLY(107),
-        MAX(108),
-        MEASURED_BY(109),
-        ESC_MEASURED_BY(110),
-        MEASURED_BY_REDUNDANTLY(111),
-        METHOD(112),
-        MIN(113),
-        MODEL(114),
-        MODEL_PROGRAM(115),
-        MODIFIABLE(116),
-        MODIFIABLE_REDUNDANTLY(117),
-        LOOP_MODIFIES(118),
-        MODIFIES(119),
-        MODIFIES_REDUNDANTLY(120),
-        MONITORED(121),
-        MONITORS_FOR(122),
-        NESTED_CONTRACT_END(123),
-        NESTED_CONTRACT_START(124),
-        NEW_OBJECT(125),
-        NONNULLELEMENTS(126),
-        NON_NULL(127),
-        NORMAL_BEHAVIOR(128),
-        NORMAL_BEHAVIOUR(129),
-        FEASIBLE_BEHAVIOR(130),
-        FEASIBLE_BEHAVIOUR(131),
-        NORMAL_EXAMPLE(132),
-        NOWARN(133),
-        NOWARN_OP(134),
-        NULLABLE(135),
-        NULLABLE_BY_DEFAULT(136),
-        NUM_OF(137),
-        OLD(138),
-        OR(139),
-        POST(140),
-        POST_REDUNDANTLY(141),
-        PRE_ESC(142),
-        PRE(143),
-        PRE_REDUNDANTLY(144),
-        PRODUCT(145),
-        PURE(146),
-        READABLE(147),
-        REFINING(148),
-        REPRESENTS(149),
-        REPRESENTS_REDUNDANTLY(150),
-        REQUIRES_REDUNDANTLY(151),
-        RESULT(152),
-        RETURNS(153),
-        RETURNS_REDUNDANTLY(154),
-        RETURN_BEHAVIOR(155),
-        BACKARROW(156),
-        RETURN_BEHAVIOUR(157),
-        SAFE_MATH(158),
-        SET(159),
-        SIGNALS(160),
-        SIGNALS_ONLY(161),
-        SIGNALS_ONLY_REDUNDANTLY(162),
-        SIGNALS_REDUNDANTLY(163),
-        SPEC_BIGINT_MATH(164),
-        SPEC_JAVA_MATH(165),
-        SPEC_PACKAGE(166),
-        SPEC_PRIVATE(167),
-        SPEC_PROTECTED(168),
-        SPEC_PUBLIC(169),
-        SPEC_SAFE_MATH(170),
-        STATIC_INITIALIZER(171),
-        STRICTLY_PURE(172),
-        SUBTYPE(173),
-        SUCH_THAT(174),
-        SUM(175),
-        TYPE(176),
-        UNINITIALIZED(177),
-        UNKNOWN_OP(178),
-        UNKNOWN_OP_EQ(179),
-        UNREACHABLE(180),
-        WARN(181),
-        WARN_OP(182),
-        WHEN_REDUNDANTLY(183),
-        WORKING_SPACE_ESC(184),
-        WORKING_SPACE(185),
-        WORKING_SPACE_REDUNDANTLY(186),
-        WRITABLE(187),
-        DOTDOT(188),
-        JML_LINE_COMMENT(189),
-        SINGLE_LINE_COMMENT(190),
-        JML_ENTER_MULTILINE_COMMENT(191),
-        ENTER_JAVADOC_COMMENT(192),
-        ENTER_JML_BLOCK_COMMENT(193),
-        ENTER_MULTILINE_COMMENT(194),
-        JML_BLOCK_COMMENT(195),
-        JAVADOC_COMMENT(196),
-        MULTI_LINE_COMMENT(197),
-        JML_MULTI_LINE_COMMENT(198),
-        COMMENT_CONTENT(199),
-        ABSTRACT(200),
-        ASSERT(201),
-        BOOLEAN(202),
-        BREAK(203),
-        BYTE(204),
-        CASE(205),
-        CATCH(206),
-        CHAR(207),
-        CLASS(208),
-        CONST(209),
-        CONTINUE(210),
-        _DEFAULT(211),
-        DO(212),
-        DOUBLE(213),
-        ELSE(214),
-        ENUM(215),
-        EXTENDS(216),
-        FALSE(217),
-        FINAL(218),
-        FINALLY(219),
-        FLOAT(220),
-        FOR(221),
-        GOTO(222),
-        IF(223),
-        IMPLEMENTS(224),
-        IMPORT(225),
-        INSTANCEOF(226),
-        INT(227),
-        INTERFACE(228),
-        LONG(229),
-        NATIVE(230),
-        NEW(231),
-        NON_SEALED(232),
-        NULL(233),
-        PACKAGE(234),
-        PERMITS(235),
-        PRIVATE(236),
-        PROTECTED(237),
-        PUBLIC(238),
-        RECORD(239),
-        RETURN(240),
-        SEALED(241),
-        SHORT(242),
-        STATIC(243),
-        STRICTFP(244),
-        SUPER(245),
-        SWITCH(246),
-        SYNCHRONIZED(247),
-        THIS(248),
-        THROW(249),
-        THROWS(250),
-        TRANSIENT(251),
-        TRUE(252),
-        TRY(253),
-        VOID(254),
-        VOLATILE(255),
-        WHILE(256),
-        YIELD(257),
-        REQUIRES(258),
-        TO(259),
-        WITH(260),
-        OPEN(261),
-        OPENS(262),
-        USES(263),
-        MODULE(264),
-        EXPORTS(265),
-        PROVIDES(266),
-        TRANSITIVE(267),
-        WHEN(268),
-        SOURCE(269),
-        TRANSACTIONBEGIN(270),
-        TRANSACTIONCOMMIT(271),
-        TRANSACTIONFINISH(272),
-        TRANSACTIONABORT(273),
-        RETURNTYPE(274),
-        LOOPSCOPE(275),
-        MERGE_POINT(276),
-        METHODFRAME(277),
-        EXEC(278),
-        CONTINUETYPE(279),
-        CCATCH(280),
-        CCAT(281),
-        BREAKTYPE(282),
-        TYPEOF(283),
-        SWITCHTOIF(284),
-        UNPACK(285),
-        REATTACHLOOPINVARIANT(286),
-        FORINITUNFOLDTRANSFORMER(287),
-        LOOPSCOPEINVARIANTTRANSFORMER(288),
-        SETSV(289),
-        ISSTATIC(290),
-        EVALARGS(291),
-        REPLACEARGS(292),
-        UNWINDLOOP(293),
-        CATCHALL(294),
-        COMMIT(295),
-        FINISH(296),
-        ABORT(297),
-        UNWIND_LOOP_BOUNDED(298),
-        FORTOWHILE(299),
-        DOBREAK(300),
-        METHODCALL(301),
-        EXPANDMETHODBODY(302),
-        CONSTRUCTORCALL(303),
-        SPECIALCONSTRUCTORECALL(304),
-        POSTWORK(305),
-        STATICINITIALIZATION(306),
-        RESOLVE_MULTIPLE_VAR_DECL(307),
-        ARRAY_POST_DECL(308),
-        ARRAY_INIT_CREATION(309),
-        ARRAY_INIT_CREATION_TRANSIENT(310),
-        ARRAY_INIT_CREATION_ASSIGNMENTS(311),
-        ENHANCEDFOR_ELIM(312),
-        STATIC_EVALUATE(313),
-        CREATE_OBJECT(314),
-        LENGTHREF(315),
-        RESULTARROW(316),
-        LONG_LITERAL(317),
-        INTEGER_LITERAL(318),
-        DECIMAL_LITERAL(319),
-        HEX_LITERAL(320),
-        OCTAL_LITERAL(321),
-        BINARY_LITERAL(322),
-        FLOATING_POINT_LITERAL(323),
-        DECIMAL_FLOATING_POINT_LITERAL(324),
-        DECIMAL_EXPONENT(325),
-        HEXADECIMAL_FLOATING_POINT_LITERAL(326),
-        HEXADECIMAL_EXPONENT(327),
-        HEX_DIGITS(328),
-        UNICODE_ESCAPE(329),
-        CHARACTER_LITERAL(330),
-        STRING_LITERAL(331),
-        ENTER_TEXT_BLOCK(332),
-        TEXT_BLOCK_LITERAL(333),
-        TEXT_BLOCK_CONTENT(334),
-        JML_IDENTIFIER(335),
-        IDENTIFIER(336),
-        JMLIDENTIFIER(337),
-        SVIDENTIFIER(338),
-        KEYIDENTIFIER(339),
-        NON_UNDERSCORE_LETTER(340),
-        PART_LETTER(341),
-        LPAREN(342),
-        RPAREN(343),
-        LBRACE(344),
-        RBRACE(345),
-        LBRACKET(346),
-        RBRACKET(347),
-        SEMICOLON(348),
-        COMMA(349),
-        DOT(350),
-        ELLIPSIS(351),
-        AT(352),
-        DOUBLECOLON(353),
-        ASSIGN(354),
-        LT(355),
-        BANG(356),
-        TILDE(357),
-        HOOK(358),
-        COLON(359),
-        ARROW(360),
-        EQ(361),
-        GE(362),
-        LE(363),
-        NE(364),
-        SC_AND(365),
-        SC_OR(366),
-        INCR(367),
-        DECR(368),
-        PLUS(369),
-        MINUS(370),
-        STAR(371),
-        SLASH(372),
-        BIT_AND(373),
-        BIT_OR(374),
-        XOR(375),
-        REM(376),
-        LSHIFT(377),
-        SHARP(378),
-        PLUSASSIGN(379),
-        MINUSASSIGN(380),
-        STARASSIGN(381),
-        SLASHASSIGN(382),
-        ANDASSIGN(383),
-        ORASSIGN(384),
-        XORASSIGN(385),
-        REMASSIGN(386),
-        LSHIFTASSIGN(387),
-        RSIGNEDSHIFTASSIGN(388),
-        RUNSIGNEDSHIFTASSIGN(389),
-        RUNSIGNEDSHIFT(390),
-        RSIGNEDSHIFT(391),
-        GT(392),
-        CTRL_Z(393),
-        UNNAMED_PLACEHOLDER(394);
+        JML_ASSERT(14),
+        ASSERT_REDUNDANTLY(15),
+        ASSIGNABLE(16),
+        ASSIGNABLE_REDUNDANTLY(17),
+        ASSUME(18),
+        ASSUME_REDUNDANTLY(19),
+        AXIOM(20),
+        BEHAVIOR(21),
+        BEHAVIOUR(22),
+        BIGINT(23),
+        BIGINT_MATH(24),
+        BREAKS(25),
+        BREAKS_REDUNDANTLY(26),
+        BREAK_BEHAVIOR(27),
+        BREAK_BEHAVIOUR(28),
+        CALLABLE(29),
+        CALLABLE_REDUNDANTLY(30),
+        CAPTURES(31),
+        CAPTURES_REDUNDANTLY(32),
+        CHOOSE(33),
+        CHOOSE_IF(34),
+        CODE(35),
+        CODE_BIGINT_MATH(36),
+        CODE_JAVA_MATH(37),
+        CODE_SAFE_MATH(38),
+        IMMUTABLE(39),
+        CONSTRAINT(40),
+        CONSTRAINT_REDUNDANTLY(41),
+        CONSTRUCTOR(42),
+        CONTINUES(43),
+        CONTINUES_REDUNDANTLY(44),
+        CONTINUE_BEHAVIOR(45),
+        CONTINUE_BEHAVIOUR(46),
+        DECLASSIFIES(47),
+        DECREASES(48),
+        DECREASES_REDUNDANTLY(49),
+        DECREASING(50),
+        DECREASING_REDUNDANTLY(51),
+        DETERMINES(52),
+        LOOP_DETERMINES(53),
+        SEPARATES(54),
+        LOOP_SEPARATES(55),
+        NEW_OBJECTS(56),
+        BY(57),
+        DIVERGES(58),
+        DIVERGES_REDUNDANTLY(59),
+        DURATION(60),
+        DURATION_REDUNDANTLY(61),
+        ENSURES(62),
+        ENSURES_REDUNDANTLY(63),
+        ENSURES_FREE(64),
+        REQUIRES_FREE(65),
+        EQUIVALENCE(66),
+        IMPLICATION(67),
+        IMPLICATION_BACKWARD(68),
+        ERASES(69),
+        EXAMPLE(70),
+        EXCEPTIONAL_BEHAVIOR(71),
+        EXCEPTIONAL_BEHAVIOUR(72),
+        EXCEPTIONAL_EXAMPLE(73),
+        EXISTS(74),
+        EXSURES(75),
+        EXSURES_REDUNDANTLY(76),
+        EXTRACT(77),
+        FIELD(78),
+        FORALLQ(79),
+        LET(80),
+        FORALL(81),
+        FOR_EXAMPLE(82),
+        PEER(83),
+        REP(84),
+        READ_ONLY(85),
+        GHOST(86),
+        BEGIN(87),
+        END(88),
+        HELPER(89),
+        HENCE_BY(90),
+        HENCE_BY_REDUNDANTLY(91),
+        IMPLIES_THAT(92),
+        IN(93),
+        INITIALIZER(94),
+        INITIALLY(95),
+        INSTANCE(96),
+        TWO_STATE(97),
+        NO_STATE(98),
+        NON_NULL_BY_DEFAULT(99),
+        INVARIANT_REDUNDANTLY(100),
+        IN_REDUNDANTLY(101),
+        JAVA_MATH(102),
+        LBLNEG(103),
+        LBLPOS(104),
+        LBL(105),
+        LOOP_CONTRACT(106),
+        LOOP_INVARIANT(107),
+        LOOP_INVARIANT_FREE(108),
+        LOOP_INVARIANT_REDUNDANTLY(109),
+        MAINTAINING(110),
+        MAINTAINING_REDUNDANTLY(111),
+        MAPS(112),
+        MAPS_REDUNDANTLY(113),
+        MAX(114),
+        MEASURED_BY(115),
+        ESC_MEASURED_BY(116),
+        MEASURED_BY_REDUNDANTLY(117),
+        METHOD(118),
+        MIN(119),
+        MODEL(120),
+        MODEL_PROGRAM(121),
+        MODIFIABLE(122),
+        MODIFIABLE_REDUNDANTLY(123),
+        LOOP_MODIFIES(124),
+        MODIFIES(125),
+        MODIFIES_REDUNDANTLY(126),
+        MONITORED(127),
+        MONITORS_FOR(128),
+        NESTED_CONTRACT_END(129),
+        NESTED_CONTRACT_START(130),
+        NONNULLELEMENTS(131),
+        NON_NULL(132),
+        NORMAL_BEHAVIOR(133),
+        NORMAL_BEHAVIOUR(134),
+        FEASIBLE_BEHAVIOR(135),
+        FEASIBLE_BEHAVIOUR(136),
+        NORMAL_EXAMPLE(137),
+        NOWARN(138),
+        NOWARN_OP(139),
+        NULLABLE(140),
+        NULLABLE_BY_DEFAULT(141),
+        NUM_OF(142),
+        OLD(143),
+        OR(144),
+        POST(145),
+        POST_REDUNDANTLY(146),
+        PRE_ESC(147),
+        PRE(148),
+        PRE_REDUNDANTLY(149),
+        PRODUCT(150),
+        PURE(151),
+        READABLE(152),
+        REFINING(153),
+        REPRESENTS(154),
+        REPRESENTS_REDUNDANTLY(155),
+        REQUIRES_REDUNDANTLY(156),
+        RESULT(157),
+        RETURNS(158),
+        RETURNS_REDUNDANTLY(159),
+        RETURN_BEHAVIOR(160),
+        BACKARROW(161),
+        RETURN_BEHAVIOUR(162),
+        SAFE_MATH(163),
+        SET(164),
+        SIGNALS(165),
+        SIGNALS_ONLY(166),
+        SIGNALS_ONLY_REDUNDANTLY(167),
+        SIGNALS_REDUNDANTLY(168),
+        SPEC_BIGINT_MATH(169),
+        SPEC_JAVA_MATH(170),
+        SPEC_PACKAGE(171),
+        SPEC_PRIVATE(172),
+        SPEC_PROTECTED(173),
+        SPEC_PUBLIC(174),
+        SPEC_SAFE_MATH(175),
+        STATIC_INITIALIZER(176),
+        STRICTLY_PURE(177),
+        SUBTYPE(178),
+        SUCH_THAT(179),
+        SUM(180),
+        TYPE(181),
+        UNINITIALIZED(182),
+        UNKNOWN_OP(183),
+        UNKNOWN_OP_EQ(184),
+        UNREACHABLE(185),
+        WARN(186),
+        WARN_OP(187),
+        WHEN_REDUNDANTLY(188),
+        WORKING_SPACE_ESC(189),
+        WORKING_SPACE(190),
+        WORKING_SPACE_REDUNDANTLY(191),
+        WRITABLE(192),
+        JML_LINE_COMMENT(193),
+        SINGLE_LINE_COMMENT(194),
+        JML_ENTER_MULTILINE_COMMENT(195),
+        ENTER_JAVADOC_COMMENT(196),
+        ENTER_JML_BLOCK_COMMENT(197),
+        ENTER_MULTILINE_COMMENT(198),
+        JML_BLOCK_COMMENT(199),
+        JAVADOC_COMMENT(200),
+        MULTI_LINE_COMMENT(201),
+        JML_MULTI_LINE_COMMENT(202),
+        COMMENT_CONTENT(203),
+        ASSERT(204),
+        ABSTRACT(205),
+        BOOLEAN(206),
+        BREAK(207),
+        BYTE(208),
+        CASE(209),
+        CATCH(210),
+        CHAR(211),
+        CLASS(212),
+        CONST(213),
+        CONTINUE(214),
+        _DEFAULT(215),
+        DO(216),
+        DOUBLE(217),
+        ELSE(218),
+        ENUM(219),
+        EXTENDS(220),
+        FALSE(221),
+        FINAL(222),
+        FINALLY(223),
+        FLOAT(224),
+        FOR(225),
+        GOTO(226),
+        IF(227),
+        IMPLEMENTS(228),
+        IMPORT(229),
+        INSTANCEOF(230),
+        INT(231),
+        INTERFACE(232),
+        LONG(233),
+        NATIVE(234),
+        NEW(235),
+        NON_SEALED(236),
+        NULL(237),
+        PACKAGE(238),
+        PERMITS(239),
+        PRIVATE(240),
+        PROTECTED(241),
+        PUBLIC(242),
+        RECORD(243),
+        RETURN(244),
+        SEALED(245),
+        SHORT(246),
+        STATIC(247),
+        STRICTFP(248),
+        SUPER(249),
+        SWITCH(250),
+        SYNCHRONIZED(251),
+        THIS(252),
+        THROW(253),
+        THROWS(254),
+        TRANSIENT(255),
+        TRUE(256),
+        TRY(257),
+        VOID(258),
+        VOLATILE(259),
+        WHILE(260),
+        YIELD(261),
+        REQUIRES(262),
+        TO(263),
+        WITH(264),
+        OPEN(265),
+        OPENS(266),
+        USES(267),
+        MODULE(268),
+        EXPORTS(269),
+        PROVIDES(270),
+        TRANSITIVE(271),
+        WHEN(272),
+        SOURCE(273),
+        TRANSACTIONBEGIN(274),
+        TRANSACTIONCOMMIT(275),
+        TRANSACTIONFINISH(276),
+        TRANSACTIONABORT(277),
+        RETURNTYPE(278),
+        LOOPSCOPE(279),
+        MERGE_POINT(280),
+        METHODFRAME(281),
+        EXEC(282),
+        CONTINUETYPE(283),
+        CCATCH(284),
+        CCAT(285),
+        BREAKTYPE(286),
+        TYPEOF(287),
+        SWITCHTOIF(288),
+        UNPACK(289),
+        REATTACHLOOPINVARIANT(290),
+        FORINITUNFOLDTRANSFORMER(291),
+        LOOPSCOPEINVARIANTTRANSFORMER(292),
+        SETSV(293),
+        ISSTATIC(294),
+        EVALARGS(295),
+        REPLACEARGS(296),
+        UNWINDLOOP(297),
+        CATCHALL(298),
+        COMMIT(299),
+        FINISH(300),
+        ABORT(301),
+        UNWIND_LOOP_BOUNDED(302),
+        FORTOWHILE(303),
+        DOBREAK(304),
+        METHODCALL(305),
+        EXPANDMETHODBODY(306),
+        CONSTRUCTORCALL(307),
+        SPECIALCONSTRUCTORECALL(308),
+        POSTWORK(309),
+        STATICINITIALIZATION(310),
+        RESOLVE_MULTIPLE_VAR_DECL(311),
+        ARRAY_POST_DECL(312),
+        ARRAY_INIT_CREATION(313),
+        ARRAY_INIT_CREATION_TRANSIENT(314),
+        ARRAY_INIT_CREATION_ASSIGNMENTS(315),
+        ENHANCEDFOR_ELIM(316),
+        STATIC_EVALUATE(317),
+        CREATE_OBJECT(318),
+        LENGTHREF(319),
+        RESULTARROW(320),
+        LONG_LITERAL(321),
+        INTEGER_LITERAL(322),
+        DECIMAL_LITERAL(323),
+        HEX_LITERAL(324),
+        OCTAL_LITERAL(325),
+        BINARY_LITERAL(326),
+        FLOATING_POINT_LITERAL(327),
+        DECIMAL_FLOATING_POINT_LITERAL(328),
+        DECIMAL_EXPONENT(329),
+        HEXADECIMAL_FLOATING_POINT_LITERAL(330),
+        HEXADECIMAL_EXPONENT(331),
+        HEX_DIGITS(332),
+        UNICODE_ESCAPE(333),
+        CHARACTER_LITERAL(334),
+        STRING_LITERAL(335),
+        ENTER_TEXT_BLOCK(336),
+        TEXT_BLOCK_LITERAL(337),
+        TEXT_BLOCK_CONTENT(338),
+        IDENTIFIER(339),
+        JML_IDENTIFIER(340),
+        SVIDENTIFIER(341),
+        KEYIDENTIFIER(342),
+        NON_UNDERSCORE_LETTER(343),
+        PART_LETTER(344),
+        LPAREN(345),
+        RPAREN(346),
+        LBRACE(347),
+        RBRACE(348),
+        LBRACKET(349),
+        RBRACKET(350),
+        SEMICOLON(351),
+        COMMA(352),
+        DOTDOT(353),
+        ELLIPSIS(354),
+        DOT(355),
+        AT(356),
+        DOUBLECOLON(357),
+        ASSIGN(358),
+        LT(359),
+        BANG(360),
+        TILDE(361),
+        HOOK(362),
+        COLON(363),
+        ARROW(364),
+        EQ(365),
+        GE(366),
+        LE(367),
+        NE(368),
+        SC_AND(369),
+        SC_OR(370),
+        INCR(371),
+        DECR(372),
+        PLUS(373),
+        MINUS(374),
+        STAR(375),
+        SLASH(376),
+        BIT_AND(377),
+        BIT_OR(378),
+        XOR(379),
+        REM(380),
+        LSHIFT(381),
+        SHARP(382),
+        PLUSASSIGN(383),
+        MINUSASSIGN(384),
+        STARASSIGN(385),
+        SLASHASSIGN(386),
+        ANDASSIGN(387),
+        ORASSIGN(388),
+        XORASSIGN(389),
+        REMASSIGN(390),
+        LSHIFTASSIGN(391),
+        RSIGNEDSHIFTASSIGN(392),
+        RUNSIGNEDSHIFTASSIGN(393),
+        RUNSIGNEDSHIFT(394),
+        RSIGNEDSHIFT(395),
+        GT(396),
+        CTRL_Z(397),
+        UNNAMED_PLACEHOLDER(398);
 
         private final int kind;
 
@@ -666,769 +665,777 @@ public enum Kind {
         }
 
         public static Kind valueOf(int kind) {
-            switch (kind) {
-                case 394:
+            switch(kind) {
+                case 398:
                     return UNNAMED_PLACEHOLDER;
-                case 393:
+                case 397:
                     return CTRL_Z;
-                case 392:
+                case 396:
                     return GT;
-                case 391:
+                case 395:
                     return RSIGNEDSHIFT;
-                case 390:
+                case 394:
                     return RUNSIGNEDSHIFT;
-                case 389:
+                case 393:
                     return RUNSIGNEDSHIFTASSIGN;
-                case 388:
+                case 392:
                     return RSIGNEDSHIFTASSIGN;
-                case 387:
+                case 391:
                     return LSHIFTASSIGN;
-                case 386:
+                case 390:
                     return REMASSIGN;
-                case 385:
+                case 389:
                     return XORASSIGN;
-                case 384:
+                case 388:
                     return ORASSIGN;
-                case 383:
+                case 387:
                     return ANDASSIGN;
-                case 382:
+                case 386:
                     return SLASHASSIGN;
-                case 381:
+                case 385:
                     return STARASSIGN;
-                case 380:
+                case 384:
                     return MINUSASSIGN;
-                case 379:
+                case 383:
                     return PLUSASSIGN;
-                case 378:
+                case 382:
                     return SHARP;
-                case 377:
+                case 381:
                     return LSHIFT;
-                case 376:
+                case 380:
                     return REM;
-                case 375:
+                case 379:
                     return XOR;
-                case 374:
+                case 378:
                     return BIT_OR;
-                case 373:
+                case 377:
                     return BIT_AND;
-                case 372:
+                case 376:
                     return SLASH;
-                case 371:
+                case 375:
                     return STAR;
-                case 370:
+                case 374:
                     return MINUS;
-                case 369:
+                case 373:
                     return PLUS;
-                case 368:
+                case 372:
                     return DECR;
-                case 367:
+                case 371:
                     return INCR;
-                case 366:
+                case 370:
                     return SC_OR;
-                case 365:
+                case 369:
                     return SC_AND;
-                case 364:
+                case 368:
                     return NE;
-                case 363:
+                case 367:
                     return LE;
-                case 362:
+                case 366:
                     return GE;
-                case 361:
+                case 365:
                     return EQ;
-                case 360:
+                case 364:
                     return ARROW;
-                case 359:
+                case 363:
                     return COLON;
-                case 358:
+                case 362:
                     return HOOK;
-                case 357:
+                case 361:
                     return TILDE;
-                case 356:
+                case 360:
                     return BANG;
-                case 355:
+                case 359:
                     return LT;
-                case 354:
+                case 358:
                     return ASSIGN;
-                case 353:
+                case 357:
                     return DOUBLECOLON;
-                case 352:
+                case 356:
                     return AT;
-                case 351:
+                case 355:
+                    return DOT;
+                case 354:
                     return ELLIPSIS;
+                case 353:
+                    return DOTDOT;
+                case 352:
+                    return COMMA;
+                case 351:
+                    return SEMICOLON;
                 case 350:
-                    return DOT;
+                    return RBRACKET;
                 case 349:
-                    return COMMA;
+                    return LBRACKET;
                 case 348:
-                    return SEMICOLON;
+                    return RBRACE;
                 case 347:
-                    return RBRACKET;
+                    return LBRACE;
                 case 346:
-                    return LBRACKET;
+                    return RPAREN;
                 case 345:
-                    return RBRACE;
+                    return LPAREN;
                 case 344:
-                    return LBRACE;
+                    return PART_LETTER;
                 case 343:
-                    return RPAREN;
+                    return NON_UNDERSCORE_LETTER;
                 case 342:
-                    return LPAREN;
+                    return KEYIDENTIFIER;
                 case 341:
-                    return PART_LETTER;
+                    return SVIDENTIFIER;
                 case 340:
-                    return NON_UNDERSCORE_LETTER;
+                    return JML_IDENTIFIER;
                 case 339:
-                    return KEYIDENTIFIER;
+                    return IDENTIFIER;
                 case 338:
-                    return SVIDENTIFIER;
+                    return TEXT_BLOCK_CONTENT;
                 case 337:
-                    return JMLIDENTIFIER;
+                    return TEXT_BLOCK_LITERAL;
                 case 336:
-                    return IDENTIFIER;
+                    return ENTER_TEXT_BLOCK;
                 case 335:
-                    return JML_IDENTIFIER;
+                    return STRING_LITERAL;
                 case 334:
-                    return TEXT_BLOCK_CONTENT;
+                    return CHARACTER_LITERAL;
                 case 333:
-                    return TEXT_BLOCK_LITERAL;
+                    return UNICODE_ESCAPE;
                 case 332:
-                    return ENTER_TEXT_BLOCK;
+                    return HEX_DIGITS;
                 case 331:
-                    return STRING_LITERAL;
+                    return HEXADECIMAL_EXPONENT;
                 case 330:
-                    return CHARACTER_LITERAL;
+                    return HEXADECIMAL_FLOATING_POINT_LITERAL;
                 case 329:
-                    return UNICODE_ESCAPE;
+                    return DECIMAL_EXPONENT;
                 case 328:
-                    return HEX_DIGITS;
+                    return DECIMAL_FLOATING_POINT_LITERAL;
                 case 327:
-                    return HEXADECIMAL_EXPONENT;
+                    return FLOATING_POINT_LITERAL;
                 case 326:
-                    return HEXADECIMAL_FLOATING_POINT_LITERAL;
+                    return BINARY_LITERAL;
                 case 325:
-                    return DECIMAL_EXPONENT;
+                    return OCTAL_LITERAL;
                 case 324:
-                    return DECIMAL_FLOATING_POINT_LITERAL;
+                    return HEX_LITERAL;
                 case 323:
-                    return FLOATING_POINT_LITERAL;
+                    return DECIMAL_LITERAL;
                 case 322:
-                    return BINARY_LITERAL;
+                    return INTEGER_LITERAL;
                 case 321:
-                    return OCTAL_LITERAL;
+                    return LONG_LITERAL;
                 case 320:
-                    return HEX_LITERAL;
+                    return RESULTARROW;
                 case 319:
-                    return DECIMAL_LITERAL;
+                    return LENGTHREF;
                 case 318:
-                    return INTEGER_LITERAL;
+                    return CREATE_OBJECT;
                 case 317:
-                    return LONG_LITERAL;
+                    return STATIC_EVALUATE;
                 case 316:
-                    return RESULTARROW;
+                    return ENHANCEDFOR_ELIM;
                 case 315:
-                    return LENGTHREF;
+                    return ARRAY_INIT_CREATION_ASSIGNMENTS;
                 case 314:
-                    return CREATE_OBJECT;
+                    return ARRAY_INIT_CREATION_TRANSIENT;
                 case 313:
-                    return STATIC_EVALUATE;
+                    return ARRAY_INIT_CREATION;
                 case 312:
-                    return ENHANCEDFOR_ELIM;
+                    return ARRAY_POST_DECL;
                 case 311:
-                    return ARRAY_INIT_CREATION_ASSIGNMENTS;
+                    return RESOLVE_MULTIPLE_VAR_DECL;
                 case 310:
-                    return ARRAY_INIT_CREATION_TRANSIENT;
+                    return STATICINITIALIZATION;
                 case 309:
-                    return ARRAY_INIT_CREATION;
+                    return POSTWORK;
                 case 308:
-                    return ARRAY_POST_DECL;
+                    return SPECIALCONSTRUCTORECALL;
                 case 307:
-                    return RESOLVE_MULTIPLE_VAR_DECL;
+                    return CONSTRUCTORCALL;
                 case 306:
-                    return STATICINITIALIZATION;
+                    return EXPANDMETHODBODY;
                 case 305:
-                    return POSTWORK;
+                    return METHODCALL;
                 case 304:
-                    return SPECIALCONSTRUCTORECALL;
+                    return DOBREAK;
                 case 303:
-                    return CONSTRUCTORCALL;
+                    return FORTOWHILE;
                 case 302:
-                    return EXPANDMETHODBODY;
+                    return UNWIND_LOOP_BOUNDED;
                 case 301:
-                    return METHODCALL;
+                    return ABORT;
                 case 300:
-                    return DOBREAK;
+                    return FINISH;
                 case 299:
-                    return FORTOWHILE;
+                    return COMMIT;
                 case 298:
-                    return UNWIND_LOOP_BOUNDED;
+                    return CATCHALL;
                 case 297:
-                    return ABORT;
+                    return UNWINDLOOP;
                 case 296:
-                    return FINISH;
+                    return REPLACEARGS;
                 case 295:
-                    return COMMIT;
+                    return EVALARGS;
                 case 294:
-                    return CATCHALL;
+                    return ISSTATIC;
                 case 293:
-                    return UNWINDLOOP;
+                    return SETSV;
                 case 292:
-                    return REPLACEARGS;
+                    return LOOPSCOPEINVARIANTTRANSFORMER;
                 case 291:
-                    return EVALARGS;
+                    return FORINITUNFOLDTRANSFORMER;
                 case 290:
-                    return ISSTATIC;
+                    return REATTACHLOOPINVARIANT;
                 case 289:
-                    return SETSV;
+                    return UNPACK;
                 case 288:
-                    return LOOPSCOPEINVARIANTTRANSFORMER;
+                    return SWITCHTOIF;
                 case 287:
-                    return FORINITUNFOLDTRANSFORMER;
+                    return TYPEOF;
                 case 286:
-                    return REATTACHLOOPINVARIANT;
+                    return BREAKTYPE;
                 case 285:
-                    return UNPACK;
+                    return CCAT;
                 case 284:
-                    return SWITCHTOIF;
+                    return CCATCH;
                 case 283:
-                    return TYPEOF;
+                    return CONTINUETYPE;
                 case 282:
-                    return BREAKTYPE;
+                    return EXEC;
                 case 281:
-                    return CCAT;
+                    return METHODFRAME;
                 case 280:
-                    return CCATCH;
+                    return MERGE_POINT;
                 case 279:
-                    return CONTINUETYPE;
+                    return LOOPSCOPE;
                 case 278:
-                    return EXEC;
+                    return RETURNTYPE;
                 case 277:
-                    return METHODFRAME;
+                    return TRANSACTIONABORT;
                 case 276:
-                    return MERGE_POINT;
+                    return TRANSACTIONFINISH;
                 case 275:
-                    return LOOPSCOPE;
+                    return TRANSACTIONCOMMIT;
                 case 274:
-                    return RETURNTYPE;
+                    return TRANSACTIONBEGIN;
                 case 273:
-                    return TRANSACTIONABORT;
+                    return SOURCE;
                 case 272:
-                    return TRANSACTIONFINISH;
+                    return WHEN;
                 case 271:
-                    return TRANSACTIONCOMMIT;
+                    return TRANSITIVE;
                 case 270:
-                    return TRANSACTIONBEGIN;
+                    return PROVIDES;
                 case 269:
-                    return SOURCE;
+                    return EXPORTS;
                 case 268:
-                    return WHEN;
+                    return MODULE;
                 case 267:
-                    return TRANSITIVE;
+                    return USES;
                 case 266:
-                    return PROVIDES;
+                    return OPENS;
                 case 265:
-                    return EXPORTS;
+                    return OPEN;
                 case 264:
-                    return MODULE;
+                    return WITH;
                 case 263:
-                    return USES;
+                    return TO;
                 case 262:
-                    return OPENS;
+                    return REQUIRES;
                 case 261:
-                    return OPEN;
+                    return YIELD;
                 case 260:
-                    return WITH;
+                    return WHILE;
                 case 259:
-                    return TO;
+                    return VOLATILE;
                 case 258:
-                    return REQUIRES;
+                    return VOID;
                 case 257:
-                    return YIELD;
+                    return TRY;
                 case 256:
-                    return WHILE;
+                    return TRUE;
                 case 255:
-                    return VOLATILE;
+                    return TRANSIENT;
                 case 254:
-                    return VOID;
+                    return THROWS;
                 case 253:
-                    return TRY;
+                    return THROW;
                 case 252:
-                    return TRUE;
+                    return THIS;
                 case 251:
-                    return TRANSIENT;
+                    return SYNCHRONIZED;
                 case 250:
-                    return THROWS;
+                    return SWITCH;
                 case 249:
-                    return THROW;
+                    return SUPER;
                 case 248:
-                    return THIS;
+                    return STRICTFP;
                 case 247:
-                    return SYNCHRONIZED;
+                    return STATIC;
                 case 246:
-                    return SWITCH;
+                    return SHORT;
                 case 245:
-                    return SUPER;
+                    return SEALED;
                 case 244:
-                    return STRICTFP;
+                    return RETURN;
                 case 243:
-                    return STATIC;
+                    return RECORD;
                 case 242:
-                    return SHORT;
+                    return PUBLIC;
                 case 241:
-                    return SEALED;
+                    return PROTECTED;
                 case 240:
-                    return RETURN;
+                    return PRIVATE;
                 case 239:
-                    return RECORD;
+                    return PERMITS;
                 case 238:
-                    return PUBLIC;
+                    return PACKAGE;
                 case 237:
-                    return PROTECTED;
+                    return NULL;
                 case 236:
-                    return PRIVATE;
+                    return NON_SEALED;
                 case 235:
-                    return PERMITS;
+                    return NEW;
                 case 234:
-                    return PACKAGE;
+                    return NATIVE;
                 case 233:
-                    return NULL;
+                    return LONG;
                 case 232:
-                    return NON_SEALED;
+                    return INTERFACE;
                 case 231:
-                    return NEW;
+                    return INT;
                 case 230:
-                    return NATIVE;
+                    return INSTANCEOF;
                 case 229:
-                    return LONG;
+                    return IMPORT;
                 case 228:
-                    return INTERFACE;
+                    return IMPLEMENTS;
                 case 227:
-                    return INT;
+                    return IF;
                 case 226:
-                    return INSTANCEOF;
+                    return GOTO;
                 case 225:
-                    return IMPORT;
+                    return FOR;
                 case 224:
-                    return IMPLEMENTS;
+                    return FLOAT;
                 case 223:
-                    return IF;
+                    return FINALLY;
                 case 222:
-                    return GOTO;
+                    return FINAL;
                 case 221:
-                    return FOR;
+                    return FALSE;
                 case 220:
-                    return FLOAT;
+                    return EXTENDS;
                 case 219:
-                    return FINALLY;
+                    return ENUM;
                 case 218:
-                    return FINAL;
+                    return ELSE;
                 case 217:
-                    return FALSE;
+                    return DOUBLE;
                 case 216:
-                    return EXTENDS;
+                    return DO;
                 case 215:
-                    return ENUM;
+                    return _DEFAULT;
                 case 214:
-                    return ELSE;
+                    return CONTINUE;
                 case 213:
-                    return DOUBLE;
+                    return CONST;
                 case 212:
-                    return DO;
+                    return CLASS;
                 case 211:
-                    return _DEFAULT;
+                    return CHAR;
                 case 210:
-                    return CONTINUE;
+                    return CATCH;
                 case 209:
-                    return CONST;
+                    return CASE;
                 case 208:
-                    return CLASS;
+                    return BYTE;
                 case 207:
-                    return CHAR;
+                    return BREAK;
                 case 206:
-                    return CATCH;
+                    return BOOLEAN;
                 case 205:
-                    return CASE;
+                    return ABSTRACT;
                 case 204:
-                    return BYTE;
+                    return ASSERT;
                 case 203:
-                    return BREAK;
+                    return COMMENT_CONTENT;
                 case 202:
-                    return BOOLEAN;
+                    return JML_MULTI_LINE_COMMENT;
                 case 201:
-                    return ASSERT;
+                    return MULTI_LINE_COMMENT;
                 case 200:
-                    return ABSTRACT;
+                    return JAVADOC_COMMENT;
                 case 199:
-                    return COMMENT_CONTENT;
+                    return JML_BLOCK_COMMENT;
                 case 198:
-                    return JML_MULTI_LINE_COMMENT;
+                    return ENTER_MULTILINE_COMMENT;
                 case 197:
-                    return MULTI_LINE_COMMENT;
+                    return ENTER_JML_BLOCK_COMMENT;
                 case 196:
-                    return JAVADOC_COMMENT;
+                    return ENTER_JAVADOC_COMMENT;
                 case 195:
-                    return JML_BLOCK_COMMENT;
+                    return JML_ENTER_MULTILINE_COMMENT;
                 case 194:
-                    return ENTER_MULTILINE_COMMENT;
+                    return SINGLE_LINE_COMMENT;
                 case 193:
-                    return ENTER_JML_BLOCK_COMMENT;
+                    return JML_LINE_COMMENT;
                 case 192:
-                    return ENTER_JAVADOC_COMMENT;
+                    return WRITABLE;
                 case 191:
-                    return JML_ENTER_MULTILINE_COMMENT;
+                    return WORKING_SPACE_REDUNDANTLY;
                 case 190:
-                    return SINGLE_LINE_COMMENT;
+                    return WORKING_SPACE;
                 case 189:
-                    return JML_LINE_COMMENT;
+                    return WORKING_SPACE_ESC;
                 case 188:
-                    return DOTDOT;
+                    return WHEN_REDUNDANTLY;
                 case 187:
-                    return WRITABLE;
+                    return WARN_OP;
                 case 186:
-                    return WORKING_SPACE_REDUNDANTLY;
+                    return WARN;
                 case 185:
-                    return WORKING_SPACE;
+                    return UNREACHABLE;
                 case 184:
-                    return WORKING_SPACE_ESC;
+                    return UNKNOWN_OP_EQ;
                 case 183:
-                    return WHEN_REDUNDANTLY;
+                    return UNKNOWN_OP;
                 case 182:
-                    return WARN_OP;
+                    return UNINITIALIZED;
                 case 181:
-                    return WARN;
+                    return TYPE;
                 case 180:
-                    return UNREACHABLE;
+                    return SUM;
                 case 179:
-                    return UNKNOWN_OP_EQ;
+                    return SUCH_THAT;
                 case 178:
-                    return UNKNOWN_OP;
+                    return SUBTYPE;
                 case 177:
-                    return UNINITIALIZED;
+                    return STRICTLY_PURE;
                 case 176:
-                    return TYPE;
+                    return STATIC_INITIALIZER;
                 case 175:
-                    return SUM;
+                    return SPEC_SAFE_MATH;
                 case 174:
-                    return SUCH_THAT;
+                    return SPEC_PUBLIC;
                 case 173:
-                    return SUBTYPE;
+                    return SPEC_PROTECTED;
                 case 172:
-                    return STRICTLY_PURE;
+                    return SPEC_PRIVATE;
                 case 171:
-                    return STATIC_INITIALIZER;
+                    return SPEC_PACKAGE;
                 case 170:
-                    return SPEC_SAFE_MATH;
+                    return SPEC_JAVA_MATH;
                 case 169:
-                    return SPEC_PUBLIC;
+                    return SPEC_BIGINT_MATH;
                 case 168:
-                    return SPEC_PROTECTED;
+                    return SIGNALS_REDUNDANTLY;
                 case 167:
-                    return SPEC_PRIVATE;
+                    return SIGNALS_ONLY_REDUNDANTLY;
                 case 166:
-                    return SPEC_PACKAGE;
+                    return SIGNALS_ONLY;
                 case 165:
-                    return SPEC_JAVA_MATH;
+                    return SIGNALS;
                 case 164:
-                    return SPEC_BIGINT_MATH;
+                    return SET;
                 case 163:
-                    return SIGNALS_REDUNDANTLY;
+                    return SAFE_MATH;
                 case 162:
-                    return SIGNALS_ONLY_REDUNDANTLY;
+                    return RETURN_BEHAVIOUR;
                 case 161:
-                    return SIGNALS_ONLY;
+                    return BACKARROW;
                 case 160:
-                    return SIGNALS;
+                    return RETURN_BEHAVIOR;
                 case 159:
-                    return SET;
+                    return RETURNS_REDUNDANTLY;
                 case 158:
-                    return SAFE_MATH;
+                    return RETURNS;
                 case 157:
-                    return RETURN_BEHAVIOUR;
+                    return RESULT;
                 case 156:
-                    return BACKARROW;
+                    return REQUIRES_REDUNDANTLY;
                 case 155:
-                    return RETURN_BEHAVIOR;
+                    return REPRESENTS_REDUNDANTLY;
                 case 154:
-                    return RETURNS_REDUNDANTLY;
+                    return REPRESENTS;
                 case 153:
-                    return RETURNS;
+                    return REFINING;
                 case 152:
-                    return RESULT;
+                    return READABLE;
                 case 151:
-                    return REQUIRES_REDUNDANTLY;
+                    return PURE;
                 case 150:
-                    return REPRESENTS_REDUNDANTLY;
+                    return PRODUCT;
                 case 149:
-                    return REPRESENTS;
+                    return PRE_REDUNDANTLY;
                 case 148:
-                    return REFINING;
+                    return PRE;
                 case 147:
-                    return READABLE;
+                    return PRE_ESC;
                 case 146:
-                    return PURE;
+                    return POST_REDUNDANTLY;
                 case 145:
-                    return PRODUCT;
+                    return POST;
                 case 144:
-                    return PRE_REDUNDANTLY;
+                    return OR;
                 case 143:
-                    return PRE;
+                    return OLD;
                 case 142:
-                    return PRE_ESC;
+                    return NUM_OF;
                 case 141:
-                    return POST_REDUNDANTLY;
+                    return NULLABLE_BY_DEFAULT;
                 case 140:
-                    return POST;
+                    return NULLABLE;
                 case 139:
-                    return OR;
+                    return NOWARN_OP;
                 case 138:
-                    return OLD;
+                    return NOWARN;
                 case 137:
-                    return NUM_OF;
+                    return NORMAL_EXAMPLE;
                 case 136:
-                    return NULLABLE_BY_DEFAULT;
+                    return FEASIBLE_BEHAVIOUR;
                 case 135:
-                    return NULLABLE;
+                    return FEASIBLE_BEHAVIOR;
                 case 134:
-                    return NOWARN_OP;
+                    return NORMAL_BEHAVIOUR;
                 case 133:
-                    return NOWARN;
+                    return NORMAL_BEHAVIOR;
                 case 132:
-                    return NORMAL_EXAMPLE;
+                    return NON_NULL;
                 case 131:
-                    return FEASIBLE_BEHAVIOUR;
+                    return NONNULLELEMENTS;
                 case 130:
-                    return FEASIBLE_BEHAVIOR;
+                    return NESTED_CONTRACT_START;
                 case 129:
-                    return NORMAL_BEHAVIOUR;
+                    return NESTED_CONTRACT_END;
                 case 128:
-                    return NORMAL_BEHAVIOR;
+                    return MONITORS_FOR;
                 case 127:
-                    return NON_NULL;
+                    return MONITORED;
                 case 126:
-                    return NONNULLELEMENTS;
+                    return MODIFIES_REDUNDANTLY;
                 case 125:
-                    return NEW_OBJECT;
+                    return MODIFIES;
                 case 124:
-                    return NESTED_CONTRACT_START;
+                    return LOOP_MODIFIES;
                 case 123:
-                    return NESTED_CONTRACT_END;
+                    return MODIFIABLE_REDUNDANTLY;
                 case 122:
-                    return MONITORS_FOR;
+                    return MODIFIABLE;
                 case 121:
-                    return MONITORED;
+                    return MODEL_PROGRAM;
                 case 120:
-                    return MODIFIES_REDUNDANTLY;
+                    return MODEL;
                 case 119:
-                    return MODIFIES;
+                    return MIN;
                 case 118:
-                    return LOOP_MODIFIES;
+                    return METHOD;
                 case 117:
-                    return MODIFIABLE_REDUNDANTLY;
+                    return MEASURED_BY_REDUNDANTLY;
                 case 116:
-                    return MODIFIABLE;
+                    return ESC_MEASURED_BY;
                 case 115:
-                    return MODEL_PROGRAM;
+                    return MEASURED_BY;
                 case 114:
-                    return MODEL;
+                    return MAX;
                 case 113:
-                    return MIN;
+                    return MAPS_REDUNDANTLY;
                 case 112:
-                    return METHOD;
+                    return MAPS;
                 case 111:
-                    return MEASURED_BY_REDUNDANTLY;
+                    return MAINTAINING_REDUNDANTLY;
                 case 110:
-                    return ESC_MEASURED_BY;
+                    return MAINTAINING;
                 case 109:
-                    return MEASURED_BY;
+                    return LOOP_INVARIANT_REDUNDANTLY;
                 case 108:
-                    return MAX;
+                    return LOOP_INVARIANT_FREE;
                 case 107:
-                    return MAPS_REDUNDANTLY;
+                    return LOOP_INVARIANT;
                 case 106:
-                    return MAPS;
+                    return LOOP_CONTRACT;
                 case 105:
-                    return MAINTAINING_REDUNDANTLY;
+                    return LBL;
                 case 104:
-                    return MAINTAINING;
+                    return LBLPOS;
                 case 103:
-                    return LOOP_INVARIANT_REDUNDANTLY;
+                    return LBLNEG;
                 case 102:
-                    return LOOP_INVARIANT_FREE;
+                    return JAVA_MATH;
                 case 101:
-                    return LOOP_INVARIANT;
+                    return IN_REDUNDANTLY;
                 case 100:
-                    return LOOP_CONTRACT;
+                    return INVARIANT_REDUNDANTLY;
                 case 99:
-                    return LBL;
+                    return NON_NULL_BY_DEFAULT;
                 case 98:
-                    return LBLPOS;
+                    return NO_STATE;
                 case 97:
-                    return LBLNEG;
+                    return TWO_STATE;
                 case 96:
-                    return JAVA_MATH;
+                    return INSTANCE;
                 case 95:
-                    return IN_REDUNDANTLY;
+                    return INITIALLY;
                 case 94:
-                    return INVARIANT_REDUNDANTLY;
+                    return INITIALIZER;
                 case 93:
-                    return NON_NULL_BY_DEFAULT;
+                    return IN;
                 case 92:
-                    return NO_STATE;
+                    return IMPLIES_THAT;
                 case 91:
-                    return TWO_STATE;
+                    return HENCE_BY_REDUNDANTLY;
                 case 90:
-                    return INSTANCE;
+                    return HENCE_BY;
                 case 89:
-                    return INITIALLY;
+                    return HELPER;
                 case 88:
-                    return INITIALIZER;
+                    return END;
                 case 87:
-                    return IN;
+                    return BEGIN;
                 case 86:
-                    return IMPLIES_THAT;
+                    return GHOST;
                 case 85:
-                    return HENCE_BY_REDUNDANTLY;
+                    return READ_ONLY;
                 case 84:
-                    return HENCE_BY;
+                    return REP;
                 case 83:
-                    return HELPER;
+                    return PEER;
                 case 82:
-                    return END;
+                    return FOR_EXAMPLE;
                 case 81:
-                    return BEGIN;
+                    return FORALL;
                 case 80:
-                    return GHOST;
+                    return LET;
                 case 79:
-                    return READ_ONLY;
+                    return FORALLQ;
                 case 78:
-                    return REP;
+                    return FIELD;
                 case 77:
-                    return PEER;
+                    return EXTRACT;
                 case 76:
-                    return FOR_EXAMPLE;
+                    return EXSURES_REDUNDANTLY;
                 case 75:
-                    return FORALL;
+                    return EXSURES;
                 case 74:
-                    return LET;
+                    return EXISTS;
                 case 73:
-                    return FORALLQ;
+                    return EXCEPTIONAL_EXAMPLE;
                 case 72:
-                    return FIELD;
+                    return EXCEPTIONAL_BEHAVIOUR;
                 case 71:
-                    return EXTRACT;
+                    return EXCEPTIONAL_BEHAVIOR;
                 case 70:
-                    return EXSURES_REDUNDANTLY;
+                    return EXAMPLE;
                 case 69:
-                    return EXSURES;
+                    return ERASES;
                 case 68:
-                    return EXISTS;
+                    return IMPLICATION_BACKWARD;
                 case 67:
-                    return EXCEPTIONAL_EXAMPLE;
+                    return IMPLICATION;
                 case 66:
-                    return EXCEPTIONAL_BEHAVIOUR;
+                    return EQUIVALENCE;
                 case 65:
-                    return EXCEPTIONAL_BEHAVIOR;
+                    return REQUIRES_FREE;
                 case 64:
-                    return EXAMPLE;
+                    return ENSURES_FREE;
                 case 63:
-                    return ERASES;
+                    return ENSURES_REDUNDANTLY;
                 case 62:
-                    return IMPLICATION_BACKWARD;
+                    return ENSURES;
                 case 61:
-                    return IMPLICATION;
+                    return DURATION_REDUNDANTLY;
                 case 60:
-                    return EQUIVALENCE;
+                    return DURATION;
                 case 59:
-                    return REQUIRES_FREE;
+                    return DIVERGES_REDUNDANTLY;
                 case 58:
-                    return ENSURES_FREE;
+                    return DIVERGES;
                 case 57:
-                    return ENSURES_REDUNDANTLY;
+                    return BY;
                 case 56:
-                    return ENSURES;
+                    return NEW_OBJECTS;
                 case 55:
-                    return DURATION_REDUNDANTLY;
+                    return LOOP_SEPARATES;
                 case 54:
-                    return DURATION;
+                    return SEPARATES;
                 case 53:
-                    return DIVERGES_REDUNDANTLY;
+                    return LOOP_DETERMINES;
                 case 52:
-                    return DIVERGES;
-                case 51:
                     return DETERMINES;
-                case 50:
+                case 51:
                     return DECREASING_REDUNDANTLY;
-                case 49:
+                case 50:
                     return DECREASING;
-                case 48:
+                case 49:
                     return DECREASES_REDUNDANTLY;
-                case 47:
+                case 48:
                     return DECREASES;
-                case 46:
+                case 47:
                     return DECLASSIFIES;
-                case 45:
+                case 46:
                     return CONTINUE_BEHAVIOUR;
-                case 44:
+                case 45:
                     return CONTINUE_BEHAVIOR;
-                case 43:
+                case 44:
                     return CONTINUES_REDUNDANTLY;
-                case 42:
+                case 43:
                     return CONTINUES;
-                case 41:
+                case 42:
                     return CONSTRUCTOR;
-                case 40:
+                case 41:
                     return CONSTRAINT_REDUNDANTLY;
-                case 39:
+                case 40:
                     return CONSTRAINT;
-                case 38:
+                case 39:
                     return IMMUTABLE;
-                case 37:
+                case 38:
                     return CODE_SAFE_MATH;
-                case 36:
+                case 37:
                     return CODE_JAVA_MATH;
-                case 35:
+                case 36:
                     return CODE_BIGINT_MATH;
-                case 34:
+                case 35:
                     return CODE;
-                case 33:
+                case 34:
                     return CHOOSE_IF;
-                case 32:
+                case 33:
                     return CHOOSE;
-                case 31:
+                case 32:
                     return CAPTURES_REDUNDANTLY;
-                case 30:
+                case 31:
                     return CAPTURES;
-                case 29:
+                case 30:
                     return CALLABLE_REDUNDANTLY;
-                case 28:
+                case 29:
                     return CALLABLE;
-                case 27:
+                case 28:
                     return BREAK_BEHAVIOUR;
-                case 26:
+                case 27:
                     return BREAK_BEHAVIOR;
-                case 25:
+                case 26:
                     return BREAKS_REDUNDANTLY;
-                case 24:
+                case 25:
                     return BREAKS;
-                case 23:
+                case 24:
                     return BIGINT_MATH;
-                case 22:
+                case 23:
                     return BIGINT;
-                case 21:
+                case 22:
                     return BEHAVIOUR;
-                case 20:
+                case 21:
                     return BEHAVIOR;
-                case 19:
+                case 20:
                     return AXIOM;
-                case 18:
+                case 19:
                     return ASSUME_REDUNDANTLY;
-                case 17:
+                case 18:
                     return ASSUME;
-                case 16:
+                case 17:
                     return ASSIGNABLE_REDUNDANTLY;
-                case 15:
+                case 16:
                     return ASSIGNABLE;
-                case 14:
+                case 15:
                     return ASSERT_REDUNDANTLY;
+                case 14:
+                    return JML_ASSERT;
                 case 13:
                     return ANTIVALENCE;
                 case 12:
@@ -1463,13 +1470,7 @@ public static Kind valueOf(int kind) {
         }
 
         public boolean isPrimitive() {
-            return this == BYTE
-                    || this == CHAR
-                    || this == SHORT
-                    || this == INT
-                    || this == LONG
-                    || this == FLOAT
-                    || this == DOUBLE;
+            return this == BYTE || this == CHAR || this == SHORT || this == INT || this == LONG || this == FLOAT || this == DOUBLE;
         }
 
         public int getKind() {
@@ -1563,11 +1564,15 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         JavaToken javaToken = (JavaToken) o;
-        if (kind != javaToken.kind) return false;
-        if (!text.equals(javaToken.text)) return false;
+        if (kind != javaToken.kind)
+            return false;
+        if (!text.equals(javaToken.text))
+            return false;
         return true;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/JavadocParser.java b/javaparser-core/src/main/java/com/github/javaparser/JavadocParser.java
index d999f77f9b..51a8721971 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/JavadocParser.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/JavadocParser.java
@@ -21,7 +21,6 @@
 package com.github.javaparser;
 
 import static com.github.javaparser.utils.Utils.*;
-
 import com.github.javaparser.ast.comments.JavadocComment;
 import com.github.javaparser.javadoc.Javadoc;
 import com.github.javaparser.javadoc.JavadocBlockTag;
@@ -52,33 +51,22 @@ public static Javadoc parse(String commentContent) {
     }
 
     public static Javadoc parse(String commentContent, boolean isMarkdownComment) {
-        List<String> cleanLines =
-                cleanLines(normalizeEolInTextBlock(commentContent, LineSeparator.SYSTEM), isMarkdownComment);
-        int indexOfFirstBlockTag = cleanLines.stream()
-                .filter(JavadocParser::isABlockLine)
-                .map(cleanLines::indexOf)
-                .findFirst()
-                .orElse(-1);
+        List<String> cleanLines = cleanLines(normalizeEolInTextBlock(commentContent, LineSeparator.SYSTEM), isMarkdownComment);
+        int indexOfFirstBlockTag = cleanLines.stream().filter(JavadocParser::isABlockLine).map(cleanLines::indexOf).findFirst().orElse(-1);
         List<String> blockLines;
         String descriptionText;
         if (indexOfFirstBlockTag == -1) {
             descriptionText = trimRight(String.join(LineSeparator.SYSTEM.asRawString(), cleanLines));
             blockLines = Collections.emptyList();
         } else {
-            descriptionText = trimRight(
-                    String.join(LineSeparator.SYSTEM.asRawString(), cleanLines.subList(0, indexOfFirstBlockTag)));
+            descriptionText = trimRight(String.join(LineSeparator.SYSTEM.asRawString(), cleanLines.subList(0, indexOfFirstBlockTag)));
             // Combine cleaned lines, but only starting with the first block tag till the end
             // In this combined string it is easier to handle multiple lines which actually belong together
-            String tagBlock = cleanLines.subList(indexOfFirstBlockTag, cleanLines.size()).stream()
-                    .collect(Collectors.joining(LineSeparator.SYSTEM.asRawString()));
+            String tagBlock = cleanLines.subList(indexOfFirstBlockTag, cleanLines.size()).stream().collect(Collectors.joining(LineSeparator.SYSTEM.asRawString()));
             // Split up the entire tag back again, considering now that some lines belong to the same block tag.
             // The pattern splits the block at each new line starting with the '@' symbol, thus the symbol
             // then needs to be added again so that the block parsers handles everything correctly.
-            blockLines = BLOCK_PATTERN
-                    .splitAsStream(tagBlock)
-                    .filter(s1 -> !s1.isEmpty())
-                    .map(s -> BLOCK_TAG_PREFIX + s)
-                    .collect(Collectors.toList());
+            blockLines = BLOCK_PATTERN.splitAsStream(tagBlock).filter(s1 -> !s1.isEmpty()).map(s -> BLOCK_TAG_PREFIX + s).collect(Collectors.toList());
         }
         Javadoc document = new Javadoc(JavadocDescription.parseText(descriptionText), isMarkdownComment);
         blockLines.forEach(l -> document.addBlockTag(parseBlockTag(l)));
@@ -108,35 +96,30 @@ private static List<String> cleanLines(String content, boolean isMarkdownComment
         if (lines.length == 0) {
             return Collections.emptyList();
         }
-        List<String> cleanedLines = Arrays.stream(lines)
-                .map(l -> {
-                    int asteriskOrLastMdSlashIndex = startsWithAsteriskOrMdSlash(l);
-                    if (asteriskOrLastMdSlashIndex == -1) {
-                        return l;
-                    }
-                    if (l.length() > (asteriskOrLastMdSlashIndex + 1)) {
-                        char c = l.charAt(asteriskOrLastMdSlashIndex + 1);
-                        if (c == ' ' || c == '\t') {
-                            return l.substring(asteriskOrLastMdSlashIndex + 2);
-                        }
-                    }
-                    return l.substring(asteriskOrLastMdSlashIndex + 1);
-                })
-                .collect(Collectors.toList());
+        List<String> cleanedLines = Arrays.stream(lines).map(l -> {
+            int asteriskOrLastMdSlashIndex = startsWithAsteriskOrMdSlash(l);
+            if (asteriskOrLastMdSlashIndex == -1) {
+                return l;
+            }
+            if (l.length() > (asteriskOrLastMdSlashIndex + 1)) {
+                char c = l.charAt(asteriskOrLastMdSlashIndex + 1);
+                if (c == ' ' || c == '\t') {
+                    return l.substring(asteriskOrLastMdSlashIndex + 2);
+                }
+            }
+            return l.substring(asteriskOrLastMdSlashIndex + 1);
+        }).collect(Collectors.toList());
         // lines containing only whitespace are normalized to empty lines
-        cleanedLines =
-                cleanedLines.stream().map(l -> l.trim().isEmpty() ? "" : l).collect(Collectors.toList());
+        cleanedLines = cleanedLines.stream().map(l -> l.trim().isEmpty() ? "" : l).collect(Collectors.toList());
         // if the first starts with a space, remove it
-        if (!cleanedLines.get(0).isEmpty()
-                && (cleanedLines.get(0).charAt(0) == ' ' || cleanedLines.get(0).charAt(0) == '\t')) {
+        if (!cleanedLines.get(0).isEmpty() && (cleanedLines.get(0).charAt(0) == ' ' || cleanedLines.get(0).charAt(0) == '\t')) {
             cleanedLines.set(0, cleanedLines.get(0).substring(1));
         }
         // drop empty lines at the beginning and at the end
         while (cleanedLines.size() > 0 && cleanedLines.get(0).trim().isEmpty()) {
             cleanedLines = cleanedLines.subList(1, cleanedLines.size());
         }
-        while (cleanedLines.size() > 0
-                && cleanedLines.get(cleanedLines.size() - 1).trim().isEmpty()) {
+        while (cleanedLines.size() > 0 && cleanedLines.get(cleanedLines.size() - 1).trim().isEmpty()) {
             cleanedLines = cleanedLines.subList(0, cleanedLines.size() - 1);
         }
         return cleanedLines;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/LineEndingProcessingProvider.java b/javaparser-core/src/main/java/com/github/javaparser/LineEndingProcessingProvider.java
index f74fa8f62b..d3ccf19849 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/LineEndingProcessingProvider.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/LineEndingProcessingProvider.java
@@ -81,10 +81,7 @@ private int fillBuffer() throws IOException {
     }
 
     public LineSeparator getDetectedLineEnding() {
-        return LineSeparator.getLineEnding(
-                eolCounts.getOrDefault(LineSeparator.CR, 0),
-                eolCounts.getOrDefault(LineSeparator.LF, 0),
-                eolCounts.getOrDefault(LineSeparator.CRLF, 0));
+        return LineSeparator.getLineEnding(eolCounts.getOrDefault(LineSeparator.CR, 0), eolCounts.getOrDefault(LineSeparator.LF, 0), eolCounts.getOrDefault(LineSeparator.CRLF, 0));
     }
 
     private boolean isBufferEmpty() {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ParseProblemException.java b/javaparser-core/src/main/java/com/github/javaparser/ParseProblemException.java
index d74bc298c8..7461c3be65 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ParseProblemException.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ParseProblemException.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import static java.util.Collections.singletonList;
-
 import com.github.javaparser.utils.LineSeparator;
 import java.util.List;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ParseStart.java b/javaparser-core/src/main/java/com/github/javaparser/ParseStart.java
index 66f4bda5af..5dc48275f3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ParseStart.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ParseStart.java
@@ -71,11 +71,9 @@ public interface ParseStart<R> {
 
     ParseStart<TypeParameter> TYPE_PARAMETER = GeneratedJavaParser::TypeParameterParseStart;
 
-    ParseStart<VariableDeclarationExpr> VARIABLE_DECLARATION_EXPR =
-            GeneratedJavaParser::VariableDeclarationExpressionParseStart;
+    ParseStart<VariableDeclarationExpr> VARIABLE_DECLARATION_EXPR = GeneratedJavaParser::VariableDeclarationExpressionParseStart;
 
-    ParseStart<ExplicitConstructorInvocationStmt> EXPLICIT_CONSTRUCTOR_INVOCATION_STMT =
-            GeneratedJavaParser::ExplicitConstructorInvocationParseStart;
+    ParseStart<ExplicitConstructorInvocationStmt> EXPLICIT_CONSTRUCTOR_INVOCATION_STMT = GeneratedJavaParser::ExplicitConstructorInvocationParseStart;
 
     ParseStart<Name> NAME = GeneratedJavaParser::NameParseStart;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java b/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java
index 785c6a7f74..192b19fa54 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ParserConfiguration.java
@@ -21,7 +21,6 @@
 package com.github.javaparser;
 
 import static com.github.javaparser.ParserConfiguration.LanguageLevel.POPULAR;
-
 import com.github.javaparser.UnicodeEscapeProcessingProvider.PositionMapping;
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
@@ -265,25 +264,7 @@ public enum LanguageLevel {
 
         final PostProcessors postProcessor;
 
-        private static final LanguageLevel[] yieldSupport = new LanguageLevel[] {
-            JAVA_13,
-            JAVA_13_PREVIEW,
-            JAVA_14,
-            JAVA_14_PREVIEW,
-            JAVA_15,
-            JAVA_15_PREVIEW,
-            JAVA_16,
-            JAVA_16_PREVIEW,
-            JAVA_17,
-            JAVA_17_PREVIEW,
-            JAVA_18,
-            JAVA_19,
-            JAVA_20,
-            JAVA_21,
-            JAVA_22,
-            JAVA_23,
-            JAVA_24
-        };
+        private static final LanguageLevel[] yieldSupport = new LanguageLevel[] { JAVA_13, JAVA_13_PREVIEW, JAVA_14, JAVA_14_PREVIEW, JAVA_15, JAVA_15_PREVIEW, JAVA_16, JAVA_16_PREVIEW, JAVA_17, JAVA_17_PREVIEW, JAVA_18, JAVA_19, JAVA_20, JAVA_21, JAVA_22, JAVA_23, JAVA_24 };
 
         LanguageLevel(Validator validator, PostProcessors postProcessor) {
             this.validator = validator;
@@ -382,9 +363,7 @@ public ParserConfiguration() {
             @Override
             public void postProcess(ParseResult<? extends Node> result, ParserConfiguration configuration) {
                 if (configuration.isAttributeComments()) {
-                    result.ifSuccessful(resultNode -> result.getCommentsCollection()
-                            .ifPresent(comments -> new CommentsInserter(configuration)
-                                    .insertComments(resultNode, comments.copy().getComments())));
+                    result.ifSuccessful(resultNode -> result.getCommentsCollection().ifPresent(comments -> new CommentsInserter(configuration).insertComments(resultNode, comments.copy().getComments())));
                 }
             }
         });
@@ -400,9 +379,7 @@ public void postProcess(ParseResult<? extends Node> result, ParserConfiguration
                         languageLevel.postProcessor.postProcess(result, configuration);
                     }
                     if (languageLevel.validator != null) {
-                        languageLevel.validator.accept(
-                                result.getResult().get(), new ProblemReporter(newProblem -> result.getProblems()
-                                        .add(newProblem)));
+                        languageLevel.validator.accept(result.getResult().get(), new ProblemReporter(newProblem -> result.getProblems().add(newProblem)));
                     }
                 }
             }
@@ -411,13 +388,11 @@ public void postProcess(ParseResult<? extends Node> result, ParserConfiguration
 
             @Override
             public void postProcess(ParseResult<? extends Node> result, ParserConfiguration configuration) {
-                configuration
-                        .getSymbolResolver()
-                        .ifPresent(symbolResolver -> result.ifSuccessful(resultNode -> {
-                            if (resultNode instanceof CompilationUnit) {
-                                resultNode.setData(Node.SYMBOL_RESOLVER_KEY, symbolResolver);
-                            }
-                        }));
+                configuration.getSymbolResolver().ifPresent(symbolResolver -> result.ifSuccessful(resultNode -> {
+                    if (resultNode instanceof CompilationUnit) {
+                        resultNode.setData(Node.SYMBOL_RESOLVER_KEY, symbolResolver);
+                    }
+                }));
             }
         });
         processors.add(() -> new Processor() {
@@ -451,8 +426,7 @@ public boolean isDoNotAssignCommentsPrecedingEmptyLines() {
         return doNotAssignCommentsPrecedingEmptyLines;
     }
 
-    public ParserConfiguration setDoNotAssignCommentsPrecedingEmptyLines(
-            boolean doNotAssignCommentsPrecedingEmptyLines) {
+    public ParserConfiguration setDoNotAssignCommentsPrecedingEmptyLines(boolean doNotAssignCommentsPrecedingEmptyLines) {
         this.doNotAssignCommentsPrecedingEmptyLines = doNotAssignCommentsPrecedingEmptyLines;
         return this;
     }
@@ -461,8 +435,7 @@ public boolean isIgnoreAnnotationsWhenAttributingComments() {
         return ignoreAnnotationsWhenAttributingComments;
     }
 
-    public ParserConfiguration setIgnoreAnnotationsWhenAttributingComments(
-            boolean ignoreAnnotationsWhenAttributingComments) {
+    public ParserConfiguration setIgnoreAnnotationsWhenAttributingComments(boolean ignoreAnnotationsWhenAttributingComments) {
         this.ignoreAnnotationsWhenAttributingComments = ignoreAnnotationsWhenAttributingComments;
         return this;
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/Position.java b/javaparser-core/src/main/java/com/github/javaparser/Position.java
index 217e602786..c0a7ac9059 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/Position.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/Position.java
@@ -21,7 +21,6 @@
 package com.github.javaparser;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import java.util.Objects;
 
 /**
@@ -190,8 +189,10 @@ public int compareTo(Position otherPosition) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         Position otherPosition = (Position) o;
         return Objects.equals(line, otherPosition.line) && Objects.equals(column, otherPosition.column);
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/Problem.java b/javaparser-core/src/main/java/com/github/javaparser/Problem.java
index 4fa2f99253..e7e7d8faf1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/Problem.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/Problem.java
@@ -21,7 +21,6 @@
 package com.github.javaparser;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.utils.LineSeparator;
 import java.util.Comparator;
 import java.util.Optional;
@@ -52,7 +51,8 @@ public String toString() {
             for (int i = 0; i < cause.getStackTrace().length; i++) {
                 StackTraceElement ste = cause.getStackTrace()[i];
                 str.append("  ").append(ste.toString());
-                if (i + 1 != cause.getStackTrace().length) str.append(LineSeparator.SYSTEM);
+                if (i + 1 != cause.getStackTrace().length)
+                    str.append(LineSeparator.SYSTEM);
             }
         }
         return str.toString();
@@ -69,9 +69,7 @@ public String getMessage() {
      * @return the message plus location information.
      */
     public String getVerboseMessage() {
-        return getLocation()
-                .map(l -> l.getBegin().getRange().map(r -> r.begin.toString()).orElse("(line ?,col ?)") + " " + message)
-                .orElse(message);
+        return getLocation().map(l -> l.getBegin().getRange().map(r -> r.begin.toString()).orElse("(line ?,col ?)") + " " + message).orElse(message);
     }
 
     /**
@@ -92,10 +90,8 @@ public Optional<Throwable> getCause() {
      * Sorts problems on position.
      */
     public static Comparator<Problem> PROBLEM_BY_BEGIN_POSITION = (a, b) -> {
-        final Optional<Position> aBegin =
-                a.getLocation().flatMap(l -> l.getBegin().getRange().map(r -> r.begin));
-        final Optional<Position> bBegin =
-                b.getLocation().flatMap(l -> l.getBegin().getRange().map(r -> r.begin));
+        final Optional<Position> aBegin = a.getLocation().flatMap(l -> l.getBegin().getRange().map(r -> r.begin));
+        final Optional<Position> bBegin = b.getLocation().flatMap(l -> l.getBegin().getRange().map(r -> r.begin));
         if (aBegin.isPresent() && bBegin.isPresent()) {
             return aBegin.get().compareTo(bBegin.get());
         }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/Processor.java b/javaparser-core/src/main/java/com/github/javaparser/Processor.java
index 9394b5eccf..14e038e895 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/Processor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/Processor.java
@@ -26,7 +26,8 @@ public class Processor {
     /**
      * Makes the parser do a post-parsing step before the result is returned to the user.
      */
-    public void postProcess(ParseResult<? extends Node> result, ParserConfiguration configuration) {}
+    public void postProcess(ParseResult<? extends Node> result, ParserConfiguration configuration) {
+    }
 
     /**
      * Adds a pre-parsing step, which has access to the sourcecode through the innerProvider.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/Providers.java b/javaparser-core/src/main/java/com/github/javaparser/Providers.java
index 1ad8d0a4e0..3c380db7a3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/Providers.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/Providers.java
@@ -21,7 +21,6 @@
 package com.github.javaparser;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import java.io.*;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
@@ -35,7 +34,8 @@ public final class Providers {
 
     public static final Charset UTF8 = Charset.forName("utf-8");
 
-    private Providers() {}
+    private Providers() {
+    }
 
     public static Provider provider(Reader reader) {
         return new StreamProvider(assertNotNull(reader));
@@ -81,8 +81,7 @@ public static Provider provider(String source) {
      * Provide a Provider from the resource found in class loader with the provided encoding.<br> As resource is
      * accessed through a class loader, a leading "/" is not allowed in pathToResource
      */
-    public static Provider resourceProvider(ClassLoader classLoader, String pathToResource, Charset encoding)
-            throws IOException {
+    public static Provider resourceProvider(ClassLoader classLoader, String pathToResource, Charset encoding) throws IOException {
         InputStream resourceAsStream = classLoader.getResourceAsStream(pathToResource);
         if (resourceAsStream == null) {
             throw new IOException("Cannot find " + pathToResource);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/Range.java b/javaparser-core/src/main/java/com/github/javaparser/Range.java
index d60952eb6c..8d1793bf76 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/Range.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/Range.java
@@ -140,7 +140,8 @@ public Range withEnd(Position end) {
      */
     public boolean contains(Range other) {
         boolean beginResult = (begin.isBeforeOrEqual(other.begin));
-        if (!beginResult) return false;
+        if (!beginResult)
+            return false;
         return end.isAfterOrEqual(other.end);
     }
 
@@ -227,8 +228,10 @@ public boolean isAfter(Range other) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         Range range = (Range) o;
         return begin.equals(range.begin) && end.equals(range.end);
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/StaticJavaParser.java b/javaparser-core/src/main/java/com/github/javaparser/StaticJavaParser.java
index a0ec270200..158e296f8f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/StaticJavaParser.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/StaticJavaParser.java
@@ -50,8 +50,7 @@
 public final class StaticJavaParser {
 
     // use ThreadLocal to resolve possible concurrency issues.
-    private static final ThreadLocal<ParserConfiguration> localConfiguration =
-            ThreadLocal.withInitial(ParserConfiguration::new);
+    private static final ThreadLocal<ParserConfiguration> localConfiguration = ThreadLocal.withInitial(ParserConfiguration::new);
 
     /**
      * Get the configuration for the parse... methods. Deprecated method.
@@ -121,8 +120,7 @@ public static CompilationUnit parse(@NotNull final InputStream in) {
      * @deprecated set the encoding in the {@link ParserConfiguration}
      */
     @Deprecated
-    public static CompilationUnit parse(@NotNull final File file, @NotNull final Charset encoding)
-            throws FileNotFoundException {
+    public static CompilationUnit parse(@NotNull final File file, @NotNull final Charset encoding) throws FileNotFoundException {
         Preconditions.checkNotNull(file, "Parameter file can't be null.");
         Preconditions.checkNotNull(encoding, "Parameter encoding can't be null.");
         return handleResult(newParser().parse(file, encoding));
@@ -202,8 +200,7 @@ public static CompilationUnit parseResource(@NotNull final String path) throws I
      * @deprecated set the encoding in the {@link ParserConfiguration}
      */
     @Deprecated
-    public static CompilationUnit parseResource(@NotNull final String path, @NotNull Charset encoding)
-            throws IOException {
+    public static CompilationUnit parseResource(@NotNull final String path, @NotNull Charset encoding) throws IOException {
         Preconditions.checkNotNull(path, "Parameter path can't be null.");
         Preconditions.checkNotNull(encoding, "Parameter encoding can't be null.");
         return handleResult(newParser().parseResource(path, encoding));
@@ -222,9 +219,7 @@ public static CompilationUnit parseResource(@NotNull final String path, @NotNull
      * @deprecated set the encoding in the {@link ParserConfiguration}
      */
     @Deprecated
-    public static CompilationUnit parseResource(
-            @NotNull final ClassLoader classLoader, @NotNull final String path, @NotNull Charset encoding)
-            throws IOException {
+    public static CompilationUnit parseResource(@NotNull final ClassLoader classLoader, @NotNull final String path, @NotNull Charset encoding) throws IOException {
         Preconditions.checkNotNull(classLoader, "Parameter classLoader can't be null.");
         Preconditions.checkNotNull(path, "Parameter path can't be null.");
         Preconditions.checkNotNull(encoding, "Parameter encoding can't be null.");
@@ -551,7 +546,8 @@ private static <T extends Node> T handleResult(ParseResult<T> result) {
         throw new ParseProblemException(result.getProblems());
     }
 
-    private StaticJavaParser() {}
+    private StaticJavaParser() {
+    }
 
     public static <T extends Expression> T parseJmlExpression(String expression) {
         return (T) handleResult(newParser().parseJmlExpression(expression));
diff --git a/javaparser-core/src/main/java/com/github/javaparser/TokenRange.java b/javaparser-core/src/main/java/com/github/javaparser/TokenRange.java
index c96425cbc2..19895de55f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/TokenRange.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/TokenRange.java
@@ -21,7 +21,6 @@
 package com.github.javaparser;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import java.util.Iterator;
 import java.util.Optional;
 
@@ -51,8 +50,7 @@ public JavaToken getEnd() {
 
     public Optional<Range> toRange() {
         if (begin.hasRange() && end.hasRange()) {
-            return Optional.of(
-                    new Range(begin.getRange().get().begin, end.getRange().get().end));
+            return Optional.of(new Range(begin.getRange().get().begin, end.getRange().get().end));
         }
         return Optional.empty();
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/TokenTypes.java b/javaparser-core/src/main/java/com/github/javaparser/TokenTypes.java
index 7b6a7704d6..03195e6af5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/TokenTypes.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/TokenTypes.java
@@ -21,7 +21,6 @@
 package com.github.javaparser;
 
 import static com.github.javaparser.GeneratedJavaParserConstants.*;
-
 import com.github.javaparser.utils.LineSeparator;
 
 /**
@@ -95,7 +94,7 @@ public static int spaceTokenKind() {
      * <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-3.html#jls-3.5">The JLS</a>.
      */
     public static JavaToken.Category getCategory(int kind) {
-        switch (kind) {
+        switch(kind) {
             case WINDOWS_EOL:
             case UNIX_EOL:
             case OLD_MAC_EOL:
@@ -108,8 +107,11 @@ public static JavaToken.Category getCategory(int kind) {
             case JAVADOC_COMMENT:
             case MULTI_LINE_COMMENT:
                 return JavaToken.Category.COMMENT;
+            case JML_BLOCK_COMMENT:
+            case JML_LINE_COMMENT:
             case ABSTRACT:
             case ASSERT:
+            case GHOST:
             case BOOLEAN:
             case BREAK:
             case BYTE:
@@ -184,6 +186,7 @@ public static JavaToken.Category getCategory(int kind) {
             case ALSO:
             case ANTIVALENCE:
             case ASSERT_REDUNDANTLY:
+            case JML_ASSERT:
             case ASSIGNABLE:
             case ASSIGNABLE_REDUNDANTLY:
             case ASSUME:
@@ -249,7 +252,6 @@ public static JavaToken.Category getCategory(int kind) {
             case PEER:
             case REP:
             case READ_ONLY:
-            case GHOST:
             case END:
             case HELPER:
             case HENCE_BY:
@@ -293,7 +295,8 @@ public static JavaToken.Category getCategory(int kind) {
             case MONITORS_FOR:
             case NESTED_CONTRACT_END:
             case NESTED_CONTRACT_START:
-            case NEW_OBJECT:
+            case NEW_OBJECTS:
+            case BY:
             case NONNULLELEMENTS:
             case NON_NULL:
             case NORMAL_BEHAVIOR:
@@ -357,10 +360,6 @@ public static JavaToken.Category getCategory(int kind) {
             case WORKING_SPACE_REDUNDANTLY:
             case WRITABLE:
             case DOTDOT:
-            case JML_LINE_COMMENT:
-            case JML_ENTER_MULTILINE_COMMENT:
-            case ENTER_JML_BLOCK_COMMENT:
-            case JML_BLOCK_COMMENT:
             case JML_MULTI_LINE_COMMENT:
             case TRANSACTIONBEGIN:
             case TRANSACTIONCOMMIT:
@@ -433,7 +432,6 @@ public static JavaToken.Category getCategory(int kind) {
             case NULL:
             case UNNAMED_PLACEHOLDER:
                 return JavaToken.Category.LITERAL;
-            case JMLIDENTIFIER:
             case SVIDENTIFIER:
             case IDENTIFIER:
             case JML_IDENTIFIER:
@@ -492,6 +490,8 @@ public static JavaToken.Category getCategory(int kind) {
                 return JavaToken.Category.OPERATOR;
             // The following are tokens that are only used internally by the lexer
             case ENTER_JAVADOC_COMMENT:
+            case ENTER_JML_BLOCK_COMMENT:
+            case JML_ENTER_MULTILINE_COMMENT:
             case ENTER_MULTILINE_COMMENT:
             case COMMENT_CONTENT:
             case HEX_DIGITS:
@@ -502,9 +502,7 @@ public static JavaToken.Category getCategory(int kind) {
             case ENTER_TEXT_BLOCK:
                 return JavaToken.Category.EOL;
             default:
-                throw new AssertionError(
-                        "Unable to categorise token kind " + kind
-                                + " -- has it recently been added to the grammar but not classified within TokenTypes.java, perhaps?");
+                throw new AssertionError("Unable to categorise token kind " + kind + " -- has it recently been added to the grammar but not classified within TokenTypes.java, perhaps?");
         }
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/UnicodeEscapeProcessingProvider.java b/javaparser-core/src/main/java/com/github/javaparser/UnicodeEscapeProcessingProvider.java
index 97dcaefc62..0254069586 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/UnicodeEscapeProcessingProvider.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/UnicodeEscapeProcessingProvider.java
@@ -120,19 +120,21 @@ public void close() throws IOException {
      */
     private int nextOutputChar() throws IOException {
         int next = nextInputChar();
-        switch (next) {
+        switch(next) {
             case EOF:
                 return EOF;
-            case BACKSLASH: {
-                if (_backslashSeen) {
+            case BACKSLASH:
+                {
+                    if (_backslashSeen) {
+                        return clearBackSlashSeen(next);
+                    }
+                    return backSlashSeen();
+                }
+            default:
+                {
+                    // An arbitrary character.
                     return clearBackSlashSeen(next);
                 }
-                return backSlashSeen();
-            }
-            default: {
-                // An arbitrary character.
-                return clearBackSlashSeen(next);
-            }
         }
     }
 
@@ -144,17 +146,19 @@ private int clearBackSlashSeen(int next) {
     private int backSlashSeen() throws IOException {
         _backslashSeen = true;
         int next = nextInputChar();
-        switch (next) {
+        switch(next) {
             case EOF:
                 // End of file after backslash produces the backslash itself.
                 return BACKSLASH;
-            case 'u': {
-                return unicodeStartSeen();
-            }
-            default: {
-                pushBack(next);
-                return BACKSLASH;
-            }
+            case 'u':
+                {
+                    return unicodeStartSeen();
+                }
+            default:
+                {
+                    pushBack(next);
+                    return BACKSLASH;
+                }
         }
     }
 
@@ -162,18 +166,21 @@ private int unicodeStartSeen() throws IOException {
         int uCnt = 1;
         while (true) {
             int next = nextInputChar();
-            switch (next) {
-                case EOF: {
-                    pushBackUs(uCnt);
-                    return BACKSLASH;
-                }
-                case 'u': {
-                    uCnt++;
-                    continue;
-                }
-                default: {
-                    return readDigits(uCnt, next);
-                }
+            switch(next) {
+                case EOF:
+                    {
+                        pushBackUs(uCnt);
+                        return BACKSLASH;
+                    }
+                case 'u':
+                    {
+                        uCnt++;
+                        continue;
+                    }
+                default:
+                    {
+                        return readDigits(uCnt, next);
+                    }
             }
         }
     }
@@ -547,28 +554,32 @@ public Position getPosition() {
          * Analyzes the given character for line feed.
          */
         public int process(int ch) {
-            switch (ch) {
-                case EOF: {
-                    break;
-                }
-                case CR: {
-                    incLine();
-                    _crSeen = true;
-                    break;
-                }
-                case LF: {
-                    // CR LF does only count as a single line terminator.
-                    if (_crSeen) {
-                        _crSeen = false;
-                    } else {
+            switch(ch) {
+                case EOF:
+                    {
+                        break;
+                    }
+                case CR:
+                    {
                         incLine();
+                        _crSeen = true;
+                        break;
+                    }
+                case LF:
+                    {
+                        // CR LF does only count as a single line terminator.
+                        if (_crSeen) {
+                            _crSeen = false;
+                        } else {
+                            incLine();
+                        }
+                        break;
+                    }
+                default:
+                    {
+                        _crSeen = false;
+                        _column++;
                     }
-                    break;
-                }
-                default: {
-                    _crSeen = false;
-                    _column++;
-                }
             }
             return ch;
         }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/AbstractModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/AbstractModifier.java
index b076100855..6d2f9bd473 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/AbstractModifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/AbstractModifier.java
@@ -24,5 +24,6 @@ public <R, A> R accept(GenericVisitor<R, A> v, A arg) {
     }
 
     @Override
-    public <A> void accept(VoidVisitor<A> v, A arg) {}
+    public <A> void accept(VoidVisitor<A> v, A arg) {
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/AccessSpecifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/AccessSpecifier.java
index 033a407e9d..f1a8521be0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/AccessSpecifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/AccessSpecifier.java
@@ -28,10 +28,8 @@
  * @since July 2014
  */
 public enum AccessSpecifier {
-    PUBLIC("public"),
-    PRIVATE("private"),
-    PROTECTED("protected"),
-    NONE("");
+
+    PUBLIC("public"), PRIVATE("private"), PROTECTED("protected"), NONE("");
 
     private final String codeRepresenation;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/AllFieldsConstructor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/AllFieldsConstructor.java
index a11b7937b8..16da0a72b4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/AllFieldsConstructor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/AllFieldsConstructor.java
@@ -30,4 +30,5 @@
  */
 @Target(ElementType.CONSTRUCTOR)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface AllFieldsConstructor {}
+public @interface AllFieldsConstructor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java b/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java
index ecc5daa830..1c1683ade8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/ArrayCreationLevel.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.expr.AnnotationExpr;
 import com.github.javaparser.ast.expr.Expression;
@@ -103,7 +102,8 @@ public ArrayCreationLevel setDimension(final @Nullable() Expression dimension) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.DIMENSION, this.dimension, dimension);
-        if (this.dimension != null) this.dimension.setParentNode(null);
+        if (this.dimension != null)
+            this.dimension.setParentNode(null);
         this.dimension = dimension;
         setAsParentNodeOf(dimension);
         return this;
@@ -126,7 +126,8 @@ public ArrayCreationLevel setAnnotations(final @NonNull() NodeList<AnnotationExp
             return this;
         }
         notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations);
-        if (this.annotations != null) this.annotations.setParentNode(null);
+        if (this.annotations != null)
+            this.annotations.setParentNode(null);
         this.annotations = annotations;
         setAsParentNodeOf(annotations);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java b/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java
index d8d0cf4183..1e353a440d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/CompilationUnit.java
@@ -28,7 +28,6 @@
 import static com.github.javaparser.ast.Modifier.createModifierList;
 import static com.github.javaparser.utils.CodeGenerationUtils.subtractPaths;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.*;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.comments.Comment;
@@ -104,11 +103,7 @@ public CompilationUnit(String packageDeclaration) {
     }
 
     @AllFieldsConstructor
-    public CompilationUnit(
-            PackageDeclaration packageDeclaration,
-            NodeList<ImportDeclaration> imports,
-            NodeList<TypeDeclaration<?>> types,
-            ModuleDeclaration module) {
+    public CompilationUnit(PackageDeclaration packageDeclaration, NodeList<ImportDeclaration> imports, NodeList<TypeDeclaration<?>> types, ModuleDeclaration module) {
         this(null, packageDeclaration, imports, types, module);
     }
 
@@ -116,12 +111,7 @@ public CompilationUnit(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public CompilationUnit(
-            TokenRange tokenRange,
-            PackageDeclaration packageDeclaration,
-            NodeList<ImportDeclaration> imports,
-            NodeList<TypeDeclaration<?>> types,
-            ModuleDeclaration module) {
+    public CompilationUnit(TokenRange tokenRange, PackageDeclaration packageDeclaration, NodeList<ImportDeclaration> imports, NodeList<TypeDeclaration<?>> types, ModuleDeclaration module) {
         super(tokenRange);
         setPackageDeclaration(packageDeclaration);
         setImports(imports);
@@ -269,7 +259,8 @@ public CompilationUnit setImports(final @NonNull() NodeList<ImportDeclaration> i
             return this;
         }
         notifyPropertyChange(ObservableProperty.IMPORTS, this.imports, imports);
-        if (this.imports != null) this.imports.setParentNode(null);
+        if (this.imports != null)
+            this.imports.setParentNode(null);
         this.imports = imports;
         setAsParentNodeOf(imports);
         return this;
@@ -289,19 +280,9 @@ public CompilationUnit setImport(int i, ImportDeclaration imports) {
      */
     public CompilationUnit addImport(ImportDeclaration importDeclaration) {
         if (importDeclaration.isAsterisk()) {
-            getImports()
-                    .removeIf(im -> Objects.equals(
-                            getImportPackageName(im).get(),
-                            getImportPackageName(importDeclaration).orElse(null)));
-        }
-        if (!isImplicitImport(importDeclaration)
-                && getImports().stream()
-                        .noneMatch(im -> im.equals(importDeclaration)
-                                || (im.isAsterisk()
-                                        && Objects.equals(
-                                                getImportPackageName(im).get(),
-                                                getImportPackageName(importDeclaration)
-                                                        .orElse(null))))) {
+            getImports().removeIf(im -> Objects.equals(getImportPackageName(im).get(), getImportPackageName(importDeclaration).orElse(null)));
+        }
+        if (!isImplicitImport(importDeclaration) && getImports().stream().noneMatch(im -> im.equals(importDeclaration) || (im.isAsterisk() && Objects.equals(getImportPackageName(im).get(), getImportPackageName(importDeclaration).orElse(null))))) {
             getImports().add(importDeclaration);
         }
         return this;
@@ -329,10 +310,7 @@ private boolean isImplicitImport(ImportDeclaration importDeclaration) {
     }
 
     private static Optional<Name> getImportPackageName(ImportDeclaration importDeclaration) {
-        return (importDeclaration.isAsterisk()
-                        ? new Name(importDeclaration.getName(), "*")
-                        : importDeclaration.getName())
-                .getQualifier();
+        return (importDeclaration.isAsterisk() ? new Name(importDeclaration.getName(), "*") : importDeclaration.getName()).getQualifier();
     }
 
     /**
@@ -346,7 +324,8 @@ public CompilationUnit setPackageDeclaration(final @Nullable() PackageDeclaratio
             return this;
         }
         notifyPropertyChange(ObservableProperty.PACKAGE_DECLARATION, this.packageDeclaration, packageDeclaration);
-        if (this.packageDeclaration != null) this.packageDeclaration.setParentNode(null);
+        if (this.packageDeclaration != null)
+            this.packageDeclaration.setParentNode(null);
         this.packageDeclaration = packageDeclaration;
         setAsParentNodeOf(packageDeclaration);
         return this;
@@ -362,7 +341,8 @@ public CompilationUnit setTypes(final @NonNull() NodeList<TypeDeclaration<?>> ty
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPES, this.types, types);
-        if (this.types != null) this.types.setParentNode(null);
+        if (this.types != null)
+            this.types.setParentNode(null);
         this.types = types;
         setAsParentNodeOf(types);
         return this;
@@ -418,11 +398,10 @@ public CompilationUnit addImport(Class<?> clazz) {
         if (clazz.isArray()) {
             return addImport(clazz.getComponentType());
         }
-        if (ClassUtils.isPrimitiveOrWrapper(clazz)
-                || JAVA_LANG.equals(clazz.getPackage().getName())) return this;
+        if (ClassUtils.isPrimitiveOrWrapper(clazz) || JAVA_LANG.equals(clazz.getPackage().getName()))
+            return this;
         if (clazz.isAnonymousClass() || clazz.isLocalClass())
-            throw new IllegalArgumentException(
-                    clazz.getName() + " is an anonymous or local class therefore it can't be added with addImport");
+            throw new IllegalArgumentException(clazz.getName() + " is an anonymous or local class therefore it can't be added with addImport");
         return addImport(clazz.getCanonicalName());
     }
 
@@ -477,8 +456,7 @@ public ClassOrInterfaceDeclaration addClass(String name) {
      * @return the newly created class
      */
     public ClassOrInterfaceDeclaration addClass(String name, Modifier.DefaultKeyword... modifiers) {
-        ClassOrInterfaceDeclaration classOrInterfaceDeclaration =
-                new ClassOrInterfaceDeclaration(createModifierList(modifiers), false, name);
+        ClassOrInterfaceDeclaration classOrInterfaceDeclaration = new ClassOrInterfaceDeclaration(createModifierList(modifiers), false, name);
         getTypes().add(classOrInterfaceDeclaration);
         return classOrInterfaceDeclaration;
     }
@@ -501,8 +479,7 @@ public ClassOrInterfaceDeclaration addInterface(String name) {
      * @return the newly created class
      */
     public ClassOrInterfaceDeclaration addInterface(String name, Modifier.DefaultKeyword... modifiers) {
-        ClassOrInterfaceDeclaration classOrInterfaceDeclaration =
-                new ClassOrInterfaceDeclaration(createModifierList(modifiers), true, name);
+        ClassOrInterfaceDeclaration classOrInterfaceDeclaration = new ClassOrInterfaceDeclaration(createModifierList(modifiers), true, name);
         getTypes().add(classOrInterfaceDeclaration);
         return classOrInterfaceDeclaration;
     }
@@ -559,12 +536,7 @@ public AnnotationDeclaration addAnnotationDeclaration(String name, Modifier.Defa
      * @param className the class name (case-sensitive)
      */
     public Optional<ClassOrInterfaceDeclaration> getClassByName(String className) {
-        return getTypes().stream()
-                .filter(type -> type.getNameAsString().equals(className)
-                        && type instanceof ClassOrInterfaceDeclaration
-                        && !((ClassOrInterfaceDeclaration) type).isInterface())
-                .findFirst()
-                .map(t -> (ClassOrInterfaceDeclaration) t);
+        return getTypes().stream().filter(type -> type.getNameAsString().equals(className) && type instanceof ClassOrInterfaceDeclaration && !((ClassOrInterfaceDeclaration) type).isInterface()).findFirst().map(t -> (ClassOrInterfaceDeclaration) t);
     }
 
     /**
@@ -573,9 +545,7 @@ public Optional<ClassOrInterfaceDeclaration> getClassByName(String className) {
      * @param className the class name (case-sensitive)
      */
     public List<ClassOrInterfaceDeclaration> getLocalDeclarationFromClassname(String className) {
-        return findAll(ClassOrInterfaceDeclaration.class).stream()
-                .filter(cid -> cid.getFullyQualifiedName().get().endsWith(className))
-                .collect(Collectors.toList());
+        return findAll(ClassOrInterfaceDeclaration.class).stream().filter(cid -> cid.getFullyQualifiedName().get().endsWith(className)).collect(Collectors.toList());
     }
 
     /**
@@ -584,12 +554,7 @@ public List<ClassOrInterfaceDeclaration> getLocalDeclarationFromClassname(String
      * @param interfaceName the interface name (case-sensitive)
      */
     public Optional<ClassOrInterfaceDeclaration> getInterfaceByName(String interfaceName) {
-        return getTypes().stream()
-                .filter(type -> type.getNameAsString().equals(interfaceName)
-                        && type instanceof ClassOrInterfaceDeclaration
-                        && ((ClassOrInterfaceDeclaration) type).isInterface())
-                .findFirst()
-                .map(t -> (ClassOrInterfaceDeclaration) t);
+        return getTypes().stream().filter(type -> type.getNameAsString().equals(interfaceName) && type instanceof ClassOrInterfaceDeclaration && ((ClassOrInterfaceDeclaration) type).isInterface()).findFirst().map(t -> (ClassOrInterfaceDeclaration) t);
     }
 
     /**
@@ -598,10 +563,7 @@ public Optional<ClassOrInterfaceDeclaration> getInterfaceByName(String interface
      * @param enumName the enum name (case-sensitive)
      */
     public Optional<EnumDeclaration> getEnumByName(String enumName) {
-        return getTypes().stream()
-                .filter(type -> type.getNameAsString().equals(enumName) && type instanceof EnumDeclaration)
-                .findFirst()
-                .map(t -> (EnumDeclaration) t);
+        return getTypes().stream().filter(type -> type.getNameAsString().equals(enumName) && type instanceof EnumDeclaration).findFirst().map(t -> (EnumDeclaration) t);
     }
 
     /**
@@ -618,9 +580,7 @@ public Optional<String> getPrimaryTypeName() {
      * If for some strange reason there are multiple types of this name, the first one is returned.
      */
     public Optional<TypeDeclaration<?>> getPrimaryType() {
-        return getPrimaryTypeName().flatMap(name -> getTypes().stream()
-                .filter(t -> t.getNameAsString().equals(name))
-                .findFirst());
+        return getPrimaryTypeName().flatMap(name -> getTypes().stream().filter(t -> t.getNameAsString().equals(name)).findFirst());
     }
 
     /**
@@ -629,10 +589,7 @@ public Optional<TypeDeclaration<?>> getPrimaryType() {
      * @param annotationName the annotation name (case-sensitive)
      */
     public Optional<AnnotationDeclaration> getAnnotationDeclarationByName(String annotationName) {
-        return getTypes().stream()
-                .filter(type -> type.getNameAsString().equals(annotationName) && type instanceof AnnotationDeclaration)
-                .findFirst()
-                .map(t -> (AnnotationDeclaration) t);
+        return getTypes().stream().filter(type -> type.getNameAsString().equals(annotationName) && type instanceof AnnotationDeclaration).findFirst().map(t -> (AnnotationDeclaration) t);
     }
 
     /**
@@ -641,10 +598,7 @@ public Optional<AnnotationDeclaration> getAnnotationDeclarationByName(String ann
      * @param recordName the enum name (case-sensitive)
      */
     public Optional<RecordDeclaration> getRecordByName(String recordName) {
-        return getTypes().stream()
-                .filter(type -> type.getNameAsString().equals(recordName) && type instanceof RecordDeclaration)
-                .findFirst()
-                .map(t -> (RecordDeclaration) t);
+        return getTypes().stream().filter(type -> type.getNameAsString().equals(recordName) && type instanceof RecordDeclaration).findFirst().map(t -> (RecordDeclaration) t);
     }
 
     @Override
@@ -699,7 +653,8 @@ public CompilationUnit setModule(final @Nullable() ModuleDeclaration module) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODULE, this.module, module);
-        if (this.module != null) this.module.setParentNode(null);
+        if (this.module != null)
+            this.module.setParentNode(null);
         this.module = module;
         setAsParentNodeOf(module);
         return this;
@@ -808,12 +763,8 @@ public Charset getEncoding() {
          * of the path) a RuntimeException is thrown.
          */
         public Path getSourceRoot() {
-            final Optional<String> pkgAsString =
-                    compilationUnit.getPackageDeclaration().map(NodeWithName::getNameAsString);
-            return pkgAsString
-                    .map(p -> Paths.get(CodeGenerationUtils.packageToPath(p)))
-                    .map(pkg -> subtractPaths(getDirectory(), pkg))
-                    .orElseGet(() -> getDirectory());
+            final Optional<String> pkgAsString = compilationUnit.getPackageDeclaration().map(NodeWithName::getNameAsString);
+            return pkgAsString.map(p -> Paths.get(CodeGenerationUtils.packageToPath(p))).map(pkg -> subtractPaths(getDirectory(), pkg)).orElseGet(() -> getDirectory());
         }
 
         public String getFileName() {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Generated.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Generated.java
index 9b7d2609b0..d0e2865346 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/Generated.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/Generated.java
@@ -22,7 +22,6 @@
 
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.SOURCE;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -33,7 +32,7 @@
  * and will be overwritten the next time the generators are run.
  */
 @Retention(SOURCE)
-@Target({PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD, LOCAL_VARIABLE, PARAMETER})
+@Target({ PACKAGE, TYPE, ANNOTATION_TYPE, METHOD, CONSTRUCTOR, FIELD, LOCAL_VARIABLE, PARAMETER })
 public @interface Generated {
 
     /**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/ImportDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/ImportDeclaration.java
index 008385207d..f3b24e9371 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/ImportDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/ImportDeclaration.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.expr.Name;
 import com.github.javaparser.ast.nodeTypes.NodeWithName;
@@ -63,13 +62,7 @@ public ImportDeclaration(String name, boolean isStatic, boolean isAsterisk, bool
         // declaration of the form ‘x.*’ by specifying only ‘x’.
         // On the other hand, if the isAsterisk parameter is false, we can check that we haven't tried to directly
         // create an import declaration of the form ‘x.*’.
-        this(
-                null,
-                getNameFromString(name),
-                isStatic,
-                isAsterisk ? isAsterisk : hasAsterisk(name),
-                isModule,
-                isJmlModel);
+        this(null, getNameFromString(name), isStatic, isAsterisk ? isAsterisk : hasAsterisk(name), isModule, isJmlModel);
     }
 
     /**
@@ -111,13 +104,7 @@ public ImportDeclaration(TokenRange range, Name name, boolean isStatic, boolean
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public ImportDeclaration(
-            TokenRange tokenRange,
-            Name name,
-            boolean isStatic,
-            boolean isAsterisk,
-            boolean isModule,
-            boolean isJmlModel) {
+    public ImportDeclaration(TokenRange tokenRange, Name name, boolean isStatic, boolean isAsterisk, boolean isModule, boolean isJmlModel) {
         super(tokenRange);
         setName(name);
         setStatic(isStatic);
@@ -216,7 +203,8 @@ public ImportDeclaration setName(final @NonNull() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Jmlish.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Jmlish.java
index 3faa00bb1f..d3abc888ca 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/Jmlish.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/Jmlish.java
@@ -4,4 +4,5 @@
  * @author Alexander Weigl
  * @version 1 (2/22/21)
  */
-public interface Jmlish {}
+public interface Jmlish {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Modifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Modifier.java
index f4ae853244..55522b5b64 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/Modifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/Modifier.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.ast.NodeList.toNodeList;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.visitor.CloneVisitor;
@@ -37,6 +36,7 @@
 /**
  * A modifier, like private, public, or volatile.
  */
+@SuppressWarnings("unused")
 public class Modifier extends Node {
 
     public static Modifier publicModifier() {
@@ -123,13 +123,6 @@ public static Modifier jmlSpecPrivateModifier() {
         return new Modifier(DefaultKeyword.JML_SPEC_PRIVATE);
     }
 
-    public interface Keyword {
-
-        String asString();
-
-        String name();
-    }
-
     public static Modifier sealedModifier() {
         return new Modifier(DefaultKeyword.SEALED);
     }
@@ -138,10 +131,18 @@ public static Modifier nonSealedModifier() {
         return new Modifier(DefaultKeyword.NON_SEALED);
     }
 
+    public interface Keyword {
+
+        String name();
+
+        String asString();
+    }
+
     /**
      * The Java modifier keywords.
      */
     public enum DefaultKeyword implements Keyword {
+
         DEFAULT("default"),
         PUBLIC("public"),
         PROTECTED("protected"),
@@ -157,7 +158,7 @@ public enum DefaultKeyword implements Keyword {
         TRANSITIVE("transitive"),
         SEALED("sealed"),
         NON_SEALED("non-sealed"),
-        // JML
+        // KEY
         JML_PACKAGE("package"),
         JML_PURE("pure"),
         JML_STRICTLY_PURE("strictly_pure"),
@@ -180,6 +181,9 @@ public enum DefaultKeyword implements Keyword {
         JML_CODE_BIGINT_MATH("code_bigint_math"),
         JML_CODE_JAVA_MATH("code_java_math"),
         JML_CODE_SAFE_MATH("code_safe_math"),
+        JML_SPEC_BIGINT_MATH("spec_bigint_math"),
+        JML_SPEC_JAVA_MATH("spec_java_math"),
+        JML_SPEC_SAFE_MATH("spec_safe_math"),
         JML_CODE("code"),
         JML_OT_PEER("peer"),
         JML_OT_REP("rep"),
@@ -238,22 +242,11 @@ public Keyword getKeyword() {
         return keyword;
     }
 
-    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public Modifier setKeyword(final @NonNull() Keyword keyword) {
-        assertNotNull(keyword);
-        if (keyword == this.keyword) {
-            return this;
-        }
-        notifyPropertyChange(ObservableProperty.KEYWORD, this.keyword, keyword);
-        this.keyword = keyword;
-        return this;
-    }
-
     /**
      * Utility method that instantiaties "Modifier"s for the keywords,
      * and puts them in a NodeList.
      */
-    public static NodeList<Modifier> createModifierList(Modifier.Keyword... modifiers) {
+    public static NodeList<Modifier> createModifierList(Keyword... modifiers) {
         return Arrays.stream(modifiers).map(Modifier::new).collect(toNodeList());
     }
 
@@ -283,4 +276,15 @@ public Modifier(TokenRange tokenRange) {
         super(tokenRange);
         customInitialization();
     }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public Modifier setKeyword(final @NonNull() Keyword keyword) {
+        assertNotNull(keyword);
+        if (keyword == this.keyword) {
+            return this;
+        }
+        notifyPropertyChange(ObservableProperty.KEYWORD, this.keyword, keyword);
+        this.keyword = keyword;
+        return this;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java
index 1107de703b..f260d4621a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java
@@ -26,7 +26,6 @@
 import static java.util.Collections.unmodifiableList;
 import static java.util.Spliterator.DISTINCT;
 import static java.util.Spliterator.NONNULL;
-
 import com.github.javaparser.HasParentNode;
 import com.github.javaparser.Position;
 import com.github.javaparser.Range;
@@ -106,8 +105,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public abstract class Node
-        implements Cloneable, HasParentNode<Node>, Visitable, NodeWithRange<Node>, NodeWithTokenRange<Node> {
+public abstract class Node implements Cloneable, HasParentNode<Node>, Visitable, NodeWithRange<Node>, NodeWithTokenRange<Node> {
 
     /**
      * Different registration mode for observers on nodes.
@@ -132,8 +130,8 @@ public enum ObserverRegistrationMode {
     }
 
     public enum Parsedness {
-        PARSED,
-        UNPARSABLE
+
+        PARSED, UNPARSABLE
     }
 
     /**
@@ -155,8 +153,7 @@ public enum Parsedness {
     // usefull to find if the node is a phantom node
     private static final int LEVELS_TO_EXPLORE = 3;
 
-    protected static final PrinterConfiguration prettyPrinterNoCommentsConfiguration =
-            new DefaultPrinterConfiguration().removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS));
+    protected static final PrinterConfiguration prettyPrinterNoCommentsConfiguration = new DefaultPrinterConfiguration().removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS));
 
     @InternalProperty
     private Range range;
@@ -200,7 +197,8 @@ protected Node(TokenRange tokenRange) {
      * It can't be written in the constructor itself because it will
      * be overwritten during code generation.
      */
-    protected void customInitialization() {}
+    protected void customInitialization() {
+    }
 
     /*
      * If there is a printer defined in CompilationUnit, returns it
@@ -214,9 +212,7 @@ protected Printer getPrinter() {
      * Return the printer initialized with the specified configuration
      */
     protected Printer getPrinter(PrinterConfiguration configuration) {
-        return findCompilationUnit()
-                .map(c -> c.getPrinter(configuration))
-                .orElseGet(() -> createDefaultPrinter(configuration));
+        return findCompilationUnit().map(c -> c.getPrinter(configuration)).orElseGet(() -> createDefaultPrinter(configuration));
     }
 
     protected Printer createDefaultPrinter() {
@@ -263,13 +259,10 @@ public Optional<TokenRange> getTokenRange() {
     @Override
     public Node setTokenRange(TokenRange tokenRange) {
         this.tokenRange = tokenRange;
-        if (tokenRange == null
-                || !(tokenRange.getBegin().hasRange() && tokenRange.getEnd().hasRange())) {
+        if (tokenRange == null || !(tokenRange.getBegin().hasRange() && tokenRange.getEnd().hasRange())) {
             range = null;
         } else {
-            range = new Range(
-                    tokenRange.getBegin().getRange().get().begin,
-                    tokenRange.getEnd().getRange().get().end);
+            range = new Range(tokenRange.getBegin().getRange().get().begin, tokenRange.getEnd().getRange().get().end);
         }
         return this;
     }
@@ -338,8 +331,7 @@ public final String toString() {
                 ConfigurablePrinter configurablePrinter = (ConfigurablePrinter) printer;
                 PrinterConfiguration config = configurablePrinter.getConfiguration();
                 if (config != null) {
-                    config.addOption(new DefaultConfigurationOption(
-                            ConfigOption.END_OF_LINE_CHARACTER, lineSeparator.asRawString()));
+                    config.addOption(new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER, lineSeparator.asRawString()));
                     configurablePrinter.setConfiguration(config);
                 }
             }
@@ -710,7 +702,7 @@ public void register(AstObserver observer, ObserverRegistrationMode mode) {
         if (mode == null) {
             throw new IllegalArgumentException("Mode should be not null");
         }
-        switch (mode) {
+        switch(mode) {
             case JUST_THIS_NODE:
                 register(observer);
                 break;
@@ -734,7 +726,8 @@ public void registerForSubtree(AstObserver observer) {
         for (PropertyMetaModel property : getMetaModel().getAllPropertyMetaModels()) {
             if (property.isNodeList()) {
                 NodeList<?> nodeList = (NodeList<?>) property.getValue(this);
-                if (nodeList != null) nodeList.register(observer);
+                if (nodeList != null)
+                    nodeList.register(observer);
             }
         }
     }
@@ -871,37 +864,35 @@ public LineSeparator getLineEndingStyle() {
     }
 
     public SymbolResolver getSymbolResolver() {
-        return findCompilationUnit()
-                .map(cu -> {
-                    if (cu.containsData(SYMBOL_RESOLVER_KEY)) {
-                        return cu.getData(SYMBOL_RESOLVER_KEY);
-                    }
-                    throw new IllegalStateException(
-                            "Symbol resolution not configured: to configure consider setting a SymbolResolver in the ParserConfiguration");
-                })
-                .orElseThrow(() -> new IllegalStateException("The node is not inserted in a CompilationUnit"));
+        return findCompilationUnit().map(cu -> {
+            if (cu.containsData(SYMBOL_RESOLVER_KEY)) {
+                return cu.getData(SYMBOL_RESOLVER_KEY);
+            }
+            throw new IllegalStateException("Symbol resolution not configured: to configure consider setting a SymbolResolver in the ParserConfiguration");
+        }).orElseThrow(() -> new IllegalStateException("The node is not inserted in a CompilationUnit"));
     }
 
     // We need to expose it because we will need to use it to inject the SymbolSolver
-    public static final DataKey<SymbolResolver> SYMBOL_RESOLVER_KEY = new DataKey<SymbolResolver>() {};
+    public static final DataKey<SymbolResolver> SYMBOL_RESOLVER_KEY = new DataKey<SymbolResolver>() {
+    };
 
-    public static final DataKey<LineSeparator> LINE_SEPARATOR_KEY = new DataKey<LineSeparator>() {};
+    public static final DataKey<LineSeparator> LINE_SEPARATOR_KEY = new DataKey<LineSeparator>() {
+    };
 
     // We need to expose it because we will need to use it to inject the printer
-    public static final DataKey<Printer> PRINTER_KEY = new DataKey<Printer>() {};
+    public static final DataKey<Printer> PRINTER_KEY = new DataKey<Printer>() {
+    };
 
-    protected static final DataKey<Boolean> PHANTOM_KEY = new DataKey<Boolean>() {};
+    protected static final DataKey<Boolean> PHANTOM_KEY = new DataKey<Boolean>() {
+    };
 
     public enum TreeTraversal {
-        PREORDER,
-        BREADTHFIRST,
-        POSTORDER,
-        PARENTS,
-        DIRECT_CHILDREN
+
+        PREORDER, BREADTHFIRST, POSTORDER, PARENTS, DIRECT_CHILDREN
     }
 
     private Iterator<Node> treeIterator(TreeTraversal traversal) {
-        switch (traversal) {
+        switch(traversal) {
             case BREADTHFIRST:
                 return new BreadthFirstIterator(this);
             case POSTORDER:
@@ -925,16 +916,14 @@ private Iterable<Node> treeIterable(TreeTraversal traversal) {
      * Make a stream of nodes using traversal algorithm "traversal".
      */
     public Stream<Node> stream(TreeTraversal traversal) {
-        return StreamSupport.stream(
-                Spliterators.spliteratorUnknownSize(treeIterator(traversal), NONNULL | DISTINCT), false);
+        return StreamSupport.stream(Spliterators.spliteratorUnknownSize(treeIterator(traversal), NONNULL | DISTINCT), false);
     }
 
     /**
      * Make a stream of nodes using pre-order traversal.
      */
     public Stream<Node> stream() {
-        return StreamSupport.stream(
-                Spliterators.spliteratorUnknownSize(treeIterator(PREORDER), NONNULL | DISTINCT), false);
+        return StreamSupport.stream(Spliterators.spliteratorUnknownSize(treeIterator(PREORDER), NONNULL | DISTINCT), false);
     }
 
     /**
@@ -994,7 +983,8 @@ public <T extends Node> List<T> findAll(Class<T> nodeType, TreeTraversal travers
     public <T extends Node> List<T> findAll(Class<T> nodeType, Predicate<T> predicate) {
         final List<T> found = new ArrayList<>();
         walk(nodeType, n -> {
-            if (predicate.test(n)) found.add(n);
+            if (predicate.test(n))
+                found.add(n);
         });
         return found;
     }
@@ -1291,9 +1281,7 @@ public boolean isCurrentExpanded() {
      * Returns true if the node has an (optional) scope expression eg. method calls (object.method())
      */
     public boolean hasScope() {
-        return (NodeWithOptionalScope.class.isAssignableFrom(this.getClass())
-                        && ((NodeWithOptionalScope) this).getScope().isPresent())
-                || (NodeWithScope.class.isAssignableFrom(this.getClass()) && ((NodeWithScope) this).getScope() != null);
+        return (NodeWithOptionalScope.class.isAssignableFrom(this.getClass()) && ((NodeWithOptionalScope) this).getScope().isPresent()) || (NodeWithScope.class.isAssignableFrom(this.getClass()) && ((NodeWithScope) this).getScope() != null);
     }
 
     /*
@@ -1305,15 +1293,7 @@ public boolean isPhantom() {
 
     private boolean isPhantom(Node node) {
         if (!node.containsData(PHANTOM_KEY)) {
-            boolean res = (node.getParentNode().isPresent()
-                            && node.getParentNode().get().hasRange()
-                            && node.hasRange()
-                            && !node.getParentNode()
-                                    .get()
-                                    .getRange()
-                                    .get()
-                                    .contains(node.getRange().get())
-                    || inPhantomNode(node, LEVELS_TO_EXPLORE));
+            boolean res = (node.getParentNode().isPresent() && node.getParentNode().get().hasRange() && node.hasRange() && !node.getParentNode().get().getRange().get().contains(node.getRange().get()) || inPhantomNode(node, LEVELS_TO_EXPLORE));
             node.setData(PHANTOM_KEY, res);
         }
         return node.getData(PHANTOM_KEY);
@@ -1323,9 +1303,7 @@ private boolean isPhantom(Node node) {
      * A node contained in a phantom node is also a phantom node. We limit how many levels up we check just for performance reasons.
      */
     private boolean inPhantomNode(Node node, int levels) {
-        return node.getParentNode().isPresent()
-                && (isPhantom(node.getParentNode().get())
-                        || inPhantomNode(node.getParentNode().get(), levels - 1));
+        return node.getParentNode().isPresent() && (isPhantom(node.getParentNode().get()) || inPhantomNode(node.getParentNode().get(), levels - 1));
     }
 
     /**
@@ -1337,16 +1315,13 @@ public Optional<NodeList<Comment>> getAssociatedSpecificationComments() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public Node setAssociatedSpecificationComments(
-            final @Nullable() NodeList<Comment> associatedSpecificationComments) {
+    public Node setAssociatedSpecificationComments(final @Nullable() NodeList<Comment> associatedSpecificationComments) {
         if (associatedSpecificationComments == this.associatedSpecificationComments) {
             return this;
         }
-        notifyPropertyChange(
-                ObservableProperty.ASSOCIATED_SPECIFICATION_COMMENTS,
-                this.associatedSpecificationComments,
-                associatedSpecificationComments);
-        if (this.associatedSpecificationComments != null) this.associatedSpecificationComments.setParentNode(null);
+        notifyPropertyChange(ObservableProperty.ASSOCIATED_SPECIFICATION_COMMENTS, this.associatedSpecificationComments, associatedSpecificationComments);
+        if (this.associatedSpecificationComments != null)
+            this.associatedSpecificationComments.setParentNode(null);
         this.associatedSpecificationComments = associatedSpecificationComments;
         setAsParentNodeOf(associatedSpecificationComments);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java b/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java
index df2dd3ab7c..8237d7b845 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/NodeList.java
@@ -44,8 +44,7 @@
  *
  * @param <N> the type of nodes contained.
  */
-public class NodeList<N extends Node>
-        implements List<N>, Iterable<N>, HasParentNode<NodeList<N>>, Visitable, Observable {
+public class NodeList<N extends Node> implements List<N>, Iterable<N>, HasParentNode<NodeList<N>>, Visitable, Observable {
 
     @InternalProperty
     private final List<N> innerList = new ArrayList<>(0);
@@ -140,8 +139,7 @@ public Iterator<N> iterator() {
     @Override
     public N set(int index, N element) {
         if (index < 0 || index >= innerList.size()) {
-            throw new IllegalArgumentException("Illegal index. The index should be between 0 and " + innerList.size()
-                    + " excluded. It is instead " + index);
+            throw new IllegalArgumentException("Illegal index. The index should be between 0 and " + innerList.size() + " excluded. It is instead " + index);
         }
         if (element == innerList.get(index)) {
             return element;
@@ -156,7 +154,8 @@ public N set(int index, N element) {
     public N remove(int index) {
         notifyElementRemoved(index, innerList.get(index));
         N remove = innerList.remove(index);
-        if (remove != null) remove.setParentNode(null);
+        if (remove != null)
+            remove.setParentNode(null);
         return remove;
     }
 
@@ -534,7 +533,8 @@ public boolean isNonEmpty() {
     }
 
     public void ifNonEmpty(Consumer<? super NodeList<N>> consumer) {
-        if (isNonEmpty()) consumer.accept(this);
+        if (isNonEmpty())
+            consumer.accept(this);
     }
 
     public static <T extends Node> Collector<T, NodeList<T>, NodeList<T>> toNodeList() {
@@ -624,8 +624,7 @@ public void remove() {
         public void set(N n) {
             int index = innerList.indexOf(current);
             if (index < 0 || index >= innerList.size()) {
-                throw new IllegalArgumentException("Illegal index. The index should be between 0 and "
-                        + innerList.size() + " excluded. It is instead " + index);
+                throw new IllegalArgumentException("Illegal index. The index should be between 0 and " + innerList.size() + " excluded. It is instead " + index);
             }
             if (n != innerList.get(index)) {
                 notifyElementReplaced(index, n);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/PackageDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/PackageDeclaration.java
index 218cabc3ac..e28ba49ab8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/PackageDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/PackageDeclaration.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.expr.AnnotationExpr;
 import com.github.javaparser.ast.expr.Name;
@@ -43,8 +42,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class PackageDeclaration extends Node
-        implements NodeWithAnnotations<PackageDeclaration>, NodeWithName<PackageDeclaration> {
+public class PackageDeclaration extends Node implements NodeWithAnnotations<PackageDeclaration>, NodeWithName<PackageDeclaration> {
 
     private NodeList<AnnotationExpr> annotations = new NodeList<>();
 
@@ -117,7 +115,8 @@ public PackageDeclaration setAnnotations(final @NonNull() NodeList<AnnotationExp
             return this;
         }
         notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations);
-        if (this.annotations != null) this.annotations.setParentNode(null);
+        if (this.annotations != null)
+            this.annotations.setParentNode(null);
         this.annotations = annotations;
         setAsParentNodeOf(annotations);
         return this;
@@ -135,7 +134,8 @@ public PackageDeclaration setName(final @NonNull() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java
index 720d709e10..5e5c7d9021 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationDeclaration.java
@@ -38,14 +38,14 @@
 import com.github.javaparser.resolution.declarations.ResolvedAnnotationDeclaration;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * An annotation type declaration.<br>{@code @interface X { ... }}
  *
  * @author Julio Vilmar Gesser
  */
-public class AnnotationDeclaration extends TypeDeclaration<AnnotationDeclaration>
-        implements NodeWithAbstractModifier<AnnotationDeclaration>, Resolvable<ResolvedAnnotationDeclaration> {
+public class AnnotationDeclaration extends TypeDeclaration<AnnotationDeclaration> implements NodeWithAbstractModifier<AnnotationDeclaration>, Resolvable<ResolvedAnnotationDeclaration> {
 
     public AnnotationDeclaration() {
         this(null, new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>());
@@ -56,11 +56,7 @@ public AnnotationDeclaration(NodeList<Modifier> modifiers, String name) {
     }
 
     @AllFieldsConstructor
-    public AnnotationDeclaration(
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            SimpleName name,
-            NodeList<BodyDeclaration<?>> members) {
+    public AnnotationDeclaration(NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<BodyDeclaration<?>> members) {
         this(null, modifiers, annotations, name, members);
     }
 
@@ -68,12 +64,7 @@ public AnnotationDeclaration(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public AnnotationDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            SimpleName name,
-            NodeList<BodyDeclaration<?>> members) {
+    public AnnotationDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<BodyDeclaration<?>> members) {
         super(tokenRange, modifiers, annotations, name, members);
         customInitialization();
     }
@@ -132,7 +123,7 @@ public Optional<AnnotationDeclaration> toAnnotationDeclaration() {
     }
 
     @Override
-    public FieldDeclaration addField(Type type, String name, Modifier.DefaultKeyword... modifiers) {
+    public FieldDeclaration addField(Type type, String name, Modifier.Keyword... modifiers) {
         throw new IllegalStateException("Cannot add a field to an annotation declaration.");
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
index f069cbfc83..f18a630184 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.body;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -57,13 +56,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class AnnotationMemberDeclaration extends BodyDeclaration<AnnotationMemberDeclaration>
-        implements NodeWithJavadoc<AnnotationMemberDeclaration>,
-                NodeWithSimpleName<AnnotationMemberDeclaration>,
-                NodeWithType<AnnotationMemberDeclaration, Type>,
-                NodeWithPublicModifier<AnnotationMemberDeclaration>,
-                NodeWithAbstractModifier<AnnotationMemberDeclaration>,
-                Resolvable<ResolvedAnnotationMemberDeclaration> {
+public class AnnotationMemberDeclaration extends BodyDeclaration<AnnotationMemberDeclaration> implements NodeWithJavadoc<AnnotationMemberDeclaration>, NodeWithSimpleName<AnnotationMemberDeclaration>, NodeWithType<AnnotationMemberDeclaration, Type>, NodeWithPublicModifier<AnnotationMemberDeclaration>, NodeWithAbstractModifier<AnnotationMemberDeclaration>, Resolvable<ResolvedAnnotationMemberDeclaration> {
 
     private NodeList<Modifier> modifiers;
 
@@ -83,12 +76,7 @@ public AnnotationMemberDeclaration(NodeList<Modifier> modifiers, Type type, Stri
     }
 
     @AllFieldsConstructor
-    public AnnotationMemberDeclaration(
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            Type type,
-            SimpleName name,
-            Expression defaultValue) {
+    public AnnotationMemberDeclaration(NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, Type type, SimpleName name, Expression defaultValue) {
         this(null, modifiers, annotations, type, name, defaultValue);
     }
 
@@ -96,13 +84,7 @@ public AnnotationMemberDeclaration(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public AnnotationMemberDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            Type type,
-            SimpleName name,
-            Expression defaultValue) {
+    public AnnotationMemberDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, Type type, SimpleName name, Expression defaultValue) {
         super(tokenRange, annotations);
         setModifiers(modifiers);
         setType(type);
@@ -166,7 +148,8 @@ public AnnotationMemberDeclaration setDefaultValue(final @Nullable() Expression
             return this;
         }
         notifyPropertyChange(ObservableProperty.DEFAULT_VALUE, this.defaultValue, defaultValue);
-        if (this.defaultValue != null) this.defaultValue.setParentNode(null);
+        if (this.defaultValue != null)
+            this.defaultValue.setParentNode(null);
         this.defaultValue = defaultValue;
         setAsParentNodeOf(defaultValue);
         return this;
@@ -179,7 +162,8 @@ public AnnotationMemberDeclaration setModifiers(final @NonNull() NodeList<Modifi
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
@@ -192,7 +176,8 @@ public AnnotationMemberDeclaration setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -205,7 +190,8 @@ public AnnotationMemberDeclaration setType(final @NonNull() Type type) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
-        if (this.type != null) this.type.setParentNode(null);
+        if (this.type != null)
+            this.type.setParentNode(null);
         this.type = type;
         setAsParentNodeOf(type);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java
index f98046d34f..303d0bea1c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/BodyDeclaration.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -30,8 +29,12 @@
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.expr.AnnotationExpr;
 import com.github.javaparser.ast.jml.body.*;
-import com.github.javaparser.ast.jml.doc.JmlDocDeclaration;
-import com.github.javaparser.ast.jml.doc.JmlDocType;
+import com.github.javaparser.ast.jml.clauses.*;
+import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.expr.*;
+import com.github.javaparser.ast.jml.stmt.*;
+import com.github.javaparser.ast.key.*;
+import com.github.javaparser.ast.key.sv.*;
 import com.github.javaparser.ast.nodeTypes.NodeWithAnnotations;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.visitor.CloneVisitor;
@@ -87,7 +90,8 @@ public T setAnnotations(final @NonNull() NodeList<AnnotationExpr> annotations) {
             return (T) this;
         }
         notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations);
-        if (this.annotations != null) this.annotations.setParentNode(null);
+        if (this.annotations != null)
+            this.annotations.setParentNode(null);
         this.annotations = annotations;
         setAsParentNodeOf(annotations);
         return (T) this;
@@ -142,9 +146,7 @@ public boolean isAnnotationDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public AnnotationDeclaration asAnnotationDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not AnnotationDeclaration, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not AnnotationDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -154,9 +156,7 @@ public boolean isAnnotationMemberDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public AnnotationMemberDeclaration asAnnotationMemberDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not AnnotationMemberDeclaration, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not AnnotationMemberDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -166,8 +166,7 @@ public boolean isCallableDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public CallableDeclaration asCallableDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not CallableDeclaration, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not CallableDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -177,9 +176,7 @@ public boolean isClassOrInterfaceDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ClassOrInterfaceDeclaration asClassOrInterfaceDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not ClassOrInterfaceDeclaration, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ClassOrInterfaceDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -189,9 +186,7 @@ public boolean isConstructorDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ConstructorDeclaration asConstructorDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not ConstructorDeclaration, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ConstructorDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -201,9 +196,7 @@ public boolean isCompactConstructorDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public CompactConstructorDeclaration asCompactConstructorDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not CompactConstructorDeclaration, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not CompactConstructorDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -213,9 +206,7 @@ public boolean isEnumConstantDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public EnumConstantDeclaration asEnumConstantDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not EnumConstantDeclaration, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not EnumConstantDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -225,8 +216,7 @@ public boolean isEnumDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public EnumDeclaration asEnumDeclaration() {
-        throw new IllegalStateException(
-                f("%s is not EnumDeclaration, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not EnumDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -236,8 +226,7 @@ public boolean isFieldDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public FieldDeclaration asFieldDeclaration() {
-        throw new IllegalStateException(
-                f("%s is not FieldDeclaration, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not FieldDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -247,9 +236,7 @@ public boolean isInitializerDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public InitializerDeclaration asInitializerDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not InitializerDeclaration, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not InitializerDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -259,8 +246,7 @@ public boolean isMethodDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public MethodDeclaration asMethodDeclaration() {
-        throw new IllegalStateException(
-                f("%s is not MethodDeclaration, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not MethodDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -270,48 +256,60 @@ public boolean isTypeDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public TypeDeclaration asTypeDeclaration() {
-        throw new IllegalStateException(
-                f("%s is not TypeDeclaration, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not TypeDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifAnnotationDeclaration(Consumer<AnnotationDeclaration> action) {}
+    public void ifAnnotationDeclaration(Consumer<AnnotationDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifAnnotationMemberDeclaration(Consumer<AnnotationMemberDeclaration> action) {}
+    public void ifAnnotationMemberDeclaration(Consumer<AnnotationMemberDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifCallableDeclaration(Consumer<CallableDeclaration> action) {}
+    public void ifCallableDeclaration(Consumer<CallableDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifClassOrInterfaceDeclaration(Consumer<ClassOrInterfaceDeclaration> action) {}
+    public void ifClassOrInterfaceDeclaration(Consumer<ClassOrInterfaceDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifConstructorDeclaration(Consumer<ConstructorDeclaration> action) {}
+    public void ifConstructorDeclaration(Consumer<ConstructorDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifEnumConstantDeclaration(Consumer<EnumConstantDeclaration> action) {}
+    public void ifEnumConstantDeclaration(Consumer<EnumConstantDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifEnumDeclaration(Consumer<EnumDeclaration> action) {}
+    public void ifEnumDeclaration(Consumer<EnumDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifFieldDeclaration(Consumer<FieldDeclaration> action) {}
+    public void ifFieldDeclaration(Consumer<FieldDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifInitializerDeclaration(Consumer<InitializerDeclaration> action) {}
+    public void ifInitializerDeclaration(Consumer<InitializerDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifMethodDeclaration(Consumer<MethodDeclaration> action) {}
+    public void ifMethodDeclaration(Consumer<MethodDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifTypeDeclaration(Consumer<TypeDeclaration> action) {}
+    public void ifTypeDeclaration(Consumer<TypeDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifRecordDeclaration(Consumer<RecordDeclaration> action) {}
+    public void ifRecordDeclaration(Consumer<RecordDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifCompactConstructorDeclaration(Consumer<CompactConstructorDeclaration> action) {}
+    public void ifCompactConstructorDeclaration(Consumer<CompactConstructorDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public Optional<AnnotationDeclaration> toAnnotationDeclaration() {
@@ -375,8 +373,7 @@ public boolean isRecordDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public RecordDeclaration asRecordDeclaration() {
-        throw new IllegalStateException(
-                f("%s is not RecordDeclaration, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not RecordDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -385,7 +382,8 @@ public Optional<RecordDeclaration> toRecordDeclaration() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifClassInvariantClause(Consumer<JmlClassExprDeclaration> action) {}
+    public void ifClassInvariantClause(Consumer<JmlClassExprDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlBodyDeclaration() {
@@ -399,9 +397,7 @@ public boolean isJmlClassAccessibleDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlClassAccessibleDeclaration asJmlClassAccessibleDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not JmlClassAccessibleDeclaration, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlClassAccessibleDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -421,7 +417,8 @@ public Optional<JmlClassAccessibleDeclaration> toJmlClassAccessibleDeclaration()
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlClassAccessibleDeclaration(Consumer<JmlClassAccessibleDeclaration> action) {}
+    public void ifJmlClassAccessibleDeclaration(Consumer<JmlClassAccessibleDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlClassExprDeclaration() {
@@ -430,9 +427,7 @@ public boolean isJmlClassExprDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlClassExprDeclaration asJmlClassExprDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not JmlClassExprDeclaration, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlClassExprDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -441,7 +436,8 @@ public Optional<JmlClassExprDeclaration> toJmlClassExprDeclaration() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlClassExprDeclaration(Consumer<JmlClassExprDeclaration> action) {}
+    public void ifJmlClassExprDeclaration(Consumer<JmlClassExprDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlClassLevelDeclaration() {
@@ -450,9 +446,7 @@ public boolean isJmlClassLevelDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlClassLevelDeclaration asJmlClassLevelDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not JmlClassLevelDeclaration, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlClassLevelDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -461,7 +455,8 @@ public Optional<JmlClassLevelDeclaration> toJmlClassLevelDeclaration() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlClassLevelDeclaration(Consumer<JmlClassLevelDeclaration> action) {}
+    public void ifJmlClassLevelDeclaration(Consumer<JmlClassLevelDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlDocDeclaration() {
@@ -470,8 +465,7 @@ public boolean isJmlDocDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlDocDeclaration asJmlDocDeclaration() {
-        throw new IllegalStateException(
-                f("%s is not JmlDocDeclaration, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlDocDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -480,7 +474,8 @@ public Optional<JmlDocDeclaration> toJmlDocDeclaration() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlDocDeclaration(Consumer<JmlDocDeclaration> action) {}
+    public void ifJmlDocDeclaration(Consumer<JmlDocDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlDocType() {
@@ -489,8 +484,7 @@ public boolean isJmlDocType() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlDocType asJmlDocType() {
-        throw new IllegalStateException(
-                f("%s is not JmlDocType, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlDocType, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -499,7 +493,8 @@ public Optional<JmlDocType> toJmlDocType() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlDocType(Consumer<JmlDocType> action) {}
+    public void ifJmlDocType(Consumer<JmlDocType> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlFieldDeclaration() {
@@ -508,8 +503,7 @@ public boolean isJmlFieldDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlFieldDeclaration asJmlFieldDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not JmlFieldDeclaration, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlFieldDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -518,7 +512,8 @@ public Optional<JmlFieldDeclaration> toJmlFieldDeclaration() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlFieldDeclaration(Consumer<JmlFieldDeclaration> action) {}
+    public void ifJmlFieldDeclaration(Consumer<JmlFieldDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlMethodDeclaration() {
@@ -527,9 +522,7 @@ public boolean isJmlMethodDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlMethodDeclaration asJmlMethodDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not JmlMethodDeclaration, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlMethodDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -538,7 +531,8 @@ public Optional<JmlMethodDeclaration> toJmlMethodDeclaration() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlMethodDeclaration(Consumer<JmlMethodDeclaration> action) {}
+    public void ifJmlMethodDeclaration(Consumer<JmlMethodDeclaration> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlRepresentsDeclaration() {
@@ -547,9 +541,7 @@ public boolean isJmlRepresentsDeclaration() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlRepresentsDeclaration asJmlRepresentsDeclaration() {
-        throw new IllegalStateException(f(
-                "%s is not JmlRepresentsDeclaration, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlRepresentsDeclaration, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -558,5 +550,6 @@ public Optional<JmlRepresentsDeclaration> toJmlRepresentsDeclaration() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlRepresentsDeclaration(Consumer<JmlRepresentsDeclaration> action) {}
+    public void ifJmlRepresentsDeclaration(Consumer<JmlRepresentsDeclaration> action) {
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java
index 7d2080a658..24e895eeb5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java
@@ -23,7 +23,6 @@
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -51,19 +50,7 @@
 /**
  * Represents a declaration which is callable eg. a method or a constructor.
  */
-public abstract class CallableDeclaration<T extends CallableDeclaration<?>> extends BodyDeclaration<T>
-        implements NodeWithAccessModifiers<T>,
-                NodeWithDeclaration,
-                NodeWithSimpleName<T>,
-                NodeWithParameters<T>,
-                NodeWithThrownExceptions<T>,
-                NodeWithTypeParameters<T>,
-                NodeWithJavadoc<T>,
-                NodeWithAbstractModifier<T>,
-                NodeWithStaticModifier<T>,
-                NodeWithFinalModifier<T>,
-                NodeWithStrictfpModifier<T>,
-                NodeWithContracts<T> {
+public abstract class CallableDeclaration<T extends CallableDeclaration<?>> extends BodyDeclaration<T> implements NodeWithAccessModifiers<T>, NodeWithDeclaration, NodeWithSimpleName<T>, NodeWithParameters<T>, NodeWithThrownExceptions<T>, NodeWithTypeParameters<T>, NodeWithJavadoc<T>, NodeWithAbstractModifier<T>, NodeWithStaticModifier<T>, NodeWithFinalModifier<T>, NodeWithStrictfpModifier<T>, NodeWithContracts<T> {
 
     private NodeList<Modifier> modifiers;
 
@@ -81,41 +68,15 @@ public abstract class CallableDeclaration<T extends CallableDeclaration<?>> exte
     private NodeList<JmlContract> contracts = new NodeList<>();
 
     @AllFieldsConstructor
-    CallableDeclaration(
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<TypeParameter> typeParameters,
-            SimpleName name,
-            NodeList<Parameter> parameters,
-            NodeList<ReferenceType> thrownExceptions,
-            ReceiverParameter receiverParameter,
-            NodeList<JmlContract> contracts) {
-        this(
-                null,
-                modifiers,
-                annotations,
-                typeParameters,
-                name,
-                parameters,
-                thrownExceptions,
-                receiverParameter,
-                contracts);
+    CallableDeclaration(NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<TypeParameter> typeParameters, SimpleName name, NodeList<Parameter> parameters, NodeList<ReferenceType> thrownExceptions, ReceiverParameter receiverParameter, NodeList<JmlContract> contracts) {
+        this(null, modifiers, annotations, typeParameters, name, parameters, thrownExceptions, receiverParameter, contracts);
     }
 
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public CallableDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<TypeParameter> typeParameters,
-            SimpleName name,
-            NodeList<Parameter> parameters,
-            NodeList<ReferenceType> thrownExceptions,
-            ReceiverParameter receiverParameter,
-            NodeList<JmlContract> contracts) {
+    public CallableDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<TypeParameter> typeParameters, SimpleName name, NodeList<Parameter> parameters, NodeList<ReferenceType> thrownExceptions, ReceiverParameter receiverParameter, NodeList<JmlContract> contracts) {
         super(tokenRange, annotations);
         setModifiers(modifiers);
         setTypeParameters(typeParameters);
@@ -146,7 +107,8 @@ public T setModifiers(final @NonNull() NodeList<Modifier> modifiers) {
             return (T) this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return (T) this;
@@ -165,7 +127,8 @@ public T setName(final @NonNull() SimpleName name) {
             return (T) this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return (T) this;
@@ -184,7 +147,8 @@ public T setParameters(final @NonNull() NodeList<Parameter> parameters) {
             return (T) this;
         }
         notifyPropertyChange(ObservableProperty.PARAMETERS, this.parameters, parameters);
-        if (this.parameters != null) this.parameters.setParentNode(null);
+        if (this.parameters != null)
+            this.parameters.setParentNode(null);
         this.parameters = parameters;
         setAsParentNodeOf(parameters);
         return (T) this;
@@ -203,7 +167,8 @@ public T setThrownExceptions(final @NonNull() NodeList<ReferenceType> thrownExce
             return (T) this;
         }
         notifyPropertyChange(ObservableProperty.THROWN_EXCEPTIONS, this.thrownExceptions, thrownExceptions);
-        if (this.thrownExceptions != null) this.thrownExceptions.setParentNode(null);
+        if (this.thrownExceptions != null)
+            this.thrownExceptions.setParentNode(null);
         this.thrownExceptions = thrownExceptions;
         setAsParentNodeOf(thrownExceptions);
         return (T) this;
@@ -222,7 +187,8 @@ public T setTypeParameters(final @NonNull() NodeList<TypeParameter> typeParamete
             return (T) this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_PARAMETERS, this.typeParameters, typeParameters);
-        if (this.typeParameters != null) this.typeParameters.setParentNode(null);
+        if (this.typeParameters != null)
+            this.typeParameters.setParentNode(null);
         this.typeParameters = typeParameters;
         setAsParentNodeOf(typeParameters);
         return (T) this;
@@ -316,10 +282,13 @@ public List<Type> getParameterTypes() {
 
         @Override
         public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
+            if (this == o)
+                return true;
+            if (o == null || getClass() != o.getClass())
+                return false;
             Signature signature = (Signature) o;
-            if (!name.equals(signature.name)) return false;
+            if (!name.equals(signature.name))
+                return false;
             return parameterTypes.equals(signature.parameterTypes);
         }
 
@@ -341,13 +310,7 @@ public String toString() {
     }
 
     public Signature getSignature() {
-        return new Signature(
-                getName().getIdentifier(),
-                getParameters().stream()
-                        .map(this::getTypeWithVarargsAsArray)
-                        .map(this::stripGenerics)
-                        .map(this::stripAnnotations)
-                        .collect(toList()));
+        return new Signature(getName().getIdentifier(), getParameters().stream().map(this::getTypeWithVarargsAsArray).map(this::stripGenerics).map(this::stripAnnotations).collect(toList()));
     }
 
     private Type stripAnnotations(Type type) {
@@ -466,7 +429,8 @@ public T setReceiverParameter(final @Nullable() ReceiverParameter receiverParame
             return (T) this;
         }
         notifyPropertyChange(ObservableProperty.RECEIVER_PARAMETER, this.receiverParameter, receiverParameter);
-        if (this.receiverParameter != null) this.receiverParameter.setParentNode(null);
+        if (this.receiverParameter != null)
+            this.receiverParameter.setParentNode(null);
         this.receiverParameter = receiverParameter;
         setAsParentNodeOf(receiverParameter);
         return (T) this;
@@ -496,7 +460,8 @@ public T setContracts(final @NonNull() NodeList<JmlContract> contracts) {
             return (T) this;
         }
         notifyPropertyChange(ObservableProperty.CONTRACTS, this.contracts, contracts);
-        if (this.contracts != null) this.contracts.setParentNode(null);
+        if (this.contracts != null)
+            this.contracts.setParentNode(null);
         this.contracts = contracts;
         setAsParentNodeOf(contracts);
         return (T) this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassAccessibleClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassAccessibleClause.java
index 9ada9a478e..63c4601a93 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassAccessibleClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassAccessibleClause.java
@@ -4,4 +4,5 @@
  * @author Alexander Weigl
  * @version 1 (2/21/21)
  */
-public class ClassAccessibleClause {}
+public class ClassAccessibleClause {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
index 9ee8e4e8d8..deb2f1c6d7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
@@ -20,9 +20,7 @@
  */
 package com.github.javaparser.ast.body;
 
-import static com.github.javaparser.ast.Modifier.DefaultKeyword.FINAL;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -54,13 +52,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class ClassOrInterfaceDeclaration extends TypeDeclaration<ClassOrInterfaceDeclaration>
-        implements NodeWithImplements<ClassOrInterfaceDeclaration>,
-                NodeWithExtends<ClassOrInterfaceDeclaration>,
-                NodeWithTypeParameters<ClassOrInterfaceDeclaration>,
-                NodeWithAbstractModifier<ClassOrInterfaceDeclaration>,
-                NodeWithFinalModifier<ClassOrInterfaceDeclaration>,
-                Resolvable<ResolvedReferenceTypeDeclaration> {
+public class ClassOrInterfaceDeclaration extends TypeDeclaration<ClassOrInterfaceDeclaration> implements NodeWithImplements<ClassOrInterfaceDeclaration>, NodeWithExtends<ClassOrInterfaceDeclaration>, NodeWithTypeParameters<ClassOrInterfaceDeclaration>, NodeWithAbstractModifier<ClassOrInterfaceDeclaration>, NodeWithFinalModifier<ClassOrInterfaceDeclaration>, Resolvable<ResolvedReferenceTypeDeclaration> {
 
     private boolean isInterface;
 
@@ -76,74 +68,23 @@ public class ClassOrInterfaceDeclaration extends TypeDeclaration<ClassOrInterfac
     private NodeList<ClassOrInterfaceType> permittedTypes;
 
     public ClassOrInterfaceDeclaration() {
-        this(
-                null,
-                new NodeList<>(),
-                new NodeList<>(),
-                false,
-                new SimpleName(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>());
-    }
-
-    public ClassOrInterfaceDeclaration(
-            final NodeList<Modifier> modifiers, final boolean isInterface, final String name) {
-        this(
-                null,
-                modifiers,
-                new NodeList<>(),
-                isInterface,
-                new SimpleName(name),
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>());
+        this(null, new NodeList<>(), new NodeList<>(), false, new SimpleName(), new NodeList<>(), new NodeList<>(), new NodeList<>(), new NodeList<>(), new NodeList<>());
+    }
+
+    public ClassOrInterfaceDeclaration(final NodeList<Modifier> modifiers, final boolean isInterface, final String name) {
+        this(null, modifiers, new NodeList<>(), isInterface, new SimpleName(name), new NodeList<>(), new NodeList<>(), new NodeList<>(), new NodeList<>(), new NodeList<>());
     }
 
     @AllFieldsConstructor
-    public ClassOrInterfaceDeclaration(
-            final NodeList<Modifier> modifiers,
-            final NodeList<AnnotationExpr> annotations,
-            final boolean isInterface,
-            final SimpleName name,
-            final NodeList<TypeParameter> typeParameters,
-            final NodeList<ClassOrInterfaceType> extendedTypes,
-            final NodeList<ClassOrInterfaceType> implementedTypes,
-            final NodeList<ClassOrInterfaceType> permittedTypes,
-            final NodeList<BodyDeclaration<?>> members) {
-        this(
-                null,
-                modifiers,
-                annotations,
-                isInterface,
-                name,
-                typeParameters,
-                extendedTypes,
-                implementedTypes,
-                permittedTypes,
-                members);
+    public ClassOrInterfaceDeclaration(final NodeList<Modifier> modifiers, final NodeList<AnnotationExpr> annotations, final boolean isInterface, final SimpleName name, final NodeList<TypeParameter> typeParameters, final NodeList<ClassOrInterfaceType> extendedTypes, final NodeList<ClassOrInterfaceType> implementedTypes, final NodeList<ClassOrInterfaceType> permittedTypes, final NodeList<BodyDeclaration<?>> members) {
+        this(null, modifiers, annotations, isInterface, name, typeParameters, extendedTypes, implementedTypes, permittedTypes, members);
     }
 
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public ClassOrInterfaceDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            boolean isInterface,
-            SimpleName name,
-            NodeList<TypeParameter> typeParameters,
-            NodeList<ClassOrInterfaceType> extendedTypes,
-            NodeList<ClassOrInterfaceType> implementedTypes,
-            NodeList<ClassOrInterfaceType> permittedTypes,
-            NodeList<BodyDeclaration<?>> members,
-            boolean isCompact) {
+    public ClassOrInterfaceDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, boolean isInterface, SimpleName name, NodeList<TypeParameter> typeParameters, NodeList<ClassOrInterfaceType> extendedTypes, NodeList<ClassOrInterfaceType> implementedTypes, NodeList<ClassOrInterfaceType> permittedTypes, NodeList<BodyDeclaration<?>> members, boolean isCompact) {
         super(tokenRange, modifiers, annotations, name, members);
         setInterface(isInterface);
         setTypeParameters(typeParameters);
@@ -158,17 +99,7 @@ public ClassOrInterfaceDeclaration(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public ClassOrInterfaceDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            boolean isInterface,
-            SimpleName name,
-            NodeList<TypeParameter> typeParameters,
-            NodeList<ClassOrInterfaceType> extendedTypes,
-            NodeList<ClassOrInterfaceType> implementedTypes,
-            NodeList<ClassOrInterfaceType> permittedTypes,
-            NodeList<BodyDeclaration<?>> members) {
+    public ClassOrInterfaceDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, boolean isInterface, SimpleName name, NodeList<TypeParameter> typeParameters, NodeList<ClassOrInterfaceType> extendedTypes, NodeList<ClassOrInterfaceType> implementedTypes, NodeList<ClassOrInterfaceType> permittedTypes, NodeList<BodyDeclaration<?>> members) {
         super(tokenRange, modifiers, annotations, name, members);
         setInterface(isInterface);
         setTypeParameters(typeParameters);
@@ -193,7 +124,7 @@ private void processIsCompactChange(boolean newIsCompact) {
         NodeList<Modifier> modifiers = getModifiers();
         if (modifiers != null) {
             getModifiers().forEach(modifier -> {
-                if (modifier.getKeyword().equals(FINAL)) {
+                if (modifier.getKeyword().equals(Modifier.DefaultKeyword.FINAL)) {
                     modifier.setData(PHANTOM_KEY, newIsCompact);
                 }
             });
@@ -210,36 +141,32 @@ public void customInitialization() {
         // name/modifier changes along with the isCompact field and to set these as phantom or not when appropriate.
         // Another option would be to override the setName, setCompact etc. methods to include this functionality,
         // but a mechanism to stop the code generators from overwriting these methods would be necessary.
-        register(
-                new AstObserverAdapter() {
-
-                    @Override
-                    public void propertyChange(
-                            Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
-                        if (!(observedNode instanceof ClassOrInterfaceDeclaration)) {
-                            throw new IllegalStateException(
-                                    "It should not be possible for a compact class observer to be added to anything other than a ClassOrInterfaceDeclaration");
-                        }
-                        if (property.equals(ObservableProperty.NAME)) {
-                            // If the name of the class changes, mark it as a phantom node if the class is compact
-                            SimpleName newName = (SimpleName) newValue;
-                            newName.setData(PHANTOM_KEY, isCompact);
-                        } else if (property.equals(ObservableProperty.MODIFIERS)) {
-                            // If modifiers change, mark them as phantom nodes if the class is compact
-                            @SuppressWarnings("unchecked")
-                            NodeList<Modifier> newModifiers = (NodeList<Modifier>) newValue;
-                            newModifiers.forEach(modifier -> {
-                                if (modifier.getKeyword().equals(FINAL)) {
-                                    modifier.setData(PHANTOM_KEY, isCompact);
-                                }
-                            });
-                        } else if (property.equals(ObservableProperty.COMPACT)) {
-                            // If a compact class is made non-compact or vice versa, handle it properly
-                            processIsCompactChange((boolean) newValue);
+        register(new AstObserverAdapter() {
+
+            @Override
+            public void propertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
+                if (!(observedNode instanceof ClassOrInterfaceDeclaration)) {
+                    throw new IllegalStateException("It should not be possible for a compact class observer to be added to anything other than a ClassOrInterfaceDeclaration");
+                }
+                if (property.equals(ObservableProperty.NAME)) {
+                    // If the name of the class changes, mark it as a phantom node if the class is compact
+                    SimpleName newName = (SimpleName) newValue;
+                    newName.setData(PHANTOM_KEY, isCompact);
+                } else if (property.equals(ObservableProperty.MODIFIERS)) {
+                    // If modifiers change, mark them as phantom nodes if the class is compact
+                    @SuppressWarnings("unchecked")
+                    NodeList<Modifier> newModifiers = (NodeList<Modifier>) newValue;
+                    newModifiers.forEach(modifier -> {
+                        if (modifier.getKeyword().equals(Modifier.DefaultKeyword.FINAL)) {
+                            modifier.setData(PHANTOM_KEY, isCompact);
                         }
-                    }
-                },
-                ObserverRegistrationMode.JUST_THIS_NODE);
+                    });
+                } else if (property.equals(ObservableProperty.COMPACT)) {
+                    // If a compact class is made non-compact or vice versa, handle it properly
+                    processIsCompactChange((boolean) newValue);
+                }
+            }
+        }, ObserverRegistrationMode.JUST_THIS_NODE);
         processIsCompactChange(isCompact());
     }
 
@@ -288,35 +215,36 @@ public ClassOrInterfaceDeclaration setExtendedTypes(final @NonNull() NodeList<Cl
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXTENDED_TYPES, this.extendedTypes, extendedTypes);
-        if (this.extendedTypes != null) this.extendedTypes.setParentNode(null);
+        if (this.extendedTypes != null)
+            this.extendedTypes.setParentNode(null);
         this.extendedTypes = extendedTypes;
         setAsParentNodeOf(extendedTypes);
         return this;
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public ClassOrInterfaceDeclaration setImplementedTypes(
-            final @NonNull() NodeList<ClassOrInterfaceType> implementedTypes) {
+    public ClassOrInterfaceDeclaration setImplementedTypes(final @NonNull() NodeList<ClassOrInterfaceType> implementedTypes) {
         assertNotNull(implementedTypes);
         if (implementedTypes == this.implementedTypes) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.IMPLEMENTED_TYPES, this.implementedTypes, implementedTypes);
-        if (this.implementedTypes != null) this.implementedTypes.setParentNode(null);
+        if (this.implementedTypes != null)
+            this.implementedTypes.setParentNode(null);
         this.implementedTypes = implementedTypes;
         setAsParentNodeOf(implementedTypes);
         return this;
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public ClassOrInterfaceDeclaration setPermittedTypes(
-            final @NonNull() NodeList<ClassOrInterfaceType> permittedTypes) {
+    public ClassOrInterfaceDeclaration setPermittedTypes(final @NonNull() NodeList<ClassOrInterfaceType> permittedTypes) {
         assertNotNull(permittedTypes);
         if (permittedTypes == this.permittedTypes) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.PERMITTED_TYPES, this.permittedTypes, permittedTypes);
-        if (this.permittedTypes != null) this.permittedTypes.setParentNode(null);
+        if (this.permittedTypes != null)
+            this.permittedTypes.setParentNode(null);
         this.permittedTypes = permittedTypes;
         setAsParentNodeOf(permittedTypes);
         return this;
@@ -339,7 +267,8 @@ public ClassOrInterfaceDeclaration setTypeParameters(final @NonNull() NodeList<T
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_PARAMETERS, this.typeParameters, typeParameters);
-        if (this.typeParameters != null) this.typeParameters.setParentNode(null);
+        if (this.typeParameters != null)
+            this.typeParameters.setParentNode(null);
         this.typeParameters = typeParameters;
         setAsParentNodeOf(typeParameters);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassRepresentsClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassRepresentsClause.java
deleted file mode 100644
index 13734ee789..0000000000
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassRepresentsClause.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.github.javaparser.ast.body;
-
-/**
- * @author Alexander Weigl
- * @version 1 (2/21/21)
- */
-public class ClassRepresentsClause {}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CompactConstructorDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CompactConstructorDeclaration.java
index 62e61e4711..8408595329 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CompactConstructorDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CompactConstructorDeclaration.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.body;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -67,14 +66,7 @@
  * @see <a href="https://docs.oracle.com/javase/specs/jls/se16/html/jls-8.html#jls-8.10.4">JLS 8.10.3 - Record Constructor Declarations</a>
  * @since 3.22.0
  */
-public class CompactConstructorDeclaration extends BodyDeclaration<CompactConstructorDeclaration>
-        implements NodeWithBlockStmt<CompactConstructorDeclaration>,
-                NodeWithAccessModifiers<CompactConstructorDeclaration>,
-                NodeWithJavadoc<CompactConstructorDeclaration>,
-                NodeWithSimpleName<CompactConstructorDeclaration>,
-                NodeWithThrownExceptions<CompactConstructorDeclaration>,
-                NodeWithTypeParameters<CompactConstructorDeclaration>,
-                Resolvable<ResolvedConstructorDeclaration> {
+public class CompactConstructorDeclaration extends BodyDeclaration<CompactConstructorDeclaration> implements NodeWithBlockStmt<CompactConstructorDeclaration>, NodeWithAccessModifiers<CompactConstructorDeclaration>, NodeWithJavadoc<CompactConstructorDeclaration>, NodeWithSimpleName<CompactConstructorDeclaration>, NodeWithThrownExceptions<CompactConstructorDeclaration>, NodeWithTypeParameters<CompactConstructorDeclaration>, Resolvable<ResolvedConstructorDeclaration> {
 
     private NodeList<Modifier> modifiers;
 
@@ -87,46 +79,19 @@ public class CompactConstructorDeclaration extends BodyDeclaration<CompactConstr
     private NodeList<ReferenceType> thrownExceptions;
 
     public CompactConstructorDeclaration() {
-        this(
-                null,
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new SimpleName(),
-                new NodeList<>(),
-                new BlockStmt());
+        this(null, new NodeList<>(), new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>(), new BlockStmt());
     }
 
     public CompactConstructorDeclaration(String name) {
-        this(
-                null,
-                new NodeList<>(new Modifier()),
-                new NodeList<>(),
-                new NodeList<>(),
-                new SimpleName(name),
-                new NodeList<>(),
-                new BlockStmt());
+        this(null, new NodeList<>(new Modifier()), new NodeList<>(), new NodeList<>(), new SimpleName(name), new NodeList<>(), new BlockStmt());
     }
 
     public CompactConstructorDeclaration(NodeList<Modifier> modifiers, String name) {
-        this(
-                null,
-                modifiers,
-                new NodeList<>(),
-                new NodeList<>(),
-                new SimpleName(name),
-                new NodeList<>(),
-                new BlockStmt());
+        this(null, modifiers, new NodeList<>(), new NodeList<>(), new SimpleName(name), new NodeList<>(), new BlockStmt());
     }
 
     @AllFieldsConstructor
-    public CompactConstructorDeclaration(
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<TypeParameter> typeParameters,
-            SimpleName name,
-            NodeList<ReferenceType> thrownExceptions,
-            BlockStmt body) {
+    public CompactConstructorDeclaration(NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<TypeParameter> typeParameters, SimpleName name, NodeList<ReferenceType> thrownExceptions, BlockStmt body) {
         this(null, modifiers, annotations, typeParameters, name, thrownExceptions, body);
     }
 
@@ -134,14 +99,7 @@ public CompactConstructorDeclaration(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public CompactConstructorDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<TypeParameter> typeParameters,
-            SimpleName name,
-            NodeList<ReferenceType> thrownExceptions,
-            BlockStmt body) {
+    public CompactConstructorDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<TypeParameter> typeParameters, SimpleName name, NodeList<ReferenceType> thrownExceptions, BlockStmt body) {
         super(tokenRange, annotations);
         setModifiers(modifiers);
         setTypeParameters(typeParameters);
@@ -181,7 +139,8 @@ public CompactConstructorDeclaration setBody(final @NonNull() BlockStmt body) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BODY, this.body, body);
-        if (this.body != null) this.body.setParentNode(null);
+        if (this.body != null)
+            this.body.setParentNode(null);
         this.body = body;
         setAsParentNodeOf(body);
         return this;
@@ -199,7 +158,8 @@ public CompactConstructorDeclaration setModifiers(final @NonNull() NodeList<Modi
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
@@ -217,7 +177,8 @@ public CompactConstructorDeclaration setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -229,14 +190,14 @@ public NodeList<ReferenceType> getThrownExceptions() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public CompactConstructorDeclaration setThrownExceptions(
-            final @NonNull() NodeList<ReferenceType> thrownExceptions) {
+    public CompactConstructorDeclaration setThrownExceptions(final @NonNull() NodeList<ReferenceType> thrownExceptions) {
         assertNotNull(thrownExceptions);
         if (thrownExceptions == this.thrownExceptions) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.THROWN_EXCEPTIONS, this.thrownExceptions, thrownExceptions);
-        if (this.thrownExceptions != null) this.thrownExceptions.setParentNode(null);
+        if (this.thrownExceptions != null)
+            this.thrownExceptions.setParentNode(null);
         this.thrownExceptions = thrownExceptions;
         setAsParentNodeOf(thrownExceptions);
         return this;
@@ -254,7 +215,8 @@ public CompactConstructorDeclaration setTypeParameters(final @NonNull() NodeList
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_PARAMETERS, this.typeParameters, typeParameters);
-        if (this.typeParameters != null) this.typeParameters.setParentNode(null);
+        if (this.typeParameters != null)
+            this.typeParameters.setParentNode(null);
         this.typeParameters = typeParameters;
         setAsParentNodeOf(typeParameters);
         return this;
@@ -265,8 +227,7 @@ public CompactConstructorDeclaration setTypeParameters(final @NonNull() NodeList
      * <p>
      * [accessSpecifier] className [throws exceptionsList]
      */
-    public String getDeclarationAsString(
-            boolean includingModifiers, boolean includingThrows, boolean includingParameterName) {
+    public String getDeclarationAsString(boolean includingModifiers, boolean includingThrows, boolean includingParameterName) {
         StringBuilder sb = new StringBuilder();
         if (includingModifiers) {
             AccessSpecifier accessSpecifier = getAccessSpecifier();
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java
index 63db760ac0..dab745a188 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java
@@ -42,6 +42,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.Nullable;
+import java.util.Objects;
 
 /**
  * A constructor declaration: {@code class X { X() { } }} where X(){} is the constructor declaration.
@@ -51,154 +52,42 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class ConstructorDeclaration extends CallableDeclaration<ConstructorDeclaration>
-        implements NodeWithOptionalBlockStmt<ConstructorDeclaration>,
-                NodeWithAccessModifiers<ConstructorDeclaration>,
-                NodeWithJavadoc<ConstructorDeclaration>,
-                NodeWithSimpleName<ConstructorDeclaration>,
-                NodeWithParameters<ConstructorDeclaration>,
-                NodeWithThrownExceptions<ConstructorDeclaration>,
-                NodeWithTypeParameters<ConstructorDeclaration>,
-                Resolvable<ResolvedConstructorDeclaration> {
+public class ConstructorDeclaration extends CallableDeclaration<ConstructorDeclaration> implements NodeWithOptionalBlockStmt<ConstructorDeclaration>, NodeWithAccessModifiers<ConstructorDeclaration>, NodeWithJavadoc<ConstructorDeclaration>, NodeWithSimpleName<ConstructorDeclaration>, NodeWithParameters<ConstructorDeclaration>, NodeWithThrownExceptions<ConstructorDeclaration>, NodeWithTypeParameters<ConstructorDeclaration>, Resolvable<ResolvedConstructorDeclaration> {
 
     @OptionalProperty
     private BlockStmt body;
 
     public ConstructorDeclaration() {
-        this(
-                null,
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new SimpleName(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new BlockStmt(),
-                null,
-                new NodeList<>());
+        this(null, new NodeList<>(), new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>(), new NodeList<>(), new BlockStmt(), null, new NodeList<>());
     }
 
     public ConstructorDeclaration(String name) {
-        this(
-                null,
-                new NodeList<>(new Modifier()),
-                new NodeList<>(),
-                new NodeList<>(),
-                new SimpleName(name),
-                new NodeList<>(),
-                new NodeList<>(),
-                new BlockStmt(),
-                null,
-                new NodeList<>());
+        this(null, new NodeList<>(new Modifier()), new NodeList<>(), new NodeList<>(), new SimpleName(name), new NodeList<>(), new NodeList<>(), new BlockStmt(), null, new NodeList<>());
     }
 
     public ConstructorDeclaration(NodeList<Modifier> modifiers, String name) {
-        this(
-                null,
-                modifiers,
-                new NodeList<>(),
-                new NodeList<>(),
-                new SimpleName(name),
-                new NodeList<>(),
-                new NodeList<>(),
-                new BlockStmt(),
-                null,
-                new NodeList<>());
+        this(null, modifiers, new NodeList<>(), new NodeList<>(), new SimpleName(name), new NodeList<>(), new NodeList<>(), new BlockStmt(), null, new NodeList<>());
     }
 
-    public ConstructorDeclaration(
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<TypeParameter> typeParameters,
-            SimpleName name,
-            NodeList<Parameter> parameters,
-            NodeList<ReferenceType> thrownExceptions,
-            BlockStmt body) {
-        this(
-                null,
-                modifiers,
-                annotations,
-                typeParameters,
-                name,
-                parameters,
-                thrownExceptions,
-                body,
-                null,
-                new NodeList<>());
+    public ConstructorDeclaration(NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<TypeParameter> typeParameters, SimpleName name, NodeList<Parameter> parameters, NodeList<ReferenceType> thrownExceptions, BlockStmt body) {
+        this(null, modifiers, annotations, typeParameters, name, parameters, thrownExceptions, body, null, new NodeList<>());
     }
 
     @AllFieldsConstructor
-    public ConstructorDeclaration(
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<TypeParameter> typeParameters,
-            SimpleName name,
-            NodeList<Parameter> parameters,
-            NodeList<ReferenceType> thrownExceptions,
-            BlockStmt body,
-            ReceiverParameter receiverParameter,
-            NodeList<JmlContract> contracts) {
-        this(
-                null,
-                modifiers,
-                annotations,
-                typeParameters,
-                name,
-                parameters,
-                thrownExceptions,
-                body,
-                receiverParameter,
-                contracts);
+    public ConstructorDeclaration(NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<TypeParameter> typeParameters, SimpleName name, NodeList<Parameter> parameters, NodeList<ReferenceType> thrownExceptions, BlockStmt body, ReceiverParameter receiverParameter, NodeList<JmlContract> contracts) {
+        this(null, modifiers, annotations, typeParameters, name, parameters, thrownExceptions, body, receiverParameter, contracts);
     }
 
-    public ConstructorDeclaration(
-            TokenRange range,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<TypeParameter> list,
-            SimpleName name,
-            NodeList<Parameter> parameters,
-            NodeList<ReferenceType> thrownExceptions,
-            BlockStmt stmt,
-            ReceiverParameter receiverParameter) {
-        this(
-                range,
-                modifiers,
-                annotations,
-                list,
-                name,
-                parameters,
-                thrownExceptions,
-                stmt,
-                receiverParameter,
-                new NodeList<>());
+    public ConstructorDeclaration(TokenRange range, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<TypeParameter> list, SimpleName name, NodeList<Parameter> parameters, NodeList<ReferenceType> thrownExceptions, BlockStmt stmt, ReceiverParameter receiverParameter) {
+        this(range, modifiers, annotations, list, name, parameters, thrownExceptions, stmt, receiverParameter, new NodeList<>());
     }
 
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public ConstructorDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<TypeParameter> typeParameters,
-            SimpleName name,
-            NodeList<Parameter> parameters,
-            NodeList<ReferenceType> thrownExceptions,
-            BlockStmt body,
-            ReceiverParameter receiverParameter,
-            NodeList<JmlContract> contracts) {
-        super(
-                tokenRange,
-                modifiers,
-                annotations,
-                typeParameters,
-                name,
-                parameters,
-                thrownExceptions,
-                receiverParameter,
-                contracts);
+    public ConstructorDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<TypeParameter> typeParameters, SimpleName name, NodeList<Parameter> parameters, NodeList<ReferenceType> thrownExceptions, BlockStmt body, ReceiverParameter receiverParameter, NodeList<JmlContract> contracts) {
+        super(tokenRange, modifiers, annotations, typeParameters, name, parameters, thrownExceptions, receiverParameter, contracts);
         setBody(body);
         customInitialization();
     }
@@ -232,7 +121,8 @@ public ConstructorDeclaration setBody(final @Nullable() BlockStmt body) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BODY, this.body, body);
-        if (this.body != null) this.body.setParentNode(null);
+        if (this.body != null)
+            this.body.setParentNode(null);
         this.body = body;
         setAsParentNodeOf(body);
         return this;
@@ -270,8 +160,7 @@ public ConstructorDeclaration setTypeParameters(final NodeList<TypeParameter> ty
      * [throws exceptionsList]
      */
     @Override
-    public String getDeclarationAsString(
-            boolean includingModifiers, boolean includingThrows, boolean includingParameterName) {
+    public String getDeclarationAsString(boolean includingModifiers, boolean includingThrows, boolean includingParameterName) {
         StringBuilder sb = new StringBuilder();
         if (includingModifiers) {
             AccessSpecifier accessSpecifier = getAccessSpecifier();
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java
index c58ab1202c..f45a1c37d2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.body;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -51,11 +50,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class EnumConstantDeclaration extends BodyDeclaration<EnumConstantDeclaration>
-        implements NodeWithJavadoc<EnumConstantDeclaration>,
-                NodeWithSimpleName<EnumConstantDeclaration>,
-                NodeWithArguments<EnumConstantDeclaration>,
-                Resolvable<ResolvedEnumConstantDeclaration> {
+public class EnumConstantDeclaration extends BodyDeclaration<EnumConstantDeclaration> implements NodeWithJavadoc<EnumConstantDeclaration>, NodeWithSimpleName<EnumConstantDeclaration>, NodeWithArguments<EnumConstantDeclaration>, Resolvable<ResolvedEnumConstantDeclaration> {
 
     private SimpleName name;
 
@@ -72,11 +67,7 @@ public EnumConstantDeclaration(String name) {
     }
 
     @AllFieldsConstructor
-    public EnumConstantDeclaration(
-            NodeList<AnnotationExpr> annotations,
-            SimpleName name,
-            NodeList<Expression> arguments,
-            NodeList<BodyDeclaration<?>> classBody) {
+    public EnumConstantDeclaration(NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<Expression> arguments, NodeList<BodyDeclaration<?>> classBody) {
         this(null, annotations, name, arguments, classBody);
     }
 
@@ -84,12 +75,7 @@ public EnumConstantDeclaration(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public EnumConstantDeclaration(
-            TokenRange tokenRange,
-            NodeList<AnnotationExpr> annotations,
-            SimpleName name,
-            NodeList<Expression> arguments,
-            NodeList<BodyDeclaration<?>> classBody) {
+    public EnumConstantDeclaration(TokenRange tokenRange, NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<Expression> arguments, NodeList<BodyDeclaration<?>> classBody) {
         super(tokenRange, annotations);
         setName(name);
         setArguments(arguments);
@@ -131,7 +117,8 @@ public EnumConstantDeclaration setArguments(final @NonNull() NodeList<Expression
             return this;
         }
         notifyPropertyChange(ObservableProperty.ARGUMENTS, this.arguments, arguments);
-        if (this.arguments != null) this.arguments.setParentNode(null);
+        if (this.arguments != null)
+            this.arguments.setParentNode(null);
         this.arguments = arguments;
         setAsParentNodeOf(arguments);
         return this;
@@ -144,7 +131,8 @@ public EnumConstantDeclaration setClassBody(final @NonNull() NodeList<BodyDeclar
             return this;
         }
         notifyPropertyChange(ObservableProperty.CLASS_BODY, this.classBody, classBody);
-        if (this.classBody != null) this.classBody.setParentNode(null);
+        if (this.classBody != null)
+            this.classBody.setParentNode(null);
         this.classBody = classBody;
         setAsParentNodeOf(classBody);
         return this;
@@ -157,7 +145,8 @@ public EnumConstantDeclaration setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java
index fe6cd731d7..2f5dcc9ac4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumDeclaration.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -47,43 +46,22 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class EnumDeclaration extends TypeDeclaration<EnumDeclaration>
-        implements NodeWithImplements<EnumDeclaration>, Resolvable<ResolvedEnumDeclaration> {
+public class EnumDeclaration extends TypeDeclaration<EnumDeclaration> implements NodeWithImplements<EnumDeclaration>, Resolvable<ResolvedEnumDeclaration> {
 
     private NodeList<ClassOrInterfaceType> implementedTypes;
 
     private NodeList<EnumConstantDeclaration> entries;
 
     public EnumDeclaration() {
-        this(
-                null,
-                new NodeList<>(),
-                new NodeList<>(),
-                new SimpleName(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>());
+        this(null, new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>(), new NodeList<>(), new NodeList<>());
     }
 
     public EnumDeclaration(NodeList<Modifier> modifiers, String name) {
-        this(
-                null,
-                modifiers,
-                new NodeList<>(),
-                new SimpleName(name),
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>());
+        this(null, modifiers, new NodeList<>(), new SimpleName(name), new NodeList<>(), new NodeList<>(), new NodeList<>());
     }
 
     @AllFieldsConstructor
-    public EnumDeclaration(
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            SimpleName name,
-            NodeList<ClassOrInterfaceType> implementedTypes,
-            NodeList<EnumConstantDeclaration> entries,
-            NodeList<BodyDeclaration<?>> members) {
+    public EnumDeclaration(NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<ClassOrInterfaceType> implementedTypes, NodeList<EnumConstantDeclaration> entries, NodeList<BodyDeclaration<?>> members) {
         this(null, modifiers, annotations, name, implementedTypes, entries, members);
     }
 
@@ -91,14 +69,7 @@ public EnumDeclaration(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public EnumDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            SimpleName name,
-            NodeList<ClassOrInterfaceType> implementedTypes,
-            NodeList<EnumConstantDeclaration> entries,
-            NodeList<BodyDeclaration<?>> members) {
+    public EnumDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<ClassOrInterfaceType> implementedTypes, NodeList<EnumConstantDeclaration> entries, NodeList<BodyDeclaration<?>> members) {
         super(tokenRange, modifiers, annotations, name, members);
         setImplementedTypes(implementedTypes);
         setEntries(entries);
@@ -148,7 +119,8 @@ public EnumDeclaration setEntries(final @NonNull() NodeList<EnumConstantDeclarat
             return this;
         }
         notifyPropertyChange(ObservableProperty.ENTRIES, this.entries, entries);
-        if (this.entries != null) this.entries.setParentNode(null);
+        if (this.entries != null)
+            this.entries.setParentNode(null);
         this.entries = entries;
         setAsParentNodeOf(entries);
         return this;
@@ -161,7 +133,8 @@ public EnumDeclaration setImplementedTypes(final @NonNull() NodeList<ClassOrInte
             return this;
         }
         notifyPropertyChange(ObservableProperty.IMPLEMENTED_TYPES, this.implementedTypes, implementedTypes);
-        if (this.implementedTypes != null) this.implementedTypes.setParentNode(null);
+        if (this.implementedTypes != null)
+            this.implementedTypes.setParentNode(null);
         this.implementedTypes = implementedTypes;
         setAsParentNodeOf(implementedTypes);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java
index 93b635657f..363cee9687 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java
@@ -23,7 +23,6 @@
 import static com.github.javaparser.ast.Modifier.DefaultKeyword.*;
 import static com.github.javaparser.ast.NodeList.nodeList;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.Modifier.DefaultKeyword;
@@ -63,13 +62,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class FieldDeclaration extends BodyDeclaration<FieldDeclaration>
-        implements NodeWithJavadoc<FieldDeclaration>,
-                NodeWithVariables<FieldDeclaration>,
-                NodeWithAccessModifiers<FieldDeclaration>,
-                NodeWithStaticModifier<FieldDeclaration>,
-                NodeWithFinalModifier<FieldDeclaration>,
-                Resolvable<ResolvedFieldDeclaration> {
+public class FieldDeclaration extends BodyDeclaration<FieldDeclaration> implements NodeWithJavadoc<FieldDeclaration>, NodeWithVariables<FieldDeclaration>, NodeWithAccessModifiers<FieldDeclaration>, NodeWithStaticModifier<FieldDeclaration>, NodeWithFinalModifier<FieldDeclaration>, Resolvable<ResolvedFieldDeclaration> {
 
     private NodeList<Modifier> modifiers;
 
@@ -89,10 +82,7 @@ public FieldDeclaration(NodeList<Modifier> modifiers, NodeList<VariableDeclarato
     }
 
     @AllFieldsConstructor
-    public FieldDeclaration(
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<VariableDeclarator> variables) {
+    public FieldDeclaration(NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<VariableDeclarator> variables) {
         this(null, modifiers, annotations, variables);
     }
 
@@ -100,11 +90,7 @@ public FieldDeclaration(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public FieldDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<VariableDeclarator> variables) {
+    public FieldDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<VariableDeclarator> variables) {
         super(tokenRange, annotations);
         setModifiers(modifiers);
         setVariables(variables);
@@ -157,7 +143,8 @@ public FieldDeclaration setModifiers(final @NonNull() NodeList<Modifier> modifie
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
@@ -170,7 +157,8 @@ public FieldDeclaration setVariables(final @NonNull() NodeList<VariableDeclarato
             return this;
         }
         notifyPropertyChange(ObservableProperty.VARIABLES, this.variables, variables);
-        if (this.variables != null) this.variables.setParentNode(null);
+        if (this.variables != null)
+            this.variables.setParentNode(null);
         this.variables = variables;
         setAsParentNodeOf(variables);
         return this;
@@ -189,16 +177,13 @@ public MethodDeclaration createGetter() {
             throw new IllegalStateException("You can use this only when the field declares only 1 variable name");
         Optional<ClassOrInterfaceDeclaration> parentClass = findAncestor(ClassOrInterfaceDeclaration.class);
         Optional<EnumDeclaration> parentEnum = findAncestor(EnumDeclaration.class);
-        if (!(parentClass.isPresent() || parentEnum.isPresent())
-                || (parentClass.isPresent() && parentClass.get().isInterface()))
+        if (!(parentClass.isPresent() || parentEnum.isPresent()) || (parentClass.isPresent() && parentClass.get().isInterface()))
             throw new IllegalStateException("You can use this only when the field is attached to a class or an enum");
         VariableDeclarator variable = getVariable(0);
         String fieldName = variable.getNameAsString();
         String fieldNameUpper = fieldName.toUpperCase().substring(0, 1) + fieldName.substring(1, fieldName.length());
         final MethodDeclaration getter;
-        getter = parentClass
-                .map(clazz -> clazz.addMethod("get" + fieldNameUpper, DefaultKeyword.PUBLIC))
-                .orElseGet(() -> parentEnum.get().addMethod("get" + fieldNameUpper, DefaultKeyword.PUBLIC));
+        getter = parentClass.map(clazz -> clazz.addMethod("get" + fieldNameUpper, DefaultKeyword.PUBLIC)).orElseGet(() -> parentEnum.get().addMethod("get" + fieldNameUpper, DefaultKeyword.PUBLIC));
         getter.setType(variable.getType());
         BlockStmt blockStmt = new BlockStmt();
         getter.setBody(blockStmt);
@@ -219,22 +204,18 @@ public MethodDeclaration createSetter() {
             throw new IllegalStateException("You can use this only when the field declares only 1 variable name");
         Optional<ClassOrInterfaceDeclaration> parentClass = findAncestor(ClassOrInterfaceDeclaration.class);
         Optional<EnumDeclaration> parentEnum = findAncestor(EnumDeclaration.class);
-        if (!(parentClass.isPresent() || parentEnum.isPresent())
-                || (parentClass.isPresent() && parentClass.get().isInterface()))
+        if (!(parentClass.isPresent() || parentEnum.isPresent()) || (parentClass.isPresent() && parentClass.get().isInterface()))
             throw new IllegalStateException("You can use this only when the field is attached to a class or an enum");
         VariableDeclarator variable = getVariable(0);
         String fieldName = variable.getNameAsString();
         String fieldNameUpper = fieldName.toUpperCase().substring(0, 1) + fieldName.substring(1, fieldName.length());
         final MethodDeclaration setter;
-        setter = parentClass
-                .map(clazz -> clazz.addMethod("set" + fieldNameUpper, DefaultKeyword.PUBLIC))
-                .orElseGet(() -> parentEnum.get().addMethod("set" + fieldNameUpper, DefaultKeyword.PUBLIC));
+        setter = parentClass.map(clazz -> clazz.addMethod("set" + fieldNameUpper, DefaultKeyword.PUBLIC)).orElseGet(() -> parentEnum.get().addMethod("set" + fieldNameUpper, DefaultKeyword.PUBLIC));
         setter.setType(new VoidType());
         setter.getParameters().add(new Parameter(variable.getType(), fieldName));
         BlockStmt blockStmt2 = new BlockStmt();
         setter.setBody(blockStmt2);
-        blockStmt2.addStatement(
-                new AssignExpr(new NameExpr("this." + fieldName), new NameExpr(fieldName), Operator.ASSIGN));
+        blockStmt2.addStatement(new AssignExpr(new NameExpr("this." + fieldName), new NameExpr(fieldName), Operator.ASSIGN));
         return setter;
     }
 
@@ -267,7 +248,7 @@ public boolean isStatic() {
      */
     @Override
     public boolean isFinal() {
-        return hasModifier(FINAL) || isDeclaredInInterface();
+        return hasModifier(Modifier.DefaultKeyword.FINAL) || isDeclaredInInterface();
     }
 
     /*
@@ -275,7 +256,7 @@ public boolean isFinal() {
      */
     @Override
     public boolean isPublic() {
-        return hasModifier(PUBLIC) || isDeclaredInInterface();
+        return hasModifier(DefaultKeyword.PUBLIC) || isDeclaredInInterface();
     }
 
     /*
@@ -283,11 +264,7 @@ public boolean isPublic() {
      */
     private boolean isDeclaredInInterface() {
         Optional<TypeDeclaration> parentType = findAncestor(TypeDeclaration.class);
-        return parentType
-                .filter(BodyDeclaration::isClassOrInterfaceDeclaration)
-                .map(BodyDeclaration::asClassOrInterfaceDeclaration)
-                .map(ClassOrInterfaceDeclaration::isInterface)
-                .orElse(false);
+        return parentType.filter(BodyDeclaration::isClassOrInterfaceDeclaration).map(BodyDeclaration::asClassOrInterfaceDeclaration).map(ClassOrInterfaceDeclaration::isInterface).orElse(false);
     }
 
     @Override
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java
index 969d7fb02b..b605611cad 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.body;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -45,8 +44,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class InitializerDeclaration extends BodyDeclaration<InitializerDeclaration>
-        implements NodeWithJavadoc<InitializerDeclaration>, NodeWithBlockStmt<InitializerDeclaration> {
+public class InitializerDeclaration extends BodyDeclaration<InitializerDeclaration> implements NodeWithJavadoc<InitializerDeclaration>, NodeWithBlockStmt<InitializerDeclaration> {
 
     private boolean isStatic;
 
@@ -102,7 +100,8 @@ public InitializerDeclaration setBody(final @NonNull() BlockStmt body) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BODY, this.body, body);
-        if (this.body != null) this.body.setParentNode(null);
+        if (this.body != null)
+            this.body.setParentNode(null);
         this.body = body;
         setAsParentNodeOf(body);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
index 0b082a4acf..6d8b43f7b2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.ast.Modifier.DefaultKeyword.*;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -60,21 +59,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class MethodDeclaration extends CallableDeclaration<MethodDeclaration>
-        implements NodeWithType<MethodDeclaration, Type>,
-                NodeWithOptionalBlockStmt<MethodDeclaration>,
-                NodeWithJavadoc<MethodDeclaration>,
-                NodeWithDeclaration,
-                NodeWithSimpleName<MethodDeclaration>,
-                NodeWithParameters<MethodDeclaration>,
-                NodeWithThrownExceptions<MethodDeclaration>,
-                NodeWithTypeParameters<MethodDeclaration>,
-                NodeWithAccessModifiers<MethodDeclaration>,
-                NodeWithAbstractModifier<MethodDeclaration>,
-                NodeWithStaticModifier<MethodDeclaration>,
-                NodeWithFinalModifier<MethodDeclaration>,
-                NodeWithStrictfpModifier<MethodDeclaration>,
-                Resolvable<ResolvedMethodDeclaration> {
+public class MethodDeclaration extends CallableDeclaration<MethodDeclaration> implements NodeWithType<MethodDeclaration, Type>, NodeWithOptionalBlockStmt<MethodDeclaration>, NodeWithJavadoc<MethodDeclaration>, NodeWithDeclaration, NodeWithSimpleName<MethodDeclaration>, NodeWithParameters<MethodDeclaration>, NodeWithThrownExceptions<MethodDeclaration>, NodeWithTypeParameters<MethodDeclaration>, NodeWithAccessModifiers<MethodDeclaration>, NodeWithAbstractModifier<MethodDeclaration>, NodeWithStaticModifier<MethodDeclaration>, NodeWithFinalModifier<MethodDeclaration>, NodeWithStrictfpModifier<MethodDeclaration>, Resolvable<ResolvedMethodDeclaration> {
 
     private Type type;
 
@@ -82,154 +67,36 @@ public class MethodDeclaration extends CallableDeclaration<MethodDeclaration>
     private BlockStmt body;
 
     public MethodDeclaration() {
-        this(
-                null,
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new ClassOrInterfaceType(),
-                new SimpleName(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new BlockStmt(),
-                null,
-                new NodeList<>());
+        this(null, new NodeList<>(), new NodeList<>(), new NodeList<>(), new ClassOrInterfaceType(), new SimpleName(), new NodeList<>(), new NodeList<>(), new BlockStmt(), null, new NodeList<>());
     }
 
     public MethodDeclaration(final NodeList<Modifier> modifiers, final Type type, final String name) {
-        this(
-                null,
-                modifiers,
-                new NodeList<>(),
-                new NodeList<>(),
-                type,
-                new SimpleName(name),
-                new NodeList<>(),
-                new NodeList<>(),
-                new BlockStmt(),
-                null,
-                new NodeList<>());
-    }
-
-    public MethodDeclaration(
-            final NodeList<Modifier> modifiers,
-            final String name,
-            final Type type,
-            final NodeList<Parameter> parameters) {
-        this(
-                null,
-                modifiers,
-                new NodeList<>(),
-                new NodeList<>(),
-                type,
-                new SimpleName(name),
-                parameters,
-                new NodeList<>(),
-                new BlockStmt(),
-                null,
-                new NodeList<>());
-    }
-
-    public MethodDeclaration(
-            final NodeList<Modifier> modifiers,
-            final NodeList<AnnotationExpr> annotations,
-            final NodeList<TypeParameter> typeParameters,
-            final Type type,
-            final SimpleName name,
-            final NodeList<Parameter> parameters,
-            final NodeList<ReferenceType> thrownExceptions,
-            final BlockStmt body) {
-        this(
-                null,
-                modifiers,
-                annotations,
-                typeParameters,
-                type,
-                name,
-                parameters,
-                thrownExceptions,
-                body,
-                null,
-                new NodeList<>());
+        this(null, modifiers, new NodeList<>(), new NodeList<>(), type, new SimpleName(name), new NodeList<>(), new NodeList<>(), new BlockStmt(), null, new NodeList<>());
+    }
+
+    public MethodDeclaration(final NodeList<Modifier> modifiers, final String name, final Type type, final NodeList<Parameter> parameters) {
+        this(null, modifiers, new NodeList<>(), new NodeList<>(), type, new SimpleName(name), parameters, new NodeList<>(), new BlockStmt(), null, new NodeList<>());
+    }
+
+    public MethodDeclaration(final NodeList<Modifier> modifiers, final NodeList<AnnotationExpr> annotations, final NodeList<TypeParameter> typeParameters, final Type type, final SimpleName name, final NodeList<Parameter> parameters, final NodeList<ReferenceType> thrownExceptions, final BlockStmt body) {
+        this(null, modifiers, annotations, typeParameters, type, name, parameters, thrownExceptions, body, null, new NodeList<>());
     }
 
     @AllFieldsConstructor
-    public MethodDeclaration(
-            final NodeList<Modifier> modifiers,
-            final NodeList<AnnotationExpr> annotations,
-            final NodeList<TypeParameter> typeParameters,
-            final Type type,
-            final SimpleName name,
-            final NodeList<Parameter> parameters,
-            final NodeList<ReferenceType> thrownExceptions,
-            final BlockStmt body,
-            ReceiverParameter receiverParameter,
-            final NodeList<JmlContract> contracts) {
-        this(
-                null,
-                modifiers,
-                annotations,
-                typeParameters,
-                type,
-                name,
-                parameters,
-                thrownExceptions,
-                body,
-                receiverParameter,
-                contracts);
-    }
-
-    public MethodDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<TypeParameter> typeParameters,
-            Type type,
-            SimpleName name,
-            NodeList<Parameter> parameters,
-            NodeList<ReferenceType> thrownExceptions,
-            BlockStmt body,
-            ReceiverParameter receiverParameter) {
-        this(
-                tokenRange,
-                modifiers,
-                annotations,
-                typeParameters,
-                type,
-                name,
-                parameters,
-                thrownExceptions,
-                body,
-                receiverParameter,
-                new NodeList<>());
+    public MethodDeclaration(final NodeList<Modifier> modifiers, final NodeList<AnnotationExpr> annotations, final NodeList<TypeParameter> typeParameters, final Type type, final SimpleName name, final NodeList<Parameter> parameters, final NodeList<ReferenceType> thrownExceptions, final BlockStmt body, ReceiverParameter receiverParameter, final NodeList<JmlContract> contracts) {
+        this(null, modifiers, annotations, typeParameters, type, name, parameters, thrownExceptions, body, receiverParameter, contracts);
+    }
+
+    public MethodDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<TypeParameter> typeParameters, Type type, SimpleName name, NodeList<Parameter> parameters, NodeList<ReferenceType> thrownExceptions, BlockStmt body, ReceiverParameter receiverParameter) {
+        this(tokenRange, modifiers, annotations, typeParameters, type, name, parameters, thrownExceptions, body, receiverParameter, new NodeList<>());
     }
 
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public MethodDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<TypeParameter> typeParameters,
-            Type type,
-            SimpleName name,
-            NodeList<Parameter> parameters,
-            NodeList<ReferenceType> thrownExceptions,
-            BlockStmt body,
-            ReceiverParameter receiverParameter,
-            NodeList<JmlContract> contracts) {
-        super(
-                tokenRange,
-                modifiers,
-                annotations,
-                typeParameters,
-                name,
-                parameters,
-                thrownExceptions,
-                receiverParameter,
-                contracts);
+    public MethodDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<TypeParameter> typeParameters, Type type, SimpleName name, NodeList<Parameter> parameters, NodeList<ReferenceType> thrownExceptions, BlockStmt body, ReceiverParameter receiverParameter, NodeList<JmlContract> contracts) {
+        super(tokenRange, modifiers, annotations, typeParameters, name, parameters, thrownExceptions, receiverParameter, contracts);
         setType(type);
         setBody(body);
         customInitialization();
@@ -264,7 +131,8 @@ public MethodDeclaration setBody(final @Nullable() BlockStmt body) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BODY, this.body, body);
-        if (this.body != null) this.body.setParentNode(null);
+        if (this.body != null)
+            this.body.setParentNode(null);
         this.body = body;
         setAsParentNodeOf(body);
         return this;
@@ -282,7 +150,8 @@ public MethodDeclaration setType(final @NonNull() Type type) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
-        if (this.type != null) this.type.setParentNode(null);
+        if (this.type != null)
+            this.type.setParentNode(null);
         this.type = type;
         setAsParentNodeOf(type);
         return this;
@@ -323,8 +192,7 @@ public MethodDeclaration setTypeParameters(final NodeList<TypeParameter> typePar
      * @return method declaration as String
      */
     @Override
-    public String getDeclarationAsString(
-            boolean includingModifiers, boolean includingThrows, boolean includingParameterName) {
+    public String getDeclarationAsString(boolean includingModifiers, boolean includingThrows, boolean includingParameterName) {
         StringBuilder sb = new StringBuilder();
         if (includingModifiers) {
             AccessSpecifier accessSpecifier = getAccessSpecifier();
@@ -398,10 +266,7 @@ public boolean isPublic() {
     }
 
     private boolean isImplicitlyPublic() {
-        return getAccessSpecifier() == AccessSpecifier.NONE
-                && hasParentNode()
-                && getParentNode().get() instanceof ClassOrInterfaceDeclaration
-                && ((ClassOrInterfaceDeclaration) getParentNode().get()).isInterface();
+        return getAccessSpecifier() == AccessSpecifier.NONE && hasParentNode() && getParentNode().get() instanceof ClassOrInterfaceDeclaration && ((ClassOrInterfaceDeclaration) getParentNode().get()).isInterface();
     }
 
     /*
@@ -414,10 +279,7 @@ public boolean isAbstract() {
     }
 
     private boolean isImplicitlyAbstract() {
-        return hasParentNode()
-                && getParentNode().get() instanceof ClassOrInterfaceDeclaration
-                && ((ClassOrInterfaceDeclaration) getParentNode().get()).isInterface()
-                && Arrays.asList(STATIC, DEFAULT, PRIVATE).stream().noneMatch(modifier -> hasModifier(modifier));
+        return hasParentNode() && getParentNode().get() instanceof ClassOrInterfaceDeclaration && ((ClassOrInterfaceDeclaration) getParentNode().get()).isInterface() && Arrays.asList(STATIC, DEFAULT, PRIVATE).stream().noneMatch(modifier -> hasModifier(modifier));
     }
 
     public boolean isNative() {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java
index cf13c79453..13cab40850 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/Parameter.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.body;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -54,12 +53,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class Parameter extends Node
-        implements NodeWithType<Parameter, Type>,
-                NodeWithAnnotations<Parameter>,
-                NodeWithSimpleName<Parameter>,
-                NodeWithFinalModifier<Parameter>,
-                Resolvable<ResolvedParameterDeclaration> {
+public class Parameter extends Node implements NodeWithType<Parameter, Type>, NodeWithAnnotations<Parameter>, NodeWithSimpleName<Parameter>, NodeWithFinalModifier<Parameter>, Resolvable<ResolvedParameterDeclaration> {
 
     private Type type;
 
@@ -74,14 +68,7 @@ public class Parameter extends Node
     private SimpleName name;
 
     public Parameter() {
-        this(
-                null,
-                new NodeList<>(),
-                new NodeList<>(),
-                new ClassOrInterfaceType(),
-                false,
-                new NodeList<>(),
-                new SimpleName());
+        this(null, new NodeList<>(), new NodeList<>(), new ClassOrInterfaceType(), false, new NodeList<>(), new SimpleName());
     }
 
     public Parameter(Type type, SimpleName name) {
@@ -103,13 +90,7 @@ public Parameter(NodeList<Modifier> modifiers, Type type, SimpleName name) {
     }
 
     @AllFieldsConstructor
-    public Parameter(
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            Type type,
-            boolean isVarArgs,
-            NodeList<AnnotationExpr> varArgsAnnotations,
-            SimpleName name) {
+    public Parameter(NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, Type type, boolean isVarArgs, NodeList<AnnotationExpr> varArgsAnnotations, SimpleName name) {
         this(null, modifiers, annotations, type, isVarArgs, varArgsAnnotations, name);
     }
 
@@ -117,14 +98,7 @@ public Parameter(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public Parameter(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            Type type,
-            boolean isVarArgs,
-            NodeList<AnnotationExpr> varArgsAnnotations,
-            SimpleName name) {
+    public Parameter(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, Type type, boolean isVarArgs, NodeList<AnnotationExpr> varArgsAnnotations, SimpleName name) {
         super(tokenRange);
         setModifiers(modifiers);
         setAnnotations(annotations);
@@ -165,7 +139,8 @@ public Parameter setType(final @NonNull() Type type) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
-        if (this.type != null) this.type.setParentNode(null);
+        if (this.type != null)
+            this.type.setParentNode(null);
         this.type = type;
         setAsParentNodeOf(type);
         return this;
@@ -216,7 +191,8 @@ public Parameter setAnnotations(final @NonNull() NodeList<AnnotationExpr> annota
             return this;
         }
         notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations);
-        if (this.annotations != null) this.annotations.setParentNode(null);
+        if (this.annotations != null)
+            this.annotations.setParentNode(null);
         this.annotations = annotations;
         setAsParentNodeOf(annotations);
         return this;
@@ -229,7 +205,8 @@ public Parameter setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -242,7 +219,8 @@ public Parameter setModifiers(final @NonNull() NodeList<Modifier> modifiers) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
@@ -287,7 +265,8 @@ public Parameter setVarArgsAnnotations(final @NonNull() NodeList<AnnotationExpr>
             return this;
         }
         notifyPropertyChange(ObservableProperty.VAR_ARGS_ANNOTATIONS, this.varArgsAnnotations, varArgsAnnotations);
-        if (this.varArgsAnnotations != null) this.varArgsAnnotations.setParentNode(null);
+        if (this.varArgsAnnotations != null)
+            this.varArgsAnnotations.setParentNode(null);
         this.varArgsAnnotations = varArgsAnnotations;
         setAsParentNodeOf(varArgsAnnotations);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ReceiverParameter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ReceiverParameter.java
index da880ededd..088320618c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ReceiverParameter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ReceiverParameter.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.body;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -51,10 +50,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class ReceiverParameter extends Node
-        implements NodeWithType<ReceiverParameter, Type>,
-                NodeWithAnnotations<ReceiverParameter>,
-                NodeWithName<ReceiverParameter> {
+public class ReceiverParameter extends Node implements NodeWithType<ReceiverParameter, Type>, NodeWithAnnotations<ReceiverParameter>, NodeWithName<ReceiverParameter> {
 
     private Type type;
 
@@ -121,7 +117,8 @@ public ReceiverParameter setType(final @NonNull() Type type) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
-        if (this.type != null) this.type.setParentNode(null);
+        if (this.type != null)
+            this.type.setParentNode(null);
         this.type = type;
         setAsParentNodeOf(type);
         return this;
@@ -146,7 +143,8 @@ public ReceiverParameter setAnnotations(final @NonNull() NodeList<AnnotationExpr
             return this;
         }
         notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations);
-        if (this.annotations != null) this.annotations.setParentNode(null);
+        if (this.annotations != null)
+            this.annotations.setParentNode(null);
         this.annotations = annotations;
         setAsParentNodeOf(annotations);
         return this;
@@ -176,7 +174,8 @@ public ReceiverParameter setName(final @NonNull() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/RecordDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/RecordDeclaration.java
index b6da2f8991..aa51721f68 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/RecordDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/RecordDeclaration.java
@@ -23,7 +23,6 @@
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import static java.util.Collections.unmodifiableList;
 import static java.util.stream.Collectors.toList;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -92,12 +91,7 @@
  * @see <a href="https://docs.oracle.com/javase/specs/jls/se16/html/jls-8.html#jls-8.10">JLS 8.10 - Record Classes</a>
  * @since 3.22.0
  */
-public class RecordDeclaration extends TypeDeclaration<RecordDeclaration>
-        implements NodeWithParameters<RecordDeclaration>,
-                NodeWithImplements<RecordDeclaration>,
-                NodeWithTypeParameters<RecordDeclaration>,
-                NodeWithFinalModifier<RecordDeclaration>,
-                Resolvable<ResolvedReferenceTypeDeclaration> {
+public class RecordDeclaration extends TypeDeclaration<RecordDeclaration> implements NodeWithParameters<RecordDeclaration>, NodeWithImplements<RecordDeclaration>, NodeWithTypeParameters<RecordDeclaration>, NodeWithFinalModifier<RecordDeclaration>, Resolvable<ResolvedReferenceTypeDeclaration> {
 
     private NodeList<TypeParameter> typeParameters;
 
@@ -109,67 +103,23 @@ public class RecordDeclaration extends TypeDeclaration<RecordDeclaration>
     private NodeList<Parameter> parameters;
 
     public RecordDeclaration() {
-        this(
-                null,
-                new NodeList<>(),
-                new NodeList<>(),
-                new SimpleName(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>(),
-                null);
+        this(null, new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>(), new NodeList<>(), new NodeList<>(), new NodeList<>(), null);
     }
 
     public RecordDeclaration(final NodeList<Modifier> modifiers, final String name) {
-        this(
-                null,
-                modifiers,
-                new NodeList<>(),
-                new SimpleName(name),
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>(),
-                null);
+        this(null, modifiers, new NodeList<>(), new SimpleName(name), new NodeList<>(), new NodeList<>(), new NodeList<>(), new NodeList<>(), null);
     }
 
     @AllFieldsConstructor
-    public RecordDeclaration(
-            final NodeList<Modifier> modifiers,
-            final NodeList<AnnotationExpr> annotations,
-            final SimpleName name,
-            final NodeList<Parameter> parameters,
-            final NodeList<TypeParameter> typeParameters,
-            final NodeList<ClassOrInterfaceType> implementedTypes,
-            final NodeList<BodyDeclaration<?>> members,
-            final ReceiverParameter receiverParameter) {
-        this(
-                null,
-                modifiers,
-                annotations,
-                name,
-                parameters,
-                typeParameters,
-                implementedTypes,
-                members,
-                receiverParameter);
+    public RecordDeclaration(final NodeList<Modifier> modifiers, final NodeList<AnnotationExpr> annotations, final SimpleName name, final NodeList<Parameter> parameters, final NodeList<TypeParameter> typeParameters, final NodeList<ClassOrInterfaceType> implementedTypes, final NodeList<BodyDeclaration<?>> members, final ReceiverParameter receiverParameter) {
+        this(null, modifiers, annotations, name, parameters, typeParameters, implementedTypes, members, receiverParameter);
     }
 
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public RecordDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            SimpleName name,
-            NodeList<Parameter> parameters,
-            NodeList<TypeParameter> typeParameters,
-            NodeList<ClassOrInterfaceType> implementedTypes,
-            NodeList<BodyDeclaration<?>> members,
-            ReceiverParameter receiverParameter) {
+    public RecordDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<Parameter> parameters, NodeList<TypeParameter> typeParameters, NodeList<ClassOrInterfaceType> implementedTypes, NodeList<BodyDeclaration<?>> members, ReceiverParameter receiverParameter) {
         super(tokenRange, modifiers, annotations, name, members);
         setParameters(parameters);
         setTypeParameters(typeParameters);
@@ -207,7 +157,8 @@ public RecordDeclaration setImplementedTypes(final @NonNull() NodeList<ClassOrIn
             return this;
         }
         notifyPropertyChange(ObservableProperty.IMPLEMENTED_TYPES, this.implementedTypes, implementedTypes);
-        if (this.implementedTypes != null) this.implementedTypes.setParentNode(null);
+        if (this.implementedTypes != null)
+            this.implementedTypes.setParentNode(null);
         this.implementedTypes = implementedTypes;
         setAsParentNodeOf(implementedTypes);
         return this;
@@ -220,7 +171,8 @@ public RecordDeclaration setTypeParameters(final @NonNull() NodeList<TypeParamet
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_PARAMETERS, this.typeParameters, typeParameters);
-        if (this.typeParameters != null) this.typeParameters.setParentNode(null);
+        if (this.typeParameters != null)
+            this.typeParameters.setParentNode(null);
         this.typeParameters = typeParameters;
         setAsParentNodeOf(typeParameters);
         return this;
@@ -370,7 +322,8 @@ public RecordDeclaration setParameters(final @NonNull() NodeList<Parameter> para
             return this;
         }
         notifyPropertyChange(ObservableProperty.PARAMETERS, this.parameters, parameters);
-        if (this.parameters != null) this.parameters.setParentNode(null);
+        if (this.parameters != null)
+            this.parameters.setParentNode(null);
         this.parameters = parameters;
         setAsParentNodeOf(parameters);
         return this;
@@ -387,7 +340,8 @@ public RecordDeclaration setReceiverParameter(final @Nullable() ReceiverParamete
             return this;
         }
         notifyPropertyChange(ObservableProperty.RECEIVER_PARAMETER, this.receiverParameter, receiverParameter);
-        if (this.receiverParameter != null) this.receiverParameter.setParentNode(null);
+        if (this.receiverParameter != null)
+            this.receiverParameter.setParentNode(null);
         this.receiverParameter = receiverParameter;
         setAsParentNodeOf(receiverParameter);
         return this;
@@ -435,10 +389,7 @@ public boolean isStatic() {
      * not "normal" constructors (which are obtainable via {@link #getConstructors()}).
      */
     public List<CompactConstructorDeclaration> getCompactConstructors() {
-        return unmodifiableList(getMembers().stream()
-                .filter(m -> m instanceof CompactConstructorDeclaration)
-                .map(m -> (CompactConstructorDeclaration) m)
-                .collect(toList()));
+        return unmodifiableList(getMembers().stream().filter(m -> m instanceof CompactConstructorDeclaration).map(m -> (CompactConstructorDeclaration) m).collect(toList()));
     }
 
     @com.github.javaparser.ast.key.IgnoreLexPrinting()
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java
index 061a65d4ed..97e7ade46b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import static java.util.stream.Collectors.toList;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -49,13 +48,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public abstract class TypeDeclaration<T extends TypeDeclaration<?>> extends BodyDeclaration<T>
-        implements NodeWithSimpleName<T>,
-                NodeWithJavadoc<T>,
-                NodeWithMembers<T>,
-                NodeWithAccessModifiers<T>,
-                NodeWithStaticModifier<T>,
-                NodeWithStrictfpModifier<T> {
+public abstract class TypeDeclaration<T extends TypeDeclaration<?>> extends BodyDeclaration<T> implements NodeWithSimpleName<T>, NodeWithJavadoc<T>, NodeWithMembers<T>, NodeWithAccessModifiers<T>, NodeWithStaticModifier<T>, NodeWithStrictfpModifier<T> {
 
     private SimpleName name;
 
@@ -67,16 +60,16 @@ public TypeDeclaration() {
         this(null, new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>());
     }
 
+    public TypeDeclaration(TokenRange range) {
+        this(range, new NodeList<>(), new NodeList<>(), new SimpleName(), new NodeList<>());
+    }
+
     public TypeDeclaration(NodeList<Modifier> modifiers, String name) {
         this(null, modifiers, new NodeList<>(), new SimpleName(name), new NodeList<>());
     }
 
     @AllFieldsConstructor
-    public TypeDeclaration(
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            SimpleName name,
-            NodeList<BodyDeclaration<?>> members) {
+    public TypeDeclaration(NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<BodyDeclaration<?>> members) {
         this(null, modifiers, annotations, name, members);
     }
 
@@ -84,12 +77,7 @@ public TypeDeclaration(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public TypeDeclaration(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            SimpleName name,
-            NodeList<BodyDeclaration<?>> members) {
+    public TypeDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<BodyDeclaration<?>> members) {
         super(tokenRange, annotations);
         setModifiers(modifiers);
         setName(name);
@@ -132,7 +120,8 @@ public T setMembers(final @NonNull() NodeList<BodyDeclaration<?>> members) {
             return (T) this;
         }
         notifyPropertyChange(ObservableProperty.MEMBERS, this.members, members);
-        if (this.members != null) this.members.setParentNode(null);
+        if (this.members != null)
+            this.members.setParentNode(null);
         this.members = members;
         setAsParentNodeOf(members);
         return (T) this;
@@ -146,7 +135,8 @@ public T setModifiers(final @NonNull() NodeList<Modifier> modifiers) {
             return (T) this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return (T) this;
@@ -160,7 +150,8 @@ public T setName(final @NonNull() SimpleName name) {
             return (T) this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return (T) this;
@@ -203,11 +194,7 @@ public boolean isTopLevelType() {
      * @return methods or constructors whose signatures match the passed signature.
      */
     public List<CallableDeclaration<?>> getCallablesWithSignature(CallableDeclaration.Signature signature) {
-        return getMembers().stream()
-                .filter(m -> m instanceof CallableDeclaration)
-                .map(m -> ((CallableDeclaration<?>) m))
-                .filter(m -> m.getSignature().equals(signature))
-                .collect(toList());
+        return getMembers().stream().filter(m -> m instanceof CallableDeclaration).map(m -> ((CallableDeclaration<?>) m)).filter(m -> m.getSignature().equals(signature)).collect(toList());
     }
 
     /**
@@ -220,14 +207,9 @@ public List<CallableDeclaration<?>> getCallablesWithSignature(CallableDeclaratio
      */
     public Optional<String> getFullyQualifiedName() {
         if (isTopLevelType()) {
-            return findCompilationUnit().map(cu -> cu.getPackageDeclaration()
-                    .map(pd -> pd.getNameAsString())
-                    .map(pkg -> pkg + "." + getNameAsString())
-                    .orElseGet(() -> getNameAsString()));
+            return findCompilationUnit().map(cu -> cu.getPackageDeclaration().map(pd -> pd.getNameAsString()).map(pkg -> pkg + "." + getNameAsString()).orElseGet(() -> getNameAsString()));
         }
-        return findAncestor(TypeDeclaration.class)
-                .map(td -> (TypeDeclaration<?>) td)
-                .flatMap(td -> td.getFullyQualifiedName().map(fqn -> fqn + "." + getNameAsString()));
+        return findAncestor(TypeDeclaration.class).map(td -> (TypeDeclaration<?>) td).flatMap(td -> td.getFullyQualifiedName().map(fqn -> fqn + "." + getNameAsString()));
     }
 
     /**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java
index 56f46f02b4..dae69293ea 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/VariableDeclarator.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -60,10 +59,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class VariableDeclarator extends Node
-        implements NodeWithType<VariableDeclarator, Type>,
-                NodeWithSimpleName<VariableDeclarator>,
-                Resolvable<ResolvedValueDeclaration> {
+public class VariableDeclarator extends Node implements NodeWithType<VariableDeclarator, Type>, NodeWithSimpleName<VariableDeclarator>, Resolvable<ResolvedValueDeclaration> {
 
     private SimpleName name;
 
@@ -120,13 +116,11 @@ protected void customInitialization() {
         register(new AstObserverAdapter() {
 
             @Override
-            public void propertyChange(
-                    Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
+            public void propertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
                 if (property == ObservableProperty.TYPE) {
                     VariableDeclarator vd = VariableDeclarator.this;
                     if (vd.getParentNode().isPresent() && vd.getParentNode().get() instanceof NodeWithVariables) {
-                        NodeWithVariables<?> nodeWithVariables =
-                                (NodeWithVariables<?>) vd.getParentNode().get();
+                        NodeWithVariables<?> nodeWithVariables = (NodeWithVariables<?>) vd.getParentNode().get();
                         // We calculate the value the property will assume after the change will be completed
                         Optional<Type> currentMaxCommonType = nodeWithVariables.getMaximumCommonType();
                         List<Type> types = new LinkedList<>();
@@ -139,11 +133,7 @@ public void propertyChange(
                             }
                         }
                         Optional<Type> newMaxCommonType = NodeWithVariables.calculateMaximumCommonType(types);
-                        ((Node) nodeWithVariables)
-                                .notifyPropertyChange(
-                                        ObservableProperty.MAXIMUM_COMMON_TYPE,
-                                        currentMaxCommonType.orElse(null),
-                                        newMaxCommonType.orElse(null));
+                        ((Node) nodeWithVariables).notifyPropertyChange(ObservableProperty.MAXIMUM_COMMON_TYPE, currentMaxCommonType.orElse(null), newMaxCommonType.orElse(null));
                     }
                 }
             }
@@ -179,7 +169,8 @@ public VariableDeclarator setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -197,7 +188,8 @@ public VariableDeclarator setInitializer(final @Nullable() Expression initialize
             return this;
         }
         notifyPropertyChange(ObservableProperty.INITIALIZER, this.initializer, initializer);
-        if (this.initializer != null) this.initializer.setParentNode(null);
+        if (this.initializer != null)
+            this.initializer.setParentNode(null);
         this.initializer = initializer;
         setAsParentNodeOf(initializer);
         return this;
@@ -225,7 +217,8 @@ public VariableDeclarator setType(final @NonNull() Type type) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
-        if (this.type != null) this.type.setParentNode(null);
+        if (this.type != null)
+            this.type.setParentNode(null);
         this.type = type;
         setAsParentNodeOf(type);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/BlockComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/BlockComment.java
index 52d5c8fc72..b8eafb19d4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/BlockComment.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/BlockComment.java
@@ -30,6 +30,7 @@
 import com.github.javaparser.metamodel.JavaParserMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * <p>
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/Comment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/Comment.java
index 88c1edda06..4d764b0473 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/Comment.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/Comment.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -101,8 +100,7 @@ public boolean isLineComment() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public LineComment asLineComment() {
-        throw new IllegalStateException(
-                f("%s is not LineComment, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not LineComment, it is %s", this, this.getClass().getSimpleName()));
     }
 
     public Optional<Node> getCommentedNode() {
@@ -185,8 +183,7 @@ public boolean isBlockComment() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public BlockComment asBlockComment() {
-        throw new IllegalStateException(
-                f("%s is not BlockComment, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not BlockComment, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -196,18 +193,20 @@ public boolean isJavadocComment() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JavadocComment asJavadocComment() {
-        throw new IllegalStateException(
-                f("%s is not JavadocComment, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JavadocComment, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifBlockComment(Consumer<BlockComment> action) {}
+    public void ifBlockComment(Consumer<BlockComment> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJavadocComment(Consumer<JavadocComment> action) {}
+    public void ifJavadocComment(Consumer<JavadocComment> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifLineComment(Consumer<LineComment> action) {}
+    public void ifLineComment(Consumer<LineComment> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public Optional<BlockComment> toBlockComment() {
@@ -254,8 +253,7 @@ public boolean isMarkdownComment() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public MarkdownComment asMarkdownComment() {
-        throw new IllegalStateException(
-                f("%s is not MarkdownComment, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not MarkdownComment, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -264,7 +262,8 @@ public Optional<MarkdownComment> toMarkdownComment() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifMarkdownComment(Consumer<MarkdownComment> action) {}
+    public void ifMarkdownComment(Consumer<MarkdownComment> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isTraditionalJavadocComment() {
@@ -273,9 +272,7 @@ public boolean isTraditionalJavadocComment() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public TraditionalJavadocComment asTraditionalJavadocComment() {
-        throw new IllegalStateException(f(
-                "%s is not TraditionalJavadocComment, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not TraditionalJavadocComment, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -284,5 +281,6 @@ public Optional<TraditionalJavadocComment> toTraditionalJavadocComment() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifTraditionalJavadocComment(Consumer<TraditionalJavadocComment> action) {}
+    public void ifTraditionalJavadocComment(Consumer<TraditionalJavadocComment> action) {
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java
index 0bd742f7ba..6911a1dce7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/CommentsCollection.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.comments;
 
 import static com.github.javaparser.ast.Node.NODE_BY_BEGIN_POSITION;
-
 import com.github.javaparser.Range;
 import java.util.Collection;
 import java.util.Set;
@@ -35,31 +34,23 @@ public class CommentsCollection {
 
     private final TreeSet<Comment> comments = new TreeSet<>(NODE_BY_BEGIN_POSITION);
 
-    public CommentsCollection() {}
+    public CommentsCollection() {
+    }
 
     public CommentsCollection(Collection<Comment> commentsToCopy) {
         comments.addAll(commentsToCopy);
     }
 
     public Set<LineComment> getLineComments() {
-        return comments.stream()
-                .filter(comment -> comment instanceof LineComment)
-                .map(comment -> (LineComment) comment)
-                .collect(Collectors.toCollection(() -> new TreeSet<>(NODE_BY_BEGIN_POSITION)));
+        return comments.stream().filter(comment -> comment instanceof LineComment).map(comment -> (LineComment) comment).collect(Collectors.toCollection(() -> new TreeSet<>(NODE_BY_BEGIN_POSITION)));
     }
 
     public Set<BlockComment> getBlockComments() {
-        return comments.stream()
-                .filter(comment -> comment instanceof BlockComment)
-                .map(comment -> (BlockComment) comment)
-                .collect(Collectors.toCollection(() -> new TreeSet<>(NODE_BY_BEGIN_POSITION)));
+        return comments.stream().filter(comment -> comment instanceof BlockComment).map(comment -> (BlockComment) comment).collect(Collectors.toCollection(() -> new TreeSet<>(NODE_BY_BEGIN_POSITION)));
     }
 
     public Set<JavadocComment> getJavadocComments() {
-        return comments.stream()
-                .filter(comment -> comment instanceof JavadocComment)
-                .map(comment -> (JavadocComment) comment)
-                .collect(Collectors.toCollection(() -> new TreeSet<>(NODE_BY_BEGIN_POSITION)));
+        return comments.stream().filter(comment -> comment instanceof JavadocComment).map(comment -> (JavadocComment) comment).collect(Collectors.toCollection(() -> new TreeSet<>(NODE_BY_BEGIN_POSITION)));
     }
 
     public void addComment(Comment comment) {
@@ -78,9 +69,7 @@ public boolean contains(Comment comment) {
             Range cRange = c.getRange().get();
             // we tolerate a difference of one element in the end column:
             // it depends how \r and \n are calculated...
-            if (cRange.begin.equals(commentRange.begin)
-                    && cRange.end.line == commentRange.end.line
-                    && Math.abs(cRange.end.column - commentRange.end.column) < 2) {
+            if (cRange.begin.equals(commentRange.begin) && cRange.end.line == commentRange.end.line && Math.abs(cRange.end.column - commentRange.end.column) < 2) {
                 return true;
             }
         }
@@ -97,8 +86,7 @@ public int size() {
 
     public CommentsCollection minus(CommentsCollection other) {
         CommentsCollection result = new CommentsCollection();
-        result.comments.addAll(
-                comments.stream().filter(comment -> !other.contains(comment)).collect(Collectors.toList()));
+        result.comments.addAll(comments.stream().filter(comment -> !other.contains(comment)).collect(Collectors.toList()));
         return result;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java
index 42f262239c..24d34eb63e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/JavadocComment.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.comments;
 
 import static com.github.javaparser.StaticJavaParser.parseJavadoc;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -31,6 +30,7 @@
 import com.github.javaparser.metamodel.JavadocCommentMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 public abstract class JavadocComment extends Comment {
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java
index 1404e6c06a..fd039dfb1e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/LineComment.java
@@ -30,6 +30,7 @@
 import com.github.javaparser.metamodel.LineCommentMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * <p>
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/MarkdownComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/MarkdownComment.java
index 75e83a12a0..c94cf61365 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/MarkdownComment.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/MarkdownComment.java
@@ -35,6 +35,7 @@
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import com.github.javaparser.ast.Node;
 
 /**
  * https://openjdk.org/jeps/467 added support for markdown JavaDoc comments
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/TraditionalJavadocComment.java b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/TraditionalJavadocComment.java
index 719e550d9e..49e5c5fe88 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/comments/TraditionalJavadocComment.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/comments/TraditionalJavadocComment.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.comments;
 
 import static com.github.javaparser.StaticJavaParser.parseJavadoc;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -33,6 +32,7 @@
 import com.github.javaparser.metamodel.TraditionalJavadocCommentMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * A Javadoc comment. {@code /∗∗ a comment ∗/}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java
index 037f47e857..90f3009e36 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AnnotationExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -44,8 +43,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public abstract class AnnotationExpr extends Expression
-        implements NodeWithName<AnnotationExpr>, Resolvable<ResolvedAnnotationDeclaration> {
+public abstract class AnnotationExpr extends Expression implements NodeWithName<AnnotationExpr>, Resolvable<ResolvedAnnotationDeclaration> {
 
     protected Name name;
 
@@ -80,7 +78,8 @@ public AnnotationExpr setName(final @NonNull() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java
index 419f4b5cba..1a145bc491 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayAccessExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -103,7 +102,8 @@ public ArrayAccessExpr setIndex(final @NonNull() Expression index) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.INDEX, this.index, index);
-        if (this.index != null) this.index.setParentNode(null);
+        if (this.index != null)
+            this.index.setParentNode(null);
         this.index = index;
         setAsParentNodeOf(index);
         return this;
@@ -116,7 +116,8 @@ public ArrayAccessExpr setName(final @NonNull() Expression name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
index 36611ba8ac..9742ebbcd1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayCreationExpr.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.StaticJavaParser.parseType;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.observer.ObservableProperty;
@@ -77,11 +76,7 @@ public ArrayCreationExpr(Type elementType) {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public ArrayCreationExpr(
-            TokenRange tokenRange,
-            Type elementType,
-            NodeList<ArrayCreationLevel> levels,
-            ArrayInitializerExpr initializer) {
+    public ArrayCreationExpr(TokenRange tokenRange, Type elementType, NodeList<ArrayCreationLevel> levels, ArrayInitializerExpr initializer) {
         super(tokenRange);
         setElementType(elementType);
         setLevels(levels);
@@ -123,7 +118,8 @@ public ArrayCreationExpr setInitializer(final @Nullable() ArrayInitializerExpr i
             return this;
         }
         notifyPropertyChange(ObservableProperty.INITIALIZER, this.initializer, initializer);
-        if (this.initializer != null) this.initializer.setParentNode(null);
+        if (this.initializer != null)
+            this.initializer.setParentNode(null);
         this.initializer = initializer;
         setAsParentNodeOf(initializer);
         return this;
@@ -136,7 +132,8 @@ public ArrayCreationExpr setElementType(final @NonNull() Type elementType) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.ELEMENT_TYPE, this.elementType, elementType);
-        if (this.elementType != null) this.elementType.setParentNode(null);
+        if (this.elementType != null)
+            this.elementType.setParentNode(null);
         this.elementType = elementType;
         setAsParentNodeOf(elementType);
         return this;
@@ -154,7 +151,8 @@ public ArrayCreationExpr setLevels(final @NonNull() NodeList<ArrayCreationLevel>
             return this;
         }
         notifyPropertyChange(ObservableProperty.LEVELS, this.levels, levels);
-        if (this.levels != null) this.levels.setParentNode(null);
+        if (this.levels != null)
+            this.levels.setParentNode(null);
         this.levels = levels;
         setAsParentNodeOf(levels);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
index 47e63d74d9..a1dc3c9a96 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -93,7 +92,8 @@ public ArrayInitializerExpr setValues(final @NonNull() NodeList<Expression> valu
             return this;
         }
         notifyPropertyChange(ObservableProperty.VALUES, this.values, values);
-        if (this.values != null) this.values.setParentNode(null);
+        if (this.values != null)
+            this.values.setParentNode(null);
         this.values = values;
         setAsParentNodeOf(values);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java
index d7fb11712e..eeaf42c516 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/AssignExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -51,6 +50,7 @@
 public class AssignExpr extends Expression {
 
     public enum Operator implements Stringable {
+
         ASSIGN("="),
         PLUS("+="),
         MINUS("-="),
@@ -75,7 +75,7 @@ public String asString() {
         }
 
         public Optional<BinaryExpr.Operator> toBinaryOperator() {
-            switch (this) {
+            switch(this) {
                 case PLUS:
                     return Optional.of(BinaryExpr.Operator.PLUS);
                 case MINUS:
@@ -176,7 +176,8 @@ public AssignExpr setTarget(final @NonNull() Expression target) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TARGET, this.target, target);
-        if (this.target != null) this.target.setParentNode(null);
+        if (this.target != null)
+            this.target.setParentNode(null);
         this.target = target;
         setAsParentNodeOf(target);
         return this;
@@ -189,7 +190,8 @@ public AssignExpr setValue(final @NonNull() Expression value) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.VALUE, this.value, value);
-        if (this.value != null) this.value.setParentNode(null);
+        if (this.value != null)
+            this.value.setParentNode(null);
         this.value = value;
         setAsParentNodeOf(value);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java
index 901564439e..a4addd30d0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BinaryExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -91,7 +90,7 @@ public String asString() {
         }
 
         public Optional<AssignExpr.Operator> toAssignOperator() {
-            switch (this) {
+            switch(this) {
                 case BINARY_OR:
                     return Optional.of(AssignExpr.Operator.BINARY_OR);
                 case BINARY_AND:
@@ -181,7 +180,8 @@ public BinaryExpr setLeft(final @NonNull() Expression left) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.LEFT, this.left, left);
-        if (this.left != null) this.left.setParentNode(null);
+        if (this.left != null)
+            this.left.setParentNode(null);
         this.left = left;
         setAsParentNodeOf(left);
         return this;
@@ -205,7 +205,8 @@ public BinaryExpr setRight(final @NonNull() Expression right) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.RIGHT, this.right, right);
-        if (this.right != null) this.right.setParentNode(null);
+        if (this.right != null)
+            this.right.setParentNode(null);
         this.right = right;
         setAsParentNodeOf(right);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
index 60e03bf77c..b834ae6b71 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
@@ -32,6 +32,8 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
+import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.Node;
 
 /**
  * The boolean literals.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java
index cfc923a18f..302fa7b007 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CastExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -101,7 +100,8 @@ public CastExpr setExpression(final @NonNull() Expression expression) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
@@ -114,7 +114,8 @@ public CastExpr setType(final @NonNull() Type type) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
-        if (this.type != null) this.type.setParentNode(null);
+        if (this.type != null)
+            this.type.setParentNode(null);
         this.type = type;
         setAsParentNodeOf(type);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java
index ed371de7f8..72044a2ca4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/CharLiteralExpr.java
@@ -32,6 +32,7 @@
 import com.github.javaparser.utils.Utils;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * A literal character.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java
index e740774133..8565b3b7a3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ClassExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -93,7 +92,8 @@ public ClassExpr setType(final @NonNull() Type type) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
-        if (this.type != null) this.type.setParentNode(null);
+        if (this.type != null)
+            this.type.setParentNode(null);
         this.type = type;
         setAsParentNodeOf(type);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ComponentPatternExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ComponentPatternExpr.java
index 5b35d46a44..46e1e42ae3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ComponentPatternExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ComponentPatternExpr.java
@@ -28,6 +28,7 @@
 import com.github.javaparser.metamodel.JavaParserMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * <h1>Pattern Matching in Java</h1>
@@ -74,7 +75,8 @@
 public abstract class ComponentPatternExpr extends Expression {
 
     @AllFieldsConstructor
-    public ComponentPatternExpr() {}
+    public ComponentPatternExpr() {
+    }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java
index 29271a5d6a..c6207e47ae 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ConditionalExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -107,7 +106,8 @@ public ConditionalExpr setCondition(final @NonNull() Expression condition) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONDITION, this.condition, condition);
-        if (this.condition != null) this.condition.setParentNode(null);
+        if (this.condition != null)
+            this.condition.setParentNode(null);
         this.condition = condition;
         setAsParentNodeOf(condition);
         return this;
@@ -120,7 +120,8 @@ public ConditionalExpr setElseExpr(final @NonNull() Expression elseExpr) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.ELSE_EXPR, this.elseExpr, elseExpr);
-        if (this.elseExpr != null) this.elseExpr.setParentNode(null);
+        if (this.elseExpr != null)
+            this.elseExpr.setParentNode(null);
         this.elseExpr = elseExpr;
         setAsParentNodeOf(elseExpr);
         return this;
@@ -133,7 +134,8 @@ public ConditionalExpr setThenExpr(final @NonNull() Expression thenExpr) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.THEN_EXPR, this.thenExpr, thenExpr);
-        if (this.thenExpr != null) this.thenExpr.setParentNode(null);
+        if (this.thenExpr != null)
+            this.thenExpr.setParentNode(null);
         this.thenExpr = thenExpr;
         setAsParentNodeOf(thenExpr);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
index d4f27bfdc9..69f9312afb 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
@@ -30,6 +30,7 @@
 import com.github.javaparser.metamodel.JavaParserMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * A float or a double constant. This value is stored exactly as found in the source.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java
index 22acf69df1..9135de3026 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/EnclosedExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -96,7 +95,8 @@ public EnclosedExpr setInner(final @NonNull() Expression inner) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.INNER, this.inner, inner);
-        if (this.inner != null) this.inner.setParentNode(null);
+        if (this.inner != null)
+            this.inner.setParentNode(null);
         this.inner = inner;
         setAsParentNodeOf(inner);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java
index e01c75569d..276db28c01 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Expression.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -29,8 +28,7 @@
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.key.KeyEscapeExpression;
 import com.github.javaparser.ast.key.KeyPassiveExpression;
-import com.github.javaparser.ast.key.KeyRangeExpression;
-import com.github.javaparser.ast.key.KeyTransactionStatement;
+import com.github.javaparser.ast.key.KeyTransactionStmt;
 import com.github.javaparser.ast.key.sv.KeyExpressionSV;
 import com.github.javaparser.ast.key.sv.KeyMetaConstructExpression;
 import com.github.javaparser.ast.key.sv.KeyProgramVariableSV;
@@ -104,8 +102,7 @@ public boolean isAnnotationExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public AnnotationExpr asAnnotationExpr() {
-        throw new IllegalStateException(
-                f("%s is not AnnotationExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not AnnotationExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -115,8 +112,7 @@ public boolean isArrayAccessExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ArrayAccessExpr asArrayAccessExpr() {
-        throw new IllegalStateException(
-                f("%s is not ArrayAccessExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ArrayAccessExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -126,8 +122,7 @@ public boolean isArrayCreationExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ArrayCreationExpr asArrayCreationExpr() {
-        throw new IllegalStateException(
-                f("%s is not ArrayCreationExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ArrayCreationExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -137,9 +132,7 @@ public boolean isArrayInitializerExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ArrayInitializerExpr asArrayInitializerExpr() {
-        throw new IllegalStateException(f(
-                "%s is not ArrayInitializerExpr, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ArrayInitializerExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -149,8 +142,7 @@ public boolean isAssignExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public AssignExpr asAssignExpr() {
-        throw new IllegalStateException(
-                f("%s is not AssignExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not AssignExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -160,8 +152,7 @@ public boolean isBinaryExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public BinaryExpr asBinaryExpr() {
-        throw new IllegalStateException(
-                f("%s is not BinaryExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not BinaryExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -171,8 +162,7 @@ public boolean isBooleanLiteralExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public BooleanLiteralExpr asBooleanLiteralExpr() {
-        throw new IllegalStateException(f(
-                "%s is not BooleanLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not BooleanLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -182,8 +172,7 @@ public boolean isCastExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public CastExpr asCastExpr() {
-        throw new IllegalStateException(
-                f("%s is not CastExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not CastExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -193,8 +182,7 @@ public boolean isCharLiteralExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public CharLiteralExpr asCharLiteralExpr() {
-        throw new IllegalStateException(
-                f("%s is not CharLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not CharLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -204,8 +192,7 @@ public boolean isClassExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ClassExpr asClassExpr() {
-        throw new IllegalStateException(
-                f("%s is not ClassExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ClassExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -215,8 +202,7 @@ public boolean isConditionalExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ConditionalExpr asConditionalExpr() {
-        throw new IllegalStateException(
-                f("%s is not ConditionalExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ConditionalExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -226,8 +212,7 @@ public boolean isDoubleLiteralExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public DoubleLiteralExpr asDoubleLiteralExpr() {
-        throw new IllegalStateException(
-                f("%s is not DoubleLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not DoubleLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -237,8 +222,7 @@ public boolean isEnclosedExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public EnclosedExpr asEnclosedExpr() {
-        throw new IllegalStateException(
-                f("%s is not EnclosedExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not EnclosedExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -248,8 +232,7 @@ public boolean isFieldAccessExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public FieldAccessExpr asFieldAccessExpr() {
-        throw new IllegalStateException(
-                f("%s is not FieldAccessExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not FieldAccessExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -259,8 +242,7 @@ public boolean isInstanceOfExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public InstanceOfExpr asInstanceOfExpr() {
-        throw new IllegalStateException(
-                f("%s is not InstanceOfExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not InstanceOfExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -270,8 +252,7 @@ public boolean isIntegerLiteralExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public IntegerLiteralExpr asIntegerLiteralExpr() {
-        throw new IllegalStateException(f(
-                "%s is not IntegerLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not IntegerLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -281,8 +262,7 @@ public boolean isLambdaExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public LambdaExpr asLambdaExpr() {
-        throw new IllegalStateException(
-                f("%s is not LambdaExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not LambdaExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -292,8 +272,7 @@ public boolean isLiteralExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public LiteralExpr asLiteralExpr() {
-        throw new IllegalStateException(
-                f("%s is not LiteralExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not LiteralExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -303,9 +282,7 @@ public boolean isLiteralStringValueExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public LiteralStringValueExpr asLiteralStringValueExpr() {
-        throw new IllegalStateException(f(
-                "%s is not LiteralStringValueExpr, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not LiteralStringValueExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -315,8 +292,7 @@ public boolean isLongLiteralExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public LongLiteralExpr asLongLiteralExpr() {
-        throw new IllegalStateException(
-                f("%s is not LongLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not LongLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -326,9 +302,7 @@ public boolean isMarkerAnnotationExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public MarkerAnnotationExpr asMarkerAnnotationExpr() {
-        throw new IllegalStateException(f(
-                "%s is not MarkerAnnotationExpr, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not MarkerAnnotationExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -338,8 +312,7 @@ public boolean isMethodCallExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public MethodCallExpr asMethodCallExpr() {
-        throw new IllegalStateException(
-                f("%s is not MethodCallExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not MethodCallExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -349,8 +322,7 @@ public boolean isMethodReferenceExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public MethodReferenceExpr asMethodReferenceExpr() {
-        throw new IllegalStateException(f(
-                "%s is not MethodReferenceExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not MethodReferenceExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -360,8 +332,7 @@ public boolean isNameExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public NameExpr asNameExpr() {
-        throw new IllegalStateException(
-                f("%s is not NameExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not NameExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -371,9 +342,7 @@ public boolean isNormalAnnotationExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public NormalAnnotationExpr asNormalAnnotationExpr() {
-        throw new IllegalStateException(f(
-                "%s is not NormalAnnotationExpr, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not NormalAnnotationExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -383,8 +352,7 @@ public boolean isNullLiteralExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public NullLiteralExpr asNullLiteralExpr() {
-        throw new IllegalStateException(
-                f("%s is not NullLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not NullLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -394,8 +362,7 @@ public boolean isObjectCreationExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ObjectCreationExpr asObjectCreationExpr() {
-        throw new IllegalStateException(f(
-                "%s is not ObjectCreationExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ObjectCreationExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -405,9 +372,7 @@ public boolean isSingleMemberAnnotationExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public SingleMemberAnnotationExpr asSingleMemberAnnotationExpr() {
-        throw new IllegalStateException(f(
-                "%s is not SingleMemberAnnotationExpr, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not SingleMemberAnnotationExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -417,8 +382,7 @@ public boolean isStringLiteralExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public StringLiteralExpr asStringLiteralExpr() {
-        throw new IllegalStateException(
-                f("%s is not StringLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not StringLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -428,8 +392,7 @@ public boolean isSuperExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public SuperExpr asSuperExpr() {
-        throw new IllegalStateException(
-                f("%s is not SuperExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not SuperExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -439,8 +402,7 @@ public boolean isThisExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ThisExpr asThisExpr() {
-        throw new IllegalStateException(
-                f("%s is not ThisExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ThisExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -450,8 +412,7 @@ public boolean isTypeExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public TypeExpr asTypeExpr() {
-        throw new IllegalStateException(
-                f("%s is not TypeExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not TypeExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -461,8 +422,7 @@ public boolean isUnaryExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public UnaryExpr asUnaryExpr() {
-        throw new IllegalStateException(
-                f("%s is not UnaryExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not UnaryExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -472,112 +432,144 @@ public boolean isVariableDeclarationExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public VariableDeclarationExpr asVariableDeclarationExpr() {
-        throw new IllegalStateException(f(
-                "%s is not VariableDeclarationExpr, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not VariableDeclarationExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifAnnotationExpr(Consumer<AnnotationExpr> action) {}
+    public void ifAnnotationExpr(Consumer<AnnotationExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifArrayAccessExpr(Consumer<ArrayAccessExpr> action) {}
+    public void ifArrayAccessExpr(Consumer<ArrayAccessExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifArrayCreationExpr(Consumer<ArrayCreationExpr> action) {}
+    public void ifArrayCreationExpr(Consumer<ArrayCreationExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifArrayInitializerExpr(Consumer<ArrayInitializerExpr> action) {}
+    public void ifArrayInitializerExpr(Consumer<ArrayInitializerExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifAssignExpr(Consumer<AssignExpr> action) {}
+    public void ifAssignExpr(Consumer<AssignExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifBinaryExpr(Consumer<BinaryExpr> action) {}
+    public void ifBinaryExpr(Consumer<BinaryExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifBooleanLiteralExpr(Consumer<BooleanLiteralExpr> action) {}
+    public void ifBooleanLiteralExpr(Consumer<BooleanLiteralExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifCastExpr(Consumer<CastExpr> action) {}
+    public void ifCastExpr(Consumer<CastExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifCharLiteralExpr(Consumer<CharLiteralExpr> action) {}
+    public void ifCharLiteralExpr(Consumer<CharLiteralExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifClassExpr(Consumer<ClassExpr> action) {}
+    public void ifClassExpr(Consumer<ClassExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifConditionalExpr(Consumer<ConditionalExpr> action) {}
+    public void ifConditionalExpr(Consumer<ConditionalExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifDoubleLiteralExpr(Consumer<DoubleLiteralExpr> action) {}
+    public void ifDoubleLiteralExpr(Consumer<DoubleLiteralExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifEnclosedExpr(Consumer<EnclosedExpr> action) {}
+    public void ifEnclosedExpr(Consumer<EnclosedExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifFieldAccessExpr(Consumer<FieldAccessExpr> action) {}
+    public void ifFieldAccessExpr(Consumer<FieldAccessExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifInstanceOfExpr(Consumer<InstanceOfExpr> action) {}
+    public void ifInstanceOfExpr(Consumer<InstanceOfExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifIntegerLiteralExpr(Consumer<IntegerLiteralExpr> action) {}
+    public void ifIntegerLiteralExpr(Consumer<IntegerLiteralExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifLambdaExpr(Consumer<LambdaExpr> action) {}
+    public void ifLambdaExpr(Consumer<LambdaExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifLiteralExpr(Consumer<LiteralExpr> action) {}
+    public void ifLiteralExpr(Consumer<LiteralExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifLiteralStringValueExpr(Consumer<LiteralStringValueExpr> action) {}
+    public void ifLiteralStringValueExpr(Consumer<LiteralStringValueExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifLongLiteralExpr(Consumer<LongLiteralExpr> action) {}
+    public void ifLongLiteralExpr(Consumer<LongLiteralExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifMarkerAnnotationExpr(Consumer<MarkerAnnotationExpr> action) {}
+    public void ifMarkerAnnotationExpr(Consumer<MarkerAnnotationExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifMethodCallExpr(Consumer<MethodCallExpr> action) {}
+    public void ifMethodCallExpr(Consumer<MethodCallExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifMethodReferenceExpr(Consumer<MethodReferenceExpr> action) {}
+    public void ifMethodReferenceExpr(Consumer<MethodReferenceExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifNameExpr(Consumer<NameExpr> action) {}
+    public void ifNameExpr(Consumer<NameExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifNormalAnnotationExpr(Consumer<NormalAnnotationExpr> action) {}
+    public void ifNormalAnnotationExpr(Consumer<NormalAnnotationExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifNullLiteralExpr(Consumer<NullLiteralExpr> action) {}
+    public void ifNullLiteralExpr(Consumer<NullLiteralExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifObjectCreationExpr(Consumer<ObjectCreationExpr> action) {}
+    public void ifObjectCreationExpr(Consumer<ObjectCreationExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifSingleMemberAnnotationExpr(Consumer<SingleMemberAnnotationExpr> action) {}
+    public void ifSingleMemberAnnotationExpr(Consumer<SingleMemberAnnotationExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifStringLiteralExpr(Consumer<StringLiteralExpr> action) {}
+    public void ifStringLiteralExpr(Consumer<StringLiteralExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifSuperExpr(Consumer<SuperExpr> action) {}
+    public void ifSuperExpr(Consumer<SuperExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifThisExpr(Consumer<ThisExpr> action) {}
+    public void ifThisExpr(Consumer<ThisExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifTypeExpr(Consumer<TypeExpr> action) {}
+    public void ifTypeExpr(Consumer<TypeExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifUnaryExpr(Consumer<UnaryExpr> action) {}
+    public void ifUnaryExpr(Consumer<UnaryExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifVariableDeclarationExpr(Consumer<VariableDeclarationExpr> action) {}
+    public void ifVariableDeclarationExpr(Consumer<VariableDeclarationExpr> action) {
+    }
 
     /**
      * returns the type associated with the node.
@@ -763,8 +755,7 @@ public boolean isSwitchExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public SwitchExpr asSwitchExpr() {
-        throw new IllegalStateException(
-                f("%s is not SwitchExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not SwitchExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -773,7 +764,8 @@ public Optional<SwitchExpr> toSwitchExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifSwitchExpr(Consumer<SwitchExpr> action) {}
+    public void ifSwitchExpr(Consumer<SwitchExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isTextBlockLiteralExpr() {
@@ -782,9 +774,7 @@ public boolean isTextBlockLiteralExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public TextBlockLiteralExpr asTextBlockLiteralExpr() {
-        throw new IllegalStateException(f(
-                "%s is not TextBlockLiteralExpr, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not TextBlockLiteralExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -793,7 +783,8 @@ public Optional<TextBlockLiteralExpr> toTextBlockLiteralExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifTextBlockLiteralExpr(Consumer<TextBlockLiteralExpr> action) {}
+    public void ifTextBlockLiteralExpr(Consumer<TextBlockLiteralExpr> action) {
+    }
 
     /**
      * See https://docs.oracle.com/javase/specs/jls/se8/html/jls-15.html#jls-15.2
@@ -872,8 +863,7 @@ public final boolean elidesTypeArguments() {
         if (!(hasScope() && this instanceof NodeWithTypeArguments)) {
             return true;
         }
-        Expression scope =
-                (Expression) ((NodeWithOptionalScope) this).getScope().get();
+        Expression scope = (Expression) ((NodeWithOptionalScope) this).getScope().get();
         NodeWithTypeArguments nwta = (NodeWithTypeArguments) this;
         return scope.elidesTypeArguments() && (!nwta.getTypeArguments().isPresent() || nwta.isUsingDiamondOperator());
     }
@@ -885,8 +875,7 @@ public boolean isTypePatternExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public TypePatternExpr asTypePatternExpr() {
-        throw new IllegalStateException(
-                f("%s is not TypePatternExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not TypePatternExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -895,7 +884,8 @@ public Optional<TypePatternExpr> toTypePatternExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifTypePatternExpr(Consumer<TypePatternExpr> action) {}
+    public void ifTypePatternExpr(Consumer<TypePatternExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isComponentPatternExpr() {
@@ -908,7 +898,8 @@ public Optional<ComponentPatternExpr> toComponentPatternExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifComponentPatternExpr(Consumer<ComponentPatternExpr> action) {}
+    public void ifComponentPatternExpr(Consumer<ComponentPatternExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isRecordPatternExpr() {
@@ -917,8 +908,7 @@ public boolean isRecordPatternExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public RecordPatternExpr asRecordPatternExpr() {
-        throw new IllegalStateException(
-                f("%s is not RecordPatternExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not RecordPatternExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -933,8 +923,7 @@ public boolean isMatchAllPatternExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public MatchAllPatternExpr asMatchAllPatternExpr() {
-        throw new IllegalStateException(f(
-                "%s is not MatchAllPatternExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not MatchAllPatternExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -943,7 +932,8 @@ public Optional<MatchAllPatternExpr> toMatchAllPatternExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifMatchAllPatternExpr(Consumer<MatchAllPatternExpr> action) {}
+    public void ifMatchAllPatternExpr(Consumer<MatchAllPatternExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isPatternExpr() {
@@ -952,8 +942,7 @@ public boolean isPatternExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public PatternExpr asPatternExpr() {
-        throw new IllegalStateException(
-                f("%s is not PatternExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not PatternExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -962,7 +951,8 @@ public Optional<PatternExpr> toPatternExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifPatternExpr(Consumer<PatternExpr> action) {}
+    public void ifPatternExpr(Consumer<PatternExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyEscapeExpression() {
@@ -971,8 +961,7 @@ public boolean isKeyEscapeExpression() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public KeyEscapeExpression asKeyEscapeExpression() {
-        throw new IllegalStateException(f(
-                "%s is not KeyEscapeExpression, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not KeyEscapeExpression, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -981,44 +970,32 @@ public Optional<KeyEscapeExpression> toKeyEscapeExpression() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyEscapeExpression(Consumer<KeyEscapeExpression> action) {}
+    public void ifKeyEscapeExpression(Consumer<KeyEscapeExpression> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyRangeExpression() {
         return false;
     }
 
-    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyRangeExpression asKeyRangeExpression() {
-        throw new IllegalStateException(f(
-                "%s is not KeyRangeExpression, it is %s", this, this.getClass().getSimpleName()));
-    }
-
-    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyRangeExpression> toKeyRangeExpression() {
-        return Optional.empty();
-    }
-
-    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyRangeExpression(Consumer<KeyRangeExpression> action) {}
-
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyTransactionStatement() {
         return true;
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyTransactionStatement asKeyTransactionStatement() {
+    public KeyTransactionStmt asKeyTransactionStatement() {
         return null;
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyTransactionStatement> toKeyTransactionStatement() {
+    public Optional<KeyTransactionStmt> toKeyTransactionStatement() {
         return Optional.empty();
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyTransactionStatement(Consumer<KeyTransactionStatement> action) {}
+    public void ifKeyTransactionStatement(Consumer<KeyTransactionStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyExpressionSV() {
@@ -1027,8 +1004,7 @@ public boolean isKeyExpressionSV() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public KeyExpressionSV asKeyExpressionSV() {
-        throw new IllegalStateException(
-                f("%s is not KeyExpressionSV, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not KeyExpressionSV, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1037,7 +1013,8 @@ public Optional<KeyExpressionSV> toKeyExpressionSV() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyExpressionSV(Consumer<KeyExpressionSV> action) {}
+    public void ifKeyExpressionSV(Consumer<KeyExpressionSV> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyMetaConstructExpression() {
@@ -1046,9 +1023,7 @@ public boolean isKeyMetaConstructExpression() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public KeyMetaConstructExpression asKeyMetaConstructExpression() {
-        throw new IllegalStateException(f(
-                "%s is not KeyMetaConstructExpression, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not KeyMetaConstructExpression, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1057,7 +1032,8 @@ public Optional<KeyMetaConstructExpression> toKeyMetaConstructExpression() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyMetaConstructExpression(Consumer<KeyMetaConstructExpression> action) {}
+    public void ifKeyMetaConstructExpression(Consumer<KeyMetaConstructExpression> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyPassiveExpression() {
@@ -1066,9 +1042,7 @@ public boolean isKeyPassiveExpression() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public KeyPassiveExpression asKeyPassiveExpression() {
-        throw new IllegalStateException(f(
-                "%s is not KeyPassiveExpression, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not KeyPassiveExpression, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1077,7 +1051,8 @@ public Optional<KeyPassiveExpression> toKeyPassiveExpression() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyPassiveExpression(Consumer<KeyPassiveExpression> action) {}
+    public void ifKeyPassiveExpression(Consumer<KeyPassiveExpression> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyProgramVariableSV() {
@@ -1086,9 +1061,7 @@ public boolean isKeyProgramVariableSV() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public KeyProgramVariableSV asKeyProgramVariableSV() {
-        throw new IllegalStateException(f(
-                "%s is not KeyProgramVariableSV, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not KeyProgramVariableSV, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1097,17 +1070,17 @@ public Optional<KeyProgramVariableSV> toKeyProgramVariableSV() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyProgramVariableSV(Consumer<KeyProgramVariableSV> action) {}
+    public void ifKeyProgramVariableSV(Consumer<KeyProgramVariableSV> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ComponentPatternExpr asComponentPatternExpr() {
-        throw new IllegalStateException(f(
-                "%s is not ComponentPatternExpr, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ComponentPatternExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifRecordPatternExpr(Consumer<RecordPatternExpr> action) {}
+    public void ifRecordPatternExpr(Consumer<RecordPatternExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlBindingExpr() {
@@ -1116,8 +1089,7 @@ public boolean isJmlBindingExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlQuantifiedExpr asJmlBindingExpr() {
-        throw new IllegalStateException(
-                f("%s is not JmlBindingExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlBindingExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1126,7 +1098,8 @@ public Optional<JmlQuantifiedExpr> toJmlBindingExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlBindingExpr(Consumer<JmlQuantifiedExpr> action) {}
+    public void ifJmlBindingExpr(Consumer<JmlQuantifiedExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlFunction() {
@@ -1140,8 +1113,7 @@ public boolean isJmlLabel() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlLabelExpr asJmlLabel() {
-        throw new IllegalStateException(
-                f("%s is not JmlLabel, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlLabel, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1150,7 +1122,8 @@ public Optional<JmlLabelExpr> toJmlLabel() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlLabel(Consumer<JmlLabelExpr> action) {}
+    public void ifJmlLabel(Consumer<JmlLabelExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlLetExpr() {
@@ -1159,8 +1132,7 @@ public boolean isJmlLetExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlLetExpr asJmlLetExpr() {
-        throw new IllegalStateException(
-                f("%s is not JmlLetExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlLetExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1169,7 +1141,8 @@ public Optional<JmlLetExpr> toJmlLetExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlLetExpr(Consumer<JmlLetExpr> action) {}
+    public void ifJmlLetExpr(Consumer<JmlLetExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlMultiCompareExpr() {
@@ -1178,8 +1151,7 @@ public boolean isJmlMultiCompareExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlMultiCompareExpr asJmlMultiCompareExpr() {
-        throw new IllegalStateException(f(
-                "%s is not JmlMultiCompareExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlMultiCompareExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1188,7 +1160,8 @@ public Optional<JmlMultiCompareExpr> toJmlMultiCompareExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlMultiCompareExpr(Consumer<JmlMultiCompareExpr> action) {}
+    public void ifJmlMultiCompareExpr(Consumer<JmlMultiCompareExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlQuantifiedExpr() {
@@ -1197,8 +1170,7 @@ public boolean isJmlQuantifiedExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlQuantifiedExpr asJmlQuantifiedExpr() {
-        throw new IllegalStateException(
-                f("%s is not JmlQuantifiedExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlQuantifiedExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1207,7 +1179,8 @@ public Optional<JmlQuantifiedExpr> toJmlQuantifiedExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlQuantifiedExpr(Consumer<JmlQuantifiedExpr> action) {}
+    public void ifJmlQuantifiedExpr(Consumer<JmlQuantifiedExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlSetComprehension() {
@@ -1216,9 +1189,7 @@ public boolean isJmlSetComprehension() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlSetComprehensionExpr asJmlSetComprehension() {
-        throw new IllegalStateException(f(
-                "%s is not JmlSetComprehensionExpr, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlSetComprehensionExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1227,7 +1198,8 @@ public Optional<JmlSetComprehensionExpr> toJmlSetComprehension() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlSetComprehension(Consumer<JmlSetComprehensionExpr> action) {}
+    public void ifJmlSetComprehension(Consumer<JmlSetComprehensionExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isLocationSetArrayAccess() {
@@ -1286,8 +1258,7 @@ public boolean isJmlBinaryInfixExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlBinaryInfixExpr asJmlBinaryInfixExpr() {
-        throw new IllegalStateException(f(
-                "%s is not JmlBinaryInfixExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlBinaryInfixExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1296,7 +1267,8 @@ public Optional<JmlBinaryInfixExpr> toJmlBinaryInfixExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlBinaryInfixExpr(Consumer<JmlBinaryInfixExpr> action) {}
+    public void ifJmlBinaryInfixExpr(Consumer<JmlBinaryInfixExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlLabelExpr() {
@@ -1305,8 +1277,7 @@ public boolean isJmlLabelExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlLabelExpr asJmlLabelExpr() {
-        throw new IllegalStateException(
-                f("%s is not JmlLabelExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlLabelExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1315,7 +1286,8 @@ public Optional<JmlLabelExpr> toJmlLabelExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlLabelExpr(Consumer<JmlLabelExpr> action) {}
+    public void ifJmlLabelExpr(Consumer<JmlLabelExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlTypeExpr() {
@@ -1324,8 +1296,7 @@ public boolean isJmlTypeExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlTypeExpr asJmlTypeExpr() {
-        throw new IllegalStateException(
-                f("%s is not JmlTypeExpr, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlTypeExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1334,7 +1305,8 @@ public Optional<JmlTypeExpr> toJmlTypeExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlTypeExpr(Consumer<JmlTypeExpr> action) {}
+    public void ifJmlTypeExpr(Consumer<JmlTypeExpr> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlSetComprehensionExpr() {
@@ -1343,9 +1315,7 @@ public boolean isJmlSetComprehensionExpr() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlSetComprehensionExpr asJmlSetComprehensionExpr() {
-        throw new IllegalStateException(f(
-                "%s is not JmlSetComprehensionExpr, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlSetComprehensionExpr, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -1354,5 +1324,6 @@ public Optional<JmlSetComprehensionExpr> toJmlSetComprehensionExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlSetComprehensionExpr(Consumer<JmlSetComprehensionExpr> action) {}
+    public void ifJmlSetComprehensionExpr(Consumer<JmlSetComprehensionExpr> action) {
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
index ac535cacec..96d3540ef8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/FieldAccessExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -54,11 +53,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class FieldAccessExpr extends Expression
-        implements NodeWithSimpleName<FieldAccessExpr>,
-                NodeWithTypeArguments<FieldAccessExpr>,
-                NodeWithScope<FieldAccessExpr>,
-                Resolvable<ResolvedValueDeclaration> {
+public class FieldAccessExpr extends Expression implements NodeWithSimpleName<FieldAccessExpr>, NodeWithTypeArguments<FieldAccessExpr>, NodeWithScope<FieldAccessExpr>, Resolvable<ResolvedValueDeclaration> {
 
     private Expression scope;
 
@@ -121,7 +116,8 @@ public FieldAccessExpr setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -145,7 +141,8 @@ public FieldAccessExpr setScope(final @NonNull() Expression scope) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.SCOPE, this.scope, scope);
-        if (this.scope != null) this.scope.setParentNode(null);
+        if (this.scope != null)
+            this.scope.setParentNode(null);
         this.scope = scope;
         setAsParentNodeOf(scope);
         return this;
@@ -168,7 +165,8 @@ public FieldAccessExpr setTypeArguments(final @Nullable() NodeList<Type> typeArg
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments);
-        if (this.typeArguments != null) this.typeArguments.setParentNode(null);
+        if (this.typeArguments != null)
+            this.typeArguments.setParentNode(null);
         this.typeArguments = typeArguments;
         setAsParentNodeOf(typeArguments);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java
index 84e29caf7a..a8f3247431 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/InstanceOfExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -98,8 +97,7 @@
  * @see <a href="https://bugs.openjdk.java.net/browse/JDK-8181287">JEP305: https://bugs.openjdk.java.net/browse/JDK-8181287</a>
  * @see <a href="https://docs.oracle.com/javase/specs/jls/se11/html/jls-15.html#jls-15.20">https://docs.oracle.com/javase/specs/jls/se11/html/jls-15.html#jls-15.20</a>
  */
-public class InstanceOfExpr extends Expression
-        implements NodeWithType<InstanceOfExpr, ReferenceType>, NodeWithExpression<InstanceOfExpr> {
+public class InstanceOfExpr extends Expression implements NodeWithType<InstanceOfExpr, ReferenceType>, NodeWithExpression<InstanceOfExpr> {
 
     private Expression expression;
 
@@ -258,7 +256,8 @@ public InstanceOfExpr setExpression(final @NonNull() Expression expression) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
@@ -270,7 +269,8 @@ public InstanceOfExpr setPattern(final @Nullable() PatternExpr pattern) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.PATTERN, this.pattern, pattern);
-        if (this.pattern != null) this.pattern.setParentNode(null);
+        if (this.pattern != null)
+            this.pattern.setParentNode(null);
         this.pattern = pattern;
         setAsParentNodeOf(pattern);
         return this;
@@ -283,7 +283,8 @@ public InstanceOfExpr setType(final @NonNull() ReferenceType type) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
-        if (this.type != null) this.type.setParentNode(null);
+        if (this.type != null)
+            this.type.setParentNode(null);
         this.type = type;
         setAsParentNodeOf(type);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
index fbd386fc9b..8ed8156d76 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.hasUnaryMinusAsParent;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -33,6 +32,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * All ways to specify an int literal.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java
index 2b6bd13221..b1e41c5c67 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LambdaExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -114,8 +113,7 @@ public LambdaExpr(NodeList<Parameter> parameters, Statement body, boolean isEncl
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public LambdaExpr(
-            TokenRange tokenRange, NodeList<Parameter> parameters, Statement body, boolean isEnclosingParameters) {
+    public LambdaExpr(TokenRange tokenRange, NodeList<Parameter> parameters, Statement body, boolean isEnclosingParameters) {
         super(tokenRange);
         setParameters(parameters);
         setBody(body);
@@ -135,7 +133,8 @@ public LambdaExpr setParameters(final @NonNull() NodeList<Parameter> parameters)
             return this;
         }
         notifyPropertyChange(ObservableProperty.PARAMETERS, this.parameters, parameters);
-        if (this.parameters != null) this.parameters.setParentNode(null);
+        if (this.parameters != null)
+            this.parameters.setParentNode(null);
         this.parameters = parameters;
         setAsParentNodeOf(parameters);
         return this;
@@ -156,7 +155,8 @@ public LambdaExpr setBody(final @NonNull() Statement body) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BODY, this.body, body);
-        if (this.body != null) this.body.setParentNode(null);
+        if (this.body != null)
+            this.body.setParentNode(null);
         this.body = body;
         setAsParentNodeOf(body);
         return this;
@@ -185,8 +185,7 @@ public LambdaExpr setEnclosingParameters(final boolean isEnclosingParameters) {
         if (isEnclosingParameters == this.isEnclosingParameters) {
             return this;
         }
-        notifyPropertyChange(
-                ObservableProperty.ENCLOSING_PARAMETERS, this.isEnclosingParameters, isEnclosingParameters);
+        notifyPropertyChange(ObservableProperty.ENCLOSING_PARAMETERS, this.isEnclosingParameters, isEnclosingParameters);
         this.isEnclosingParameters = isEnclosingParameters;
         return this;
     }
@@ -312,7 +311,8 @@ public LambdaExpr setContracts(final @NonNull() NodeList<JmlContract> contracts)
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONTRACTS, this.contracts, contracts);
-        if (this.contracts != null) this.contracts.setParentNode(null);
+        if (this.contracts != null)
+            this.contracts.setParentNode(null);
         this.contracts = contracts;
         setAsParentNodeOf(contracts);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java
index 48ec8f5fcc..322367069c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralExpr.java
@@ -28,6 +28,7 @@
 import com.github.javaparser.metamodel.LiteralExprMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * A base class for all literal expressions.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralStringValueExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralStringValueExpr.java
index 066a17db25..abcac4ee80 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralStringValueExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LiteralStringValueExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -33,6 +32,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.Node;
 
 /**
  * Any literal value that is stored internally as a String.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java
index 8ec85caa5d..2f75141337 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/LongLiteralExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.hasUnaryMinusAsParent;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -34,6 +33,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * All ways to specify a long literal.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
index 277db2f286..7b5f7d09b9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.StaticJavaParser.parseName;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -32,6 +31,7 @@
 import com.github.javaparser.metamodel.MarkerAnnotationExprMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * An annotation that uses only the annotation type name.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MatchAllPatternExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MatchAllPatternExpr.java
index 7d40ada70c..9a0ef84fe9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MatchAllPatternExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MatchAllPatternExpr.java
@@ -20,7 +20,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -84,7 +83,8 @@ public MatchAllPatternExpr setModifiers(final @NonNull() NodeList<Modifier> modi
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java
index 1c67be40d7..b1d3d811b8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MemberValuePair.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -101,7 +100,8 @@ public MemberValuePair setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -114,7 +114,8 @@ public MemberValuePair setValue(final @NonNull() Expression value) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.VALUE, this.value, value);
-        if (this.value != null) this.value.setParentNode(null);
+        if (this.value != null)
+            this.value.setParentNode(null);
         this.value = value;
         setAsParentNodeOf(value);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java
index b8c9c4bfc3..852875a52e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodCallExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -56,12 +55,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class MethodCallExpr extends Expression
-        implements NodeWithTypeArguments<MethodCallExpr>,
-                NodeWithArguments<MethodCallExpr>,
-                NodeWithSimpleName<MethodCallExpr>,
-                NodeWithOptionalScope<MethodCallExpr>,
-                Resolvable<ResolvedMethodDeclaration> {
+public class MethodCallExpr extends Expression implements NodeWithTypeArguments<MethodCallExpr>, NodeWithArguments<MethodCallExpr>, NodeWithSimpleName<MethodCallExpr>, NodeWithOptionalScope<MethodCallExpr>, Resolvable<ResolvedMethodDeclaration> {
 
     @OptionalProperty
     private Expression scope;
@@ -93,11 +87,7 @@ public MethodCallExpr(final Expression scope, final String name, final NodeList<
         this(null, scope, null, new SimpleName(name), arguments);
     }
 
-    public MethodCallExpr(
-            final Expression scope,
-            final NodeList<Type> typeArguments,
-            final String name,
-            final NodeList<Expression> arguments) {
+    public MethodCallExpr(final Expression scope, final NodeList<Type> typeArguments, final String name, final NodeList<Expression> arguments) {
         this(null, scope, typeArguments, new SimpleName(name), arguments);
     }
 
@@ -106,11 +96,7 @@ public MethodCallExpr(final Expression scope, final SimpleName name, final NodeL
     }
 
     @AllFieldsConstructor
-    public MethodCallExpr(
-            final Expression scope,
-            final NodeList<Type> typeArguments,
-            final SimpleName name,
-            final NodeList<Expression> arguments) {
+    public MethodCallExpr(final Expression scope, final NodeList<Type> typeArguments, final SimpleName name, final NodeList<Expression> arguments) {
         this(null, scope, typeArguments, name, arguments);
     }
 
@@ -118,12 +104,7 @@ public MethodCallExpr(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public MethodCallExpr(
-            TokenRange tokenRange,
-            Expression scope,
-            NodeList<Type> typeArguments,
-            SimpleName name,
-            NodeList<Expression> arguments) {
+    public MethodCallExpr(TokenRange tokenRange, Expression scope, NodeList<Type> typeArguments, SimpleName name, NodeList<Expression> arguments) {
         super(tokenRange);
         setScope(scope);
         setTypeArguments(typeArguments);
@@ -166,7 +147,8 @@ public MethodCallExpr setArguments(final @NonNull() NodeList<Expression> argumen
             return this;
         }
         notifyPropertyChange(ObservableProperty.ARGUMENTS, this.arguments, arguments);
-        if (this.arguments != null) this.arguments.setParentNode(null);
+        if (this.arguments != null)
+            this.arguments.setParentNode(null);
         this.arguments = arguments;
         setAsParentNodeOf(arguments);
         return this;
@@ -179,7 +161,8 @@ public MethodCallExpr setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -191,7 +174,8 @@ public MethodCallExpr setScope(final @Nullable() Expression scope) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.SCOPE, this.scope, scope);
-        if (this.scope != null) this.scope.setParentNode(null);
+        if (this.scope != null)
+            this.scope.setParentNode(null);
         this.scope = scope;
         setAsParentNodeOf(scope);
         return this;
@@ -214,7 +198,8 @@ public MethodCallExpr setTypeArguments(final @Nullable() NodeList<Type> typeArgu
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments);
-        if (this.typeArguments != null) this.typeArguments.setParentNode(null);
+        if (this.typeArguments != null)
+            this.typeArguments.setParentNode(null);
         this.typeArguments = typeArguments;
         setAsParentNodeOf(typeArguments);
         return this;
@@ -366,8 +351,7 @@ public boolean isPolyExpression() {
         // 3. The method to be invoked, as determined by the following subsections, is generic (§8.4.4) and has a
         // return type that mentions at least one of the method's type parameters.
         // A method is generic if it declares one or more type variables (§4.4).
-        if (isGenericMethod()
-                && hasParameterwithSameTypeThanResultType(resolve().getReturnType())) {
+        if (isGenericMethod() && hasParameterwithSameTypeThanResultType(resolve().getReturnType())) {
             // it's a poly expression
             return true;
         }
@@ -387,9 +371,7 @@ private boolean isGenericMethod() {
      *  return true if at least one of the method's type parameters has the same type as the specified type .
      */
     private boolean hasParameterwithSameTypeThanResultType(ResolvedType resolvedReturnType) {
-        return getTypeArguments().isPresent()
-                && getTypeArguments().get().stream()
-                        .anyMatch(argType -> argType.resolve().isAssignableBy(resolvedReturnType));
+        return getTypeArguments().isPresent() && getTypeArguments().get().stream().anyMatch(argType -> argType.resolve().isAssignableBy(resolvedReturnType));
     }
 
     /*
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java
index b96667e252..06f6b1589b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/MethodReferenceExpr.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -58,10 +57,7 @@
  *
  * @author Raquel Pau
  */
-public class MethodReferenceExpr extends Expression
-        implements NodeWithTypeArguments<MethodReferenceExpr>,
-                NodeWithIdentifier<MethodReferenceExpr>,
-                Resolvable<ResolvedMethodDeclaration> {
+public class MethodReferenceExpr extends Expression implements NodeWithTypeArguments<MethodReferenceExpr>, NodeWithIdentifier<MethodReferenceExpr>, Resolvable<ResolvedMethodDeclaration> {
 
     private Expression scope;
 
@@ -84,8 +80,7 @@ public MethodReferenceExpr(Expression scope, NodeList<Type> typeArguments, Strin
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public MethodReferenceExpr(
-            TokenRange tokenRange, Expression scope, NodeList<Type> typeArguments, String identifier) {
+    public MethodReferenceExpr(TokenRange tokenRange, Expression scope, NodeList<Type> typeArguments, String identifier) {
         super(tokenRange);
         setScope(scope);
         setTypeArguments(typeArguments);
@@ -117,7 +112,8 @@ public MethodReferenceExpr setScope(final @NonNull() Expression scope) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.SCOPE, this.scope, scope);
-        if (this.scope != null) this.scope.setParentNode(null);
+        if (this.scope != null)
+            this.scope.setParentNode(null);
         this.scope = scope;
         setAsParentNodeOf(scope);
         return this;
@@ -140,7 +136,8 @@ public MethodReferenceExpr setTypeArguments(final @Nullable() NodeList<Type> typ
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments);
-        if (this.typeArguments != null) this.typeArguments.setParentNode(null);
+        if (this.typeArguments != null)
+            this.typeArguments.setParentNode(null);
         this.typeArguments = typeArguments;
         setAsParentNodeOf(typeArguments);
         return this;
@@ -264,11 +261,7 @@ public boolean isPolyExpression() {
      * If they are different, we consider it to be a primary expression.
      */
     public boolean isScopePrimaryExpr() {
-        return !getScope()
-                .calculateResolvedType()
-                .erasure()
-                .describe()
-                .endsWith(getScope().toString());
+        return !getScope().calculateResolvedType().erasure().describe().endsWith(getScope().toString());
     }
 
     @com.github.javaparser.ast.key.IgnoreLexPrinting()
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
index e199b6b2a5..4129f7d838 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/Name.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -137,7 +136,8 @@ public Name setQualifier(final @Nullable() Name qualifier) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.QUALIFIER, this.qualifier, qualifier);
-        if (this.qualifier != null) this.qualifier.setParentNode(null);
+        if (this.qualifier != null)
+            this.qualifier.setParentNode(null);
         this.qualifier = qualifier;
         setAsParentNodeOf(qualifier);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java
index 73eb739b07..00c0f99866 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NameExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -100,7 +99,8 @@ public NameExpr setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
index 8ea0d511c6..bac98b7b4a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -89,7 +88,8 @@ public NormalAnnotationExpr setPairs(final @NonNull() NodeList<MemberValuePair>
             return this;
         }
         notifyPropertyChange(ObservableProperty.PAIRS, this.pairs, pairs);
-        if (this.pairs != null) this.pairs.setParentNode(null);
+        if (this.pairs != null)
+            this.pairs.setParentNode(null);
         this.pairs = pairs;
         setAsParentNodeOf(pairs);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java
index 1257a95317..734c1bf963 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/NullLiteralExpr.java
@@ -30,6 +30,7 @@
 import com.github.javaparser.metamodel.NullLiteralExprMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * A literal "null".
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java
index 52fbfb8b2c..4faac5a4e4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ObjectCreationExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -61,12 +60,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class ObjectCreationExpr extends Expression
-        implements NodeWithTypeArguments<ObjectCreationExpr>,
-                NodeWithType<ObjectCreationExpr, ClassOrInterfaceType>,
-                NodeWithArguments<ObjectCreationExpr>,
-                NodeWithOptionalScope<ObjectCreationExpr>,
-                Resolvable<ResolvedConstructorDeclaration> {
+public class ObjectCreationExpr extends Expression implements NodeWithTypeArguments<ObjectCreationExpr>, NodeWithType<ObjectCreationExpr, ClassOrInterfaceType>, NodeWithArguments<ObjectCreationExpr>, NodeWithOptionalScope<ObjectCreationExpr>, Resolvable<ResolvedConstructorDeclaration> {
 
     @OptionalProperty
     private Expression scope;
@@ -92,18 +86,12 @@ public ObjectCreationExpr() {
      * @param type this is the class that the constructor is being called for.
      * @param arguments Any arguments to pass to the constructor
      */
-    public ObjectCreationExpr(
-            final Expression scope, final ClassOrInterfaceType type, final NodeList<Expression> arguments) {
+    public ObjectCreationExpr(final Expression scope, final ClassOrInterfaceType type, final NodeList<Expression> arguments) {
         this(null, scope, type, null, arguments, null);
     }
 
     @AllFieldsConstructor
-    public ObjectCreationExpr(
-            final Expression scope,
-            final ClassOrInterfaceType type,
-            final NodeList<Type> typeArguments,
-            final NodeList<Expression> arguments,
-            final NodeList<BodyDeclaration<?>> anonymousClassBody) {
+    public ObjectCreationExpr(final Expression scope, final ClassOrInterfaceType type, final NodeList<Type> typeArguments, final NodeList<Expression> arguments, final NodeList<BodyDeclaration<?>> anonymousClassBody) {
         this(null, scope, type, typeArguments, arguments, anonymousClassBody);
     }
 
@@ -111,13 +99,7 @@ public ObjectCreationExpr(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public ObjectCreationExpr(
-            TokenRange tokenRange,
-            Expression scope,
-            ClassOrInterfaceType type,
-            NodeList<Type> typeArguments,
-            NodeList<Expression> arguments,
-            NodeList<BodyDeclaration<?>> anonymousClassBody) {
+    public ObjectCreationExpr(TokenRange tokenRange, Expression scope, ClassOrInterfaceType type, NodeList<Type> typeArguments, NodeList<Expression> arguments, NodeList<BodyDeclaration<?>> anonymousClassBody) {
         super(tokenRange);
         setScope(scope);
         setType(type);
@@ -145,7 +127,8 @@ public Optional<NodeList<BodyDeclaration<?>>> getAnonymousClassBody() {
     }
 
     public void addAnonymousClassBody(BodyDeclaration<?> body) {
-        if (anonymousClassBody == null) anonymousClassBody = new NodeList<>();
+        if (anonymousClassBody == null)
+            anonymousClassBody = new NodeList<>();
         anonymousClassBody.add(body);
     }
 
@@ -178,7 +161,8 @@ public ObjectCreationExpr setAnonymousClassBody(final @Nullable() NodeList<BodyD
             return this;
         }
         notifyPropertyChange(ObservableProperty.ANONYMOUS_CLASS_BODY, this.anonymousClassBody, anonymousClassBody);
-        if (this.anonymousClassBody != null) this.anonymousClassBody.setParentNode(null);
+        if (this.anonymousClassBody != null)
+            this.anonymousClassBody.setParentNode(null);
         this.anonymousClassBody = anonymousClassBody;
         setAsParentNodeOf(anonymousClassBody);
         return this;
@@ -191,7 +175,8 @@ public ObjectCreationExpr setArguments(final @NonNull() NodeList<Expression> arg
             return this;
         }
         notifyPropertyChange(ObservableProperty.ARGUMENTS, this.arguments, arguments);
-        if (this.arguments != null) this.arguments.setParentNode(null);
+        if (this.arguments != null)
+            this.arguments.setParentNode(null);
         this.arguments = arguments;
         setAsParentNodeOf(arguments);
         return this;
@@ -209,7 +194,8 @@ public ObjectCreationExpr setScope(final @Nullable() Expression scope) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.SCOPE, this.scope, scope);
-        if (this.scope != null) this.scope.setParentNode(null);
+        if (this.scope != null)
+            this.scope.setParentNode(null);
         this.scope = scope;
         setAsParentNodeOf(scope);
         return this;
@@ -222,7 +208,8 @@ public ObjectCreationExpr setType(final @NonNull() ClassOrInterfaceType type) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
-        if (this.type != null) this.type.setParentNode(null);
+        if (this.type != null)
+            this.type.setParentNode(null);
         this.type = type;
         setAsParentNodeOf(type);
         return this;
@@ -245,7 +232,8 @@ public ObjectCreationExpr setTypeArguments(final @Nullable() NodeList<Type> type
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments);
-        if (this.typeArguments != null) this.typeArguments.setParentNode(null);
+        if (this.typeArguments != null)
+            this.typeArguments.setParentNode(null);
         this.typeArguments = typeArguments;
         setAsParentNodeOf(typeArguments);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/PatternExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/PatternExpr.java
index c154fbd576..9a5e4e0b21 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/PatternExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/PatternExpr.java
@@ -20,7 +20,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.nodeTypes.NodeWithType;
@@ -49,7 +48,8 @@ public abstract class PatternExpr extends ComponentPatternExpr implements NodeWi
     private Type type;
 
     @AllFieldsConstructor
-    public PatternExpr(Type type) {}
+    public PatternExpr(Type type) {
+    }
 
     /**
      * This constructor is used by the parser and is considered private.
@@ -73,7 +73,8 @@ public PatternExpr setType(final @NonNull() Type type) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
-        if (this.type != null) this.type.setParentNode(null);
+        if (this.type != null)
+            this.type.setParentNode(null);
         this.type = type;
         setAsParentNodeOf(type);
         return this;
@@ -85,7 +86,8 @@ public <R, A> R accept(GenericVisitor<R, A> v, A arg) {
     }
 
     @Override
-    public <A> void accept(VoidVisitor<A> v, A arg) {}
+    public <A> void accept(VoidVisitor<A> v, A arg) {
+    }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/RecordPatternExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/RecordPatternExpr.java
index eb8b39e920..1a751c61a1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/RecordPatternExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/RecordPatternExpr.java
@@ -20,7 +20,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -89,8 +88,7 @@ public RecordPatternExpr() {
     }
 
     @AllFieldsConstructor
-    public RecordPatternExpr(
-            final NodeList<Modifier> modifiers, final Type type, final NodeList<ComponentPatternExpr> patternList) {
+    public RecordPatternExpr(final NodeList<Modifier> modifiers, final Type type, final NodeList<ComponentPatternExpr> patternList) {
         this(null, modifiers, type, patternList);
     }
 
@@ -127,7 +125,8 @@ public RecordPatternExpr setModifiers(final @NonNull() NodeList<Modifier> modifi
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
@@ -163,7 +162,8 @@ public RecordPatternExpr setPatternList(final @NonNull() NodeList<ComponentPatte
             return this;
         }
         notifyPropertyChange(ObservableProperty.PATTERN_LIST, this.patternList, patternList);
-        if (this.patternList != null) this.patternList.setParentNode(null);
+        if (this.patternList != null)
+            this.patternList.setParentNode(null);
         this.patternList = patternList;
         setAsParentNodeOf(patternList);
         return this;
@@ -227,11 +227,7 @@ public RecordPatternExprMetaModel getMetaModel() {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public RecordPatternExpr(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            Type type,
-            NodeList<ComponentPatternExpr> patternList) {
+    public RecordPatternExpr(TokenRange tokenRange, NodeList<Modifier> modifiers, Type type, NodeList<ComponentPatternExpr> patternList) {
         super(tokenRange, type);
         setModifiers(modifiers);
         setPatternList(patternList);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java
index 3d4c6e4a2f..b4127d4e1d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SimpleName.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
index 1b1a0e847b..f1579a327d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -89,7 +88,8 @@ public SingleMemberAnnotationExpr setMemberValue(final @NonNull() Expression mem
             return this;
         }
         notifyPropertyChange(ObservableProperty.MEMBER_VALUE, this.memberValue, memberValue);
-        if (this.memberValue != null) this.memberValue.setParentNode(null);
+        if (this.memberValue != null)
+            this.memberValue.setParentNode(null);
         this.memberValue = memberValue;
         setAsParentNodeOf(memberValue);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java
index bf07a2819e..55ce6e72a0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/StringLiteralExpr.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.StringEscapeUtils.escapeJava;
 import static com.github.javaparser.utils.StringEscapeUtils.unescapeJava;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -34,6 +33,7 @@
 import com.github.javaparser.utils.Utils;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * A literal string.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java
index 72d854ebc9..a19b6b9dfc 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SuperExpr.java
@@ -34,6 +34,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.Nullable;
+import java.util.Objects;
 
 /**
  * An occurrence of the "super" keyword. <br>
@@ -93,7 +94,8 @@ public SuperExpr setTypeName(final @Nullable() Name typeName) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_NAME, this.typeName, typeName);
-        if (this.typeName != null) this.typeName.setParentNode(null);
+        if (this.typeName != null)
+            this.typeName.setParentNode(null);
         this.typeName = typeName;
         setAsParentNodeOf(typeName);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SwitchExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SwitchExpr.java
index ec675b183a..212f5262ee 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SwitchExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/SwitchExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -119,7 +118,8 @@ public SwitchExpr setEntries(final @NonNull() NodeList<SwitchEntry> entries) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.ENTRIES, this.entries, entries);
-        if (this.entries != null) this.entries.setParentNode(null);
+        if (this.entries != null)
+            this.entries.setParentNode(null);
         this.entries = entries;
         setAsParentNodeOf(entries);
         return this;
@@ -132,7 +132,8 @@ public SwitchExpr setSelector(final @NonNull() Expression selector) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.SELECTOR, this.selector, selector);
-        if (this.selector != null) this.selector.setParentNode(null);
+        if (this.selector != null)
+            this.selector.setParentNode(null);
         this.selector = selector;
         setAsParentNodeOf(selector);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TextBlockLiteralExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TextBlockLiteralExpr.java
index 19a82bc1e4..c7bc3a3c53 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TextBlockLiteralExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TextBlockLiteralExpr.java
@@ -23,7 +23,6 @@
 import static com.github.javaparser.utils.StringEscapeUtils.unescapeJavaTextBlock;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.IntStream.range;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -37,6 +36,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
+import com.github.javaparser.ast.Node;
 
 /**
  * <h1>A text block</h1>
@@ -131,18 +131,11 @@ public Stream<String> stripIndentOfLines() {
         /* If the last line in the list of individual lines (i.e., the line with the closing delimiter) is blank, then add it to the set of determining lines.
         (The indentation of the closing delimiter should influence the indentation of the content as a whole -- a "significant trailing line" policy.) */
         /* Compute the common white space prefix of the set of determining lines, by counting the number of leading white space characters on each line and taking the minimum count. */
-        int commonWhiteSpacePrefixSize = range(0, rawLines.length)
-                .mapToObj(nr -> new Pair<>(nr, rawLines[nr]))
-                .filter(l -> !emptyOrWhitespace(l.b) || isLastLine(rawLines, l.a))
-                .map(l -> indentSize(l.b))
-                .min(Integer::compare)
-                .orElse(0);
+        int commonWhiteSpacePrefixSize = range(0, rawLines.length).mapToObj(nr -> new Pair<>(nr, rawLines[nr])).filter(l -> !emptyOrWhitespace(l.b) || isLastLine(rawLines, l.a)).map(l -> indentSize(l.b)).min(Integer::compare).orElse(0);
         /* Remove the common white space prefix from each non-blank line in the list of individual lines. */
         /* Remove all trailing white space from all lines in the modified list of individual lines from step 5.
         This step collapses wholly-whitespace lines in the modified list so that they are empty, but does not discard them. */
-        return Arrays.stream(rawLines)
-                .map(l -> l.length() < commonWhiteSpacePrefixSize ? l : l.substring(commonWhiteSpacePrefixSize))
-                .map(this::trimTrailing);
+        return Arrays.stream(rawLines).map(l -> l.length() < commonWhiteSpacePrefixSize ? l : l.substring(commonWhiteSpacePrefixSize)).map(this::trimTrailing);
     }
 
     /**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java
index 8880c136e8..bc015d4334 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/ThisExpr.java
@@ -36,6 +36,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.Nullable;
+import java.util.Objects;
 
 /**
  * An occurrence of the "this" keyword. <br>
@@ -95,7 +96,8 @@ public ThisExpr setTypeName(final @Nullable() Name typeName) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_NAME, this.typeName, typeName);
-        if (this.typeName != null) this.typeName.setParentNode(null);
+        if (this.typeName != null)
+            this.typeName.setParentNode(null);
         this.typeName = typeName;
         setAsParentNodeOf(typeName);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java
index 7b5f9927ab..aef010e6ef 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypeExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -94,7 +93,8 @@ public TypeExpr setType(final @NonNull() Type type) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
-        if (this.type != null) this.type.setParentNode(null);
+        if (this.type != null)
+            this.type.setParentNode(null);
         this.type = type;
         setAsParentNodeOf(type);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypePatternExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypePatternExpr.java
index 6af3cfacdc..2f75e88150 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypePatternExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/TypePatternExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.nodeTypes.NodeWithSimpleName;
@@ -73,8 +72,7 @@
  * @see <a href="https://bugs.openjdk.java.net/browse/JDK-8181287">JEP305: https://bugs.openjdk.java.net/browse/JDK-8181287</a>
  * @see <a href="https://docs.oracle.com/javase/specs/jls/se11/html/jls-15.html#jls-15.20">https://docs.oracle.com/javase/specs/jls/se11/html/jls-15.html#jls-15.20</a>
  */
-public class TypePatternExpr extends PatternExpr
-        implements NodeWithSimpleName<TypePatternExpr>, NodeWithFinalModifier<TypePatternExpr> {
+public class TypePatternExpr extends PatternExpr implements NodeWithSimpleName<TypePatternExpr>, NodeWithFinalModifier<TypePatternExpr> {
 
     private NodeList<Modifier> modifiers;
 
@@ -124,7 +122,8 @@ public TypePatternExpr setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -173,7 +172,8 @@ public TypePatternExpr setModifiers(final @NonNull() NodeList<Modifier> modifier
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java
index 462d6ccfaa..99c3d19de2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/UnaryExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -53,6 +52,7 @@
 public class UnaryExpr extends Expression implements NodeWithExpression<UnaryExpr> {
 
     public enum Operator implements Stringable {
+
         PLUS("+", false),
         MINUS("-", false),
         PREFIX_INCREMENT("++", false),
@@ -137,7 +137,8 @@ public UnaryExpr setExpression(final @NonNull() Expression expression) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
index 6f4f4f772a..7b23207fb7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.ast.NodeList.nodeList;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.VariableDeclarator;
@@ -55,10 +54,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class VariableDeclarationExpr extends Expression
-        implements NodeWithFinalModifier<VariableDeclarationExpr>,
-                NodeWithAnnotations<VariableDeclarationExpr>,
-                NodeWithVariables<VariableDeclarationExpr> {
+public class VariableDeclarationExpr extends Expression implements NodeWithFinalModifier<VariableDeclarationExpr>, NodeWithAnnotations<VariableDeclarationExpr>, NodeWithVariables<VariableDeclarationExpr> {
 
     private NodeList<Modifier> modifiers;
 
@@ -80,19 +76,11 @@ public VariableDeclarationExpr(VariableDeclarator var) {
     }
 
     public VariableDeclarationExpr(final Type type, String variableName, Modifier... modifiers) {
-        this(
-                null,
-                Arrays.stream(modifiers).collect(Collectors.toCollection(() -> new NodeList<>())),
-                new NodeList<>(),
-                nodeList(new VariableDeclarator(type, variableName)));
+        this(null, Arrays.stream(modifiers).collect(Collectors.toCollection(() -> new NodeList<>())), new NodeList<>(), nodeList(new VariableDeclarator(type, variableName)));
     }
 
     public VariableDeclarationExpr(VariableDeclarator var, Modifier... modifiers) {
-        this(
-                null,
-                Arrays.stream(modifiers).collect(Collectors.toCollection(() -> new NodeList<>())),
-                new NodeList<>(),
-                nodeList(var));
+        this(null, Arrays.stream(modifiers).collect(Collectors.toCollection(() -> new NodeList<>())), new NodeList<>(), nodeList(var));
     }
 
     public VariableDeclarationExpr(final NodeList<VariableDeclarator> variables) {
@@ -104,10 +92,7 @@ public VariableDeclarationExpr(final NodeList<Modifier> modifiers, final NodeLis
     }
 
     @AllFieldsConstructor
-    public VariableDeclarationExpr(
-            final NodeList<Modifier> modifiers,
-            final NodeList<AnnotationExpr> annotations,
-            final NodeList<VariableDeclarator> variables) {
+    public VariableDeclarationExpr(final NodeList<Modifier> modifiers, final NodeList<AnnotationExpr> annotations, final NodeList<VariableDeclarator> variables) {
         this(null, modifiers, annotations, variables);
     }
 
@@ -115,11 +100,7 @@ public VariableDeclarationExpr(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public VariableDeclarationExpr(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            NodeList<VariableDeclarator> variables) {
+    public VariableDeclarationExpr(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, NodeList<VariableDeclarator> variables) {
         super(tokenRange);
         setModifiers(modifiers);
         setAnnotations(annotations);
@@ -167,7 +148,8 @@ public VariableDeclarationExpr setAnnotations(final @NonNull() NodeList<Annotati
             return this;
         }
         notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations);
-        if (this.annotations != null) this.annotations.setParentNode(null);
+        if (this.annotations != null)
+            this.annotations.setParentNode(null);
         this.annotations = annotations;
         setAsParentNodeOf(annotations);
         return this;
@@ -180,7 +162,8 @@ public VariableDeclarationExpr setModifiers(final @NonNull() NodeList<Modifier>
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
@@ -193,7 +176,8 @@ public VariableDeclarationExpr setVariables(final @NonNull() NodeList<VariableDe
             return this;
         }
         notifyPropertyChange(ObservableProperty.VARIABLES, this.variables, variables);
-        if (this.variables != null) this.variables.setParentNode(null);
+        if (this.variables != null)
+            this.variables.setParentNode(null);
         this.variables = variables;
         setAsParentNodeOf(variables);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/ArbitraryNodeContainer.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/ArbitraryNodeContainer.java
index 20e7b0208a..9451af007e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/ArbitraryNodeContainer.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/ArbitraryNodeContainer.java
@@ -30,7 +30,8 @@ public <R, A> R accept(GenericVisitor<R, A> v, A arg) {
     }
 
     @Override
-    public <A> void accept(VoidVisitor<A> v, A arg) {}
+    public <A> void accept(VoidVisitor<A> v, A arg) {
+    }
 
     public NodeList<Node> getChildren() {
         return children;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlContainer.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlContainer.java
index 29bd6d388e..28b9e8a48e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlContainer.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlContainer.java
@@ -29,7 +29,8 @@ public interface JmlContainer<R extends Node, T extends Node> extends Jmlish {
     R setSingleLine(boolean singleLine);
 
     default void setTagsFromStart(JavaToken token) {
-        if (token.getText().trim().length() <= 3) return;
+        if (token.getText().trim().length() <= 3)
+            return;
         String tags = token.getText().trim().substring(2);
         Range range = token.getRange().get();
         tags = tags.substring(0, tags.length() - 1);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlModelProgram.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlModelProgram.java
index 06dbb199f6..ec371a545c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlModelProgram.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/JmlModelProgram.java
@@ -18,10 +18,7 @@
  * @author Alexander Weigl
  * @version 1 (12/14/21)
  */
-public class JmlModelProgram extends Node
-        implements NodeWithModifiers<JmlModelProgram>,
-                NodeWithAnnotations<JmlModelProgram>,
-                NodeWithContracts<JmlModelProgram> {
+public class JmlModelProgram extends Node implements NodeWithModifiers<JmlModelProgram>, NodeWithAnnotations<JmlModelProgram>, NodeWithContracts<JmlModelProgram> {
 
     private Modifier modifiers;
 
@@ -37,20 +34,11 @@ public JmlModelProgram(TokenRange tokenRange) {
     }
 
     @AllFieldsConstructor
-    public JmlModelProgram(
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            JmlContract contracts,
-            NodeList<Statement> statements) {
+    public JmlModelProgram(NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, JmlContract contracts, NodeList<Statement> statements) {
         this(null, modifiers, annotations, contracts, statements);
     }
 
-    public JmlModelProgram(
-            TokenRange range,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            JmlContract contracts,
-            NodeList<Statement> statements) {
+    public JmlModelProgram(TokenRange range, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, JmlContract contracts, NodeList<Statement> statements) {
         super(range);
     }
 
@@ -60,7 +48,8 @@ public <R, A> R accept(GenericVisitor<R, A> v, A arg) {
     }
 
     @Override
-    public <A> void accept(VoidVisitor<A> v, A arg) {}
+    public <A> void accept(VoidVisitor<A> v, A arg) {
+    }
 
     @Override
     public NodeList<JmlContract> getContracts() {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/NodeWithContracts.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/NodeWithContracts.java
index c506caa32d..d0a8772b55 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/NodeWithContracts.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/NodeWithContracts.java
@@ -9,15 +9,16 @@
  * @author Alexander Weigl
  * @version 1 (12/9/21)
  */
-public interface NodeWithContracts<T extends Node> {
+public interface NodeWithContracts<N extends Node> {
 
     NodeList<JmlContract> getContracts();
 
-    T setContracts(NodeList<JmlContract> contracts);
+    N setContracts(NodeList<JmlContract> contracts);
 
     default void addContracts(JmlContract contracts) {
         final var jmlContracts = getContracts();
         jmlContracts.add(contracts);
-        if (jmlContracts.size() == 1) JmlUtility.fixRangeContracts(this);
+        if (jmlContracts.size() == 1)
+            JmlUtility.fixRangeContracts(this);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassAccessibleDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassAccessibleDeclaration.java
index 055e40f50b..6a6a78cae0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassAccessibleDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassAccessibleDeclaration.java
@@ -1,12 +1,12 @@
 package com.github.javaparser.ast.jml.body;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.expr.SimpleName;
 import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
+import com.github.javaparser.ast.nodeTypes.modifiers.NodeWithAccessModifiers;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.visitor.CloneVisitor;
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -24,8 +24,7 @@
  * @author Alexander Weigl
  * @version 1 (3/11/21)
  */
-public class JmlClassAccessibleDeclaration extends JmlClassLevelDeclaration<JmlClassAccessibleDeclaration>
-        implements NodeWithModifiers<JmlClassAccessibleDeclaration> {
+public class JmlClassAccessibleDeclaration extends JmlClassLevelDeclaration<JmlClassAccessibleDeclaration> implements NodeWithModifiers<JmlClassAccessibleDeclaration>, NodeWithAccessModifiers<JmlClassAccessibleDeclaration> {
 
     private NodeList<Modifier> modifiers;
 
@@ -43,12 +42,7 @@ public JmlClassAccessibleDeclaration() {
     }
 
     @AllFieldsConstructor
-    public JmlClassAccessibleDeclaration(
-            NodeList<SimpleName> jmlTags,
-            NodeList<Modifier> modifiers,
-            Expression variable,
-            NodeList<Expression> expressions,
-            Expression measuredBy) {
+    public JmlClassAccessibleDeclaration(NodeList<SimpleName> jmlTags, NodeList<Modifier> modifiers, Expression variable, NodeList<Expression> expressions, Expression measuredBy) {
         this(null, jmlTags, modifiers, variable, expressions, measuredBy);
     }
 
@@ -56,13 +50,7 @@ public JmlClassAccessibleDeclaration(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlClassAccessibleDeclaration(
-            TokenRange tokenRange,
-            NodeList<SimpleName> jmlTags,
-            NodeList<Modifier> modifiers,
-            Expression variable,
-            NodeList<Expression> expressions,
-            Expression measuredBy) {
+    public JmlClassAccessibleDeclaration(TokenRange tokenRange, NodeList<SimpleName> jmlTags, NodeList<Modifier> modifiers, Expression variable, NodeList<Expression> expressions, Expression measuredBy) {
         super(tokenRange);
         setJmlTags(jmlTags);
         setModifiers(modifiers);
@@ -84,7 +72,8 @@ public JmlClassAccessibleDeclaration setModifiers(final @NonNull() NodeList<Modi
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
@@ -199,7 +188,8 @@ public JmlClassAccessibleDeclaration setExpressions(final @NonNull() NodeList<Ex
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSIONS, this.expressions, expressions);
-        if (this.expressions != null) this.expressions.setParentNode(null);
+        if (this.expressions != null)
+            this.expressions.setParentNode(null);
         this.expressions = expressions;
         setAsParentNodeOf(expressions);
         return this;
@@ -217,7 +207,8 @@ public JmlClassAccessibleDeclaration setVariable(final @NonNull() Expression var
             return this;
         }
         notifyPropertyChange(ObservableProperty.VARIABLE, this.variable, variable);
-        if (this.variable != null) this.variable.setParentNode(null);
+        if (this.variable != null)
+            this.variable.setParentNode(null);
         this.variable = variable;
         setAsParentNodeOf(variable);
         return this;
@@ -234,7 +225,8 @@ public JmlClassAccessibleDeclaration setMeasuredBy(final @Nullable() Expression
             return this;
         }
         notifyPropertyChange(ObservableProperty.MEASURED_BY, this.measuredBy, measuredBy);
-        if (this.measuredBy != null) this.measuredBy.setParentNode(null);
+        if (this.measuredBy != null)
+            this.measuredBy.setParentNode(null);
         this.measuredBy = measuredBy;
         setAsParentNodeOf(measuredBy);
         return this;
@@ -276,7 +268,8 @@ public JmlClassAccessibleDeclaration setJmlTags(final @NonNull() NodeList<Simple
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassExprDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassExprDeclaration.java
index 51f022823e..71be2dcb85 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassExprDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassExprDeclaration.java
@@ -1,13 +1,13 @@
 package com.github.javaparser.ast.jml.body;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.expr.SimpleName;
 import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
+import com.github.javaparser.ast.nodeTypes.modifiers.NodeWithAccessModifiers;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.visitor.CloneVisitor;
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -25,8 +25,7 @@
  * @author Alexander Weigl
  * @version 1 (2/21/21)
  */
-public class JmlClassExprDeclaration extends JmlClassLevelDeclaration<JmlClassExprDeclaration>
-        implements NodeWithModifiers<JmlClassExprDeclaration> {
+public class JmlClassExprDeclaration extends JmlClassLevelDeclaration<JmlClassExprDeclaration> implements NodeWithModifiers<JmlClassExprDeclaration>, NodeWithAccessModifiers<JmlClassExprDeclaration> {
 
     private SimpleName kind;
 
@@ -44,12 +43,7 @@ public JmlClassExprDeclaration() {
     }
 
     @AllFieldsConstructor
-    public JmlClassExprDeclaration(
-            NodeList<SimpleName> jmlTags,
-            NodeList<Modifier> modifiers,
-            SimpleName kind,
-            SimpleName name,
-            Expression invariant) {
+    public JmlClassExprDeclaration(NodeList<SimpleName> jmlTags, NodeList<Modifier> modifiers, SimpleName kind, SimpleName name, Expression invariant) {
         this(null, jmlTags, modifiers, kind, name, invariant);
     }
 
@@ -81,7 +75,8 @@ public JmlClassExprDeclaration setInvariant(final @NonNull() Expression invarian
             return this;
         }
         notifyPropertyChange(ObservableProperty.INVARIANT, this.invariant, invariant);
-        if (this.invariant != null) this.invariant.setParentNode(null);
+        if (this.invariant != null)
+            this.invariant.setParentNode(null);
         this.invariant = invariant;
         setAsParentNodeOf(invariant);
         return this;
@@ -159,8 +154,7 @@ public JmlClassExprDeclaration clone() {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlClassExprDeclaration(
-            TokenRange tokenRange, NodeList<Modifier> modifiers, SimpleName kind, Expression invariant) {
+    public JmlClassExprDeclaration(TokenRange tokenRange, NodeList<Modifier> modifiers, SimpleName kind, Expression invariant) {
         super(tokenRange);
         setModifiers(modifiers);
         setKind(kind);
@@ -180,7 +174,8 @@ public JmlClassExprDeclaration setModifiers(final @NonNull() NodeList<Modifier>
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
@@ -198,7 +193,8 @@ public JmlClassExprDeclaration setKind(final @NonNull() SimpleName kind) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.KIND, this.kind, kind);
-        if (this.kind != null) this.kind.setParentNode(null);
+        if (this.kind != null)
+            this.kind.setParentNode(null);
         this.kind = kind;
         setAsParentNodeOf(kind);
         return this;
@@ -226,7 +222,8 @@ public JmlClassExprDeclaration setName(final @Nullable() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -241,13 +238,7 @@ public JmlClassExprDeclaration removeName() {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlClassExprDeclaration(
-            TokenRange tokenRange,
-            NodeList<SimpleName> jmlTags,
-            NodeList<Modifier> modifiers,
-            SimpleName kind,
-            SimpleName name,
-            Expression invariant) {
+    public JmlClassExprDeclaration(TokenRange tokenRange, NodeList<SimpleName> jmlTags, NodeList<Modifier> modifiers, SimpleName kind, SimpleName name, Expression invariant) {
         super(tokenRange);
         setJmlTags(jmlTags);
         setModifiers(modifiers);
@@ -270,7 +261,8 @@ public JmlClassExprDeclaration setJmlTags(final @NonNull() NodeList<SimpleName>
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassLevelDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassLevelDeclaration.java
index 28ebc88af6..816a87216d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassLevelDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlClassLevelDeclaration.java
@@ -11,16 +11,17 @@
 import com.github.javaparser.metamodel.JmlClassLevelDeclarationMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * @author Alexander Weigl
  * @version 1 (3/17/21)
  */
-public abstract class JmlClassLevelDeclaration<T extends BodyDeclaration<?>> extends BodyDeclaration<T>
-        implements Jmlish, NodeWithJmlTags<T> {
+public abstract class JmlClassLevelDeclaration<T extends BodyDeclaration<?>> extends BodyDeclaration<T> implements Jmlish, NodeWithJmlTags<T> {
 
     @AllFieldsConstructor
-    public JmlClassLevelDeclaration() {}
+    public JmlClassLevelDeclaration() {
+    }
 
     /**
      * This constructor is used by the parser and is considered private.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlFieldDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlFieldDeclaration.java
index d4a9109f33..51487cc4e3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlFieldDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlFieldDeclaration.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.body;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -74,7 +73,8 @@ public JmlFieldDeclaration setDecl(final @NonNull() FieldDeclaration decl) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.DECL, this.decl, decl);
-        if (this.decl != null) this.decl.setParentNode(null);
+        if (this.decl != null)
+            this.decl.setParentNode(null);
         this.decl = decl;
         setAsParentNodeOf(decl);
         return this;
@@ -124,7 +124,8 @@ public JmlFieldDeclaration setJmlTags(final @NonNull() NodeList<SimpleName> jmlT
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlMethodDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlMethodDeclaration.java
index ba343f6f06..fc9f35e401 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlMethodDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlMethodDeclaration.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.body;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -41,8 +40,7 @@ public JmlMethodDeclaration() {
     }
 
     @AllFieldsConstructor
-    public JmlMethodDeclaration(
-            NodeList<SimpleName> jmlTags, MethodDeclaration methodDeclaration, JmlContract contract) {
+    public JmlMethodDeclaration(NodeList<SimpleName> jmlTags, MethodDeclaration methodDeclaration, JmlContract contract) {
         this(null, jmlTags, methodDeclaration, contract);
     }
 
@@ -50,11 +48,7 @@ public JmlMethodDeclaration(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlMethodDeclaration(
-            TokenRange tokenRange,
-            NodeList<SimpleName> jmlTags,
-            MethodDeclaration methodDeclaration,
-            JmlContract contract) {
+    public JmlMethodDeclaration(TokenRange tokenRange, NodeList<SimpleName> jmlTags, MethodDeclaration methodDeclaration, JmlContract contract) {
         super(tokenRange);
         setJmlTags(jmlTags);
         setMethodDeclaration(methodDeclaration);
@@ -86,7 +80,8 @@ public JmlMethodDeclaration setMethodDeclaration(final @NonNull() MethodDeclarat
             return this;
         }
         notifyPropertyChange(ObservableProperty.METHOD_DECLARATION, this.methodDeclaration, methodDeclaration);
-        if (this.methodDeclaration != null) this.methodDeclaration.setParentNode(null);
+        if (this.methodDeclaration != null)
+            this.methodDeclaration.setParentNode(null);
         this.methodDeclaration = methodDeclaration;
         setAsParentNodeOf(methodDeclaration);
         return this;
@@ -155,7 +150,8 @@ public JmlMethodDeclaration setContract(final @Nullable() JmlContract contract)
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONTRACT, this.contract, contract);
-        if (this.contract != null) this.contract.setParentNode(null);
+        if (this.contract != null)
+            this.contract.setParentNode(null);
         this.contract = contract;
         setAsParentNodeOf(contract);
         return this;
@@ -185,7 +181,8 @@ public JmlMethodDeclaration setJmlTags(final @NonNull() NodeList<SimpleName> jml
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlRepresentsDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlRepresentsDeclaration.java
index 259c93656f..6915fe9ad5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlRepresentsDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlRepresentsDeclaration.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.body;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.Expression;
@@ -9,6 +8,7 @@
 import com.github.javaparser.ast.expr.SimpleName;
 import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
 import com.github.javaparser.ast.nodeTypes.NodeWithName;
+import com.github.javaparser.ast.nodeTypes.modifiers.NodeWithAccessModifiers;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.visitor.CloneVisitor;
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,8 +29,7 @@
  * @author Alexander Weigl
  * @version 1 (3/11/21)
  */
-public class JmlRepresentsDeclaration extends JmlClassLevelDeclaration<JmlRepresentsDeclaration>
-        implements NodeWithModifiers<JmlRepresentsDeclaration>, NodeWithName<JmlRepresentsDeclaration> {
+public class JmlRepresentsDeclaration extends JmlClassLevelDeclaration<JmlRepresentsDeclaration> implements NodeWithName<JmlRepresentsDeclaration>, NodeWithModifiers<JmlRepresentsDeclaration>, NodeWithAccessModifiers<JmlRepresentsDeclaration> {
 
     private NodeList<Modifier> modifiers;
 
@@ -41,8 +40,7 @@ public class JmlRepresentsDeclaration extends JmlClassLevelDeclaration<JmlRepres
     private NodeList<SimpleName> jmlTags;
 
     @AllFieldsConstructor
-    public JmlRepresentsDeclaration(
-            NodeList<SimpleName> jmlTags, NodeList<Modifier> modifiers, Name name, Expression expr) {
+    public JmlRepresentsDeclaration(NodeList<SimpleName> jmlTags, NodeList<Modifier> modifiers, Name name, Expression expr) {
         this(null, jmlTags, modifiers, name, expr);
     }
 
@@ -50,12 +48,7 @@ public JmlRepresentsDeclaration(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlRepresentsDeclaration(
-            TokenRange tokenRange,
-            NodeList<SimpleName> jmlTags,
-            NodeList<Modifier> modifiers,
-            Name name,
-            Expression expr) {
+    public JmlRepresentsDeclaration(TokenRange tokenRange, NodeList<SimpleName> jmlTags, NodeList<Modifier> modifiers, Name name, Expression expr) {
         super(tokenRange);
         setJmlTags(jmlTags);
         setModifiers(modifiers);
@@ -76,7 +69,8 @@ public JmlRepresentsDeclaration setModifiers(final @NonNull() NodeList<Modifier>
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
@@ -106,7 +100,8 @@ public JmlRepresentsDeclaration setExpr(final @NonNull() Expression expr) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPR, this.expr, expr);
-        if (this.expr != null) this.expr.setParentNode(null);
+        if (this.expr != null)
+            this.expr.setParentNode(null);
         this.expr = expr;
         setAsParentNodeOf(expr);
         return this;
@@ -124,7 +119,8 @@ public JmlRepresentsDeclaration setName(final @NonNull() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -205,7 +201,8 @@ public JmlRepresentsDeclaration setJmlTags(final @NonNull() NodeList<SimpleName>
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlSpecification.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlSpecification.java
deleted file mode 100644
index 1aeb947618..0000000000
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/body/JmlSpecification.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.github.javaparser.ast.jml.body;
-
-import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.NodeList;
-import java.util.Set;
-
-/**
- * @author Alexander Weigl
- * @version 1 (3/17/21)
- */
-public class JmlSpecification {
-
-    /*<T extends Node & Jmlish>*/
-    private boolean singleLine;
-
-    private Set<String> jmlTags;
-
-    private NodeList<Node> elements;
-}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/BlockContractable.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/BlockContractable.java
deleted file mode 100644
index 4dffbf556c..0000000000
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/BlockContractable.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.github.javaparser.ast.jml.clauses;
-
-/**
- * @author Alexander Weigl
- * @version 1 (3/16/21)
- */
-public interface BlockContractable {}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/ContractType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/ContractType.java
index 766a5e2a5d..942365b2d4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/ContractType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/ContractType.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.clauses;
 
 import static com.github.javaparser.ast.jml.clauses.JmlClauseKind.*;
-
 import java.util.EnumSet;
 
 /**
@@ -9,156 +8,13 @@
  * @version 1 (04.05.24)
  */
 public enum ContractType {
-    METHOD(
-            ENSURES,
-            ENSURES_FREE,
-            ENSURES_REDUNDANTLY,
-            REQUIRES,
-            REQUIRES_FREE,
-            REQUIRES_REDUNDANTLY,
-            DECREASES,
-            MODIFIES,
-            MODIFIABLE,
-            ASSIGNABLE,
-            ACCESSIBLE,
-            PRE,
-            POST,
-            OLD,
-            FORALL,
-            SIGNALS,
-            SIGNALS_ONLY,
-            WHEN,
-            WORKING_SPACE,
-            CAPTURES,
-            ASSIGNABLE_REDUNDANTLY,
-            MODIFIABLE_REDUNDANTLY,
-            MODIFIES_REDUNDANTLY,
-            CAPTURES_REDUNDANTLY,
-            CALLABLE,
-            DIVERGES,
-            DURATION),
-    LOOP(
-            ENSURES,
-            ENSURES_FREE,
-            ENSURES_REDUNDANTLY,
-            REQUIRES,
-            REQUIRES_FREE,
-            REQUIRES_REDUNDANTLY,
-            DECREASES,
-            MODIFIES,
-            MODIFIABLE,
-            ASSIGNABLE,
-            ACCESSIBLE,
-            PRE,
-            POST,
-            RETURNS,
-            BREAKS,
-            CONTINUES,
-            OLD,
-            FORALL,
-            SIGNALS,
-            SIGNALS_ONLY,
-            WHEN,
-            WORKING_SPACE,
-            CAPTURES,
-            ASSIGNABLE_REDUNDANTLY,
-            MODIFIABLE_REDUNDANTLY,
-            MODIFIES_REDUNDANTLY,
-            CAPTURES_REDUNDANTLY,
-            CALLABLE,
-            DIVERGES,
-            DURATION),
+
+    METHOD(ENSURES, ENSURES_FREE, ENSURES_REDUNDANTLY, REQUIRES, REQUIRES_FREE, REQUIRES_REDUNDANTLY, DECREASES, MODIFIES, MODIFIABLE, ASSIGNABLE, ACCESSIBLE, PRE, POST, OLD, FORALL, SIGNALS, SIGNALS_ONLY, WHEN, WORKING_SPACE, CAPTURES, ASSIGNABLE_REDUNDANTLY, MODIFIABLE_REDUNDANTLY, MODIFIES_REDUNDANTLY, CAPTURES_REDUNDANTLY, CALLABLE, DIVERGES, DURATION),
+    LOOP(ENSURES, ENSURES_FREE, ENSURES_REDUNDANTLY, REQUIRES, REQUIRES_FREE, REQUIRES_REDUNDANTLY, DECREASES, MODIFIES, MODIFIABLE, ASSIGNABLE, ACCESSIBLE, PRE, POST, RETURNS, BREAKS, CONTINUES, OLD, FORALL, SIGNALS, SIGNALS_ONLY, WHEN, WORKING_SPACE, CAPTURES, ASSIGNABLE_REDUNDANTLY, MODIFIABLE_REDUNDANTLY, MODIFIES_REDUNDANTLY, CAPTURES_REDUNDANTLY, CALLABLE, DIVERGES, DURATION),
     LOOP_INV(LOOP_INVARIANT, LOOP_INVARIANT_FREE, LOOP_INVARIANT_REDUNDANTLY, ASSIGNABLE, ASSIGNABLE_REDUNDANTLY),
-    BLOCK(
-            ENSURES,
-            ENSURES_FREE,
-            ENSURES_REDUNDANTLY,
-            REQUIRES,
-            REQUIRES_FREE,
-            REQUIRES_REDUNDANTLY,
-            DECREASES,
-            MODIFIES,
-            MODIFIABLE,
-            ASSIGNABLE,
-            ACCESSIBLE,
-            PRE,
-            POST,
-            RETURNS,
-            BREAKS,
-            CONTINUES,
-            OLD,
-            FORALL,
-            SIGNALS,
-            SIGNALS_ONLY,
-            WHEN,
-            WORKING_SPACE,
-            CAPTURES,
-            ASSIGNABLE_REDUNDANTLY,
-            MODIFIABLE_REDUNDANTLY,
-            MODIFIES_REDUNDANTLY,
-            CAPTURES_REDUNDANTLY,
-            CALLABLE,
-            DIVERGES,
-            DURATION),
-    STATEMENT(
-            ENSURES,
-            ENSURES_FREE,
-            ENSURES_REDUNDANTLY,
-            REQUIRES,
-            REQUIRES_FREE,
-            REQUIRES_REDUNDANTLY,
-            DECREASES,
-            MODIFIES,
-            MODIFIABLE,
-            ASSIGNABLE,
-            ACCESSIBLE,
-            PRE,
-            POST,
-            RETURNS,
-            BREAKS,
-            CONTINUES,
-            OLD,
-            FORALL,
-            SIGNALS,
-            SIGNALS_ONLY,
-            WHEN,
-            WORKING_SPACE,
-            CAPTURES,
-            ASSIGNABLE_REDUNDANTLY,
-            MODIFIABLE_REDUNDANTLY,
-            MODIFIES_REDUNDANTLY,
-            CAPTURES_REDUNDANTLY,
-            CALLABLE,
-            DIVERGES,
-            DURATION),
-    LAMBDA(
-            ENSURES,
-            ENSURES_FREE,
-            ENSURES_REDUNDANTLY,
-            REQUIRES,
-            REQUIRES_FREE,
-            REQUIRES_REDUNDANTLY,
-            DECREASES,
-            MODIFIES,
-            MODIFIABLE,
-            ASSIGNABLE,
-            ACCESSIBLE,
-            PRE,
-            POST,
-            OLD,
-            FORALL,
-            SIGNALS,
-            SIGNALS_ONLY,
-            WHEN,
-            WORKING_SPACE,
-            CAPTURES,
-            ASSIGNABLE_REDUNDANTLY,
-            MODIFIABLE_REDUNDANTLY,
-            MODIFIES_REDUNDANTLY,
-            CAPTURES_REDUNDANTLY,
-            CALLABLE,
-            DIVERGES,
-            DURATION);
+    BLOCK(ENSURES, ENSURES_FREE, ENSURES_REDUNDANTLY, REQUIRES, REQUIRES_FREE, REQUIRES_REDUNDANTLY, DECREASES, MODIFIES, MODIFIABLE, ASSIGNABLE, ACCESSIBLE, PRE, POST, RETURNS, BREAKS, CONTINUES, OLD, FORALL, SIGNALS, SIGNALS_ONLY, WHEN, WORKING_SPACE, CAPTURES, ASSIGNABLE_REDUNDANTLY, MODIFIABLE_REDUNDANTLY, MODIFIES_REDUNDANTLY, CAPTURES_REDUNDANTLY, CALLABLE, DIVERGES, DURATION),
+    STATEMENT(ENSURES, ENSURES_FREE, ENSURES_REDUNDANTLY, REQUIRES, REQUIRES_FREE, REQUIRES_REDUNDANTLY, DECREASES, MODIFIES, MODIFIABLE, ASSIGNABLE, ACCESSIBLE, PRE, POST, RETURNS, BREAKS, CONTINUES, OLD, FORALL, SIGNALS, SIGNALS_ONLY, WHEN, WORKING_SPACE, CAPTURES, ASSIGNABLE_REDUNDANTLY, MODIFIABLE_REDUNDANTLY, MODIFIES_REDUNDANTLY, CAPTURES_REDUNDANTLY, CALLABLE, DIVERGES, DURATION),
+    LAMBDA(ENSURES, ENSURES_FREE, ENSURES_REDUNDANTLY, REQUIRES, REQUIRES_FREE, REQUIRES_REDUNDANTLY, DECREASES, MODIFIES, MODIFIABLE, ASSIGNABLE, ACCESSIBLE, PRE, POST, OLD, FORALL, SIGNALS, SIGNALS_ONLY, WHEN, WORKING_SPACE, CAPTURES, ASSIGNABLE_REDUNDANTLY, MODIFIABLE_REDUNDANTLY, MODIFIES_REDUNDANTLY, CAPTURES_REDUNDANTLY, CALLABLE, DIVERGES, DURATION);
 
     final EnumSet<JmlClauseKind> validKinds;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlCallableClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlCallableClause.java
index f18a881d37..ee9b63e7e3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlCallableClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlCallableClause.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.clauses;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -106,14 +105,30 @@ public JmlCallableClause setMethodSignatures(final @NonNull() NodeList<JmlMethod
             return this;
         }
         notifyPropertyChange(ObservableProperty.METHOD_SIGNATURES, this.methodSignatures, methodSignatures);
-        if (this.methodSignatures != null) this.methodSignatures.setParentNode(null);
+        if (this.methodSignatures != null)
+            this.methodSignatures.setParentNode(null);
         this.methodSignatures = methodSignatures;
         setAsParentNodeOf(methodSignatures);
         return this;
     }
 
+    /**
+     * This constructor is used by the parser and is considered private.
+     */
+    @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
+    public JmlCallableClause(TokenRange tokenRange, SimpleName name, NodeList<JmlMethodSignature> methodSignatures) {
+        super(tokenRange, name);
+        setMethodSignatures(methodSignatures);
+        customInitialization();
+    }
+
+    @com.github.javaparser.ast.key.IgnoreLexPrinting()
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public @NonNull() NodeList<JmlMethodSignature> methodSignatures() {
+        return Objects.requireNonNull(methodSignatures);
+    }
+
     @Override
-    @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator")
     public boolean remove(Node node) {
         if (node == null) {
             return false;
@@ -128,7 +143,6 @@ public boolean remove(Node node) {
     }
 
     @Override
-    @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator")
     public boolean replace(Node node, Node replacementNode) {
         if (node == null) {
             return false;
@@ -141,20 +155,4 @@ public boolean replace(Node node, Node replacementNode) {
         }
         return super.replace(node, replacementNode);
     }
-
-    /**
-     * This constructor is used by the parser and is considered private.
-     */
-    @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlCallableClause(TokenRange tokenRange, SimpleName name, NodeList<JmlMethodSignature> methodSignatures) {
-        super(tokenRange, name);
-        setMethodSignatures(methodSignatures);
-        customInitialization();
-    }
-
-    @com.github.javaparser.ast.key.IgnoreLexPrinting()
-    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public @NonNull() NodeList<JmlMethodSignature> methodSignatures() {
-        return Objects.requireNonNull(methodSignatures);
-    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClause.java
index 93e056126f..63193616d1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClause.java
@@ -1,13 +1,13 @@
 package com.github.javaparser.ast.jml.clauses;
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Jmlish;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.SimpleName;
+import com.github.javaparser.ast.nodeTypes.NodeWithOptionalSimpleName;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.visitor.CloneVisitor;
 import com.github.javaparser.metamodel.JavaParserMetaModel;
@@ -15,15 +15,19 @@
 import com.github.javaparser.metamodel.OptionalProperty;
 import java.util.Optional;
 import java.util.function.Consumer;
+import org.jspecify.annotations.NullMarked;
 import org.jspecify.annotations.Nullable;
+import java.util.Objects;
 
 /**
  * @author Alexander Weigl
  * @version 1 (2/21/21)
  */
-public abstract class JmlClause extends Node implements Jmlish {
+@NullMarked
+public abstract class JmlClause extends Node implements Jmlish, NodeWithOptionalSimpleName<JmlClause> {
 
     @OptionalProperty
+    @Nullable
     private SimpleName name;
 
     public JmlClause() {
@@ -31,7 +35,7 @@ public JmlClause() {
     }
 
     @AllFieldsConstructor
-    public JmlClause(final SimpleName name) {
+    public JmlClause(@Nullable final SimpleName name) {
         this(null, name);
     }
 
@@ -79,7 +83,8 @@ public JmlClause setName(final @Nullable() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -127,8 +132,7 @@ public boolean isJmlCallableClause() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlCallableClause asJmlCallableClause() {
-        throw new IllegalStateException(
-                f("%s is not JmlCallableClause, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlCallableClause, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -137,7 +141,8 @@ public Optional<JmlCallableClause> toJmlCallableClause() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlCallableClause(Consumer<JmlCallableClause> action) {}
+    public void ifJmlCallableClause(Consumer<JmlCallableClause> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlClauseLabel() {
@@ -145,18 +150,18 @@ public boolean isJmlClauseLabel() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public JmlClauseLabel asJmlClauseLabel() {
-        throw new IllegalStateException(
-                f("%s is not JmlClauseLabel, it is %s", this, this.getClass().getSimpleName()));
+    public JmlLabledClause asJmlClauseLabel() {
+        throw new IllegalStateException(f("%s is not JmlClauseLabel, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<JmlClauseLabel> toJmlClauseLabel() {
+    public Optional<JmlLabledClause> toJmlClauseLabel() {
         return Optional.empty();
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlClauseLabel(Consumer<JmlClauseLabel> action) {}
+    public void ifJmlClauseLabel(Consumer<JmlLabledClause> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlForallClause() {
@@ -165,8 +170,7 @@ public boolean isJmlForallClause() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlForallClause asJmlForallClause() {
-        throw new IllegalStateException(
-                f("%s is not JmlForallClause, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlForallClause, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -175,7 +179,8 @@ public Optional<JmlForallClause> toJmlForallClause() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlForallClause(Consumer<JmlForallClause> action) {}
+    public void ifJmlForallClause(Consumer<JmlForallClause> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlMultiExprClause() {
@@ -184,8 +189,7 @@ public boolean isJmlMultiExprClause() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlMultiExprClause asJmlMultiExprClause() {
-        throw new IllegalStateException(f(
-                "%s is not JmlMultiExprClause, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlMultiExprClause, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -194,7 +198,8 @@ public Optional<JmlMultiExprClause> toJmlMultiExprClause() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlMultiExprClause(Consumer<JmlMultiExprClause> action) {}
+    public void ifJmlMultiExprClause(Consumer<JmlMultiExprClause> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlOldClause() {
@@ -203,8 +208,7 @@ public boolean isJmlOldClause() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlOldClause asJmlOldClause() {
-        throw new IllegalStateException(
-                f("%s is not JmlOldClause, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlOldClause, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -213,7 +217,8 @@ public Optional<JmlOldClause> toJmlOldClause() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlOldClause(Consumer<JmlOldClause> action) {}
+    public void ifJmlOldClause(Consumer<JmlOldClause> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlSignalsClause() {
@@ -222,8 +227,7 @@ public boolean isJmlSignalsClause() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlSignalsClause asJmlSignalsClause() {
-        throw new IllegalStateException(
-                f("%s is not JmlSignalsClause, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlSignalsClause, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -232,7 +236,8 @@ public Optional<JmlSignalsClause> toJmlSignalsClause() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlSignalsClause(Consumer<JmlSignalsClause> action) {}
+    public void ifJmlSignalsClause(Consumer<JmlSignalsClause> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlSignalsOnlyClause() {
@@ -241,9 +246,7 @@ public boolean isJmlSignalsOnlyClause() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlSignalsOnlyClause asJmlSignalsOnlyClause() {
-        throw new IllegalStateException(f(
-                "%s is not JmlSignalsOnlyClause, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlSignalsOnlyClause, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -252,7 +255,8 @@ public Optional<JmlSignalsOnlyClause> toJmlSignalsOnlyClause() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlSignalsOnlyClause(Consumer<JmlSignalsOnlyClause> action) {}
+    public void ifJmlSignalsOnlyClause(Consumer<JmlSignalsOnlyClause> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlSimpleExprClause() {
@@ -261,8 +265,7 @@ public boolean isJmlSimpleExprClause() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlSimpleExprClause asJmlSimpleExprClause() {
-        throw new IllegalStateException(f(
-                "%s is not JmlSimpleExprClause, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlSimpleExprClause, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -271,7 +274,8 @@ public Optional<JmlSimpleExprClause> toJmlSimpleExprClause() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlSimpleExprClause(Consumer<JmlSimpleExprClause> action) {}
+    public void ifJmlSimpleExprClause(Consumer<JmlSimpleExprClause> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlClauseIf() {
@@ -279,18 +283,18 @@ public boolean isJmlClauseIf() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public JmlClauseIf asJmlClauseIf() {
-        throw new IllegalStateException(
-                f("%s is not JmlClauseIf, it is %s", this, this.getClass().getSimpleName()));
+    public JmlConditionalClause asJmlClauseIf() {
+        throw new IllegalStateException(f("%s is not JmlClauseIf, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<JmlClauseIf> toJmlClauseIf() {
+    public Optional<JmlConditionalClause> toJmlClauseIf() {
         return Optional.empty();
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlClauseIf(Consumer<JmlClauseIf> action) {}
+    public void ifJmlClauseIf(Consumer<JmlConditionalClause> action) {
+    }
 
     @com.github.javaparser.ast.key.IgnoreLexPrinting()
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseKind.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseKind.java
index 6aa867fb60..876006ddd2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseKind.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseKind.java
@@ -7,6 +7,7 @@
 import java.util.Optional;
 
 public enum JmlClauseKind implements JmlKeyword {
+
     ENSURES(GeneratedJavaParserConstants.ENSURES),
     ENSURES_FREE(GeneratedJavaParserConstants.ENSURES_FREE),
     ENSURES_REDUNDANTLY(GeneratedJavaParserConstants.ENSURES_REDUNDANTLY),
@@ -58,6 +59,11 @@ public enum JmlClauseKind implements JmlKeyword {
     DIVERGES_REDUNDANTLY(GeneratedJavaParserConstants.DIVERGES_REDUNDANTLY),
     DURATION(GeneratedJavaParserConstants.DURATION),
     DURATION_REDUNDANTLY(GeneratedJavaParserConstants.DURATION_REDUNDANTLY),
+    //Information Flow
+    DETERMINES(GeneratedJavaParserConstants.DURATION_REDUNDANTLY),
+    LOOP_DETERMINES(GeneratedJavaParserConstants.DURATION_REDUNDANTLY),
+    SEPARATES(GeneratedJavaParserConstants.DURATION_REDUNDANTLY),
+    LOOP_SEPARATES(GeneratedJavaParserConstants.DURATION_REDUNDANTLY),
     NONE(-1);
 
     public final String jmlSymbol;
@@ -79,10 +85,12 @@ public String jmlSymbol() {
         return jmlSymbol;
     }
 
+    public int getTokenType() {
+        return tokenType;
+    }
+
     public static JmlClauseKind getKindByToken(JavaToken token) {
-        Optional<JmlClauseKind> k = Arrays.stream(JmlClauseKind.values())
-                .filter(it -> it.jmlSymbol.equals(token.getText()))
-                .findFirst();
+        Optional<JmlClauseKind> k = Arrays.stream(JmlClauseKind.values()).filter(it -> it.jmlSymbol.equals(token.getText())).findFirst();
         if (k.isPresent()) {
             return k.get();
         } else {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseIf.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlConditionalClause.java
similarity index 62%
rename from javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseIf.java
rename to javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlConditionalClause.java
index 4f63265e0d..c497e7c990 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseIf.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlConditionalClause.java
@@ -1,46 +1,47 @@
 package com.github.javaparser.ast.jml.clauses;
 
-import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.expr.SimpleName;
+import com.github.javaparser.ast.nodeTypes.NodeWithCondition;
+import com.github.javaparser.ast.nodeTypes.NodeWithExpression;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.visitor.CloneVisitor;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 import com.github.javaparser.metamodel.JavaParserMetaModel;
-import com.github.javaparser.metamodel.JmlClauseIfMetaModel;
+import com.github.javaparser.metamodel.JmlConditionalClauseMetaModel;
+import org.jspecify.annotations.NonNull;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
-import org.jspecify.annotations.NonNull;
+import static com.github.javaparser.utils.Utils.assertNotNull;
 
 /**
  * @author Alexander Weigl
  * @version 1 (2/22/21)
  */
-public class JmlClauseIf extends JmlClause implements MethodContractable {
+public class JmlConditionalClause extends JmlClause implements NodeWithExpression<JmlConditionalClause>, NodeWithCondition<JmlConditionalClause> {
 
     private JmlClauseKind kind;
 
-    private Expression then;
+    private Expression expression;
 
     private Expression condition;
 
     @AllFieldsConstructor
-    public JmlClauseIf(SimpleName name, Expression condition, JmlClauseKind kind, Expression then) {
-        this(null, name, condition, kind, then);
+    public JmlConditionalClause(SimpleName name, Expression condition, JmlClauseKind kind, Expression expression) {
+        this(null, name, condition, kind, expression);
     }
 
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlClauseIf(TokenRange tokenRange) {
+    public JmlConditionalClause(TokenRange tokenRange) {
         super(tokenRange);
         customInitialization();
     }
@@ -55,8 +56,8 @@ public boolean replace(Node node, Node replacementNode) {
             setCondition((Expression) replacementNode);
             return true;
         }
-        if (node == then) {
-            setThen((Expression) replacementNode);
+        if (node == expression) {
+            setExpression((Expression) replacementNode);
             return true;
         }
         return super.replace(node, replacementNode);
@@ -64,8 +65,8 @@ public boolean replace(Node node, Node replacementNode) {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
-    public JmlClauseIf clone() {
-        return (JmlClauseIf) accept(new CloneVisitor(), null);
+    public JmlConditionalClause clone() {
+        return (JmlConditionalClause) accept(new CloneVisitor(), null);
     }
 
     @Override
@@ -92,20 +93,21 @@ public Expression getCondition() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public JmlClauseIf setCondition(final @NonNull() Expression condition) {
+    public JmlConditionalClause setCondition(final @NonNull() Expression condition) {
         assertNotNull(condition);
         if (condition == this.condition) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONDITION, this.condition, condition);
-        if (this.condition != null) this.condition.setParentNode(null);
+        if (this.condition != null)
+            this.condition.setParentNode(null);
         this.condition = condition;
         setAsParentNodeOf(condition);
         return this;
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public JmlClauseIf setKind(final @NonNull() JmlClauseKind kind) {
+    public JmlConditionalClause setKind(final @NonNull() JmlClauseKind kind) {
         assertNotNull(kind);
         if (kind == this.kind) {
             return this;
@@ -117,19 +119,20 @@ public JmlClauseIf setKind(final @NonNull() JmlClauseKind kind) {
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
     public Expression getThen() {
-        return then;
+        return expression;
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public JmlClauseIf setThen(final @NonNull() Expression then) {
-        assertNotNull(then);
-        if (then == this.then) {
+    public JmlConditionalClause setThen(@NonNull() final Expression expression) {
+        assertNotNull(expression);
+        if (expression == this.expression) {
             return this;
         }
-        notifyPropertyChange(ObservableProperty.THEN, this.then, then);
-        if (this.then != null) this.then.setParentNode(null);
-        this.then = then;
-        setAsParentNodeOf(then);
+        notifyPropertyChange(ObservableProperty.CONDITION, this.expression, expression);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
+        this.expression = expression;
+        setAsParentNodeOf(expression);
         return this;
     }
 
@@ -141,38 +144,31 @@ public boolean isJmlClauseIf() {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public JmlClauseIf asJmlClauseIf() {
+    public JmlConditionalClause asJmlClauseIf() {
         return this;
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<JmlClauseIf> toJmlClauseIf() {
+    public Optional<JmlConditionalClause> toJmlClauseIf() {
         return Optional.of(this);
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlClauseIf(Consumer<JmlClauseIf> action) {
+    public void ifJmlClauseIf(Consumer<JmlConditionalClause> action) {
         action.accept(this);
     }
 
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
-    public JmlClauseIfMetaModel getMetaModel() {
-        return JavaParserMetaModel.jmlClauseIfMetaModel;
-    }
-
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlClauseIf(
-            TokenRange tokenRange, SimpleName name, Expression condition, JmlClauseKind kind, Expression then) {
+    public JmlConditionalClause(TokenRange tokenRange, SimpleName name, Expression condition, JmlClauseKind kind, Expression expression) {
         super(tokenRange, name);
         setCondition(condition);
         setKind(kind);
-        setThen(then);
+        setExpression(expression);
         customInitialization();
     }
 
@@ -190,7 +186,39 @@ public JmlClauseIf(
 
     @com.github.javaparser.ast.key.IgnoreLexPrinting()
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public @NonNull() Expression then() {
-        return Objects.requireNonNull(then);
+    @NonNull()
+    public Expression then() {
+        return Objects.requireNonNull(expression);
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public Expression getExpression() {
+        return expression;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public JmlConditionalClause setExpression(final @NonNull() Expression expression) {
+        assertNotNull(expression);
+        if (expression == this.expression) {
+            return this;
+        }
+        notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
+        this.expression = expression;
+        setAsParentNodeOf(expression);
+        return this;
+    }
+
+    @com.github.javaparser.ast.key.IgnoreLexPrinting()
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public @NonNull() Expression expression() {
+        return Objects.requireNonNull(expression);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
+    public JmlConditionalClauseMetaModel getMetaModel() {
+        return JavaParserMetaModel.jmlConditionalClauseMetaModel;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlContract.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlContract.java
index 2b02b37694..48d34cd571 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlContract.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlContract.java
@@ -1,12 +1,12 @@
 package com.github.javaparser.ast.jml.clauses;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.SimpleName;
 import com.github.javaparser.ast.jml.NodeWithJmlTags;
 import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
+import com.github.javaparser.ast.nodeTypes.modifiers.NodeWithAccessModifiers;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.stmt.Behavior;
 import com.github.javaparser.ast.visitor.CloneVisitor;
@@ -24,7 +24,7 @@
  * @author Alexander Weigl
  * @version 1 (3/14/21)
  */
-public class JmlContract extends Node implements Jmlish, NodeWithModifiers<JmlContract>, NodeWithJmlTags<JmlContract> {
+public class JmlContract extends Node implements Jmlish, NodeWithModifiers<JmlContract>, NodeWithJmlTags<JmlContract>, NodeWithAccessModifiers<JmlContract> {
 
     private NodeList<SimpleName> jmlTags = new NodeList<>();
 
@@ -42,45 +42,19 @@ public class JmlContract extends Node implements Jmlish, NodeWithModifiers<JmlCo
     private NodeList<JmlContract> subContracts = new NodeList<>();
 
     public JmlContract() {
-        this(
-                (TokenRange) null,
-                new NodeList<>(),
-                ContractType.METHOD,
-                Behavior.NONE,
-                null,
-                new NodeList<>(),
-                new NodeList<>(),
-                new NodeList<>());
+        this((TokenRange) null, new NodeList<>(), ContractType.METHOD, Behavior.NONE, null, new NodeList<>(), new NodeList<>(), new NodeList<>());
     }
 
     @AllFieldsConstructor
-    public JmlContract(
-            NodeList<SimpleName> jmlTags,
-            ContractType type,
-            Behavior behavior,
-            SimpleName name,
-            NodeList<Modifier> modifiers,
-            NodeList<JmlClause> clauses,
-            NodeList<JmlContract> subContracts) {
+    public JmlContract(NodeList<SimpleName> jmlTags, ContractType type, Behavior behavior, SimpleName name, NodeList<Modifier> modifiers, NodeList<JmlClause> clauses, NodeList<JmlContract> subContracts) {
         this(null, jmlTags, type, behavior, name, modifiers, clauses, subContracts);
     }
 
-    public JmlContract(
-            ContractType type,
-            Behavior behavior,
-            SimpleName name,
-            NodeList<Modifier> modifiers,
-            NodeList<JmlClause> clauses,
-            NodeList<JmlContract> subContracts) {
+    public JmlContract(ContractType type, Behavior behavior, SimpleName name, NodeList<Modifier> modifiers, NodeList<JmlClause> clauses, NodeList<JmlContract> subContracts) {
         this((TokenRange) null, new NodeList<>(), type, behavior, name, modifiers, clauses, subContracts);
     }
 
-    public JmlContract(
-            TokenRange range,
-            Behavior behavior,
-            NodeList<Modifier> modifiers,
-            NodeList<JmlClause> clauses,
-            NodeList<JmlContract> subContracts) {
+    public JmlContract(TokenRange range, Behavior behavior, NodeList<Modifier> modifiers, NodeList<JmlClause> clauses, NodeList<JmlContract> subContracts) {
         this(range, new NodeList<>(), ContractType.METHOD, behavior, null, modifiers, clauses, subContracts);
     }
 
@@ -124,7 +98,8 @@ public JmlContract setClauses(final @NonNull() NodeList<JmlClause> clauses) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CLAUSES, this.clauses, clauses);
-        if (this.clauses != null) this.clauses.setParentNode(null);
+        if (this.clauses != null)
+            this.clauses.setParentNode(null);
         this.clauses = clauses;
         setAsParentNodeOf(clauses);
         return this;
@@ -142,7 +117,8 @@ public JmlContract setModifiers(final @NonNull() NodeList<Modifier> modifiers) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
@@ -160,7 +136,8 @@ public JmlContract setSubContracts(final @NonNull() NodeList<JmlContract> subCon
             return this;
         }
         notifyPropertyChange(ObservableProperty.SUB_CONTRACTS, this.subContracts, subContracts);
-        if (this.subContracts != null) this.subContracts.setParentNode(null);
+        if (this.subContracts != null)
+            this.subContracts.setParentNode(null);
         this.subContracts = subContracts;
         setAsParentNodeOf(subContracts);
         return this;
@@ -254,13 +231,7 @@ public JmlContract clone() {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlContract(
-            TokenRange tokenRange,
-            boolean isLoopContract,
-            Behavior behavior,
-            NodeList<Modifier> modifiers,
-            NodeList<JmlClause> clauses,
-            NodeList<JmlContract> subContracts) {
+    public JmlContract(TokenRange tokenRange, boolean isLoopContract, Behavior behavior, NodeList<Modifier> modifiers, NodeList<JmlClause> clauses, NodeList<JmlContract> subContracts) {
         super(tokenRange);
         setLoopContract(isLoopContract);
         setBehavior(behavior);
@@ -298,7 +269,8 @@ public JmlContract setJmlTags(final @NonNull() NodeList<SimpleName> jmlTags) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
@@ -315,7 +287,8 @@ public JmlContract setName(final @Nullable() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -346,15 +319,7 @@ public JmlContract removeName() {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlContract(
-            TokenRange tokenRange,
-            ContractType type,
-            boolean isLoopContract,
-            Behavior behavior,
-            SimpleName name,
-            NodeList<Modifier> modifiers,
-            NodeList<JmlClause> clauses,
-            NodeList<JmlContract> subContracts) {
+    public JmlContract(TokenRange tokenRange, ContractType type, boolean isLoopContract, Behavior behavior, SimpleName name, NodeList<Modifier> modifiers, NodeList<JmlClause> clauses, NodeList<JmlContract> subContracts) {
         super(tokenRange);
         setType(type);
         setLoopContract(isLoopContract);
@@ -370,15 +335,7 @@ public JmlContract(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlContract(
-            TokenRange tokenRange,
-            NodeList<SimpleName> jmlTags,
-            ContractType type,
-            Behavior behavior,
-            SimpleName name,
-            NodeList<Modifier> modifiers,
-            NodeList<JmlClause> clauses,
-            NodeList<JmlContract> subContracts) {
+    public JmlContract(TokenRange tokenRange, NodeList<SimpleName> jmlTags, ContractType type, Behavior behavior, SimpleName name, NodeList<Modifier> modifiers, NodeList<JmlClause> clauses, NodeList<JmlContract> subContracts) {
         super(tokenRange);
         setJmlTags(jmlTags);
         setType(type);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlForallClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlForallClause.java
index 35b6baa53b..3a5d6e503a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlForallClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlForallClause.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.clauses;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -23,7 +22,7 @@
  * @author Alexander Weigl
  * @version 1 (2/22/21)
  */
-public class JmlForallClause extends JmlClause implements MethodContractable {
+public class JmlForallClause extends JmlClause {
 
     private NodeList<Parameter> boundedVariables;
 
@@ -66,7 +65,8 @@ public JmlForallClause setBoundedVariables(final @NonNull() NodeList<Parameter>
             return this;
         }
         notifyPropertyChange(ObservableProperty.BOUNDED_VARIABLES, this.boundedVariables, boundedVariables);
-        if (this.boundedVariables != null) this.boundedVariables.setParentNode(null);
+        if (this.boundedVariables != null)
+            this.boundedVariables.setParentNode(null);
         this.boundedVariables = boundedVariables;
         setAsParentNodeOf(boundedVariables);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlInfFlowClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlInfFlowClause.java
new file mode 100644
index 0000000000..03876c860a
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlInfFlowClause.java
@@ -0,0 +1,327 @@
+package com.github.javaparser.ast.jml.clauses;
+
+import com.github.javaparser.JavaToken;
+import com.github.javaparser.TokenRange;
+import com.github.javaparser.ast.AllFieldsConstructor;
+import com.github.javaparser.ast.NodeList;
+import com.github.javaparser.ast.expr.Expression;
+import com.github.javaparser.ast.expr.SimpleName;
+import com.github.javaparser.ast.nodeTypes.NodeWithOptionalSimpleName;
+import com.github.javaparser.ast.visitor.GenericVisitor;
+import com.github.javaparser.ast.visitor.VoidVisitor;
+import com.github.javaparser.metamodel.OptionalProperty;
+import org.jspecify.annotations.NullMarked;
+import java.util.Objects;
+import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.observer.ObservableProperty;
+import static com.github.javaparser.utils.Utils.assertNotNull;
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.visitor.CloneVisitor;
+import com.github.javaparser.metamodel.JmlInfFlowClauseMetaModel;
+import com.github.javaparser.metamodel.JavaParserMetaModel;
+import com.github.javaparser.ast.Generated;
+
+/// ```
+/// determines_clause
+///   : (DETERMINES | SEPARATES | LOOP_SEPARATES | LOOP_DETERMINES )
+///     determined=infflowspeclist
+///     BY (byItself=ITSELF|by=infflowspeclist)
+///     ( DECLASSIFIES decl+=infflowspeclist
+///     | ERASES       erases+=infflowspeclist
+///     | NEW_OBJECTS newObs+=infflowspeclist
+///     )*
+///     SEMI_TOPLEVEL
+///   ;
+/// ```
+///
+/// @author Alexander Weigl
+/// @version 1 (3/18/26)
+@NullMarked
+public class JmlInfFlowClause extends JmlClause {
+
+    private JmlClauseKind kind;
+
+    private NodeList<Expression> expressions;
+
+    private NodeList<Expression> by;
+
+    private NodeList<Expression> declassifies;
+
+    private NodeList<Expression> erases;
+
+    private NodeList<Expression> newObjects;
+
+    @AllFieldsConstructor
+    public JmlInfFlowClause(JmlClauseKind kind, SimpleName name, NodeList<Expression> by, NodeList<Expression> declassifies, NodeList<Expression> erases, NodeList<Expression> expressions, NodeList<Expression> newObjects) {
+        this(null, kind, name, by, declassifies, erases, expressions, newObjects);
+    }
+
+    /**
+     * This constructor is used by the parser and is considered private.
+     */
+    @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
+    public JmlInfFlowClause(TokenRange tokenRange, JmlClauseKind kind, SimpleName name, NodeList<Expression> by, NodeList<Expression> declassifies, NodeList<Expression> erases, NodeList<Expression> expressions, NodeList<Expression> newObjects) {
+        super(tokenRange, name);
+        setKind(kind);
+        setBy(by);
+        setDeclassifies(declassifies);
+        setErases(erases);
+        setExpressions(expressions);
+        setNewObjects(newObjects);
+        customInitialization();
+    }
+
+    public JmlInfFlowClause(TokenRange range, JavaToken begin, SimpleName name, NodeList<Expression> determined, NodeList<Expression> by, NodeList<Expression> declassifies, NodeList<Expression> erases, NodeList<Expression> newObjects) {
+        this(range, JmlClauseKind.getKindByToken(begin), name, determined, by, declassifies, erases, newObjects);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public JmlClauseKind getKind() {
+        return kind;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.AcceptGenerator")
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.AcceptGenerator")
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public NodeList<Expression> getBy() {
+        return by;
+    }
+
+    @com.github.javaparser.ast.key.IgnoreLexPrinting()
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public @NonNull() NodeList<Expression> by() {
+        return Objects.requireNonNull(by);
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public JmlInfFlowClause setBy(final @NonNull() NodeList<Expression> by) {
+        assertNotNull(by);
+        if (by == this.by) {
+            return this;
+        }
+        notifyPropertyChange(ObservableProperty.BY, this.by, by);
+        if (this.by != null)
+            this.by.setParentNode(null);
+        this.by = by;
+        setAsParentNodeOf(by);
+        return this;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public NodeList<Expression> getDeclassifies() {
+        return declassifies;
+    }
+
+    @com.github.javaparser.ast.key.IgnoreLexPrinting()
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public @NonNull() NodeList<Expression> declassifies() {
+        return Objects.requireNonNull(declassifies);
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public JmlInfFlowClause setDeclassifies(final @NonNull() NodeList<Expression> declassifies) {
+        assertNotNull(declassifies);
+        if (declassifies == this.declassifies) {
+            return this;
+        }
+        notifyPropertyChange(ObservableProperty.DECLASSIFIES, this.declassifies, declassifies);
+        if (this.declassifies != null)
+            this.declassifies.setParentNode(null);
+        this.declassifies = declassifies;
+        setAsParentNodeOf(declassifies);
+        return this;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public NodeList<Expression> getErases() {
+        return erases;
+    }
+
+    @com.github.javaparser.ast.key.IgnoreLexPrinting()
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public @NonNull() NodeList<Expression> erases() {
+        return Objects.requireNonNull(erases);
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public JmlInfFlowClause setErases(final @NonNull() NodeList<Expression> erases) {
+        assertNotNull(erases);
+        if (erases == this.erases) {
+            return this;
+        }
+        notifyPropertyChange(ObservableProperty.ERASES, this.erases, erases);
+        if (this.erases != null)
+            this.erases.setParentNode(null);
+        this.erases = erases;
+        setAsParentNodeOf(erases);
+        return this;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public NodeList<Expression> getExpressions() {
+        return expressions;
+    }
+
+    @com.github.javaparser.ast.key.IgnoreLexPrinting()
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public @NonNull() NodeList<Expression> expressions() {
+        return Objects.requireNonNull(expressions);
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public JmlInfFlowClause setExpressions(final @NonNull() NodeList<Expression> expressions) {
+        assertNotNull(expressions);
+        if (expressions == this.expressions) {
+            return this;
+        }
+        notifyPropertyChange(ObservableProperty.EXPRESSIONS, this.expressions, expressions);
+        if (this.expressions != null)
+            this.expressions.setParentNode(null);
+        this.expressions = expressions;
+        setAsParentNodeOf(expressions);
+        return this;
+    }
+
+    @com.github.javaparser.ast.key.IgnoreLexPrinting()
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public @NonNull() JmlClauseKind kind() {
+        return Objects.requireNonNull(kind);
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public JmlInfFlowClause setKind(final @NonNull() JmlClauseKind kind) {
+        assertNotNull(kind);
+        if (kind == this.kind) {
+            return this;
+        }
+        notifyPropertyChange(ObservableProperty.KIND, this.kind, kind);
+        this.kind = kind;
+        return this;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public NodeList<Expression> getNewObjects() {
+        return newObjects;
+    }
+
+    @com.github.javaparser.ast.key.IgnoreLexPrinting()
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public @NonNull() NodeList<Expression> newObjects() {
+        return Objects.requireNonNull(newObjects);
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public JmlInfFlowClause setNewObjects(final @NonNull() NodeList<Expression> newObjects) {
+        assertNotNull(newObjects);
+        if (newObjects == this.newObjects) {
+            return this;
+        }
+        notifyPropertyChange(ObservableProperty.NEW_OBJECTS, this.newObjects, newObjects);
+        if (this.newObjects != null)
+            this.newObjects.setParentNode(null);
+        this.newObjects = newObjects;
+        setAsParentNodeOf(newObjects);
+        return this;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator")
+    public boolean remove(Node node) {
+        if (node == null) {
+            return false;
+        }
+        for (int i = 0; i < by.size(); i++) {
+            if (by.get(i) == node) {
+                by.remove(i);
+                return true;
+            }
+        }
+        for (int i = 0; i < declassifies.size(); i++) {
+            if (declassifies.get(i) == node) {
+                declassifies.remove(i);
+                return true;
+            }
+        }
+        for (int i = 0; i < erases.size(); i++) {
+            if (erases.get(i) == node) {
+                erases.remove(i);
+                return true;
+            }
+        }
+        for (int i = 0; i < expressions.size(); i++) {
+            if (expressions.get(i) == node) {
+                expressions.remove(i);
+                return true;
+            }
+        }
+        for (int i = 0; i < newObjects.size(); i++) {
+            if (newObjects.get(i) == node) {
+                newObjects.remove(i);
+                return true;
+            }
+        }
+        return super.remove(node);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator")
+    public boolean replace(Node node, Node replacementNode) {
+        if (node == null) {
+            return false;
+        }
+        for (int i = 0; i < by.size(); i++) {
+            if (by.get(i) == node) {
+                by.set(i, (Expression) replacementNode);
+                return true;
+            }
+        }
+        for (int i = 0; i < declassifies.size(); i++) {
+            if (declassifies.get(i) == node) {
+                declassifies.set(i, (Expression) replacementNode);
+                return true;
+            }
+        }
+        for (int i = 0; i < erases.size(); i++) {
+            if (erases.get(i) == node) {
+                erases.set(i, (Expression) replacementNode);
+                return true;
+            }
+        }
+        for (int i = 0; i < expressions.size(); i++) {
+            if (expressions.get(i) == node) {
+                expressions.set(i, (Expression) replacementNode);
+                return true;
+            }
+        }
+        for (int i = 0; i < newObjects.size(); i++) {
+            if (newObjects.get(i) == node) {
+                newObjects.set(i, (Expression) replacementNode);
+                return true;
+            }
+        }
+        return super.replace(node, replacementNode);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
+    public JmlInfFlowClause clone() {
+        return (JmlInfFlowClause) accept(new CloneVisitor(), null);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
+    public JmlInfFlowClauseMetaModel getMetaModel() {
+        return JavaParserMetaModel.jmlInfFlowClauseMetaModel;
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseLabel.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlLabledClause.java
similarity index 65%
rename from javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseLabel.java
rename to javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlLabledClause.java
index 68278bc01a..88cf4b04ed 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlClauseLabel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlLabledClause.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.clauses;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
@@ -10,6 +9,7 @@
 import com.github.javaparser.ast.expr.BooleanLiteralExpr;
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.expr.SimpleName;
+import com.github.javaparser.ast.nodeTypes.NodeWithExpression;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.visitor.CloneVisitor;
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -22,47 +22,48 @@
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
+import com.github.javaparser.metamodel.JmlLabledClauseMetaModel;
 
 /**
  * @author Alexander Weigl
  * @version 1 (2/21/21)
  */
-public class JmlClauseLabel extends JmlClause {
+public class JmlLabledClause extends JmlClause implements NodeWithExpression<JmlLabledClause> {
 
     private JmlClauseKind kind;
 
     @OptionalProperty
     private SimpleName label;
 
-    private Expression expr;
+    private Expression expression;
 
-    public JmlClauseLabel() {
+    public JmlLabledClause() {
         this(JmlClauseKind.NONE, null, new BooleanLiteralExpr(true));
     }
 
-    public JmlClauseLabel(SimpleName label, Expression expr) {
-        this(JmlClauseKind.NONE, label, expr);
+    public JmlLabledClause(SimpleName label, Expression expression) {
+        this(JmlClauseKind.NONE, label, expression);
     }
 
     @AllFieldsConstructor
-    public JmlClauseLabel(JmlClauseKind kind, SimpleName label, Expression expr) {
-        this(null, kind, label, expr);
+    public JmlLabledClause(JmlClauseKind kind, SimpleName label, Expression expression) {
+        this(null, kind, label, expression);
     }
 
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlClauseLabel(TokenRange tokenRange, JmlClauseKind kind, SimpleName label, Expression expr) {
+    public JmlLabledClause(TokenRange tokenRange, JmlClauseKind kind, SimpleName label, Expression expression) {
         super(tokenRange);
         setKind(kind);
         setLabel(label);
-        setExpr(expr);
+        setExpression(expression);
         customInitialization();
     }
 
-    public JmlClauseLabel(TokenRange range, JavaToken kind, SimpleName label, Expression expr) {
-        this(range, JmlClauseKind.getKindByToken(kind), label, expr);
+    public JmlLabledClause(TokenRange range, JavaToken kind, SimpleName label, Expression expression) {
+        this(range, JmlClauseKind.getKindByToken(kind), label, expression);
     }
 
     @Override
@@ -98,8 +99,8 @@ public boolean replace(Node node, Node replacementNode) {
         if (node == null) {
             return false;
         }
-        if (node == expr) {
-            setExpr((Expression) replacementNode);
+        if (node == expression) {
+            setExpression((Expression) replacementNode);
             return true;
         }
         if (label != null) {
@@ -113,34 +114,35 @@ public boolean replace(Node node, Node replacementNode) {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
-    public JmlClauseLabel clone() {
-        return (JmlClauseLabel) accept(new CloneVisitor(), null);
+    public JmlLabledClause clone() {
+        return (JmlLabledClause) accept(new CloneVisitor(), null);
     }
 
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlClauseLabel(TokenRange tokenRange) {
+    public JmlLabledClause(TokenRange tokenRange) {
         super(tokenRange);
         customInitialization();
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
     public Expression getExpr() {
-        return expr;
+        return expression;
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public JmlClauseLabel setExpr(final @NonNull() Expression expr) {
-        assertNotNull(expr);
-        if (expr == this.expr) {
+    public JmlLabledClause setExpr(@NonNull() final Expression expression) {
+        assertNotNull(expression);
+        if (expression == this.expression) {
             return this;
         }
-        notifyPropertyChange(ObservableProperty.EXPR, this.expr, expr);
-        if (this.expr != null) this.expr.setParentNode(null);
-        this.expr = expr;
-        setAsParentNodeOf(expr);
+        notifyPropertyChange(ObservableProperty.EXPR, this.expression, expression);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
+        this.expression = expression;
+        setAsParentNodeOf(expression);
         return this;
     }
 
@@ -150,25 +152,20 @@ public Optional<SimpleName> getLabel() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public JmlClauseLabel setLabel(final @Nullable() SimpleName label) {
+    public JmlLabledClause setLabel(final @Nullable() SimpleName label) {
         if (label == this.label) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.LABEL, this.label, label);
-        if (this.label != null) this.label.setParentNode(null);
+        if (this.label != null)
+            this.label.setParentNode(null);
         this.label = label;
         setAsParentNodeOf(label);
         return this;
     }
 
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
-    public JmlClauseLabelMetaModel getMetaModel() {
-        return JavaParserMetaModel.jmlClauseLabelMetaModel;
-    }
-
     @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator")
-    public JmlClauseLabel removeLabel() {
+    public JmlLabledClause removeLabel() {
         return setLabel((SimpleName) null);
     }
 
@@ -179,7 +176,7 @@ public JmlClauseKind getKind() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public JmlClauseLabel setKind(final @NonNull() JmlClauseKind kind) {
+    public JmlLabledClause setKind(final @NonNull() JmlClauseKind kind) {
         assertNotNull(kind);
         if (kind == this.kind) {
             return this;
@@ -197,26 +194,27 @@ public boolean isJmlClauseLabel() {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public JmlClauseLabel asJmlClauseLabel() {
+    public JmlLabledClause asJmlClauseLabel() {
         return this;
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<JmlClauseLabel> toJmlClauseLabel() {
+    public Optional<JmlLabledClause> toJmlClauseLabel() {
         return Optional.of(this);
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlClauseLabel(Consumer<JmlClauseLabel> action) {
+    public void ifJmlClauseLabel(Consumer<JmlLabledClause> action) {
         action.accept(this);
     }
 
     @com.github.javaparser.ast.key.IgnoreLexPrinting()
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public @NonNull() Expression expr() {
-        return Objects.requireNonNull(expr);
+    @NonNull()
+    public Expression expr() {
+        return Objects.requireNonNull(expression);
     }
 
     @com.github.javaparser.ast.key.IgnoreLexPrinting()
@@ -230,4 +228,35 @@ public void ifJmlClauseLabel(Consumer<JmlClauseLabel> action) {
     public @Nullable() SimpleName label() {
         return label;
     }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public Expression getExpression() {
+        return expression;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public JmlLabledClause setExpression(final @NonNull() Expression expression) {
+        assertNotNull(expression);
+        if (expression == this.expression) {
+            return this;
+        }
+        notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
+        this.expression = expression;
+        setAsParentNodeOf(expression);
+        return this;
+    }
+
+    @com.github.javaparser.ast.key.IgnoreLexPrinting()
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public @NonNull() Expression expression() {
+        return Objects.requireNonNull(expression);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
+    public JmlLabledClauseMetaModel getMetaModel() {
+        return JavaParserMetaModel.jmlLabledClauseMetaModel;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMethodSignature.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMethodSignature.java
index 3f440394ff..c9eee52c2e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMethodSignature.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMethodSignature.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.clauses;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -63,7 +62,8 @@ public JmlMethodSignature setArgumentTypes(final @NonNull() NodeList<Type> argum
             return this;
         }
         notifyPropertyChange(ObservableProperty.ARGUMENT_TYPES, this.argumentTypes, argumentTypes);
-        if (this.argumentTypes != null) this.argumentTypes.setParentNode(null);
+        if (this.argumentTypes != null)
+            this.argumentTypes.setParentNode(null);
         this.argumentTypes = argumentTypes;
         setAsParentNodeOf(argumentTypes);
         return this;
@@ -81,7 +81,8 @@ public JmlMethodSignature setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -98,7 +99,8 @@ public JmlMethodSignature setReceiver(final @Nullable() Type receiver) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.RECEIVER, this.receiver, receiver);
-        if (this.receiver != null) this.receiver.setParentNode(null);
+        if (this.receiver != null)
+            this.receiver.setParentNode(null);
         this.receiver = receiver;
         setAsParentNodeOf(receiver);
         return this;
@@ -161,12 +163,6 @@ public JmlMethodSignature clone() {
         return (JmlMethodSignature) accept(new CloneVisitor(), null);
     }
 
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
-    public JmlMethodSignatureMetaModel getMetaModel() {
-        return JavaParserMetaModel.jmlMethodSignatureMetaModel;
-    }
-
     /**
      * This constructor is used by the parser and is considered private.
      */
@@ -196,4 +192,9 @@ public JmlMethodSignature(TokenRange tokenRange, Type receiver, SimpleName name,
     public @Nullable() Type receiver() {
         return receiver;
     }
+
+    @Override
+    public JmlMethodSignatureMetaModel getMetaModel() {
+        return JavaParserMetaModel.jmlMethodSignatureMetaModel;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMultiExprClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMultiExprClause.java
index 5e4d3e5607..8a3376712d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMultiExprClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlMultiExprClause.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.clauses;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
@@ -37,17 +36,11 @@ public class JmlMultiExprClause extends JmlClause {
     private NodeList<Expression> expressions;
 
     @AllFieldsConstructor
-    public JmlMultiExprClause(
-            JmlClauseKind kind, SimpleName name, NodeList<SimpleName> heaps, NodeList<Expression> expressions) {
+    public JmlMultiExprClause(JmlClauseKind kind, SimpleName name, NodeList<SimpleName> heaps, NodeList<Expression> expressions) {
         this(null, kind, name, heaps, expressions);
     }
 
-    public JmlMultiExprClause(
-            TokenRange range,
-            JavaToken begin,
-            SimpleName label,
-            NodeList<SimpleName> heaps,
-            NodeList<Expression> exprs) {
+    public JmlMultiExprClause(TokenRange range, JavaToken begin, SimpleName label, NodeList<SimpleName> heaps, NodeList<Expression> exprs) {
         this(range, JmlClauseKind.getKindByToken(begin), label, heaps, exprs);
     }
 
@@ -81,7 +74,8 @@ public JmlMultiExprClause setExpressions(final @NonNull() NodeList<Expression> e
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSIONS, this.expressions, expressions);
-        if (this.expressions != null) this.expressions.setParentNode(null);
+        if (this.expressions != null)
+            this.expressions.setParentNode(null);
         this.expressions = expressions;
         setAsParentNodeOf(expressions);
         return this;
@@ -98,7 +92,8 @@ public JmlMultiExprClause setHeaps(final @Nullable() NodeList<SimpleName> heaps)
             return this;
         }
         notifyPropertyChange(ObservableProperty.HEAPS, this.heaps, heaps);
-        if (this.heaps != null) this.heaps.setParentNode(null);
+        if (this.heaps != null)
+            this.heaps.setParentNode(null);
         this.heaps = heaps;
         setAsParentNodeOf(heaps);
         return this;
@@ -177,12 +172,7 @@ public JmlMultiExprClauseMetaModel getMetaModel() {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlMultiExprClause(
-            TokenRange tokenRange,
-            JmlClauseKind kind,
-            SimpleName name,
-            NodeList<SimpleName> heaps,
-            NodeList<Expression> expressions) {
+    public JmlMultiExprClause(TokenRange tokenRange, JmlClauseKind kind, SimpleName name, NodeList<SimpleName> heaps, NodeList<Expression> expressions) {
         super(tokenRange, name);
         setKind(kind);
         setHeaps(heaps);
@@ -200,7 +190,8 @@ public JmlMultiExprClause setExpression(final NodeList<Expression> expressions)
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expressions, expressions);
-        if (this.expressions != null) this.expressions.setParentNode(null);
+        if (this.expressions != null)
+            this.expressions.setParentNode(null);
         this.expressions = expressions;
         setAsParentNodeOf(expressions);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlOldClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlOldClause.java
index adf89215c9..e95d834efb 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlOldClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlOldClause.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.clauses;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -70,7 +69,8 @@ public JmlOldClause setDeclarations(final @NonNull() VariableDeclarationExpr dec
             return this;
         }
         notifyPropertyChange(ObservableProperty.DECLARATIONS, this.declarations, declarations);
-        if (this.declarations != null) this.declarations.setParentNode(null);
+        if (this.declarations != null)
+            this.declarations.setParentNode(null);
         this.declarations = declarations;
         setAsParentNodeOf(declarations);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsClause.java
index 817918bd60..bd334793ba 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsClause.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.clauses;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -24,7 +23,7 @@
  * @author Alexander Weigl
  * @version 1 (2/21/21)
  */
-public class JmlSignalsClause extends JmlClause implements MethodContractable, BlockContractable {
+public class JmlSignalsClause extends JmlClause {
 
     private Parameter parameter;
 
@@ -79,7 +78,8 @@ public JmlSignalsClause setExpression(final @NonNull() Expression expression) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
@@ -108,7 +108,8 @@ public JmlSignalsClause setParameter(final @NonNull() Parameter parameter) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.PARAMETER, this.parameter, parameter);
-        if (this.parameter != null) this.parameter.setParentNode(null);
+        if (this.parameter != null)
+            this.parameter.setParentNode(null);
         this.parameter = parameter;
         setAsParentNodeOf(parameter);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsOnlyClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsOnlyClause.java
index c40a866646..c40a191555 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsOnlyClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSignalsOnlyClause.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.clauses;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -23,7 +22,7 @@
  * @author Alexander Weigl
  * @version 1 (2/21/21)
  */
-public class JmlSignalsOnlyClause extends JmlClause implements MethodContractable, BlockContractable {
+public class JmlSignalsOnlyClause extends JmlClause {
 
     private NodeList<Type> types;
 
@@ -42,7 +41,8 @@ public JmlSignalsOnlyClause(TokenRange tokenRange, NodeList<Type> types) {
         customInitialization();
     }
 
-    public JmlSignalsOnlyClause() {}
+    public JmlSignalsOnlyClause() {
+    }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.AcceptGenerator")
@@ -118,7 +118,8 @@ public JmlSignalsOnlyClause setTypes(final @NonNull() NodeList<Type> types) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPES, this.types, types);
-        if (this.types != null) this.types.setParentNode(null);
+        if (this.types != null)
+            this.types.setParentNode(null);
         this.types = types;
         setAsParentNodeOf(types);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSimpleExprClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSimpleExprClause.java
index af176afeb9..3bbd0a8ed6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSimpleExprClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/JmlSimpleExprClause.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.clauses;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
@@ -27,16 +26,16 @@
  * @author Alexander Weigl
  * @version 1 (2/21/21)
  */
-public class JmlSimpleExprClause extends JmlClause implements MethodContractable, BlockContractable {
+public class JmlSimpleExprClause extends JmlClause {
 
     private JmlClauseKind kind;
 
-    @OptionalProperty
     private NodeList<SimpleName> heaps;
 
     private Expression expression;
 
-    public JmlSimpleExprClause() {}
+    public JmlSimpleExprClause() {
+    }
 
     @AllFieldsConstructor
     public JmlSimpleExprClause(JmlClauseKind kind, SimpleName name, NodeList<SimpleName> heaps, Expression expression) {
@@ -52,11 +51,10 @@ public JmlSimpleExprClause(TokenRange range, JavaToken kind, Expression expr) {
     }
 
     public JmlSimpleExprClause(TokenRange range, JavaToken kind, SimpleName name, Expression expr) {
-        this(range, JmlClauseKind.getKindByToken(kind), name, null, expr);
+        this(range, JmlClauseKind.getKindByToken(kind), name, new NodeList<>(), expr);
     }
 
-    public JmlSimpleExprClause(
-            TokenRange range, JavaToken kind, SimpleName name, NodeList<SimpleName> heaps, Expression expr) {
+    public JmlSimpleExprClause(TokenRange range, JavaToken kind, SimpleName name, NodeList<SimpleName> heaps, Expression expr) {
         this(range, JmlClauseKind.getKindByToken(kind), name, heaps, expr);
     }
 
@@ -134,7 +132,8 @@ public Expression getExpression() {
     public JmlSimpleExprClause setExpression(final NodeList<Expression> expression) {
         assertNotNull(expression);
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         setAsParentNodeOf(expression);
         return this;
     }
@@ -150,7 +149,8 @@ public JmlSimpleExprClause setHeaps(final @Nullable() NodeList<SimpleName> heaps
             return this;
         }
         notifyPropertyChange(ObservableProperty.HEAPS, this.heaps, heaps);
-        if (this.heaps != null) this.heaps.setParentNode(null);
+        if (this.heaps != null)
+            this.heaps.setParentNode(null);
         this.heaps = heaps;
         setAsParentNodeOf(heaps);
         return this;
@@ -166,12 +166,7 @@ public JmlClauseKind getKind() {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlSimpleExprClause(
-            TokenRange tokenRange,
-            JmlClauseKind kind,
-            SimpleName name,
-            NodeList<SimpleName> heaps,
-            Expression expression) {
+    public JmlSimpleExprClause(TokenRange tokenRange, JmlClauseKind kind, SimpleName name, NodeList<SimpleName> heaps, Expression expression) {
         super(tokenRange, name);
         setKind(kind);
         setHeaps(heaps);
@@ -197,7 +192,8 @@ public JmlSimpleExprClause setExpression(final @NonNull() Expression expression)
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/LoopContractable.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/LoopContractable.java
index 9ad35a782e..bdf65b2f93 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/LoopContractable.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/LoopContractable.java
@@ -4,4 +4,5 @@
  * @author Alexander Weigl
  * @version 1 (3/16/21)
  */
-public interface LoopContractable {}
+public interface LoopContractable {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/MethodContractable.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/MethodContractable.java
deleted file mode 100644
index 2c77cde4de..0000000000
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/clauses/MethodContractable.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.github.javaparser.ast.jml.clauses;
-
-/**
- * @author Alexander Weigl
- * @version 1 (3/16/21)
- */
-public interface MethodContractable {}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDoc.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDoc.java
index 9d464147c0..1fe3002478 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDoc.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDoc.java
@@ -1,7 +1,7 @@
 package com.github.javaparser.ast.jml.doc;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
+import com.github.javaparser.GeneratedJavaParserConstants;
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
@@ -22,11 +22,19 @@
  */
 public class JmlDoc extends Node {
 
-    private JavaToken content;
+    private String content;
 
-    @AllFieldsConstructor
     public JmlDoc(JavaToken content) {
-        this(new TokenRange(content, content), content);
+        this(new TokenRange(content, content), content.getText());
+    }
+
+    private static JavaToken getContent(JavaToken content) {
+        return content;
+    }
+
+    @AllFieldsConstructor
+    public JmlDoc(String content) {
+        this(null, content);
     }
 
     @Override
@@ -42,14 +50,14 @@ public <A> void accept(final VoidVisitor<A> v, final A arg) {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public JavaToken getContent() {
+    public String getContent() {
         return content;
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public JmlDoc setContent(final @NonNull() JavaToken content) {
+    public JmlDoc setContent(final @NonNull() String content) {
         assertNotNull(content);
-        if (content == this.content) {
+        if (content.equals(this.content)) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONTENT, this.content, content);
@@ -63,25 +71,38 @@ public JmlDoc clone() {
         return (JmlDoc) accept(new CloneVisitor(), null);
     }
 
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
-    public JmlDocMetaModel getMetaModel() {
-        return JavaParserMetaModel.jmlDocMetaModel;
-    }
-
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlDoc(TokenRange tokenRange, JavaToken content) {
+    public JmlDoc(TokenRange tokenRange, String content) {
         super(tokenRange);
         setContent(content);
         customInitialization();
     }
 
+    public JmlDoc(TokenRange tokenRange, JavaToken content) {
+        this(tokenRange, content.getText());
+    }
+
     @com.github.javaparser.ast.key.IgnoreLexPrinting()
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public @NonNull() JavaToken content() {
+    public @NonNull() String content() {
         return Objects.requireNonNull(content);
     }
+
+    public JavaToken constructToken() {
+        final var tokenRange = getTokenRange();
+        if (tokenRange.isPresent()) {
+            assert (tokenRange.get().getBegin() == tokenRange.get().getEnd());
+            return tokenRange.get().getBegin();
+        }
+        return new JavaToken(GeneratedJavaParserConstants.JML_BLOCK_COMMENT, getContent());
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
+    public JmlDocMetaModel getMetaModel() {
+        return JavaParserMetaModel.jmlDocMetaModel;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocDeclaration.java
index b304362f00..64588e8bd5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocDeclaration.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.doc;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
@@ -119,7 +118,8 @@ public JmlDocDeclaration setJmlComments(final @NonNull() NodeList<JmlDoc> jmlCom
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_COMMENTS, this.jmlComments, jmlComments);
-        if (this.jmlComments != null) this.jmlComments.setParentNode(null);
+        if (this.jmlComments != null)
+            this.jmlComments.setParentNode(null);
         this.jmlComments = jmlComments;
         setAsParentNodeOf(jmlComments);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocStmt.java
index 17d418e009..c7c850b8e0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.doc;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
@@ -113,7 +112,8 @@ public JmlDocStmt setJmlComments(final @NonNull() NodeList<JmlDoc> jmlComments)
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_COMMENTS, this.jmlComments, jmlComments);
-        if (this.jmlComments != null) this.jmlComments.setParentNode(null);
+        if (this.jmlComments != null)
+            this.jmlComments.setParentNode(null);
         this.jmlComments = jmlComments;
         setAsParentNodeOf(jmlComments);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocType.java
index 7273ef8579..4df9fec5f8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/doc/JmlDocType.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.doc;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.BodyDeclaration;
@@ -33,12 +32,7 @@ public JmlDocType(NodeList<JmlDoc> jmlComments) {
     }
 
     @AllFieldsConstructor
-    public JmlDocType(
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            SimpleName name,
-            NodeList<BodyDeclaration<?>> members,
-            NodeList<JmlDoc> jmlComments) {
+    public JmlDocType(NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<BodyDeclaration<?>> members, NodeList<JmlDoc> jmlComments) {
         super(modifiers, annotations, name, members);
         this.jmlComments = jmlComments;
     }
@@ -81,7 +75,8 @@ public JmlDocType setJmlComments(final @NonNull() NodeList<JmlDoc> jmlComments)
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_COMMENTS, this.jmlComments, jmlComments);
-        if (this.jmlComments != null) this.jmlComments.setParentNode(null);
+        if (this.jmlComments != null)
+            this.jmlComments.setParentNode(null);
         this.jmlComments = jmlComments;
         setAsParentNodeOf(jmlComments);
         return this;
@@ -133,13 +128,7 @@ public JmlDocTypeMetaModel getMetaModel() {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlDocType(
-            TokenRange tokenRange,
-            NodeList<Modifier> modifiers,
-            NodeList<AnnotationExpr> annotations,
-            SimpleName name,
-            NodeList<BodyDeclaration<?>> members,
-            NodeList<JmlDoc> jmlComments) {
+    public JmlDocType(TokenRange tokenRange, NodeList<Modifier> modifiers, NodeList<AnnotationExpr> annotations, SimpleName name, NodeList<BodyDeclaration<?>> members, NodeList<JmlDoc> jmlComments) {
         super(tokenRange, modifiers, annotations, name, members);
         setJmlComments(jmlComments);
         customInitialization();
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlBinaryInfixExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlBinaryInfixExpr.java
index 32408b6d57..d81070ff1d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlBinaryInfixExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlBinaryInfixExpr.java
@@ -1,11 +1,11 @@
 package com.github.javaparser.ast.jml.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
+import com.github.javaparser.ast.Jmlish;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.expr.SimpleName;
@@ -24,7 +24,7 @@
  * @author Alexander Weigl
  * @version 1 (7/3/21)
  */
-public class JmlBinaryInfixExpr extends Expression {
+public class JmlBinaryInfixExpr extends JmlExpression {
 
     private Expression left;
 
@@ -109,7 +109,8 @@ public JmlBinaryInfixExpr setLeft(final @NonNull() Expression left) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.LEFT, this.left, left);
-        if (this.left != null) this.left.setParentNode(null);
+        if (this.left != null)
+            this.left.setParentNode(null);
         this.left = left;
         setAsParentNodeOf(left);
         return this;
@@ -127,7 +128,8 @@ public JmlBinaryInfixExpr setOperator(final @NonNull() SimpleName operator) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.OPERATOR, this.operator, operator);
-        if (this.operator != null) this.operator.setParentNode(null);
+        if (this.operator != null)
+            this.operator.setParentNode(null);
         this.operator = operator;
         setAsParentNodeOf(operator);
         return this;
@@ -145,7 +147,8 @@ public JmlBinaryInfixExpr setRight(final @NonNull() Expression right) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.RIGHT, this.right, right);
-        if (this.right != null) this.right.setParentNode(null);
+        if (this.right != null)
+            this.right.setParentNode(null);
         this.right = right;
         setAsParentNodeOf(right);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlExpression.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlExpression.java
new file mode 100644
index 0000000000..6e6d92aa29
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlExpression.java
@@ -0,0 +1,20 @@
+package com.github.javaparser.ast.jml.expr;
+
+import com.github.javaparser.TokenRange;
+import com.github.javaparser.ast.Jmlish;
+import com.github.javaparser.ast.expr.Expression;
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (4/6/26)
+ */
+public abstract class JmlExpression extends Expression implements Jmlish {
+    public JmlExpression() {
+        super();
+    }
+
+    public JmlExpression(TokenRange tokenRange) {
+        super(tokenRange);
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLabelExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLabelExpr.java
index 9da2fd9cad..ca6dba4bd2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLabelExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLabelExpr.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
@@ -27,7 +26,7 @@
  * @author Alexander Weigl
  * @version 1 (2/21/21)
  */
-public class JmlLabelExpr extends Expression implements Jmlish {
+public class JmlLabelExpr extends JmlExpression {
 
     private Kind kind;
 
@@ -45,16 +44,12 @@ public JmlLabelExpr(TokenRange range, JavaToken quant, SimpleName name, Expressi
     }
 
     private static Kind token2Kind(JavaToken token) {
-        return Arrays.stream(Kind.values())
-                .filter(it -> it.jmlSymbol().equals(token.getText()))
-                .findFirst()
-                .get();
+        return Arrays.stream(Kind.values()).filter(it -> it.jmlSymbol().equals(token.getText())).findFirst().get();
     }
 
     public enum Kind implements JmlKeyword {
-        NEUTRAL("\\lbl"),
-        POSITIVE("\\lblpos"),
-        NEGATIVE("\\lblneg");
+
+        NEUTRAL("\\lbl"), POSITIVE("\\lblpos"), NEGATIVE("\\lblneg");
 
         private final String symbol;
 
@@ -153,7 +148,8 @@ public JmlLabelExpr setExpression(final @NonNull() Expression expression) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
@@ -197,7 +193,8 @@ public JmlLabelExpr setLabel(final @NonNull() SimpleName label) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.LABEL, this.label, label);
-        if (this.label != null) this.label.setParentNode(null);
+        if (this.label != null)
+            this.label.setParentNode(null);
         this.label = label;
         setAsParentNodeOf(label);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLetExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLetExpr.java
index 61288e492d..cbe66706a7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLetExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlLetExpr.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -24,7 +23,7 @@
  * @author Alexander Weigl
  * @version 1 (2/21/21)
  */
-public class JmlLetExpr extends Expression implements Jmlish {
+public class JmlLetExpr extends JmlExpression {
 
     private VariableDeclarationExpr variables;
 
@@ -89,7 +88,8 @@ public JmlLetExpr setBody(final @NonNull() Expression body) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BODY, this.body, body);
-        if (this.body != null) this.body.setParentNode(null);
+        if (this.body != null)
+            this.body.setParentNode(null);
         this.body = body;
         setAsParentNodeOf(body);
         return this;
@@ -107,7 +107,8 @@ public JmlLetExpr setVariables(final @NonNull() VariableDeclarationExpr variable
             return this;
         }
         notifyPropertyChange(ObservableProperty.VARIABLES, this.variables, variables);
-        if (this.variables != null) this.variables.setParentNode(null);
+        if (this.variables != null)
+            this.variables.setParentNode(null);
         this.variables = variables;
         setAsParentNodeOf(variables);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlMultiCompareExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlMultiCompareExpr.java
index 691caf21b9..f0bdd52036 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlMultiCompareExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlMultiCompareExpr.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.BinaryExpr;
@@ -24,7 +23,7 @@
  * @author Alexander Weigl
  * @version 1 (2/21/21)
  */
-public class JmlMultiCompareExpr extends Expression implements Jmlish {
+public class JmlMultiCompareExpr extends JmlExpression {
 
     @NonEmptyProperty
     private NodeList<Expression> expressions;
@@ -127,7 +126,8 @@ public JmlMultiCompareExpr setExpressions(final @NonNull() NodeList<Expression>
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSIONS, this.expressions, expressions);
-        if (this.expressions != null) this.expressions.setParentNode(null);
+        if (this.expressions != null)
+            this.expressions.setParentNode(null);
         this.expressions = expressions;
         setAsParentNodeOf(expressions);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlQuantifiedExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlQuantifiedExpr.java
index 8ccde7b085..20a67586d8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlQuantifiedExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlQuantifiedExpr.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.jml.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
@@ -47,14 +46,16 @@
  *
  * @author Alexander Weigl
  */
-public class JmlQuantifiedExpr extends Expression implements Jmlish {
+public class JmlQuantifiedExpr extends JmlExpression {
 
-    public interface JmlBinder extends JmlKeyword {}
+    public interface JmlBinder extends JmlKeyword {
+    }
 
     /**
      * 12.4.24.2 Generalized Quantifiers
      */
     public enum JmlDefaultBinder implements JmlBinder {
+
         FORALL("\\forall"),
         EXISTS("\\exists"),
         NUM_OF("\\num_of"),
@@ -74,10 +75,9 @@ public enum JmlDefaultBinder implements JmlBinder {
         }
 
         public static JmlBinder valueOf(JavaToken binder) {
-            Optional<JmlDefaultBinder> b = Arrays.stream(values())
-                    .filter(it -> binder.getText().equals(it.symbol))
-                    .findFirst();
-            if (b.isPresent()) return b.get();
+            Optional<JmlDefaultBinder> b = Arrays.stream(values()).filter(it -> binder.getText().equals(it.symbol)).findFirst();
+            if (b.isPresent())
+                return b.get();
             else {
                 return binder::getText;
                 // throw new IllegalArgumentException(String.format("Unknown binder %s", binder.getText()));
@@ -107,13 +107,11 @@ public JmlQuantifiedExpr(final NodeList<Parameter> variables, final Expression e
     }
 
     @AllFieldsConstructor
-    public JmlQuantifiedExpr(
-            final JmlBinder binder, final NodeList<Parameter> variables, final Expression expressions) {
+    public JmlQuantifiedExpr(final JmlBinder binder, final NodeList<Parameter> variables, final Expression expressions) {
         this(null, binder, variables, new NodeList<>(expressions));
     }
 
-    public JmlQuantifiedExpr(
-            TokenRange tokenRange, JavaToken binder, NodeList<Parameter> variables, NodeList<Expression> expressions) {
+    public JmlQuantifiedExpr(TokenRange tokenRange, JavaToken binder, NodeList<Parameter> variables, NodeList<Expression> expressions) {
         this(tokenRange, JmlDefaultBinder.valueOf(binder), variables, new NodeList<>(expressions));
     }
 
@@ -121,8 +119,7 @@ public JmlQuantifiedExpr(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlQuantifiedExpr(
-            TokenRange tokenRange, JmlBinder binder, NodeList<Parameter> variables, NodeList<Expression> expressions) {
+    public JmlQuantifiedExpr(TokenRange tokenRange, JmlBinder binder, NodeList<Parameter> variables, NodeList<Expression> expressions) {
         super(tokenRange);
         setBinder(binder);
         setVariables(variables);
@@ -178,7 +175,8 @@ public JmlQuantifiedExpr setExpressions(final @NonNull() NodeList<Expression> ex
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSIONS, this.expressions, expressions);
-        if (this.expressions != null) this.expressions.setParentNode(null);
+        if (this.expressions != null)
+            this.expressions.setParentNode(null);
         this.expressions = expressions;
         setAsParentNodeOf(expressions);
         return this;
@@ -196,7 +194,8 @@ public JmlQuantifiedExpr setVariables(final @NonNull() NodeList<Parameter> varia
             return this;
         }
         notifyPropertyChange(ObservableProperty.VARIABLES, this.variables, variables);
-        if (this.variables != null) this.variables.setParentNode(null);
+        if (this.variables != null)
+            this.variables.setParentNode(null);
         this.variables = variables;
         setAsParentNodeOf(variables);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlSetComprehensionExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlSetComprehensionExpr.java
index 9eb3949bff..de103a7a04 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlSetComprehensionExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlSetComprehensionExpr.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -20,23 +19,22 @@
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
 
-/**
- * 12.5 Set Comprehensions
- * https://www.cs.ucf.edu/~leavens/JML/jmlrefman/jmlrefman_12.html#SEC160
- * <p>
- * new JMLObjectSet {Integer i | myIntSet.has(i) &&
- * i != null && 0 <= i.intValue() && i.intValue() <= 10 }
- *
- * @author Alexander Weigl
- * @version 1 (3/20/21)
- */
-public class JmlSetComprehensionExpr extends Expression implements Jmlish {
+/// [12.5 Set Comprehensions](https://www.cs.ucf.edu/~leavens/JML/jmlrefman/jmlrefman_12.html#SEC160)
+///
+/// ```java
+/// new JMLObjectSet {Integer i | myIntSet.has(i) &&
+/// i != null && 0 <= i.intValue() && i.intValue() <= 10 }
+/// ```
+/// @author Alexander Weigl
+/// @version 1 (3/20/21)
+public class JmlSetComprehensionExpr extends JmlExpression {
 
     private VariableDeclarator binding;
 
     private Expression predicate;
 
-    public JmlSetComprehensionExpr() {}
+    public JmlSetComprehensionExpr() {
+    }
 
     @AllFieldsConstructor
     public JmlSetComprehensionExpr(VariableDeclarator binding, Expression predicate) {
@@ -103,7 +101,8 @@ public JmlSetComprehensionExpr setBinding(final @NonNull() VariableDeclarator bi
             return this;
         }
         notifyPropertyChange(ObservableProperty.BINDING, this.binding, binding);
-        if (this.binding != null) this.binding.setParentNode(null);
+        if (this.binding != null)
+            this.binding.setParentNode(null);
         this.binding = binding;
         setAsParentNodeOf(binding);
         return this;
@@ -121,7 +120,8 @@ public JmlSetComprehensionExpr setPredicate(final @NonNull() Expression predicat
             return this;
         }
         notifyPropertyChange(ObservableProperty.PREDICATE, this.predicate, predicate);
-        if (this.predicate != null) this.predicate.setParentNode(null);
+        if (this.predicate != null)
+            this.predicate.setParentNode(null);
         this.predicate = predicate;
         setAsParentNodeOf(predicate);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlTypeExpr.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlTypeExpr.java
index 0554644bbc..8bf1465d44 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlTypeExpr.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/expr/JmlTypeExpr.java
@@ -1,10 +1,10 @@
 package com.github.javaparser.ast.jml.expr;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
+import com.github.javaparser.ast.Jmlish;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.observer.ObservableProperty;
@@ -23,7 +23,7 @@
  * @author Alexander Weigl
  * @version 1 (12/29/21)
  */
-public class JmlTypeExpr extends Expression {
+public class JmlTypeExpr extends JmlExpression {
 
     private Type type;
 
@@ -66,7 +66,8 @@ public JmlTypeExpr setType(final @NonNull() Type type) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.type, type);
-        if (this.type != null) this.type.setParentNode(null);
+        if (this.type != null)
+            this.type.setParentNode(null);
         this.type = type;
         setAsParentNodeOf(type);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlBeginStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlBeginStmt.java
index 4cddc20cd0..1afb7c592b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlBeginStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlBeginStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -79,7 +78,8 @@ public JmlBeginStmt setJmlTags(final @NonNull() NodeList<SimpleName> jmlTags) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlEndStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlEndStmt.java
index b244e822a2..a78a57e139 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlEndStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlEndStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -79,7 +78,8 @@ public JmlEndStmt setJmlTags(final @NonNull() NodeList<SimpleName> jmlTags) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlExpressionStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlExpressionStmt.java
index 7ce418bd65..06257e2d5a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlExpressionStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlExpressionStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.GeneratedJavaParserConstants;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
@@ -31,7 +30,8 @@
 public class JmlExpressionStmt extends JmlStatement implements NodeWithJmlTags<JmlExpressionStmt> {
 
     public enum JmlStmtKind implements JmlKeyword {
-        ASSERT(GeneratedJavaParserConstants.ASSERT),
+
+        ASSERT(GeneratedJavaParserConstants.JML_ASSERT),
         ASSERT_REDUNDANTLY(GeneratedJavaParserConstants.ASSERT_REDUNDANTLY),
         ASSUME(GeneratedJavaParserConstants.ASSUME),
         ASSUME_REDUNDANTLY(GeneratedJavaParserConstants.ASSUME_REDUNDANTLY),
@@ -65,9 +65,7 @@ public JmlExpressionStmt(NodeList<SimpleName> jmlTags, final JmlStmtKind kind, f
     public JmlExpressionStmt(TokenRange range, NodeList<SimpleName> jmlTags, final Expression expression) {
         this(range, jmlTags, JmlStmtKind.ASSERT, expression);
         int tt = range.getBegin().getKind();
-        Optional<JmlStmtKind> k = Arrays.stream(JmlStmtKind.values())
-                .filter(i -> i.tokenType == tt)
-                .findFirst();
+        Optional<JmlStmtKind> k = Arrays.stream(JmlStmtKind.values()).filter(i -> i.tokenType == tt).findFirst();
         k.ifPresent(this::setKind);
         if (!k.isPresent()) {
             throw new IllegalArgumentException("wrong token type");
@@ -138,7 +136,8 @@ public JmlExpressionStmt setExpression(final @NonNull() Expression expression) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
@@ -148,8 +147,7 @@ public JmlExpressionStmt setExpression(final @NonNull() Expression expression) {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public JmlExpressionStmt(
-            TokenRange tokenRange, NodeList<SimpleName> jmlTags, JmlStmtKind kind, Expression expression) {
+    public JmlExpressionStmt(TokenRange tokenRange, NodeList<SimpleName> jmlTags, JmlStmtKind kind, Expression expression) {
         super(tokenRange);
         setJmlTags(jmlTags);
         setKind(kind);
@@ -185,7 +183,8 @@ public JmlExpressionStmt setJmlTags(final @NonNull() NodeList<SimpleName> jmlTag
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlGhostStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlGhostStmt.java
index d0ff365733..7b320598fa 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlGhostStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlGhostStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -71,7 +70,8 @@ public JmlGhostStmt setstatement(final Statement statement) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.STATEMENT, this.statement, statement);
-        if (this.statement != null) this.statement.setParentNode(null);
+        if (this.statement != null)
+            this.statement.setParentNode(null);
         this.statement = statement;
         setAsParentNodeOf(statement);
         return this;
@@ -109,7 +109,8 @@ public JmlGhostStmt setStatement(final @NonNull() Statement statement) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.STATEMENT, this.statement, statement);
-        if (this.statement != null) this.statement.setParentNode(null);
+        if (this.statement != null)
+            this.statement.setParentNode(null);
         this.statement = statement;
         setAsParentNodeOf(statement);
         return this;
@@ -133,7 +134,8 @@ public JmlGhostStmt setJmlTags(final @NonNull() NodeList<SimpleName> jmlTags) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlLabelStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlLabelStmt.java
index 3cb04e9ab9..0fb47fa99b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlLabelStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlLabelStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -59,7 +58,8 @@ public JmlLabelStmt setLabel(final @NonNull() SimpleName label) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.LABEL, this.label, label);
-        if (this.label != null) this.label.setParentNode(null);
+        if (this.label != null)
+            this.label.setParentNode(null);
         this.label = label;
         setAsParentNodeOf(label);
         return this;
@@ -119,7 +119,8 @@ public JmlLabelStmt setJmlTags(final @NonNull() NodeList<SimpleName> jmlTags) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlRefiningStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlRefiningStmt.java
index 8346c81050..aba95f5be2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlRefiningStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlRefiningStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -79,7 +78,8 @@ public JmlRefiningStmt setJmlTags(final @NonNull() NodeList<SimpleName> jmlTags)
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlStatement.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlStatement.java
index 4fa4233b1b..67d8c3ac83 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlStatement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlStatement.java
@@ -10,6 +10,7 @@
 import com.github.javaparser.metamodel.JmlStatementMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * @author Alexander Weigl
@@ -18,7 +19,8 @@
 public abstract class JmlStatement extends Statement implements Jmlish {
 
     @AllFieldsConstructor
-    public JmlStatement() {}
+    public JmlStatement() {
+    }
 
     /**
      * This constructor is used by the parser and is considered private.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlUnreachableStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlUnreachableStmt.java
index 97a9492147..c74190af58 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlUnreachableStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/stmt/JmlUnreachableStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.jml.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -73,7 +72,8 @@ public JmlUnreachableStmt setJmlTags(final @NonNull() NodeList<SimpleName> jmlTa
             return this;
         }
         notifyPropertyChange(ObservableProperty.JML_TAGS, this.jmlTags, jmlTags);
-        if (this.jmlTags != null) this.jmlTags.setParentNode(null);
+        if (this.jmlTags != null)
+            this.jmlTags.setParentNode(null);
         this.jmlTags = jmlTags;
         setAsParentNodeOf(jmlTags);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/type/JmlLogicType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/type/JmlLogicType.java
index 5e1d495266..967f20e6b4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/jml/type/JmlLogicType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/jml/type/JmlLogicType.java
@@ -38,11 +38,8 @@
 public class JmlLogicType extends Type implements Jmlish {
 
     public enum Primitive implements JmlKeyword {
-        SET("\\set"),
-        SEQ("\\seq"),
-        MAP("\\map"),
-        BIGINT("\\bigint"),
-        BIGFLOAT("\\bigfloat");
+
+        SET("\\set"), SEQ("\\seq"), MAP("\\map"), BIGINT("\\bigint"), BIGFLOAT("\\bigfloat");
 
         final String symbol;
 
@@ -79,7 +76,8 @@ public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.AcceptGenerator")
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {}
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
     public Primitive getType() {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/IgnoreLexPrinting.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/IgnoreLexPrinting.java
index 017b0b451e..db0a688b45 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/IgnoreLexPrinting.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/IgnoreLexPrinting.java
@@ -8,4 +8,5 @@
  * @version 1 (2/1/26)
  */
 @Retention(RetentionPolicy.RUNTIME)
-public @interface IgnoreLexPrinting {}
+public @interface IgnoreLexPrinting {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeYMarkerStatement.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeYMarkerStatement.java
new file mode 100644
index 0000000000..2d3a736ee9
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeYMarkerStatement.java
@@ -0,0 +1,114 @@
+package com.github.javaparser.ast.key;
+
+import com.github.javaparser.TokenRange;
+import com.github.javaparser.ast.AllFieldsConstructor;
+import com.github.javaparser.ast.DataKey;
+import com.github.javaparser.ast.Generated;
+import com.github.javaparser.ast.observer.ObservableProperty;
+import com.github.javaparser.ast.stmt.Statement;
+import com.github.javaparser.ast.visitor.CloneVisitor;
+import com.github.javaparser.ast.visitor.GenericVisitor;
+import com.github.javaparser.ast.visitor.VoidVisitor;
+import com.github.javaparser.metamodel.JavaParserMetaModel;
+import com.github.javaparser.metamodel.KeYMarkerStatementMetaModel;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.Consumer;
+import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.Node;
+
+/**
+ * This class is statement, that can be plugged everywhere. Its meaning is defined by {@link #kind} with semantics
+ * left to the user. For additional value, use {@link #setData(DataKey, Object)} and {@link #getData(DataKey)}.
+ *
+ * @author Alexander Weigl
+ * @version 1 (3/4/26)
+ */
+public class KeYMarkerStatement extends Statement {
+
+    private int kind = 0;
+
+    @AllFieldsConstructor
+    public KeYMarkerStatement(int kind) {
+        this.kind = kind;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.AcceptGenerator")
+    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+        return v.visit(this, arg);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.AcceptGenerator")
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+        v.visit(this, arg);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeYMarkerStatement() {
+        return true;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeYMarkerStatement asKeYMarkerStatement() {
+        return this;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeYMarkerStatement> toKeYMarkerStatement() {
+        return Optional.of(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeYMarkerStatement(Consumer<KeYMarkerStatement> action) {
+        action.accept(this);
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public int getKind() {
+        return kind;
+    }
+
+    @com.github.javaparser.ast.key.IgnoreLexPrinting()
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public int kind() {
+        return Objects.requireNonNull(kind);
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
+    public KeYMarkerStatement setKind(final int kind) {
+        if (kind == this.kind) {
+            return this;
+        }
+        notifyPropertyChange(ObservableProperty.KIND, this.kind, kind);
+        this.kind = kind;
+        return this;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
+    public KeYMarkerStatement clone() {
+        return (KeYMarkerStatement) accept(new CloneVisitor(), null);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
+    public KeYMarkerStatementMetaModel getMetaModel() {
+        return JavaParserMetaModel.keYMarkerStatementMetaModel;
+    }
+
+    /**
+     * This constructor is used by the parser and is considered private.
+     */
+    @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
+    public KeYMarkerStatement(TokenRange tokenRange, int kind) {
+        super(tokenRange);
+        setKind(kind);
+        customInitialization();
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyAbstractExecutionContext.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyAbstractExecutionContext.java
index 40bf6a4bf3..fdef644077 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyAbstractExecutionContext.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyAbstractExecutionContext.java
@@ -36,7 +36,8 @@ public <R, A> R accept(GenericVisitor<R, A> v, A arg) {
     }
 
     @Override
-    public <A> void accept(VoidVisitor<A> v, A arg) {}
+    public <A> void accept(VoidVisitor<A> v, A arg) {
+    }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCatchAllStatement.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCatchAllStmt.java
similarity index 71%
rename from javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCatchAllStatement.java
rename to javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCatchAllStmt.java
index eeedb4d130..946157d21c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCatchAllStatement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCatchAllStmt.java
@@ -1,13 +1,11 @@
 package com.github.javaparser.ast.key;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.Name;
-import com.github.javaparser.ast.key.sv.*;
 import com.github.javaparser.ast.observer.ObservableProperty;
 import com.github.javaparser.ast.stmt.BlockStmt;
 import com.github.javaparser.ast.stmt.Statement;
@@ -15,20 +13,20 @@
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 import com.github.javaparser.metamodel.JavaParserMetaModel;
-import com.github.javaparser.metamodel.KeyCatchAllStatementMetaModel;
+import com.github.javaparser.metamodel.KeyCatchAllStmtMetaModel;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
 
-public class KeyCatchAllStatement extends Statement {
+public class KeyCatchAllStmt extends Statement {
 
     private Name label;
 
     private BlockStmt block;
 
     @AllFieldsConstructor
-    public KeyCatchAllStatement(Name label, BlockStmt block) {
+    public KeyCatchAllStmt(Name label, BlockStmt block) {
         this(null, label, block);
     }
 
@@ -36,7 +34,7 @@ public KeyCatchAllStatement(Name label, BlockStmt block) {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public KeyCatchAllStatement(TokenRange tokenRange, Name label, BlockStmt block) {
+    public KeyCatchAllStmt(TokenRange tokenRange, Name label, BlockStmt block) {
         super(tokenRange);
         setLabel(label);
         setBlock(block);
@@ -63,19 +61,19 @@ public boolean isKeyCatchAllStatement() {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyCatchAllStatement asKeyCatchAllStatement() {
+    public KeyCatchAllStmt asKeyCatchAllStatement() {
         return this;
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyCatchAllStatement> toKeyCatchAllStatement() {
+    public Optional<KeyCatchAllStmt> toKeyCatchAllStatement() {
         return Optional.of(this);
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyCatchAllStatement(Consumer<KeyCatchAllStatement> action) {
+    public void ifKeyCatchAllStatement(Consumer<KeyCatchAllStmt> action) {
         action.accept(this);
     }
 
@@ -85,13 +83,14 @@ public BlockStmt getBlock() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyCatchAllStatement setBlock(final @NonNull() BlockStmt block) {
+    public KeyCatchAllStmt setBlock(final @NonNull() BlockStmt block) {
         assertNotNull(block);
         if (block == this.block) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BLOCK, this.block, block);
-        if (this.block != null) this.block.setParentNode(null);
+        if (this.block != null)
+            this.block.setParentNode(null);
         this.block = block;
         setAsParentNodeOf(block);
         return this;
@@ -103,13 +102,14 @@ public Name getLabel() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyCatchAllStatement setLabel(final @NonNull() Name label) {
+    public KeyCatchAllStmt setLabel(final @NonNull() Name label) {
         assertNotNull(label);
         if (label == this.label) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.LABEL, this.label, label);
-        if (this.label != null) this.label.setParentNode(null);
+        if (this.label != null)
+            this.label.setParentNode(null);
         this.label = label;
         setAsParentNodeOf(label);
         return this;
@@ -134,14 +134,8 @@ public boolean replace(Node node, Node replacementNode) {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
-    public KeyCatchAllStatement clone() {
-        return (KeyCatchAllStatement) accept(new CloneVisitor(), null);
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
-    public KeyCatchAllStatementMetaModel getMetaModel() {
-        return JavaParserMetaModel.keyCatchAllStatementMetaModel;
+    public KeyCatchAllStmt clone() {
+        return (KeyCatchAllStmt) accept(new CloneVisitor(), null);
     }
 
     @com.github.javaparser.ast.key.IgnoreLexPrinting()
@@ -155,4 +149,34 @@ public KeyCatchAllStatementMetaModel getMetaModel() {
     public @NonNull() Name label() {
         return Objects.requireNonNull(label);
     }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeyCatchAllStmt() {
+        return true;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeyCatchAllStmt asKeyCatchAllStmt() {
+        return this;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeyCatchAllStmt> toKeyCatchAllStmt() {
+        return Optional.of(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeyCatchAllStmt(Consumer<KeyCatchAllStmt> action) {
+        action.accept(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
+    public KeyCatchAllStmtMetaModel getMetaModel() {
+        return JavaParserMetaModel.keyCatchAllStmtMetaModel;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchBreak.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchBreak.java
index 21cd0e1404..03d85b1dad 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchBreak.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchBreak.java
@@ -17,6 +17,7 @@
 import com.github.javaparser.metamodel.OptionalProperty;
 import java.util.Optional;
 import org.jspecify.annotations.Nullable;
+import java.util.Objects;
 
 public class KeyCcatchBreak extends KeyCcatchBranch {
 
@@ -77,7 +78,8 @@ public KeyCcatchBreak setBlock(final @Nullable() BlockStmt block) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BLOCK, this.block, block);
-        if (this.block != null) this.block.setParentNode(null);
+        if (this.block != null)
+            this.block.setParentNode(null);
         this.block = block;
         setAsParentNodeOf(block);
         return this;
@@ -94,7 +96,8 @@ public KeyCcatchBreak setLabel(final @Nullable() Name label) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.LABEL, this.label, label);
-        if (this.label != null) this.label.setParentNode(null);
+        if (this.label != null)
+            this.label.setParentNode(null);
         this.label = label;
         setAsParentNodeOf(label);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchContinue.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchContinue.java
index c9aff26221..d466f64571 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchContinue.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchContinue.java
@@ -15,6 +15,7 @@
 import com.github.javaparser.metamodel.OptionalProperty;
 import java.util.Optional;
 import org.jspecify.annotations.Nullable;
+import java.util.Objects;
 
 public class KeyCcatchContinue extends KeyCcatchBranch {
 
@@ -75,7 +76,8 @@ public KeyCcatchContinue setBlock(final @Nullable() BlockStmt block) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BLOCK, this.block, block);
-        if (this.block != null) this.block.setParentNode(null);
+        if (this.block != null)
+            this.block.setParentNode(null);
         this.block = block;
         setAsParentNodeOf(block);
         return this;
@@ -92,7 +94,8 @@ public KeyCcatchContinue setLabel(final @Nullable() Name label) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.LABEL, this.label, label);
-        if (this.label != null) this.label.setParentNode(null);
+        if (this.label != null)
+            this.label.setParentNode(null);
         this.label = label;
         setAsParentNodeOf(label);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchParameter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchParameter.java
index 128445a49e..a8fb3cfcca 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchParameter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchParameter.java
@@ -15,6 +15,7 @@
 import com.github.javaparser.metamodel.OptionalProperty;
 import java.util.Optional;
 import org.jspecify.annotations.Nullable;
+import java.util.Objects;
 
 public class KeyCcatchParameter extends KeyCcatchBranch {
 
@@ -71,7 +72,8 @@ public KeyCcatchParameter setBlock(final @Nullable() BlockStmt block) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BLOCK, this.block, block);
-        if (this.block != null) this.block.setParentNode(null);
+        if (this.block != null)
+            this.block.setParentNode(null);
         this.block = block;
         setAsParentNodeOf(block);
         return this;
@@ -88,7 +90,8 @@ public KeyCcatchParameter setParameter(final @Nullable() Parameter parameter) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.PARAMETER, this.parameter, parameter);
-        if (this.parameter != null) this.parameter.setParentNode(null);
+        if (this.parameter != null)
+            this.parameter.setParentNode(null);
         this.parameter = parameter;
         setAsParentNodeOf(parameter);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchReturn.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchReturn.java
index 05ecb09bdd..808d26cff0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchReturn.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyCcatchReturn.java
@@ -15,6 +15,7 @@
 import com.github.javaparser.metamodel.OptionalProperty;
 import java.util.Optional;
 import org.jspecify.annotations.Nullable;
+import java.util.Objects;
 
 public class KeyCcatchReturn extends KeyCcatchBranch {
 
@@ -79,7 +80,8 @@ public KeyCcatchReturn setBlock(final @Nullable() BlockStmt block) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BLOCK, this.block, block);
-        if (this.block != null) this.block.setParentNode(null);
+        if (this.block != null)
+            this.block.setParentNode(null);
         this.block = block;
         setAsParentNodeOf(block);
         return this;
@@ -96,7 +98,8 @@ public KeyCcatchReturn setParameter(final @Nullable() Parameter parameter) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.PARAMETER, this.parameter, parameter);
-        if (this.parameter != null) this.parameter.setParentNode(null);
+        if (this.parameter != null)
+            this.parameter.setParentNode(null);
         this.parameter = parameter;
         setAsParentNodeOf(parameter);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyEscapeExpression.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyEscapeExpression.java
index c0a638e2df..ff8ed83360 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyEscapeExpression.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyEscapeExpression.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
@@ -98,7 +97,8 @@ public KeyEscapeExpression setArguments(final @Nullable() NodeList<Expression> a
             return this;
         }
         notifyPropertyChange(ObservableProperty.ARGUMENTS, this.arguments, arguments);
-        if (this.arguments != null) this.arguments.setParentNode(null);
+        if (this.arguments != null)
+            this.arguments.setParentNode(null);
         this.arguments = arguments;
         setAsParentNodeOf(arguments);
         return this;
@@ -116,7 +116,8 @@ public KeyEscapeExpression setCallee(final @NonNull() Name callee) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CALLEE, this.callee, callee);
-        if (this.callee != null) this.callee.setParentNode(null);
+        if (this.callee != null)
+            this.callee.setParentNode(null);
         this.callee = callee;
         setAsParentNodeOf(callee);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyExecStatement.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyExecStmt.java
similarity index 74%
rename from javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyExecStatement.java
rename to javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyExecStmt.java
index ce8b4d5593..e9f0f08ba0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyExecStatement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyExecStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -14,20 +13,20 @@
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 import com.github.javaparser.metamodel.JavaParserMetaModel;
-import com.github.javaparser.metamodel.KeyExecStatementMetaModel;
+import com.github.javaparser.metamodel.KeyExecStmtMetaModel;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
 
-public class KeyExecStatement extends Statement {
+public class KeyExecStmt extends Statement {
 
     private BlockStmt execBlock;
 
     private NodeList<KeyCcatchBranch> branches;
 
     @AllFieldsConstructor
-    public KeyExecStatement(BlockStmt execBlock, NodeList<KeyCcatchBranch> branches) {
+    public KeyExecStmt(BlockStmt execBlock, NodeList<KeyCcatchBranch> branches) {
         this(null, execBlock, branches);
     }
 
@@ -35,7 +34,7 @@ public KeyExecStatement(BlockStmt execBlock, NodeList<KeyCcatchBranch> branches)
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public KeyExecStatement(TokenRange tokenRange, BlockStmt execBlock, NodeList<KeyCcatchBranch> branches) {
+    public KeyExecStmt(TokenRange tokenRange, BlockStmt execBlock, NodeList<KeyCcatchBranch> branches) {
         super(tokenRange);
         setExecBlock(execBlock);
         setBranches(branches);
@@ -60,13 +59,14 @@ public NodeList<KeyCcatchBranch> getBranches() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyExecStatement setBranches(final @NonNull() NodeList<KeyCcatchBranch> branches) {
+    public KeyExecStmt setBranches(final @NonNull() NodeList<KeyCcatchBranch> branches) {
         assertNotNull(branches);
         if (branches == this.branches) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BRANCHES, this.branches, branches);
-        if (this.branches != null) this.branches.setParentNode(null);
+        if (this.branches != null)
+            this.branches.setParentNode(null);
         this.branches = branches;
         setAsParentNodeOf(branches);
         return this;
@@ -78,13 +78,14 @@ public BlockStmt getExecBlock() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyExecStatement setExecBlock(final @NonNull() BlockStmt execBlock) {
+    public KeyExecStmt setExecBlock(final @NonNull() BlockStmt execBlock) {
         assertNotNull(execBlock);
         if (execBlock == this.execBlock) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXEC_BLOCK, this.execBlock, execBlock);
-        if (this.execBlock != null) this.execBlock.setParentNode(null);
+        if (this.execBlock != null)
+            this.execBlock.setParentNode(null);
         this.execBlock = execBlock;
         setAsParentNodeOf(execBlock);
         return this;
@@ -126,14 +127,8 @@ public boolean replace(Node node, Node replacementNode) {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
-    public KeyExecStatement clone() {
-        return (KeyExecStatement) accept(new CloneVisitor(), null);
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
-    public KeyExecStatementMetaModel getMetaModel() {
-        return JavaParserMetaModel.keyExecStatementMetaModel;
+    public KeyExecStmt clone() {
+        return (KeyExecStmt) accept(new CloneVisitor(), null);
     }
 
     @Override
@@ -144,19 +139,19 @@ public boolean isKeyExecStatement() {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyExecStatement asKeyExecStatement() {
+    public KeyExecStmt asKeyExecStatement() {
         return this;
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyExecStatement> toKeyExecStatement() {
+    public Optional<KeyExecStmt> toKeyExecStatement() {
         return Optional.of(this);
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyExecStatement(Consumer<KeyExecStatement> action) {
+    public void ifKeyExecStatement(Consumer<KeyExecStmt> action) {
         action.accept(this);
     }
 
@@ -171,4 +166,34 @@ public void ifKeyExecStatement(Consumer<KeyExecStatement> action) {
     public @NonNull() BlockStmt execBlock() {
         return Objects.requireNonNull(execBlock);
     }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeyExecStmt() {
+        return true;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeyExecStmt asKeyExecStmt() {
+        return this;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeyExecStmt> toKeyExecStmt() {
+        return Optional.of(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeyExecStmt(Consumer<KeyExecStmt> action) {
+        action.accept(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
+    public KeyExecStmtMetaModel getMetaModel() {
+        return JavaParserMetaModel.keyExecStmtMetaModel;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyExecutionContext.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyExecutionContext.java
index 9b378b1d46..299b006339 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyExecutionContext.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyExecutionContext.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -78,7 +77,8 @@ public KeyExecutionContext setContext(final @NonNull() Type context) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONTEXT, this.context, context);
-        if (this.context != null) this.context.setParentNode(null);
+        if (this.context != null)
+            this.context.setParentNode(null);
         this.context = context;
         setAsParentNodeOf(context);
         return this;
@@ -95,7 +95,8 @@ public KeyExecutionContext setInstance(final @Nullable() Expression instance) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.INSTANCE, this.instance, instance);
-        if (this.instance != null) this.instance.setParentNode(null);
+        if (this.instance != null)
+            this.instance.setParentNode(null);
         this.instance = instance;
         setAsParentNodeOf(instance);
         return this;
@@ -113,7 +114,8 @@ public KeyExecutionContext setSignature(final @NonNull() KeyMethodSignature sign
             return this;
         }
         notifyPropertyChange(ObservableProperty.SIGNATURE, this.signature, signature);
-        if (this.signature != null) this.signature.setParentNode(null);
+        if (this.signature != null)
+            this.signature.setParentNode(null);
         this.signature = signature;
         setAsParentNodeOf(signature);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyLoopScopeBlock.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyLoopScopeBlockStmt.java
similarity index 70%
rename from javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyLoopScopeBlock.java
rename to javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyLoopScopeBlockStmt.java
index b127364e81..463e82f0e5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyLoopScopeBlock.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyLoopScopeBlockStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -14,20 +13,20 @@
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 import com.github.javaparser.metamodel.JavaParserMetaModel;
-import com.github.javaparser.metamodel.KeyLoopScopeBlockMetaModel;
+import com.github.javaparser.metamodel.KeyLoopScopeBlockStmtMetaModel;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
 
-public class KeyLoopScopeBlock extends Statement {
+public class KeyLoopScopeBlockStmt extends Statement {
 
     private Expression indexPV;
 
     private BlockStmt block;
 
     @AllFieldsConstructor
-    public KeyLoopScopeBlock(Expression indexPV, BlockStmt block) {
+    public KeyLoopScopeBlockStmt(Expression indexPV, BlockStmt block) {
         this.indexPV = indexPV;
         this.block = block;
     }
@@ -36,7 +35,7 @@ public KeyLoopScopeBlock(Expression indexPV, BlockStmt block) {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public KeyLoopScopeBlock(TokenRange tokenRange, Expression indexPV, BlockStmt block) {
+    public KeyLoopScopeBlockStmt(TokenRange tokenRange, Expression indexPV, BlockStmt block) {
         super(tokenRange);
         setIndexPV(indexPV);
         setBlock(block);
@@ -61,13 +60,14 @@ public BlockStmt getBlock() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyLoopScopeBlock setBlock(final @NonNull() BlockStmt block) {
+    public KeyLoopScopeBlockStmt setBlock(final @NonNull() BlockStmt block) {
         assertNotNull(block);
         if (block == this.block) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BLOCK, this.block, block);
-        if (this.block != null) this.block.setParentNode(null);
+        if (this.block != null)
+            this.block.setParentNode(null);
         this.block = block;
         setAsParentNodeOf(block);
         return this;
@@ -79,13 +79,14 @@ public Expression getIndexPV() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyLoopScopeBlock setIndexPV(final @NonNull() Expression indexPV) {
+    public KeyLoopScopeBlockStmt setIndexPV(final @NonNull() Expression indexPV) {
         assertNotNull(indexPV);
         if (indexPV == this.indexPV) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.INDEX_P_V, this.indexPV, indexPV);
-        if (this.indexPV != null) this.indexPV.setParentNode(null);
+        if (this.indexPV != null)
+            this.indexPV.setParentNode(null);
         this.indexPV = indexPV;
         setAsParentNodeOf(indexPV);
         return this;
@@ -110,14 +111,8 @@ public boolean replace(Node node, Node replacementNode) {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
-    public KeyLoopScopeBlock clone() {
-        return (KeyLoopScopeBlock) accept(new CloneVisitor(), null);
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
-    public KeyLoopScopeBlockMetaModel getMetaModel() {
-        return JavaParserMetaModel.keyLoopScopeBlockMetaModel;
+    public KeyLoopScopeBlockStmt clone() {
+        return (KeyLoopScopeBlockStmt) accept(new CloneVisitor(), null);
     }
 
     @Override
@@ -128,19 +123,19 @@ public boolean isKeyLoopScopeBlock() {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyLoopScopeBlock asKeyLoopScopeBlock() {
+    public KeyLoopScopeBlockStmt asKeyLoopScopeBlock() {
         return this;
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyLoopScopeBlock> toKeyLoopScopeBlock() {
+    public Optional<KeyLoopScopeBlockStmt> toKeyLoopScopeBlock() {
         return Optional.of(this);
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyLoopScopeBlock(Consumer<KeyLoopScopeBlock> action) {
+    public void ifKeyLoopScopeBlock(Consumer<KeyLoopScopeBlockStmt> action) {
         action.accept(this);
     }
 
@@ -155,4 +150,34 @@ public void ifKeyLoopScopeBlock(Consumer<KeyLoopScopeBlock> action) {
     public @NonNull() Expression indexPV() {
         return Objects.requireNonNull(indexPV);
     }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeyLoopScopeBlockStmt() {
+        return true;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeyLoopScopeBlockStmt asKeyLoopScopeBlockStmt() {
+        return this;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeyLoopScopeBlockStmt> toKeyLoopScopeBlockStmt() {
+        return Optional.of(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeyLoopScopeBlockStmt(Consumer<KeyLoopScopeBlockStmt> action) {
+        action.accept(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
+    public KeyLoopScopeBlockStmtMetaModel getMetaModel() {
+        return JavaParserMetaModel.keyLoopScopeBlockStmtMetaModel;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMergePointStatement.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMergePointStmt.java
similarity index 70%
rename from javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMergePointStatement.java
rename to javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMergePointStmt.java
index 6c90f9cb95..6871c21ce2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMergePointStatement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMergePointStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -13,7 +12,7 @@
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 import com.github.javaparser.metamodel.JavaParserMetaModel;
-import com.github.javaparser.metamodel.KeyMergePointStatementMetaModel;
+import com.github.javaparser.metamodel.KeyMergePointStmtMetaModel;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -21,12 +20,12 @@
 
 /// A statement marking a merge point for the theorem prover, carries an `expr`;
 /// @author weigl
-public class KeyMergePointStatement extends Statement {
+public class KeyMergePointStmt extends Statement {
 
     private Expression expr;
 
     @AllFieldsConstructor
-    public KeyMergePointStatement(Expression expr) {
+    public KeyMergePointStmt(Expression expr) {
         this(null, expr);
     }
 
@@ -34,7 +33,7 @@ public KeyMergePointStatement(Expression expr) {
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public KeyMergePointStatement(TokenRange tokenRange, Expression expr) {
+    public KeyMergePointStmt(TokenRange tokenRange, Expression expr) {
         super(tokenRange);
         setExpr(expr);
         customInitialization();
@@ -67,14 +66,8 @@ public boolean replace(Node node, Node replacementNode) {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
-    public KeyMergePointStatement clone() {
-        return (KeyMergePointStatement) accept(new CloneVisitor(), null);
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
-    public KeyMergePointStatementMetaModel getMetaModel() {
-        return JavaParserMetaModel.keyMergePointStatementMetaModel;
+    public KeyMergePointStmt clone() {
+        return (KeyMergePointStmt) accept(new CloneVisitor(), null);
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
@@ -83,13 +76,14 @@ public Expression getExpr() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyMergePointStatement setExpr(final @NonNull() Expression expr) {
+    public KeyMergePointStmt setExpr(final @NonNull() Expression expr) {
         assertNotNull(expr);
         if (expr == this.expr) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPR, this.expr, expr);
-        if (this.expr != null) this.expr.setParentNode(null);
+        if (this.expr != null)
+            this.expr.setParentNode(null);
         this.expr = expr;
         setAsParentNodeOf(expr);
         return this;
@@ -103,19 +97,19 @@ public boolean isKeyMergePointStatement() {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyMergePointStatement asKeyMergePointStatement() {
+    public KeyMergePointStmt asKeyMergePointStatement() {
         return this;
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyMergePointStatement> toKeyMergePointStatement() {
+    public Optional<KeyMergePointStmt> toKeyMergePointStatement() {
         return Optional.of(this);
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyMergePointStatement(Consumer<KeyMergePointStatement> action) {
+    public void ifKeyMergePointStatement(Consumer<KeyMergePointStmt> action) {
         action.accept(this);
     }
 
@@ -124,4 +118,34 @@ public void ifKeyMergePointStatement(Consumer<KeyMergePointStatement> action) {
     public @NonNull() Expression expr() {
         return Objects.requireNonNull(expr);
     }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeyMergePointStmt() {
+        return true;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeyMergePointStmt asKeyMergePointStmt() {
+        return this;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeyMergePointStmt> toKeyMergePointStmt() {
+        return Optional.of(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeyMergePointStmt(Consumer<KeyMergePointStmt> action) {
+        action.accept(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
+    public KeyMergePointStmtMetaModel getMetaModel() {
+        return JavaParserMetaModel.keyMergePointStmtMetaModel;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodBodyStatement.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodBodyStatement.java
index 4ef4b86ef4..38ee1f9219 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodBodyStatement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodBodyStatement.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -75,7 +74,8 @@ public KeyMethodBodyStatement setExpr(final @NonNull() Expression expr) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPR, this.expr, expr);
-        if (this.expr != null) this.expr.setParentNode(null);
+        if (this.expr != null)
+            this.expr.setParentNode(null);
         this.expr = expr;
         setAsParentNodeOf(expr);
         return this;
@@ -92,7 +92,8 @@ public KeyMethodBodyStatement setName(final @Nullable() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -110,7 +111,8 @@ public KeyMethodBodyStatement setSource(final @NonNull() Type source) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.SOURCE, this.source, source);
-        if (this.source != null) this.source.setParentNode(null);
+        if (this.source != null)
+            this.source.setParentNode(null);
         this.source = source;
         setAsParentNodeOf(source);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodCallStatement.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodCallStmt.java
similarity index 75%
rename from javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodCallStatement.java
rename to javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodCallStmt.java
index 611d9a1a23..b64d77f93b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodCallStatement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodCallStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -14,7 +13,7 @@
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 import com.github.javaparser.metamodel.JavaParserMetaModel;
-import com.github.javaparser.metamodel.KeyMethodCallStatementMetaModel;
+import com.github.javaparser.metamodel.KeyMethodCallStmtMetaModel;
 import com.github.javaparser.metamodel.OptionalProperty;
 import java.util.Objects;
 import java.util.Optional;
@@ -28,7 +27,7 @@
 /// }
 /// ```
 /// @author weigl
-public class KeyMethodCallStatement extends Statement {
+public class KeyMethodCallStmt extends Statement {
 
     @OptionalProperty
     private Name name;
@@ -38,7 +37,7 @@ public class KeyMethodCallStatement extends Statement {
     private BlockStmt block;
 
     @AllFieldsConstructor
-    public KeyMethodCallStatement(Name name, KeyExecutionContext context, BlockStmt block) {
+    public KeyMethodCallStmt(Name name, KeyExecutionContext context, BlockStmt block) {
         this(null, name, context, block);
     }
 
@@ -46,8 +45,7 @@ public KeyMethodCallStatement(Name name, KeyExecutionContext context, BlockStmt
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public KeyMethodCallStatement(
-            TokenRange tokenRange, Name name, KeyAbstractExecutionContext context, BlockStmt block) {
+    public KeyMethodCallStmt(TokenRange tokenRange, Name name, KeyAbstractExecutionContext context, BlockStmt block) {
         super(tokenRange);
         setName(name);
         setContext(context);
@@ -75,19 +73,19 @@ public boolean isKeyMethodCallStatement() {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyMethodCallStatement asKeyMethodCallStatement() {
+    public KeyMethodCallStmt asKeyMethodCallStatement() {
         return this;
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyMethodCallStatement> toKeyMethodCallStatement() {
+    public Optional<KeyMethodCallStmt> toKeyMethodCallStatement() {
         return Optional.of(this);
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyMethodCallStatement(Consumer<KeyMethodCallStatement> action) {
+    public void ifKeyMethodCallStatement(Consumer<KeyMethodCallStmt> action) {
         action.accept(this);
     }
 
@@ -97,13 +95,14 @@ public BlockStmt getBlock() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyMethodCallStatement setBlock(final @NonNull() BlockStmt block) {
+    public KeyMethodCallStmt setBlock(final @NonNull() BlockStmt block) {
         assertNotNull(block);
         if (block == this.block) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BLOCK, this.block, block);
-        if (this.block != null) this.block.setParentNode(null);
+        if (this.block != null)
+            this.block.setParentNode(null);
         this.block = block;
         setAsParentNodeOf(block);
         return this;
@@ -115,13 +114,14 @@ public KeyAbstractExecutionContext getContext() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyMethodCallStatement setContext(final @NonNull() KeyAbstractExecutionContext context) {
+    public KeyMethodCallStmt setContext(final @NonNull() KeyAbstractExecutionContext context) {
         assertNotNull(context);
         if (context == this.context) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONTEXT, this.context, context);
-        if (this.context != null) this.context.setParentNode(null);
+        if (this.context != null)
+            this.context.setParentNode(null);
         this.context = context;
         setAsParentNodeOf(context);
         return this;
@@ -133,12 +133,13 @@ public Optional<Name> getName() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyMethodCallStatement setName(final @Nullable() Name name) {
+    public KeyMethodCallStmt setName(final @Nullable() Name name) {
         if (name == this.name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -184,18 +185,12 @@ public boolean replace(Node node, Node replacementNode) {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
-    public KeyMethodCallStatement clone() {
-        return (KeyMethodCallStatement) accept(new CloneVisitor(), null);
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
-    public KeyMethodCallStatementMetaModel getMetaModel() {
-        return JavaParserMetaModel.keyMethodCallStatementMetaModel;
+    public KeyMethodCallStmt clone() {
+        return (KeyMethodCallStmt) accept(new CloneVisitor(), null);
     }
 
     @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator")
-    public KeyMethodCallStatement removeName() {
+    public KeyMethodCallStmt removeName() {
         return setName((Name) null);
     }
 
@@ -216,4 +211,34 @@ public KeyMethodCallStatement removeName() {
     public @Nullable() Name name() {
         return name;
     }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeyMethodCallStmt() {
+        return true;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeyMethodCallStmt asKeyMethodCallStmt() {
+        return this;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeyMethodCallStmt> toKeyMethodCallStmt() {
+        return Optional.of(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeyMethodCallStmt(Consumer<KeyMethodCallStmt> action) {
+        action.accept(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
+    public KeyMethodCallStmtMetaModel getMetaModel() {
+        return JavaParserMetaModel.keyMethodCallStmtMetaModel;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodSignature.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodSignature.java
index 3e397abc37..4811f3e450 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodSignature.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodSignature.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -66,7 +65,8 @@ public KeyMethodSignature setName(final @NonNull() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -84,7 +84,8 @@ public KeyMethodSignature setParamTypes(final @NonNull() NodeList<Type> paramTyp
             return this;
         }
         notifyPropertyChange(ObservableProperty.PARAM_TYPES, this.paramTypes, paramTypes);
-        if (this.paramTypes != null) this.paramTypes.setParentNode(null);
+        if (this.paramTypes != null)
+            this.paramTypes.setParentNode(null);
         this.paramTypes = paramTypes;
         setAsParentNodeOf(paramTypes);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyPassiveExpression.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyPassiveExpression.java
index 3f08702ba4..ffef09ff3a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyPassiveExpression.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyPassiveExpression.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -68,7 +67,8 @@ public KeyPassiveExpression setExpr(final @NonNull() Expression expr) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPR, this.expr, expr);
-        if (this.expr != null) this.expr.setParentNode(null);
+        if (this.expr != null)
+            this.expr.setParentNode(null);
         this.expr = expr;
         setAsParentNodeOf(expr);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyRangeExpression.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyRangeExpression.java
deleted file mode 100644
index 03bdc442b9..0000000000
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyRangeExpression.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.github.javaparser.ast.key;
-
-import static com.github.javaparser.utils.Utils.assertNotNull;
-
-import com.github.javaparser.TokenRange;
-import com.github.javaparser.ast.AllFieldsConstructor;
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.expr.Expression;
-import com.github.javaparser.ast.observer.ObservableProperty;
-import com.github.javaparser.ast.visitor.CloneVisitor;
-import com.github.javaparser.ast.visitor.GenericVisitor;
-import com.github.javaparser.ast.visitor.VoidVisitor;
-import com.github.javaparser.metamodel.JavaParserMetaModel;
-import com.github.javaparser.metamodel.KeyRangeExpressionMetaModel;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Consumer;
-import org.jspecify.annotations.NonNull;
-
-/// @deprecated currently unused
-@Deprecated()
-public class KeyRangeExpression extends Expression {
-
-    private Expression lower;
-
-    private Expression upper;
-
-    @AllFieldsConstructor
-    public KeyRangeExpression(Expression lower, Expression upper) {
-        this(null, lower, upper);
-    }
-
-    /**
-     * This constructor is used by the parser and is considered private.
-     */
-    @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public KeyRangeExpression(TokenRange tokenRange, Expression lower, Expression upper) {
-        super(tokenRange);
-        setLower(lower);
-        setUpper(upper);
-        customInitialization();
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.AcceptGenerator")
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.AcceptGenerator")
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public boolean isKeyRangeExpression() {
-        return true;
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyRangeExpression asKeyRangeExpression() {
-        return this;
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyRangeExpression> toKeyRangeExpression() {
-        return Optional.of(this);
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyRangeExpression(Consumer<KeyRangeExpression> action) {
-        action.accept(this);
-    }
-
-    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public Expression getUpper() {
-        return upper;
-    }
-
-    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyRangeExpression setUpper(final @NonNull() Expression upper) {
-        assertNotNull(upper);
-        if (upper == this.upper) {
-            return this;
-        }
-        notifyPropertyChange(ObservableProperty.UPPER, this.upper, upper);
-        if (this.upper != null) this.upper.setParentNode(null);
-        this.upper = upper;
-        setAsParentNodeOf(upper);
-        return this;
-    }
-
-    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public Expression getLower() {
-        return lower;
-    }
-
-    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyRangeExpression setLower(final @NonNull() Expression lower) {
-        assertNotNull(lower);
-        if (lower == this.lower) {
-            return this;
-        }
-        notifyPropertyChange(ObservableProperty.LOWER, this.lower, lower);
-        if (this.lower != null) this.lower.setParentNode(null);
-        this.lower = lower;
-        setAsParentNodeOf(lower);
-        return this;
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.ReplaceMethodGenerator")
-    public boolean replace(Node node, Node replacementNode) {
-        if (node == null) {
-            return false;
-        }
-        if (node == lower) {
-            setLower((Expression) replacementNode);
-            return true;
-        }
-        if (node == upper) {
-            setUpper((Expression) replacementNode);
-            return true;
-        }
-        return super.replace(node, replacementNode);
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
-    public KeyRangeExpression clone() {
-        return (KeyRangeExpression) accept(new CloneVisitor(), null);
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
-    public KeyRangeExpressionMetaModel getMetaModel() {
-        return JavaParserMetaModel.keyRangeExpressionMetaModel;
-    }
-
-    @com.github.javaparser.ast.key.IgnoreLexPrinting()
-    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public @NonNull() Expression lower() {
-        return Objects.requireNonNull(lower);
-    }
-
-    @com.github.javaparser.ast.key.IgnoreLexPrinting()
-    @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public @NonNull() Expression upper() {
-        return Objects.requireNonNull(upper);
-    }
-}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyTransactionStatement.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyTransactionStmt.java
similarity index 69%
rename from javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyTransactionStatement.java
rename to javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyTransactionStmt.java
index 1ffdb88e0b..30fe8810ec 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyTransactionStatement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyTransactionStmt.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
@@ -12,11 +11,12 @@
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
 import com.github.javaparser.metamodel.JavaParserMetaModel;
-import com.github.javaparser.metamodel.KeyTransactionStatementMetaModel;
+import com.github.javaparser.metamodel.KeyTransactionStmtMetaModel;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.Node;
 
 /// A transaction statement is a Java statement to modeling JavaCard transaction.
 ///
@@ -30,16 +30,16 @@
 /// }
 /// ```
 /// @author weigl
-public class KeyTransactionStatement extends Statement {
+public class KeyTransactionStmt extends Statement {
 
     private TransactionType type;
 
     @AllFieldsConstructor
-    public KeyTransactionStatement(TransactionType type) {
+    public KeyTransactionStmt(TransactionType type) {
         this.type = type;
     }
 
-    public KeyTransactionStatement(TokenRange range, JavaToken begin) {
+    public KeyTransactionStmt(TokenRange range, JavaToken begin) {
         super(range);
         setType(TransactionType.byName(begin.getText()));
     }
@@ -57,10 +57,8 @@ public <A> void accept(final VoidVisitor<A> v, final A arg) {
     }
 
     public enum TransactionType {
-        BEGIN("#beginJavaCardTransaction"),
-        COMMIT("#commitJavaCardTransaction"),
-        FINISH("#finishJavaCardTransaction"),
-        ABORT("#abortJavaCardTransaction");
+
+        BEGIN("#beginJavaCardTransaction"), COMMIT("#commitJavaCardTransaction"), FINISH("#finishJavaCardTransaction"), ABORT("#abortJavaCardTransaction");
 
         public final String symbol;
 
@@ -84,7 +82,7 @@ public TransactionType getType() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public KeyTransactionStatement setType(final @NonNull() TransactionType type) {
+    public KeyTransactionStmt setType(final @NonNull() TransactionType type) {
         assertNotNull(type);
         if (type == this.type) {
             return this;
@@ -96,21 +94,15 @@ public KeyTransactionStatement setType(final @NonNull() TransactionType type) {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.CloneGenerator")
-    public KeyTransactionStatement clone() {
-        return (KeyTransactionStatement) accept(new CloneVisitor(), null);
-    }
-
-    @Override
-    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
-    public KeyTransactionStatementMetaModel getMetaModel() {
-        return JavaParserMetaModel.keyTransactionStatementMetaModel;
+    public KeyTransactionStmt clone() {
+        return (KeyTransactionStmt) accept(new CloneVisitor(), null);
     }
 
     /**
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public KeyTransactionStatement(TokenRange tokenRange, TransactionType type) {
+    public KeyTransactionStmt(TokenRange tokenRange, TransactionType type) {
         super(tokenRange);
         setType(type);
         customInitialization();
@@ -124,19 +116,19 @@ public boolean isKeyTransactionStatement() {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyTransactionStatement asKeyTransactionStatement() {
+    public KeyTransactionStmt asKeyTransactionStatement() {
         return this;
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyTransactionStatement> toKeyTransactionStatement() {
+    public Optional<KeyTransactionStmt> toKeyTransactionStatement() {
         return Optional.of(this);
     }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyTransactionStatement(Consumer<KeyTransactionStatement> action) {
+    public void ifKeyTransactionStatement(Consumer<KeyTransactionStmt> action) {
         action.accept(this);
     }
 
@@ -145,4 +137,34 @@ public void ifKeyTransactionStatement(Consumer<KeyTransactionStatement> action)
     public @NonNull() TransactionType type() {
         return Objects.requireNonNull(type);
     }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeyTransactionStmt() {
+        return true;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeyTransactionStmt asKeyTransactionStmt() {
+        return this;
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeyTransactionStmt> toKeyTransactionStmt() {
+        return Optional.of(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeyTransactionStmt(Consumer<KeyTransactionStmt> action) {
+        action.accept(this);
+    }
+
+    @Override
+    @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
+    public KeyTransactionStmtMetaModel getMetaModel() {
+        return JavaParserMetaModel.keyTransactionStmtMetaModel;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/package-info.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/package-info.java
index a70fa2bbba..096ecedd67 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/package-info.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/package-info.java
@@ -4,3 +4,4 @@
 /// @author Alexander Weigl
 /// @version 1 (2/2/26)
 package com.github.javaparser.ast.key;
+
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyCcatchSV.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyCcatchSV.java
index 4d8cfbd850..15e0203338 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyCcatchSV.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyCcatchSV.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -14,6 +13,7 @@
 import com.github.javaparser.metamodel.KeyCcatchSVMetaModel;
 import java.util.Objects;
 import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.Node;
 
 /**
  * @author Alexander Weigl
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyContextStatementBlock.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyContextStatementBlock.java
index 7bca1ff336..2c0631501f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyContextStatementBlock.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyContextStatementBlock.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -38,12 +37,7 @@ public class KeyContextStatementBlock extends Statement {
     private KeyExpressionSV expression;
 
     @AllFieldsConstructor
-    public KeyContextStatementBlock(
-            NodeList<Statement> statements,
-            KeyExecCtxtSV context,
-            KeyTypeSV tr,
-            KeyMethodSignatureSV signature,
-            KeyExpressionSV expression) {
+    public KeyContextStatementBlock(NodeList<Statement> statements, KeyExecCtxtSV context, KeyTypeSV tr, KeyMethodSignatureSV signature, KeyExpressionSV expression) {
         this(null, statements, context, tr, signature, expression);
     }
 
@@ -51,12 +45,7 @@ public KeyContextStatementBlock(TokenRange tokenRange, NodeList<Statement> state
         this(tokenRange, statements, context, null, null, null);
     }
 
-    public KeyContextStatementBlock(
-            TokenRange tokenRange,
-            NodeList<Statement> statements,
-            KeyTypeSV tr,
-            KeyMethodSignatureSV pm,
-            KeyExpressionSV sv) {
+    public KeyContextStatementBlock(TokenRange tokenRange, NodeList<Statement> statements, KeyTypeSV tr, KeyMethodSignatureSV pm, KeyExpressionSV sv) {
         this(tokenRange, statements, null, tr, pm, sv);
     }
 
@@ -64,13 +53,7 @@ public KeyContextStatementBlock(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public KeyContextStatementBlock(
-            TokenRange tokenRange,
-            NodeList<Statement> statements,
-            KeyExecCtxtSV context,
-            KeyTypeSV tr,
-            KeyMethodSignatureSV signature,
-            KeyExpressionSV expression) {
+    public KeyContextStatementBlock(TokenRange tokenRange, NodeList<Statement> statements, KeyExecCtxtSV context, KeyTypeSV tr, KeyMethodSignatureSV signature, KeyExpressionSV expression) {
         super(tokenRange);
         setStatements(statements);
         setContext(context);
@@ -127,7 +110,8 @@ public KeyContextStatementBlock setContext(final @Nullable() KeyExecCtxtSV conte
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONTEXT, this.context, context);
-        if (this.context != null) this.context.setParentNode(null);
+        if (this.context != null)
+            this.context.setParentNode(null);
         this.context = context;
         setAsParentNodeOf(context);
         return this;
@@ -144,7 +128,8 @@ public KeyContextStatementBlock setExpression(final @Nullable() KeyExpressionSV
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
@@ -161,7 +146,8 @@ public KeyContextStatementBlock setSignature(final @Nullable() KeyMethodSignatur
             return this;
         }
         notifyPropertyChange(ObservableProperty.SIGNATURE, this.signature, signature);
-        if (this.signature != null) this.signature.setParentNode(null);
+        if (this.signature != null)
+            this.signature.setParentNode(null);
         this.signature = signature;
         setAsParentNodeOf(signature);
         return this;
@@ -179,7 +165,8 @@ public KeyContextStatementBlock setStatements(final @NonNull() NodeList<Statemen
             return this;
         }
         notifyPropertyChange(ObservableProperty.STATEMENTS, this.statements, statements);
-        if (this.statements != null) this.statements.setParentNode(null);
+        if (this.statements != null)
+            this.statements.setParentNode(null);
         this.statements = statements;
         setAsParentNodeOf(statements);
         return this;
@@ -196,7 +183,8 @@ public KeyContextStatementBlock setTr(final @Nullable() KeyTypeSV tr) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TR, this.tr, tr);
-        if (this.tr != null) this.tr.setParentNode(null);
+        if (this.tr != null)
+            this.tr.setParentNode(null);
         this.tr = tr;
         setAsParentNodeOf(tr);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyExecCtxtSV.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyExecCtxtSV.java
index 2809ec85a0..e1813726a3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyExecCtxtSV.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyExecCtxtSV.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -16,6 +15,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.Node;
 
 public class KeyExecCtxtSV extends Statement {
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyExecutionContextSV.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyExecutionContextSV.java
index 9277c27574..25fb84d960 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyExecutionContextSV.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyExecutionContextSV.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -14,6 +13,7 @@
 import com.github.javaparser.metamodel.KeyExecutionContextSVMetaModel;
 import java.util.Objects;
 import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.Node;
 
 /**
  * @author Alexander Weigl
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyExpressionSV.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyExpressionSV.java
index 4f6a04ae10..4c1afbeddc 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyExpressionSV.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyExpressionSV.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -16,6 +15,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.Node;
 
 public class KeyExpressionSV extends Expression {
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyJumpLabelSV.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyJumpLabelSV.java
index 8617ce69c1..de7388eaef 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyJumpLabelSV.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyJumpLabelSV.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstruct.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstruct.java
index 02f5bd1637..ed08f52c2a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstruct.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstruct.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
@@ -42,7 +41,8 @@ public KeyMetaConstruct(TokenRange range, String kind, Node child, Node... schem
         this.kind = kind;
         this.child = child;
         for (Node schema : schemas) {
-            if (schema != null) this.schemas.add(schema);
+            if (schema != null)
+                this.schemas.add(schema);
         }
     }
 
@@ -74,7 +74,8 @@ public KeyMetaConstruct setChild(final @NonNull() Node child) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CHILD, this.child, child);
-        if (this.child != null) this.child.setParentNode(null);
+        if (this.child != null)
+            this.child.setParentNode(null);
         this.child = child;
         setAsParentNodeOf(child);
         return this;
@@ -108,7 +109,8 @@ public KeyMetaConstruct setSchemas(final @NonNull() NodeList<Node> schemas) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.SCHEMAS, this.schemas, schemas);
-        if (this.schemas != null) this.schemas.setParentNode(null);
+        if (this.schemas != null)
+            this.schemas.setParentNode(null);
         this.schemas = schemas;
         setAsParentNodeOf(schemas);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstructExpression.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstructExpression.java
index b0fa5a93ee..cb7b2d5743 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstructExpression.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstructExpression.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
@@ -70,7 +69,8 @@ public KeyMetaConstructExpression setChild(final @NonNull() Expression child) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CHILD, this.child, child);
-        if (this.child != null) this.child.setParentNode(null);
+        if (this.child != null)
+            this.child.setParentNode(null);
         this.child = child;
         setAsParentNodeOf(child);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstructType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstructType.java
index 0038b56423..9b081a5695 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstructType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstructType.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -42,8 +41,7 @@ public KeyMetaConstructType(NodeList<AnnotationExpr> annotations, String kind, E
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public KeyMetaConstructType(
-            TokenRange tokenRange, NodeList<AnnotationExpr> annotations, String kind, Expression expr) {
+    public KeyMetaConstructType(TokenRange tokenRange, NodeList<AnnotationExpr> annotations, String kind, Expression expr) {
         super(tokenRange, annotations);
         setKind(kind);
         setExpr(expr);
@@ -84,7 +82,8 @@ public KeyMetaConstructType setExpr(final @NonNull() Expression expr) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPR, this.expr, expr);
-        if (this.expr != null) this.expr.setParentNode(null);
+        if (this.expr != null)
+            this.expr.setParentNode(null);
         this.expr = expr;
         setAsParentNodeOf(expr);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMethodSignatureSV.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMethodSignatureSV.java
index 7cb4d11743..725ada9539 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMethodSignatureSV.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMethodSignatureSV.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyProgramVariableSV.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyProgramVariableSV.java
index d70fd43959..eff2692015 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyProgramVariableSV.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyProgramVariableSV.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -16,6 +15,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.Node;
 
 public class KeyProgramVariableSV extends Expression {
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyStatementSV.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyStatementSV.java
index 56b30b0f10..4b267914fc 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyStatementSV.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyStatementSV.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -16,6 +15,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.Node;
 
 public class KeyStatementSV extends Statement {
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyTypeSV.java b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyTypeSV.java
index 172b1793b5..4de686421a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyTypeSV.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyTypeSV.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.ast.key.sv;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -20,6 +19,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.Node;
 
 public class KeyTypeSV extends Type {
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDeclaration.java
index 3eccbda96a..1fde5aa9ba 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDeclaration.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.StaticJavaParser.parseModuleDirective;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -44,8 +43,7 @@
 /**
  * A Java 9 Jigsaw module declaration. {@code @Foo module com.github.abc { requires a.B; }}
  */
-public class ModuleDeclaration extends Node
-        implements NodeWithName<ModuleDeclaration>, NodeWithAnnotations<ModuleDeclaration> {
+public class ModuleDeclaration extends Node implements NodeWithName<ModuleDeclaration>, NodeWithAnnotations<ModuleDeclaration> {
 
     private Name name;
 
@@ -64,8 +62,7 @@ public ModuleDeclaration(Name name, boolean isOpen) {
     }
 
     @AllFieldsConstructor
-    public ModuleDeclaration(
-            NodeList<AnnotationExpr> annotations, Name name, boolean isOpen, NodeList<ModuleDirective> directives) {
+    public ModuleDeclaration(NodeList<AnnotationExpr> annotations, Name name, boolean isOpen, NodeList<ModuleDirective> directives) {
         this(null, annotations, name, isOpen, directives);
     }
 
@@ -73,12 +70,7 @@ public ModuleDeclaration(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public ModuleDeclaration(
-            TokenRange tokenRange,
-            NodeList<AnnotationExpr> annotations,
-            Name name,
-            boolean isOpen,
-            NodeList<ModuleDirective> directives) {
+    public ModuleDeclaration(TokenRange tokenRange, NodeList<AnnotationExpr> annotations, Name name, boolean isOpen, NodeList<ModuleDirective> directives) {
         super(tokenRange);
         setAnnotations(annotations);
         setName(name);
@@ -111,7 +103,8 @@ public ModuleDeclaration setName(final @NonNull() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -129,7 +122,8 @@ public ModuleDeclaration setAnnotations(final @NonNull() NodeList<AnnotationExpr
             return this;
         }
         notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations);
-        if (this.annotations != null) this.annotations.setParentNode(null);
+        if (this.annotations != null)
+            this.annotations.setParentNode(null);
         this.annotations = annotations;
         setAsParentNodeOf(annotations);
         return this;
@@ -184,7 +178,8 @@ public ModuleDeclaration setDirectives(final @NonNull() NodeList<ModuleDirective
             return this;
         }
         notifyPropertyChange(ObservableProperty.DIRECTIVES, this.directives, directives);
-        if (this.directives != null) this.directives.setParentNode(null);
+        if (this.directives != null)
+            this.directives.setParentNode(null);
         this.directives = directives;
         setAsParentNodeOf(directives);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDirective.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDirective.java
index d49cf2f66c..579480c7d9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDirective.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleDirective.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.modules;
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -108,19 +107,24 @@ public ModuleUsesDirective asModuleUsesStmt() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifModuleExportsStmt(Consumer<ModuleExportsDirective> action) {}
+    public void ifModuleExportsStmt(Consumer<ModuleExportsDirective> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifModuleOpensStmt(Consumer<ModuleOpensDirective> action) {}
+    public void ifModuleOpensStmt(Consumer<ModuleOpensDirective> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifModuleProvidesStmt(Consumer<ModuleProvidesDirective> action) {}
+    public void ifModuleProvidesStmt(Consumer<ModuleProvidesDirective> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifModuleRequiresStmt(Consumer<ModuleRequiresDirective> action) {}
+    public void ifModuleRequiresStmt(Consumer<ModuleRequiresDirective> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifModuleUsesStmt(Consumer<ModuleUsesDirective> action) {}
+    public void ifModuleUsesStmt(Consumer<ModuleUsesDirective> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public Optional<ModuleExportsDirective> toModuleExportsStmt() {
@@ -154,9 +158,7 @@ public boolean isModuleExportsDirective() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ModuleExportsDirective asModuleExportsDirective() {
-        throw new IllegalStateException(f(
-                "%s is not ModuleExportsDirective, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ModuleExportsDirective, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -165,7 +167,8 @@ public Optional<ModuleExportsDirective> toModuleExportsDirective() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifModuleExportsDirective(Consumer<ModuleExportsDirective> action) {}
+    public void ifModuleExportsDirective(Consumer<ModuleExportsDirective> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isModuleOpensDirective() {
@@ -174,9 +177,7 @@ public boolean isModuleOpensDirective() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ModuleOpensDirective asModuleOpensDirective() {
-        throw new IllegalStateException(f(
-                "%s is not ModuleOpensDirective, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ModuleOpensDirective, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -185,7 +186,8 @@ public Optional<ModuleOpensDirective> toModuleOpensDirective() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifModuleOpensDirective(Consumer<ModuleOpensDirective> action) {}
+    public void ifModuleOpensDirective(Consumer<ModuleOpensDirective> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isModuleProvidesDirective() {
@@ -194,9 +196,7 @@ public boolean isModuleProvidesDirective() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ModuleProvidesDirective asModuleProvidesDirective() {
-        throw new IllegalStateException(f(
-                "%s is not ModuleProvidesDirective, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ModuleProvidesDirective, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -205,7 +205,8 @@ public Optional<ModuleProvidesDirective> toModuleProvidesDirective() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifModuleProvidesDirective(Consumer<ModuleProvidesDirective> action) {}
+    public void ifModuleProvidesDirective(Consumer<ModuleProvidesDirective> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isModuleRequiresDirective() {
@@ -214,9 +215,7 @@ public boolean isModuleRequiresDirective() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ModuleRequiresDirective asModuleRequiresDirective() {
-        throw new IllegalStateException(f(
-                "%s is not ModuleRequiresDirective, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ModuleRequiresDirective, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -225,7 +224,8 @@ public Optional<ModuleRequiresDirective> toModuleRequiresDirective() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifModuleRequiresDirective(Consumer<ModuleRequiresDirective> action) {}
+    public void ifModuleRequiresDirective(Consumer<ModuleRequiresDirective> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isModuleUsesDirective() {
@@ -234,8 +234,7 @@ public boolean isModuleUsesDirective() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ModuleUsesDirective asModuleUsesDirective() {
-        throw new IllegalStateException(f(
-                "%s is not ModuleUsesDirective, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ModuleUsesDirective, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -244,7 +243,8 @@ public Optional<ModuleUsesDirective> toModuleUsesDirective() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifModuleUsesDirective(Consumer<ModuleUsesDirective> action) {}
+    public void ifModuleUsesDirective(Consumer<ModuleUsesDirective> action) {
+    }
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.GetMetaModelGenerator")
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleExportsDirective.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleExportsDirective.java
index 2f7b5bccf1..bec36d5af9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleExportsDirective.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleExportsDirective.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.StaticJavaParser.parseName;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -109,7 +108,8 @@ public ModuleExportsDirective setName(final @NonNull() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -127,7 +127,8 @@ public ModuleExportsDirective setModuleNames(final @NonNull() NodeList<Name> mod
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODULE_NAMES, this.moduleNames, moduleNames);
-        if (this.moduleNames != null) this.moduleNames.setParentNode(null);
+        if (this.moduleNames != null)
+            this.moduleNames.setParentNode(null);
         this.moduleNames = moduleNames;
         setAsParentNodeOf(moduleNames);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleOpensDirective.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleOpensDirective.java
index 84f2aa1fd3..e9eac4750e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleOpensDirective.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleOpensDirective.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.modules;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -108,7 +107,8 @@ public ModuleOpensDirective setName(final @NonNull() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -126,7 +126,8 @@ public ModuleOpensDirective setModuleNames(final @NonNull() NodeList<Name> modul
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODULE_NAMES, this.moduleNames, moduleNames);
-        if (this.moduleNames != null) this.moduleNames.setParentNode(null);
+        if (this.moduleNames != null)
+            this.moduleNames.setParentNode(null);
         this.moduleNames = moduleNames;
         setAsParentNodeOf(moduleNames);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleProvidesDirective.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleProvidesDirective.java
index 7a26019f5f..d5da497ad7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleProvidesDirective.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleProvidesDirective.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.modules;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -137,7 +136,8 @@ public ModuleProvidesDirective setName(final @NonNull() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -150,7 +150,8 @@ public ModuleProvidesDirective setWith(final @NonNull() NodeList<Name> with) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.WITH, this.with, with);
-        if (this.with != null) this.with.setParentNode(null);
+        if (this.with != null)
+            this.with.setParentNode(null);
         this.with = with;
         setAsParentNodeOf(with);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleRequiresDirective.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleRequiresDirective.java
index 68d58408f5..26a4f762be 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleRequiresDirective.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleRequiresDirective.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.ast.Modifier.DefaultKeyword.*;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.expr.Name;
@@ -42,8 +41,7 @@
 /**
  * A require directive in module-info.java. {@code require a.b.C;}
  */
-public class ModuleRequiresDirective extends ModuleDirective
-        implements NodeWithStaticModifier<ModuleRequiresDirective>, NodeWithName<ModuleRequiresDirective> {
+public class ModuleRequiresDirective extends ModuleDirective implements NodeWithStaticModifier<ModuleRequiresDirective>, NodeWithName<ModuleRequiresDirective> {
 
     private NodeList<Modifier> modifiers;
 
@@ -93,7 +91,8 @@ public ModuleRequiresDirective setModifiers(final @NonNull() NodeList<Modifier>
             return this;
         }
         notifyPropertyChange(ObservableProperty.MODIFIERS, this.modifiers, modifiers);
-        if (this.modifiers != null) this.modifiers.setParentNode(null);
+        if (this.modifiers != null)
+            this.modifiers.setParentNode(null);
         this.modifiers = modifiers;
         setAsParentNodeOf(modifiers);
         return this;
@@ -111,7 +110,8 @@ public ModuleRequiresDirective setName(final @NonNull() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleUsesDirective.java b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleUsesDirective.java
index 3676e2bd9c..5d9840ea8a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleUsesDirective.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/modules/ModuleUsesDirective.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.modules;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -84,7 +83,8 @@ public ModuleUsesDirective setType(final Name name) {
             return (ModuleUsesDirective) this;
         }
         notifyPropertyChange(ObservableProperty.TYPE, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -131,7 +131,8 @@ public ModuleUsesDirective setName(final @NonNull() Name name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
index d5dce74f03..22720c43c0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.StaticJavaParser.parseExpression;
 import static com.github.javaparser.StaticJavaParser.parseName;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.expr.*;
@@ -140,8 +139,7 @@ default N addMarkerAnnotation(Class<? extends Annotation> clazz) {
      */
     @SuppressWarnings("unchecked")
     default N addSingleMemberAnnotation(String name, Expression expression) {
-        SingleMemberAnnotationExpr singleMemberAnnotationExpr =
-                new SingleMemberAnnotationExpr(parseName(name), expression);
+        SingleMemberAnnotationExpr singleMemberAnnotationExpr = new SingleMemberAnnotationExpr(parseName(name), expression);
         return addAnnotation(singleMemberAnnotationExpr);
     }
 
@@ -187,8 +185,7 @@ default N addSingleMemberAnnotation(Class<? extends Annotation> clazz, String va
      * @return true if found, false if not
      */
     default boolean isAnnotationPresent(String annotationName) {
-        return getAnnotations().stream()
-                .anyMatch(a -> a.getName().getIdentifier().equals(annotationName));
+        return getAnnotations().stream().anyMatch(a -> a.getName().getIdentifier().equals(annotationName));
     }
 
     /**
@@ -207,9 +204,7 @@ default boolean isAnnotationPresent(Class<? extends Annotation> annotationClass)
      * @param annotationName the name of the annotation
      */
     default Optional<AnnotationExpr> getAnnotationByName(String annotationName) {
-        return getAnnotations().stream()
-                .filter(a -> a.getName().getIdentifier().equals(annotationName))
-                .findFirst();
+        return getAnnotations().stream().filter(a -> a.getName().getIdentifier().equals(annotationName)).findFirst();
     }
 
     /**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArguments.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArguments.java
index a30ad253c1..4c9edbe92d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArguments.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithArguments.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes;
 
 import static com.github.javaparser.StaticJavaParser.parseExpression;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.expr.Expression;
@@ -76,7 +75,8 @@ default int getArgumentPosition(Expression argument, Function<Expression, Expres
         for (int i = 0; i < getArguments().size(); i++) {
             Expression expression = getArguments().get(i);
             expression = converter.apply(expression);
-            if (expression == argument) return i;
+            if (expression == argument)
+                return i;
         }
         throw new IllegalStateException();
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExpression.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExpression.java
index a8b12aa809..3a9d3dc6ba 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExpression.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExpression.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes;
 
 import static com.github.javaparser.StaticJavaParser.parseExpression;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.Expression;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java
index 1954259d9a..f6503455ea 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes;
 
 import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java
index 53ac1d00bb..d7c99ce775 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithIdentifier.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes;
 
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
-
 import com.github.javaparser.ast.Node;
 
 public interface NodeWithIdentifier<N extends Node> {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java
index 4ef4587144..0c6bde1673 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes;
 
 import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadoc.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadoc.java
index f056cc76bc..b0ae7fe1e6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadoc.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadoc.java
@@ -44,8 +44,7 @@ public interface NodeWithJavadoc<N extends Node> {
      * @return The JavadocComment for this node wrapped in an optional as it may be absent.
      */
     default Optional<JavadocComment> getJavadocComment() {
-        return getComment().filter(comment -> comment instanceof JavadocComment).map(comment ->
-                (JavadocComment) comment);
+        return getComment().filter(comment -> comment instanceof JavadocComment).map(comment -> (JavadocComment) comment);
     }
 
     /**
@@ -62,8 +61,7 @@ default Optional<Javadoc> getJavadoc() {
      */
     @SuppressWarnings("unchecked")
     default N setJavadocComment(String comment, boolean isMarkdownComment) {
-        JavadocComment javadocComment =
-                isMarkdownComment ? new MarkdownComment(comment) : new TraditionalJavadocComment(comment);
+        JavadocComment javadocComment = isMarkdownComment ? new MarkdownComment(comment) : new TraditionalJavadocComment(comment);
         return setJavadocComment(javadocComment);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java
index 53a57f9c9f..60ba86f93f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java
@@ -23,10 +23,10 @@
 import static com.github.javaparser.StaticJavaParser.parseType;
 import static com.github.javaparser.ast.Modifier.DefaultKeyword.*;
 import static com.github.javaparser.ast.Modifier.Keyword;
+import static com.github.javaparser.ast.Modifier.Keyword.*;
 import static com.github.javaparser.ast.Modifier.createModifierList;
 import static java.util.Collections.unmodifiableList;
 import static java.util.stream.Collectors.toList;
-
 import com.github.javaparser.ast.Modifier;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
@@ -80,7 +80,7 @@ default N addMember(BodyDeclaration<?> member) {
      * @param modifiers the modifiers like {@link Modifier.DefaultKeyword#PUBLIC}
      * @return the {@link FieldDeclaration} created
      */
-    default FieldDeclaration addField(Class<?> typeClass, String name, Modifier.DefaultKeyword... modifiers) {
+    default FieldDeclaration addField(Class<?> typeClass, String name, Modifier.Keyword... modifiers) {
         tryAddImportToParentCompilationUnit(typeClass);
         return addField(typeClass.getSimpleName(), name, modifiers);
     }
@@ -93,7 +93,7 @@ default FieldDeclaration addField(Class<?> typeClass, String name, Modifier.Defa
      * @param modifiers the modifiers like {@link Modifier.DefaultKeyword#PUBLIC}
      * @return the {@link FieldDeclaration} created
      */
-    default FieldDeclaration addField(String type, String name, Modifier.DefaultKeyword... modifiers) {
+    default FieldDeclaration addField(String type, String name, Modifier.Keyword... modifiers) {
         return addField(parseType(type), name, modifiers);
     }
 
@@ -105,7 +105,7 @@ default FieldDeclaration addField(String type, String name, Modifier.DefaultKeyw
      * @param modifiers the modifiers like {@link Modifier.DefaultKeyword#PUBLIC}
      * @return the {@link FieldDeclaration} created
      */
-    default FieldDeclaration addField(Type type, String name, Modifier.DefaultKeyword... modifiers) {
+    default FieldDeclaration addField(Type type, String name, Modifier.Keyword... modifiers) {
         FieldDeclaration fieldDeclaration = new FieldDeclaration();
         VariableDeclarator variable = new VariableDeclarator(type, name);
         fieldDeclaration.getVariables().add(variable);
@@ -123,8 +123,7 @@ default FieldDeclaration addField(Type type, String name, Modifier.DefaultKeywor
      * @param modifiers   the modifiers like {@link Modifier.DefaultKeyword#PUBLIC}
      * @return the {@link FieldDeclaration} created
      */
-    default FieldDeclaration addFieldWithInitializer(
-            Class<?> typeClass, String name, Expression initializer, Modifier.DefaultKeyword... modifiers) {
+    default FieldDeclaration addFieldWithInitializer(Class<?> typeClass, String name, Expression initializer, Modifier.DefaultKeyword... modifiers) {
         tryAddImportToParentCompilationUnit(typeClass);
         return addFieldWithInitializer(typeClass.getSimpleName(), name, initializer, modifiers);
     }
@@ -138,8 +137,7 @@ default FieldDeclaration addFieldWithInitializer(
      * @param modifiers   the modifiers like {@link Modifier.DefaultKeyword#PUBLIC}
      * @return the {@link FieldDeclaration} created
      */
-    default FieldDeclaration addFieldWithInitializer(
-            String type, String name, Expression initializer, Modifier.DefaultKeyword... modifiers) {
+    default FieldDeclaration addFieldWithInitializer(String type, String name, Expression initializer, Modifier.DefaultKeyword... modifiers) {
         return addFieldWithInitializer(parseType(type), name, initializer, modifiers);
     }
 
@@ -152,8 +150,7 @@ default FieldDeclaration addFieldWithInitializer(
      * @param modifiers   the modifiers like {@link Modifier.DefaultKeyword#PUBLIC}
      * @return the {@link FieldDeclaration} created
      */
-    default FieldDeclaration addFieldWithInitializer(
-            Type type, String name, Expression initializer, Modifier.DefaultKeyword... modifiers) {
+    default FieldDeclaration addFieldWithInitializer(Type type, String name, Expression initializer, Keyword... modifiers) {
         FieldDeclaration declaration = addField(type, name, modifiers);
         declaration.getVariables().iterator().next().setInitializer(initializer);
         return declaration;
@@ -283,7 +280,7 @@ default MethodDeclaration addMethod(String methodName, Keyword... modifiers) {
      * @param modifiers the modifiers like {@link Modifier.DefaultKeyword#PUBLIC}
      * @return the created constructor
      */
-    default ConstructorDeclaration addConstructor(Modifier.DefaultKeyword... modifiers) {
+    default ConstructorDeclaration addConstructor(Keyword... modifiers) {
         ConstructorDeclaration constructorDeclaration = new ConstructorDeclaration();
         constructorDeclaration.setModifiers(createModifierList(modifiers));
         constructorDeclaration.setName(getName());
@@ -318,9 +315,7 @@ default BlockStmt addStaticInitializer() {
      * @return the methods found (multiple in case of overloading)
      */
     default List<MethodDeclaration> getMethodsByName(String name) {
-        return unmodifiableList(getMethods().stream()
-                .filter(m -> m.getNameAsString().equals(name))
-                .collect(toList()));
+        return unmodifiableList(getMethods().stream().filter(m -> m.getNameAsString().equals(name)).collect(toList()));
     }
 
     /**
@@ -329,10 +324,7 @@ default List<MethodDeclaration> getMethodsByName(String name) {
      * @return the methods found. This list is immutable.
      */
     default List<MethodDeclaration> getMethods() {
-        return unmodifiableList(getMembers().stream()
-                .filter(m -> m instanceof MethodDeclaration)
-                .map(m -> (MethodDeclaration) m)
-                .collect(toList()));
+        return unmodifiableList(getMembers().stream().filter(m -> m instanceof MethodDeclaration).map(m -> (MethodDeclaration) m).collect(toList()));
     }
 
     /**
@@ -351,9 +343,7 @@ default List<MethodDeclaration> getMethods() {
      * @return the methods found
      */
     default List<MethodDeclaration> getMethodsByParameterTypes(String... paramTypes) {
-        return unmodifiableList(getMethods().stream()
-                .filter(m -> m.hasParametersOfType(paramTypes))
-                .collect(toList()));
+        return unmodifiableList(getMethods().stream().filter(m -> m.hasParametersOfType(paramTypes)).collect(toList()));
     }
 
     /**
@@ -365,9 +355,7 @@ default List<MethodDeclaration> getMethodsByParameterTypes(String... paramTypes)
      * @return the methods found
      */
     default List<MethodDeclaration> getMethodsBySignature(String name, String... paramTypes) {
-        return unmodifiableList(getMethodsByName(name).stream()
-                .filter(m -> m.hasParametersOfType(paramTypes))
-                .collect(toList()));
+        return unmodifiableList(getMethodsByName(name).stream().filter(m -> m.hasParametersOfType(paramTypes)).collect(toList()));
     }
 
     /**
@@ -383,9 +371,7 @@ default List<MethodDeclaration> getMethodsBySignature(String name, String... par
      * @return the methods found
      */
     default List<MethodDeclaration> getMethodsByParameterTypes(Class<?>... paramTypes) {
-        return unmodifiableList(getMethods().stream()
-                .filter(m -> m.hasParametersOfType(paramTypes))
-                .collect(toList()));
+        return unmodifiableList(getMethods().stream().filter(m -> m.hasParametersOfType(paramTypes)).collect(toList()));
     }
 
     /**
@@ -396,10 +382,7 @@ default List<MethodDeclaration> getMethodsByParameterTypes(Class<?>... paramType
      * @return the constructors found. This list is immutable.
      */
     default List<ConstructorDeclaration> getConstructors() {
-        return unmodifiableList(getMembers().stream()
-                .filter(m -> m instanceof ConstructorDeclaration)
-                .map(m -> (ConstructorDeclaration) m)
-                .collect(toList()));
+        return unmodifiableList(getMembers().stream().filter(m -> m instanceof ConstructorDeclaration).map(m -> (ConstructorDeclaration) m).collect(toList()));
     }
 
     /**
@@ -408,11 +391,7 @@ default List<ConstructorDeclaration> getConstructors() {
      * @return the constructor found, if any.
      */
     default Optional<ConstructorDeclaration> getDefaultConstructor() {
-        return getMembers().stream()
-                .filter(m -> m instanceof ConstructorDeclaration)
-                .map(m -> (ConstructorDeclaration) m)
-                .filter(cd -> cd.getParameters().isEmpty())
-                .findFirst();
+        return getMembers().stream().filter(m -> m instanceof ConstructorDeclaration).map(m -> (ConstructorDeclaration) m).filter(cd -> cd.getParameters().isEmpty()).findFirst();
     }
 
     /**
@@ -432,9 +411,7 @@ default Optional<ConstructorDeclaration> getDefaultConstructor() {
      * @return the constructor found, if any.
      */
     default Optional<ConstructorDeclaration> getConstructorByParameterTypes(String... paramTypes) {
-        return getConstructors().stream()
-                .filter(m -> m.hasParametersOfType(paramTypes))
-                .findFirst();
+        return getConstructors().stream().filter(m -> m.hasParametersOfType(paramTypes)).findFirst();
     }
 
     /**
@@ -450,9 +427,7 @@ default Optional<ConstructorDeclaration> getConstructorByParameterTypes(String..
      * @return the constructor found, if any.
      */
     default Optional<ConstructorDeclaration> getConstructorByParameterTypes(Class<?>... paramTypes) {
-        return getConstructors().stream()
-                .filter(m -> m.hasParametersOfType(paramTypes))
-                .findFirst();
+        return getConstructors().stream().filter(m -> m.hasParametersOfType(paramTypes)).findFirst();
     }
 
     /**
@@ -462,12 +437,7 @@ default Optional<ConstructorDeclaration> getConstructorByParameterTypes(Class<?>
      * @return null if not found, the FieldDeclaration otherwise
      */
     default Optional<FieldDeclaration> getFieldByName(String name) {
-        return getMembers().stream()
-                .filter(m -> m instanceof FieldDeclaration)
-                .map(f -> (FieldDeclaration) f)
-                .filter(f -> f.getVariables().stream()
-                        .anyMatch(var -> var.getNameAsString().equals(name)))
-                .findFirst();
+        return getMembers().stream().filter(m -> m instanceof FieldDeclaration).map(f -> (FieldDeclaration) f).filter(f -> f.getVariables().stream().anyMatch(var -> var.getNameAsString().equals(name))).findFirst();
     }
 
     /**
@@ -476,10 +446,7 @@ default Optional<FieldDeclaration> getFieldByName(String name) {
      * @return the fields found. This list is immutable.
      */
     default List<FieldDeclaration> getFields() {
-        return unmodifiableList(getMembers().stream()
-                .filter(m -> m instanceof FieldDeclaration)
-                .map(m -> (FieldDeclaration) m)
-                .collect(toList()));
+        return unmodifiableList(getMembers().stream().filter(m -> m instanceof FieldDeclaration).map(m -> (FieldDeclaration) m).collect(toList()));
     }
 
     /**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java
index be3f319d56..5bb3d960a8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java
@@ -20,11 +20,10 @@
  */
 package com.github.javaparser.ast.nodeTypes;
 
-import static com.github.javaparser.ast.Modifier.DefaultKeyword.*;
 import static com.github.javaparser.ast.NodeList.toNodeList;
-
 import com.github.javaparser.ast.AccessSpecifier;
 import com.github.javaparser.ast.Modifier;
+import com.github.javaparser.ast.Modifier.Keyword;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import java.util.Arrays;
@@ -49,9 +48,9 @@ public interface NodeWithModifiers<N extends Node> {
     N setModifiers(NodeList<Modifier> modifiers);
 
     @SuppressWarnings("unchecked")
-    default N addModifier(Modifier.Keyword... newModifiers) {
+    default N addModifier(Keyword... newModifiers) {
         NodeList<Modifier> existingModifiers = new NodeList<>(getModifiers());
-        for (Modifier.Keyword newModifier : newModifiers) {
+        for (Keyword newModifier : newModifiers) {
             boolean alreadyPresent = existingModifiers.stream().anyMatch(m -> m.getKeyword() == newModifier);
             if (!alreadyPresent) {
                 existingModifiers.add(new Modifier(newModifier));
@@ -62,16 +61,14 @@ default N addModifier(Modifier.Keyword... newModifiers) {
     }
 
     @SuppressWarnings("unchecked")
-    default N removeModifier(Modifier.Keyword... modifiersToRemove) {
-        List<Modifier.Keyword> modifiersToRemoveAsList = Arrays.asList(modifiersToRemove);
-        NodeList<Modifier> remaining = getModifiers().stream()
-                .filter(existingModifier -> !modifiersToRemoveAsList.contains(existingModifier.getKeyword()))
-                .collect(toNodeList());
+    default N removeModifier(Keyword... modifiersToRemove) {
+        List<Keyword> modifiersToRemoveAsList = Arrays.asList(modifiersToRemove);
+        NodeList<Modifier> remaining = getModifiers().stream().filter(existingModifier -> !modifiersToRemoveAsList.contains(existingModifier.getKeyword())).collect(toNodeList());
         setModifiers(remaining);
         return (N) this;
     }
 
-    default N setModifier(Modifier.Keyword m, boolean set) {
+    default N setModifier(Keyword m, boolean set) {
         if (set) {
             return addModifier(m);
         }
@@ -79,10 +76,10 @@ default N setModifier(Modifier.Keyword m, boolean set) {
     }
 
     /**
-     * @param modifier the modifer being searched for
+     * @param modifier the modifier being searched for
      * @return true if the modifier has been explicitly added to this node, else false
      */
-    default boolean hasModifier(Modifier.Keyword modifier) {
+    default boolean hasModifier(Keyword modifier) {
         for (Modifier m : getModifiers()) {
             if (m.getKeyword() == modifier) {
                 return true;
@@ -94,10 +91,17 @@ default boolean hasModifier(Modifier.Keyword modifier) {
     /**
      * Creates a list of modifier nodes corresponding to the keywords passed, and set it.
      */
-    default N setModifiers(final Modifier.DefaultKeyword... modifiers) {
+    default N setModifiers(final Modifier.Keyword... modifiers) {
         return setModifiers(Arrays.stream(modifiers).map(Modifier::new).collect(toNodeList()));
     }
 
+    /**
+     * Creates a list of modifier nodes corresponding to the keywords passed, and set it.
+     */
+    default N setModifiers(List<Keyword> modifiers) {
+        return setModifiers(modifiers.stream().map(Modifier::new).collect(toNodeList()));
+    }
+
     /**
      * @return the access specifier as far as it can be derived from the modifiers.
      * Does not take anything else into account (like "interface methods are implicitly public")
@@ -105,7 +109,7 @@ default N setModifiers(final Modifier.DefaultKeyword... modifiers) {
     default AccessSpecifier getAccessSpecifier() {
         for (Modifier modifier : getModifiers()) {
             if (modifier.getKeyword() instanceof Modifier.DefaultKeyword dk) {
-                switch (dk) {
+                switch(dk) {
                     case PUBLIC:
                         return AccessSpecifier.PUBLIC;
                     case PROTECTED:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java
index b7e958f981..0206672fef 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithName.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.StaticJavaParser.parseName;
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.Name;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalLabel.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalLabel.java
index 2a650c00f1..bb6adf88eb 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalLabel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalLabel.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes;
 
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.SimpleName;
 import java.util.Optional;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalSimpleName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalSimpleName.java
new file mode 100644
index 0000000000..cd9a2ce04a
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithOptionalSimpleName.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.ast.nodeTypes;
+
+import static com.github.javaparser.utils.Utils.assertNonEmpty;
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.expr.NameExpr;
+import com.github.javaparser.ast.expr.SimpleName;
+import java.util.Optional;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * A node with a name.
+ * <p>
+ * The main reason for this interface is to permit users to manipulate homogeneously all nodes with a getName method.
+ */
+@NullMarked
+public interface NodeWithOptionalSimpleName<N extends Node> {
+
+    Optional<SimpleName> getName();
+
+    N setName(@Nullable SimpleName name);
+
+    @SuppressWarnings("unchecked")
+    default N setName(@Nullable String name) {
+        assertNonEmpty(name);
+        return setName(new SimpleName(name));
+    }
+
+    default Optional<String> getNameAsString() {
+        return getName().map(SimpleName::getIdentifier);
+    }
+
+    default Optional<NameExpr> getNameAsExpression() {
+        return getName().map(NameExpr::new);
+    }
+
+    @Nullable
+    SimpleName name();
+
+    @Nullable
+    default String nameAsString() {
+        return name() != null ? name().getIdentifier() : null;
+    }
+
+    @Nullable
+    default NameExpr nameAsExpression() {
+        return name() != null ? new NameExpr(name()) : null;
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java
index 37d402c6bd..2eaaf7b536 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.StaticJavaParser.parseType;
 import static java.util.stream.Collectors.toList;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.body.Parameter;
@@ -106,9 +105,7 @@ default Parameter addAndGetParameter(Parameter parameter) {
      * @return null if not found, the param found otherwise
      */
     default Optional<Parameter> getParameterByName(String name) {
-        return getParameters().stream()
-                .filter(p -> p.getNameAsString().equals(name))
-                .findFirst();
+        return getParameters().stream().filter(p -> p.getNameAsString().equals(name)).findFirst();
     }
 
     /**
@@ -118,9 +115,7 @@ default Optional<Parameter> getParameterByName(String name) {
      * @return null if not found, the param found otherwise
      */
     default Optional<Parameter> getParameterByType(String type) {
-        return getParameters().stream()
-                .filter(p -> p.getType().toString().equals(type))
-                .findFirst();
+        return getParameters().stream().filter(p -> p.getType().toString().equals(type)).findFirst();
     }
 
     /**
@@ -130,9 +125,7 @@ default Optional<Parameter> getParameterByType(String type) {
      * @return null if not found, the param found otherwise
      */
     default Optional<Parameter> getParameterByType(Class<?> type) {
-        return getParameters().stream()
-                .filter(p -> p.getType().toString().equals(type.getSimpleName()))
-                .findFirst();
+        return getParameters().stream().filter(p -> p.getType().toString().equals(type.getSimpleName())).findFirst();
     }
 
     /**
@@ -151,10 +144,7 @@ default Optional<Parameter> getParameterByType(Class<?> type) {
      * @return {@code true} if all parameters match one by one, in the given order.
      */
     default boolean hasParametersOfType(String... paramTypes) {
-        return getParameters().stream()
-                .map(p -> p.getType().asString())
-                .collect(toList())
-                .equals(Arrays.asList(paramTypes));
+        return getParameters().stream().map(p -> p.getType().asString()).collect(toList()).equals(Arrays.asList(paramTypes));
     }
 
     /**
@@ -173,12 +163,6 @@ default boolean hasParametersOfType(Class<?>... paramTypes) {
         return // if p.getType() is a class or interface type, we want to consider its erasure, i.e., if the
         // parameter
         // is "List<String>", we want to consider it as "List", so we need to call getName()
-        getParameters().stream()
-                .map(p -> p.getType()
-                        .toClassOrInterfaceType()
-                        .map(NodeWithSimpleName::getNameAsString)
-                        .orElseGet(() -> p.getType().asString()))
-                .collect(toList())
-                .equals(Stream.of(paramTypes).map(Class::getSimpleName).collect(toList()));
+        getParameters().stream().map(p -> p.getType().toClassOrInterfaceType().map(NodeWithSimpleName::getNameAsString).orElseGet(() -> p.getType().asString())).collect(toList()).equals(Stream.of(paramTypes).map(Class::getSimpleName).collect(toList()));
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java
index e365676558..c4aa22fa2b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithSimpleName.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes;
 
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.NameExpr;
 import com.github.javaparser.ast.expr.SimpleName;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java
index 1ebaede21c..298587e2a6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithStatements.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes;
 
 import static com.github.javaparser.StaticJavaParser.parseStatement;
-
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrownExceptions.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrownExceptions.java
index 51d158ee87..514739fe96 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrownExceptions.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithThrownExceptions.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes;
 
 import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.type.ReferenceType;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java
index f1f8517d85..99142ba977 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithType.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.StaticJavaParser.parseType;
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
-
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.type.Type;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java
index 04394fddd7..a5462e7e87 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes;
 
 import static com.github.javaparser.ast.NodeList.nodeList;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.type.Type;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeParameters.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeParameters.java
index 72c5e34a43..a2eef5cc6a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeParameters.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithTypeParameters.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes;
 
 import static com.github.javaparser.StaticJavaParser.parseTypeParameter;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.type.TypeParameter;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java
index 7f59807c76..63f5c22ebd 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java
@@ -123,8 +123,7 @@ default N setAllTypes(Type newType) {
      */
     @DerivedProperty
     default Optional<Type> getMaximumCommonType() {
-        return calculateMaximumCommonType(
-                getVariables().stream().map(v -> v.getType()).collect(Collectors.toList()));
+        return calculateMaximumCommonType(getVariables().stream().map(v -> v.getType()).collect(Collectors.toList()));
     }
 
     static Optional<Type> calculateMaximumCommonType(List<Type> types) {
@@ -158,13 +157,10 @@ private Optional<Type> toArrayLevel(Type type, int level) {
             // Now, given that equality on nodes consider the position the simplest way is to compare
             // the pretty-printed string got for a node. We just check all them are the same and if they
             // are we just just is not null
-            Object[] values = types.stream()
-                    .map(v -> {
-                        Optional<Type> t = helper.toArrayLevel(v, currentLevel);
-                        return t.map(Node::toString).orElse(null);
-                    })
-                    .distinct()
-                    .toArray();
+            Object[] values = types.stream().map(v -> {
+                Optional<Type> t = helper.toArrayLevel(v, currentLevel);
+                return t.map(Node::toString).orElse(null);
+            }).distinct().toArray();
             if (values.length == 1 && values[0] != null) {
                 level++;
             } else {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAbstractModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAbstractModifier.java
index f468de2a4b..f977b7df4f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAbstractModifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAbstractModifier.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes.modifiers;
 
 import static com.github.javaparser.ast.Modifier.DefaultKeyword.ABSTRACT;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAccessModifiers.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAccessModifiers.java
index ffd61cfd56..53e7c0abb9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAccessModifiers.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithAccessModifiers.java
@@ -25,5 +25,5 @@
 /**
  * A node that can be public, protected, and/or private.
  */
-public interface NodeWithAccessModifiers<N extends Node>
-        extends NodeWithPublicModifier<N>, NodeWithPrivateModifier<N>, NodeWithProtectedModifier<N> {}
+public interface NodeWithAccessModifiers<N extends Node> extends NodeWithPublicModifier<N>, NodeWithPrivateModifier<N>, NodeWithProtectedModifier<N> {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithFinalModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithFinalModifier.java
index 82c342f9f9..1bf387f26c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithFinalModifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithFinalModifier.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes.modifiers;
 
 import static com.github.javaparser.ast.Modifier.DefaultKeyword.FINAL;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPrivateModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPrivateModifier.java
index 55bb6a29d2..109b438fcf 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPrivateModifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPrivateModifier.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes.modifiers;
 
 import static com.github.javaparser.ast.Modifier.DefaultKeyword.PRIVATE;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithProtectedModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithProtectedModifier.java
index 28c44955cd..7236653ed2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithProtectedModifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithProtectedModifier.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes.modifiers;
 
 import static com.github.javaparser.ast.Modifier.DefaultKeyword.PROTECTED;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPublicModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPublicModifier.java
index 345fa129c4..515d44252d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPublicModifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithPublicModifier.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes.modifiers;
 
 import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStaticModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStaticModifier.java
index ef88628f12..466315425e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStaticModifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStaticModifier.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes.modifiers;
 
 import static com.github.javaparser.ast.Modifier.DefaultKeyword.STATIC;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStrictfpModifier.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStrictfpModifier.java
index 1bad210ea7..3ed2aeade0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStrictfpModifier.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/modifiers/NodeWithStrictfpModifier.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.nodeTypes.modifiers;
 
 import static com.github.javaparser.ast.Modifier.DefaultKeyword.STRICTFP;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.nodeTypes.NodeWithModifiers;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/AstObserver.java b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/AstObserver.java
index 8fbb575cb3..04854dc5a6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/AstObserver.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/AstObserver.java
@@ -32,8 +32,8 @@ public interface AstObserver {
      * Type of change occurring on a List
      */
     enum ListChangeType {
-        ADDITION,
-        REMOVAL
+
+        ADDITION, REMOVAL
     }
 
     /**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/ObservableProperty.java b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/ObservableProperty.java
index 09c1054621..c6bafe0ae2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/ObservableProperty.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/ObservableProperty.java
@@ -34,6 +34,7 @@
  */
 @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
 public enum ObservableProperty {
+
     ANNOTATIONS(Type.MULTIPLE_REFERENCE),
     ANONYMOUS_CLASS_BODY(Type.MULTIPLE_REFERENCE),
     ARGUMENTS(Type.MULTIPLE_REFERENCE),
@@ -47,6 +48,7 @@ public enum ObservableProperty {
     BODY(Type.SINGLE_REFERENCE),
     BOUNDED_VARIABLES(Type.MULTIPLE_REFERENCE),
     BRANCHES(Type.MULTIPLE_REFERENCE),
+    BY(Type.MULTIPLE_REFERENCE),
     CALLEE(Type.SINGLE_REFERENCE),
     CATCH_CLAUSES(Type.MULTIPLE_REFERENCE),
     CHECK(Type.SINGLE_REFERENCE),
@@ -65,6 +67,7 @@ public enum ObservableProperty {
     CONTRACTS(Type.MULTIPLE_REFERENCE),
     DECL(Type.SINGLE_REFERENCE),
     DECLARATIONS(Type.SINGLE_REFERENCE),
+    DECLASSIFIES(Type.MULTIPLE_REFERENCE),
     DEFAULT(Type.SINGLE_ATTRIBUTE),
     DEFAULT_VALUE(Type.SINGLE_REFERENCE),
     DIMENSION(Type.SINGLE_REFERENCE),
@@ -75,6 +78,7 @@ public enum ObservableProperty {
     ELSE_STMT(Type.SINGLE_REFERENCE),
     ENCLOSING_PARAMETERS(Type.SINGLE_ATTRIBUTE),
     ENTRIES(Type.MULTIPLE_REFERENCE),
+    ERASES(Type.MULTIPLE_REFERENCE),
     EXEC_BLOCK(Type.SINGLE_REFERENCE),
     EXPR(Type.SINGLE_REFERENCE),
     EXPRESSION(Type.SINGLE_REFERENCE),
@@ -105,7 +109,6 @@ public enum ObservableProperty {
     LABELS(Type.MULTIPLE_REFERENCE),
     LEFT(Type.SINGLE_REFERENCE),
     LEVELS(Type.MULTIPLE_REFERENCE),
-    LOWER(Type.SINGLE_REFERENCE),
     MEASURED_BY(Type.SINGLE_REFERENCE),
     MEMBERS(Type.MULTIPLE_REFERENCE),
     MEMBER_VALUE(Type.SINGLE_REFERENCE),
@@ -116,6 +119,7 @@ public enum ObservableProperty {
     MODULE(Type.SINGLE_ATTRIBUTE),
     MODULE_NAMES(Type.MULTIPLE_REFERENCE),
     NAME(Type.SINGLE_REFERENCE),
+    NEW_OBJECTS(Type.MULTIPLE_REFERENCE),
     OPEN(Type.SINGLE_ATTRIBUTE),
     OPERATOR(Type.SINGLE_ATTRIBUTE),
     OPERATORS(Type.SINGLE_ATTRIBUTE),
@@ -147,7 +151,6 @@ public enum ObservableProperty {
     SUPER_TYPE(Type.SINGLE_REFERENCE),
     TARGET(Type.SINGLE_REFERENCE),
     TEXT(Type.SINGLE_ATTRIBUTE),
-    THEN(Type.SINGLE_REFERENCE),
     THEN_EXPR(Type.SINGLE_REFERENCE),
     THEN_STMT(Type.SINGLE_REFERENCE),
     THIS(Type.SINGLE_ATTRIBUTE),
@@ -161,7 +164,6 @@ public enum ObservableProperty {
     TYPE_NAME(Type.SINGLE_REFERENCE),
     TYPE_PARAMETERS(Type.MULTIPLE_REFERENCE),
     UPDATE(Type.MULTIPLE_REFERENCE),
-    UPPER(Type.SINGLE_REFERENCE),
     VALUE(Type.SINGLE_REFERENCE),
     VALUES(Type.MULTIPLE_REFERENCE),
     VARIABLE(Type.SINGLE_REFERENCE),
@@ -183,10 +185,8 @@ public enum ObservableProperty {
     COMMENTED_NODE;
 
     enum Type {
-        SINGLE_ATTRIBUTE(false, false),
-        SINGLE_REFERENCE(false, true),
-        MULTIPLE_ATTRIBUTE(true, false),
-        MULTIPLE_REFERENCE(true, true);
+
+        SINGLE_ATTRIBUTE(false, false), SINGLE_REFERENCE(false, true), MULTIPLE_ATTRIBUTE(true, false), MULTIPLE_REFERENCE(true, true);
 
         private boolean multiple;
 
@@ -203,9 +203,7 @@ enum Type {
     private boolean derived;
 
     public static ObservableProperty fromCamelCaseName(String camelCaseName) {
-        Optional<ObservableProperty> observableProperty = Arrays.stream(values())
-                .filter(v -> v.camelCaseName().equals(camelCaseName))
-                .findFirst();
+        Optional<ObservableProperty> observableProperty = Arrays.stream(values()).filter(v -> v.camelCaseName().equals(camelCaseName)).findFirst();
         if (observableProperty.isPresent()) {
             return observableProperty.get();
         }
@@ -263,9 +261,7 @@ public Node getValueAsSingleReference(Node node) {
                 }
                 return null;
             }
-            throw new RuntimeException(String.format(
-                    "Property %s returned %s (%s)",
-                    this.name(), rawValue.toString(), rawValue.getClass().getCanonicalName()));
+            throw new RuntimeException(String.format("Property %s returned %s (%s)", this.name(), rawValue.toString(), rawValue.getClass().getCanonicalName()));
         } catch (ClassCastException e) {
             throw new RuntimeException(e);
         }
@@ -295,10 +291,7 @@ public NodeList<? extends Node> getValueAsMultipleReference(Node node) {
             }
             return null;
         } catch (ClassCastException e) {
-            throw new RuntimeException(
-                    "Unable to get list value for " + this.name() + " from " + node + " (class: "
-                            + node.getClass().getSimpleName() + ")",
-                    e);
+            throw new RuntimeException("Unable to get list value for " + this.name() + " from " + node + " (class: " + node.getClass().getSimpleName() + ")", e);
         }
     }
 
@@ -307,10 +300,7 @@ public Collection<?> getValueAsCollection(Node node) {
         try {
             return (Collection) rawValue;
         } catch (ClassCastException e) {
-            throw new RuntimeException(
-                    "Unable to get list value for " + this.name() + " from " + node + " (class: "
-                            + node.getClass().getSimpleName() + ")",
-                    e);
+            throw new RuntimeException("Unable to get list value for " + this.name() + " from " + node + " (class: " + node.getClass().getSimpleName() + ")", e);
         }
     }
 
@@ -333,10 +323,7 @@ public Object getRawValue(Node node) {
         try {
             return node.getClass().getMethod(getterName).invoke(node);
         } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-            throw new RuntimeException(
-                    "Unable to get value for " + this.name() + " from " + node + " ("
-                            + node.getClass().getSimpleName() + ")",
-                    e);
+            throw new RuntimeException("Unable to get value for " + this.name() + " from " + node + " (" + node.getClass().getSimpleName() + ")", e);
         }
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/PropagatingAstObserver.java b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/PropagatingAstObserver.java
index 945fe02884..19e68ce990 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/observer/PropagatingAstObserver.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/observer/PropagatingAstObserver.java
@@ -39,14 +39,12 @@ public static PropagatingAstObserver transformInPropagatingObserver(final AstObs
         return new PropagatingAstObserver() {
 
             @Override
-            public void concretePropertyChange(
-                    Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
+            public void concretePropertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
                 observer.propertyChange(observedNode, property, oldValue, newValue);
             }
 
             @Override
-            public void concreteListChange(
-                    NodeList<?> observedNode, ListChangeType type, int index, Node nodeAddedOrRemoved) {
+            public void concreteListChange(NodeList<?> observedNode, ListChangeType type, int index, Node nodeAddedOrRemoved) {
                 observer.listChange(observedNode, type, index, nodeAddedOrRemoved);
             }
 
@@ -84,8 +82,7 @@ public void listReplacement(NodeList<?> observedNode, int index, Node oldNode, N
         concreteListReplacement(observedNode, index, oldNode, newNode);
     }
 
-    public void concretePropertyChange(
-            Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
+    public void concretePropertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
         // do nothing
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java
index 40896e51bb..8ca62bb2f6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/AssertStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -106,7 +105,8 @@ public AssertStmt setCheck(final @NonNull() Expression check) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CHECK, this.check, check);
-        if (this.check != null) this.check.setParentNode(null);
+        if (this.check != null)
+            this.check.setParentNode(null);
         this.check = check;
         setAsParentNodeOf(check);
         return this;
@@ -124,7 +124,8 @@ public AssertStmt setMessage(final @Nullable() Expression message) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.MESSAGE, this.message, message);
-        if (this.message != null) this.message.setParentNode(null);
+        if (this.message != null)
+            this.message.setParentNode(null);
         this.message = message;
         setAsParentNodeOf(message);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Behavior.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Behavior.java
index 0ab3af6f5c..6d12e3cbe1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Behavior.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Behavior.java
@@ -8,6 +8,7 @@
  * @version 1 (3/14/21)
  */
 public enum Behavior implements Jmlish, JmlKeyword {
+
     NONE(""),
     BEHAVIOR("behavior"),
     NORMAL("normal_behavior"),
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java
index 18488a203f..94e73de524 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BlockStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -104,7 +103,8 @@ public BlockStmt setStatements(final @NonNull() NodeList<Statement> statements)
             return this;
         }
         notifyPropertyChange(ObservableProperty.STATEMENTS, this.statements, statements);
-        if (this.statements != null) this.statements.setParentNode(null);
+        if (this.statements != null)
+            this.statements.setParentNode(null);
         this.statements = statements;
         setAsParentNodeOf(statements);
         return this;
@@ -206,7 +206,8 @@ public BlockStmt setContracts(final @NonNull() NodeList<JmlContract> contracts)
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONTRACTS, this.contracts, contracts);
-        if (this.contracts != null) this.contracts.setParentNode(null);
+        if (this.contracts != null)
+            this.contracts.setParentNode(null);
         this.contracts = contracts;
         setAsParentNodeOf(contracts);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java
index 3f94a27865..5a479e2ce2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/BreakStmt.java
@@ -35,6 +35,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.Nullable;
+import java.util.Objects;
 
 /**
  * <h1>The break statement</h1>
@@ -113,7 +114,8 @@ public BreakStmt setLabel(final @Nullable() SimpleName label) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.LABEL, this.label, label);
-        if (this.label != null) this.label.setParentNode(null);
+        if (this.label != null)
+            this.label.setParentNode(null);
         this.label = label;
         setAsParentNodeOf(label);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java
index 2b6adb939e..8ee0606f6b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/CatchClause.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.Parameter;
@@ -54,16 +53,8 @@ public CatchClause() {
         this(null, new Parameter(), new BlockStmt());
     }
 
-    public CatchClause(
-            final NodeList<Modifier> exceptModifier,
-            final NodeList<AnnotationExpr> exceptAnnotations,
-            final ClassOrInterfaceType exceptType,
-            final SimpleName exceptName,
-            final BlockStmt body) {
-        this(
-                null,
-                new Parameter(null, exceptModifier, exceptAnnotations, exceptType, false, new NodeList<>(), exceptName),
-                body);
+    public CatchClause(final NodeList<Modifier> exceptModifier, final NodeList<AnnotationExpr> exceptAnnotations, final ClassOrInterfaceType exceptType, final SimpleName exceptName, final BlockStmt body) {
+        this(null, new Parameter(null, exceptModifier, exceptAnnotations, exceptType, false, new NodeList<>(), exceptName), body);
     }
 
     @AllFieldsConstructor
@@ -111,7 +102,8 @@ public CatchClause setParameter(final @NonNull() Parameter parameter) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.PARAMETER, this.parameter, parameter);
-        if (this.parameter != null) this.parameter.setParentNode(null);
+        if (this.parameter != null)
+            this.parameter.setParentNode(null);
         this.parameter = parameter;
         setAsParentNodeOf(parameter);
         return this;
@@ -129,7 +121,8 @@ public CatchClause setBody(final @NonNull() BlockStmt body) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BODY, this.body, body);
-        if (this.body != null) this.body.setParentNode(null);
+        if (this.body != null)
+            this.body.setParentNode(null);
         this.body = body;
         setAsParentNodeOf(body);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java
index e083777c7b..c1b0a410b4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ContinueStmt.java
@@ -36,6 +36,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.Nullable;
+import java.util.Objects;
 
 /**
  * A continue statement with an optional label;
@@ -101,7 +102,8 @@ public ContinueStmt setLabel(final @Nullable() SimpleName label) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.LABEL, this.label, label);
-        if (this.label != null) this.label.setParentNode(null);
+        if (this.label != null)
+            this.label.setParentNode(null);
         this.label = label;
         setAsParentNodeOf(label);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java
index 99189b522a..5038ded715 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/DoStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -50,8 +49,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class DoStmt extends Statement
-        implements NodeWithBody<DoStmt>, NodeWithCondition<DoStmt>, NodeWithContracts<DoStmt> {
+public class DoStmt extends Statement implements NodeWithBody<DoStmt>, NodeWithCondition<DoStmt>, NodeWithContracts<DoStmt> {
 
     private NodeList<JmlContract> contracts;
 
@@ -117,7 +115,8 @@ public DoStmt setBody(final @NonNull() Statement body) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BODY, this.body, body);
-        if (this.body != null) this.body.setParentNode(null);
+        if (this.body != null)
+            this.body.setParentNode(null);
         this.body = body;
         setAsParentNodeOf(body);
         return this;
@@ -130,7 +129,8 @@ public DoStmt setCondition(final @NonNull() Expression condition) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONDITION, this.condition, condition);
-        if (this.condition != null) this.condition.setParentNode(null);
+        if (this.condition != null)
+            this.condition.setParentNode(null);
         this.condition = condition;
         setAsParentNodeOf(condition);
         return this;
@@ -222,7 +222,8 @@ public DoStmt setContracts(final @NonNull() NodeList<JmlContract> contracts) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONTRACTS, this.contracts, contracts);
-        if (this.contracts != null) this.contracts.setParentNode(null);
+        if (this.contracts != null)
+            this.contracts.setParentNode(null);
         this.contracts = contracts;
         setAsParentNodeOf(contracts);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java
index 30e4a5453c..69dcaf706e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/EmptyStmt.java
@@ -30,6 +30,7 @@
 import com.github.javaparser.metamodel.JavaParserMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * An empty statement is a ";" where a statement is expected.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
index e6e0fc5b3b..78c3f9ae9e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -56,10 +55,7 @@
  * @see com.github.javaparser.ast.expr.SuperExpr
  * @see com.github.javaparser.ast.expr.ThisExpr
  */
-public class ExplicitConstructorInvocationStmt extends Statement
-        implements NodeWithTypeArguments<ExplicitConstructorInvocationStmt>,
-                NodeWithArguments<ExplicitConstructorInvocationStmt>,
-                Resolvable<ResolvedConstructorDeclaration> {
+public class ExplicitConstructorInvocationStmt extends Statement implements NodeWithTypeArguments<ExplicitConstructorInvocationStmt>, NodeWithArguments<ExplicitConstructorInvocationStmt>, Resolvable<ResolvedConstructorDeclaration> {
 
     @OptionalProperty
     private NodeList<Type> typeArguments;
@@ -75,17 +71,12 @@ public ExplicitConstructorInvocationStmt() {
         this(null, null, true, null, new NodeList<>());
     }
 
-    public ExplicitConstructorInvocationStmt(
-            final boolean isThis, final Expression expression, final NodeList<Expression> arguments) {
+    public ExplicitConstructorInvocationStmt(final boolean isThis, final Expression expression, final NodeList<Expression> arguments) {
         this(null, null, isThis, expression, arguments);
     }
 
     @AllFieldsConstructor
-    public ExplicitConstructorInvocationStmt(
-            final NodeList<Type> typeArguments,
-            final boolean isThis,
-            final Expression expression,
-            final NodeList<Expression> arguments) {
+    public ExplicitConstructorInvocationStmt(final NodeList<Type> typeArguments, final boolean isThis, final Expression expression, final NodeList<Expression> arguments) {
         this(null, typeArguments, isThis, expression, arguments);
     }
 
@@ -93,12 +84,7 @@ public ExplicitConstructorInvocationStmt(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public ExplicitConstructorInvocationStmt(
-            TokenRange tokenRange,
-            NodeList<Type> typeArguments,
-            boolean isThis,
-            Expression expression,
-            NodeList<Expression> arguments) {
+    public ExplicitConstructorInvocationStmt(TokenRange tokenRange, NodeList<Type> typeArguments, boolean isThis, Expression expression, NodeList<Expression> arguments) {
         super(tokenRange);
         setTypeArguments(typeArguments);
         setThis(isThis);
@@ -142,7 +128,8 @@ public ExplicitConstructorInvocationStmt setArguments(final @NonNull() NodeList<
             return this;
         }
         notifyPropertyChange(ObservableProperty.ARGUMENTS, this.arguments, arguments);
-        if (this.arguments != null) this.arguments.setParentNode(null);
+        if (this.arguments != null)
+            this.arguments.setParentNode(null);
         this.arguments = arguments;
         setAsParentNodeOf(arguments);
         return this;
@@ -160,7 +147,8 @@ public ExplicitConstructorInvocationStmt setExpression(final @Nullable() Express
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
@@ -193,7 +181,8 @@ public ExplicitConstructorInvocationStmt setTypeArguments(final @Nullable() Node
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments);
-        if (this.typeArguments != null) this.typeArguments.setParentNode(null);
+        if (this.typeArguments != null)
+            this.typeArguments.setParentNode(null);
         this.typeArguments = typeArguments;
         setAsParentNodeOf(typeArguments);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java
index 8537700a86..9f55351b06 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ExpressionStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -92,7 +91,8 @@ public ExpressionStmt setExpression(final @NonNull() Expression expression) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForEachStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForEachStmt.java
index e7cfd8fddf..71c34c7dfc 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForEachStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForEachStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.VariableDeclarator;
@@ -68,11 +67,7 @@ public ForEachStmt(final VariableDeclarationExpr variable, final Expression iter
     }
 
     @AllFieldsConstructor
-    public ForEachStmt(
-            final VariableDeclarationExpr variable,
-            final Expression iterable,
-            final Statement body,
-            final NodeList<JmlContract> contracts) {
+    public ForEachStmt(final VariableDeclarationExpr variable, final Expression iterable, final Statement body, final NodeList<JmlContract> contracts) {
         this(null, variable, iterable, body, contracts);
     }
 
@@ -80,12 +75,7 @@ public ForEachStmt(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public ForEachStmt(
-            TokenRange tokenRange,
-            VariableDeclarationExpr variable,
-            Expression iterable,
-            Statement body,
-            NodeList<JmlContract> contracts) {
+    public ForEachStmt(TokenRange tokenRange, VariableDeclarationExpr variable, Expression iterable, Statement body, NodeList<JmlContract> contracts) {
         super(tokenRange);
         setVariable(variable);
         setIterable(iterable);
@@ -132,7 +122,8 @@ public ForEachStmt setBody(final @NonNull() Statement body) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BODY, this.body, body);
-        if (this.body != null) this.body.setParentNode(null);
+        if (this.body != null)
+            this.body.setParentNode(null);
         this.body = body;
         setAsParentNodeOf(body);
         return this;
@@ -145,7 +136,8 @@ public ForEachStmt setIterable(final @NonNull() Expression iterable) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.ITERABLE, this.iterable, iterable);
-        if (this.iterable != null) this.iterable.setParentNode(null);
+        if (this.iterable != null)
+            this.iterable.setParentNode(null);
         this.iterable = iterable;
         setAsParentNodeOf(iterable);
         return this;
@@ -158,7 +150,8 @@ public ForEachStmt setVariable(final @NonNull() VariableDeclarationExpr variable
             return this;
         }
         notifyPropertyChange(ObservableProperty.VARIABLE, this.variable, variable);
-        if (this.variable != null) this.variable.setParentNode(null);
+        if (this.variable != null)
+            this.variable.setParentNode(null);
         this.variable = variable;
         setAsParentNodeOf(variable);
         return this;
@@ -190,8 +183,7 @@ public VariableDeclarator getVariableDeclarator() {
      * @return {@code true} if this foreach statement's variable is {@code final}, and {@code false} otherwise.
      */
     public boolean hasFinalVariable() {
-        return getVariable().getModifiers().isNonEmpty()
-                && getVariable().getModifiers().get(0).getKeyword() == Modifier.DefaultKeyword.FINAL;
+        return getVariable().getModifiers().isNonEmpty() && getVariable().getModifiers().get(0).getKeyword() == Modifier.DefaultKeyword.FINAL;
     }
 
     @Override
@@ -296,7 +288,8 @@ public ForEachStmt setContracts(final @NonNull() NodeList<JmlContract> contracts
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONTRACTS, this.contracts, contracts);
-        if (this.contracts != null) this.contracts.setParentNode(null);
+        if (this.contracts != null)
+            this.contracts.setParentNode(null);
         this.contracts = contracts;
         setAsParentNodeOf(contracts);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java
index 14a6acbaae..e6c40a61db 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ForStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -89,30 +88,16 @@ public ForStmt() {
         this(new NodeList<>(), new BooleanLiteralExpr(), new NodeList<>(), new ReturnStmt());
     }
 
-    public ForStmt(
-            final NodeList<Expression> initialization,
-            final Expression compare,
-            final NodeList<Expression> update,
-            final Statement body) {
+    public ForStmt(final NodeList<Expression> initialization, final Expression compare, final NodeList<Expression> update, final Statement body) {
         this(initialization, compare, update, body, new NodeList<>());
     }
 
     @AllFieldsConstructor
-    public ForStmt(
-            final NodeList<Expression> initialization,
-            final Expression compare,
-            final NodeList<Expression> update,
-            final Statement body,
-            final NodeList<JmlContract> contracts) {
+    public ForStmt(final NodeList<Expression> initialization, final Expression compare, final NodeList<Expression> update, final Statement body, final NodeList<JmlContract> contracts) {
         this(null, initialization, compare, update, body, contracts);
     }
 
-    public ForStmt(
-            TokenRange tokenRange,
-            NodeList<Expression> initialization,
-            Expression compare,
-            NodeList<Expression> update,
-            Statement body) {
+    public ForStmt(TokenRange tokenRange, NodeList<Expression> initialization, Expression compare, NodeList<Expression> update, Statement body) {
         this(tokenRange, initialization, compare, update, body, new NodeList<>());
     }
 
@@ -120,13 +105,7 @@ public ForStmt(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public ForStmt(
-            TokenRange tokenRange,
-            NodeList<Expression> initialization,
-            Expression compare,
-            NodeList<Expression> update,
-            Statement body,
-            NodeList<JmlContract> contracts) {
+    public ForStmt(TokenRange tokenRange, NodeList<Expression> initialization, Expression compare, NodeList<Expression> update, Statement body, NodeList<JmlContract> contracts) {
         super(tokenRange);
         setInitialization(initialization);
         setCompare(compare);
@@ -175,7 +154,8 @@ public ForStmt setBody(final @NonNull() Statement body) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BODY, this.body, body);
-        if (this.body != null) this.body.setParentNode(null);
+        if (this.body != null)
+            this.body.setParentNode(null);
         this.body = body;
         setAsParentNodeOf(body);
         return this;
@@ -193,7 +173,8 @@ public ForStmt setCompare(final @Nullable() Expression compare) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.COMPARE, this.compare, compare);
-        if (this.compare != null) this.compare.setParentNode(null);
+        if (this.compare != null)
+            this.compare.setParentNode(null);
         this.compare = compare;
         setAsParentNodeOf(compare);
         return this;
@@ -206,7 +187,8 @@ public ForStmt setInitialization(final @NonNull() NodeList<Expression> initializ
             return this;
         }
         notifyPropertyChange(ObservableProperty.INITIALIZATION, this.initialization, initialization);
-        if (this.initialization != null) this.initialization.setParentNode(null);
+        if (this.initialization != null)
+            this.initialization.setParentNode(null);
         this.initialization = initialization;
         setAsParentNodeOf(initialization);
         return this;
@@ -219,7 +201,8 @@ public ForStmt setUpdate(final @NonNull() NodeList<Expression> update) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.UPDATE, this.update, update);
-        if (this.update != null) this.update.setParentNode(null);
+        if (this.update != null)
+            this.update.setParentNode(null);
         this.update = update;
         setAsParentNodeOf(update);
         return this;
@@ -348,7 +331,8 @@ public ForStmt setContracts(final @NonNull() NodeList<JmlContract> contracts) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONTRACTS, this.contracts, contracts);
-        if (this.contracts != null) this.contracts.setParentNode(null);
+        if (this.contracts != null)
+            this.contracts.setParentNode(null);
         this.contracts = contracts;
         setAsParentNodeOf(contracts);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java
index 5c15d8059c..53b6af9225 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/IfStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -114,7 +113,8 @@ public IfStmt setCondition(final @NonNull() Expression condition) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONDITION, this.condition, condition);
-        if (this.condition != null) this.condition.setParentNode(null);
+        if (this.condition != null)
+            this.condition.setParentNode(null);
         this.condition = condition;
         setAsParentNodeOf(condition);
         return this;
@@ -132,7 +132,8 @@ public IfStmt setElseStmt(final @Nullable() Statement elseStmt) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.ELSE_STMT, this.elseStmt, elseStmt);
-        if (this.elseStmt != null) this.elseStmt.setParentNode(null);
+        if (this.elseStmt != null)
+            this.elseStmt.setParentNode(null);
         this.elseStmt = elseStmt;
         setAsParentNodeOf(elseStmt);
         return this;
@@ -145,7 +146,8 @@ public IfStmt setThenStmt(final @NonNull() Statement thenStmt) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.THEN_STMT, this.thenStmt, thenStmt);
-        if (this.thenStmt != null) this.thenStmt.setParentNode(null);
+        if (this.thenStmt != null)
+            this.thenStmt.setParentNode(null);
         this.thenStmt = thenStmt;
         setAsParentNodeOf(thenStmt);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
index 07ed289a85..0c81044bba 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LabeledStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -97,7 +96,8 @@ public LabeledStmt setStatement(final @NonNull() Statement statement) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.STATEMENT, this.statement, statement);
-        if (this.statement != null) this.statement.setParentNode(null);
+        if (this.statement != null)
+            this.statement.setParentNode(null);
         this.statement = statement;
         setAsParentNodeOf(statement);
         return this;
@@ -115,7 +115,8 @@ public LabeledStmt setLabel(final @NonNull() SimpleName label) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.LABEL, this.label, label);
-        if (this.label != null) this.label.setParentNode(null);
+        if (this.label != null)
+            this.label.setParentNode(null);
         this.label = label;
         setAsParentNodeOf(label);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java
index 83c2ca83e9..3a1a6b757e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalClassDeclarationStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -90,14 +89,14 @@ public ClassOrInterfaceDeclaration getClassDeclaration() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
-    public LocalClassDeclarationStmt setClassDeclaration(
-            final @NonNull() ClassOrInterfaceDeclaration classDeclaration) {
+    public LocalClassDeclarationStmt setClassDeclaration(final @NonNull() ClassOrInterfaceDeclaration classDeclaration) {
         assertNotNull(classDeclaration);
         if (classDeclaration == this.classDeclaration) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CLASS_DECLARATION, this.classDeclaration, classDeclaration);
-        if (this.classDeclaration != null) this.classDeclaration.setParentNode(null);
+        if (this.classDeclaration != null)
+            this.classDeclaration.setParentNode(null);
         this.classDeclaration = classDeclaration;
         setAsParentNodeOf(classDeclaration);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalRecordDeclarationStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalRecordDeclarationStmt.java
index a151964c60..01f19e36e9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalRecordDeclarationStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/LocalRecordDeclarationStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -91,7 +90,8 @@ public LocalRecordDeclarationStmt setRecordDeclaration(final @NonNull() RecordDe
             return this;
         }
         notifyPropertyChange(ObservableProperty.RECORD_DECLARATION, this.recordDeclaration, recordDeclaration);
-        if (this.recordDeclaration != null) this.recordDeclaration.setParentNode(null);
+        if (this.recordDeclaration != null)
+            this.recordDeclaration.setParentNode(null);
         this.recordDeclaration = recordDeclaration;
         setAsParentNodeOf(recordDeclaration);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java
index e6002d15c9..b264532b7d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ReturnStmt.java
@@ -36,6 +36,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.Nullable;
+import java.util.Objects;
 
 /**
  * The return statement, with an optional expression to return.
@@ -102,7 +103,8 @@ public ReturnStmt setExpression(final @Nullable() Expression expression) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Statement.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Statement.java
index 95fc88a9d0..3074d0ffd0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Statement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/Statement.java
@@ -21,12 +21,11 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.jml.doc.JmlDocStmt;
+import com.github.javaparser.ast.jml.doc.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
 import com.github.javaparser.ast.key.sv.KeyContextStatementBlock;
@@ -79,8 +78,7 @@ public boolean isAssertStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public AssertStmt asAssertStmt() {
-        throw new IllegalStateException(
-                f("%s is not AssertStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not AssertStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -90,8 +88,7 @@ public boolean isBlockStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public BlockStmt asBlockStmt() {
-        throw new IllegalStateException(
-                f("%s is not BlockStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not BlockStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -101,8 +98,7 @@ public boolean isBreakStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public BreakStmt asBreakStmt() {
-        throw new IllegalStateException(
-                f("%s is not BreakStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not BreakStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -112,8 +108,7 @@ public boolean isContinueStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ContinueStmt asContinueStmt() {
-        throw new IllegalStateException(
-                f("%s is not ContinueStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ContinueStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -123,8 +118,7 @@ public boolean isDoStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public DoStmt asDoStmt() {
-        throw new IllegalStateException(
-                f("%s is not DoStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not DoStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -134,8 +128,7 @@ public boolean isEmptyStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public EmptyStmt asEmptyStmt() {
-        throw new IllegalStateException(
-                f("%s is not EmptyStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not EmptyStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -145,9 +138,7 @@ public boolean isExplicitConstructorInvocationStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ExplicitConstructorInvocationStmt asExplicitConstructorInvocationStmt() {
-        throw new IllegalStateException(f(
-                "%s is not ExplicitConstructorInvocationStmt, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ExplicitConstructorInvocationStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -157,8 +148,7 @@ public boolean isExpressionStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ExpressionStmt asExpressionStmt() {
-        throw new IllegalStateException(
-                f("%s is not ExpressionStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ExpressionStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -168,8 +158,7 @@ public boolean isForStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ForStmt asForStmt() {
-        throw new IllegalStateException(
-                f("%s is not ForStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ForStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -179,8 +168,7 @@ public boolean isIfStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public IfStmt asIfStmt() {
-        throw new IllegalStateException(
-                f("%s is not IfStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not IfStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -190,8 +178,7 @@ public boolean isLabeledStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public LabeledStmt asLabeledStmt() {
-        throw new IllegalStateException(
-                f("%s is not LabeledStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not LabeledStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -206,16 +193,12 @@ public boolean isLocalRecordDeclarationStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public LocalClassDeclarationStmt asLocalClassDeclarationStmt() {
-        throw new IllegalStateException(f(
-                "%s is not LocalClassDeclarationStmt, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not LocalClassDeclarationStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public LocalRecordDeclarationStmt asLocalRecordDeclarationStmt() {
-        throw new IllegalStateException(f(
-                "%s is not LocalRecordDeclarationStmt, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not LocalRecordDeclarationStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -225,8 +208,7 @@ public boolean isReturnStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ReturnStmt asReturnStmt() {
-        throw new IllegalStateException(
-                f("%s is not ReturnStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ReturnStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -236,8 +218,7 @@ public boolean isSwitchStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public SwitchStmt asSwitchStmt() {
-        throw new IllegalStateException(
-                f("%s is not SwitchStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not SwitchStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -247,8 +228,7 @@ public boolean isSynchronizedStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public SynchronizedStmt asSynchronizedStmt() {
-        throw new IllegalStateException(
-                f("%s is not SynchronizedStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not SynchronizedStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -258,8 +238,7 @@ public boolean isThrowStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ThrowStmt asThrowStmt() {
-        throw new IllegalStateException(
-                f("%s is not ThrowStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ThrowStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -269,8 +248,7 @@ public boolean isTryStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public TryStmt asTryStmt() {
-        throw new IllegalStateException(
-                f("%s is not TryStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not TryStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -280,8 +258,7 @@ public boolean isUnparsableStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public UnparsableStmt asUnparsableStmt() {
-        throw new IllegalStateException(
-                f("%s is not UnparsableStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not UnparsableStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -291,69 +268,88 @@ public boolean isWhileStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public WhileStmt asWhileStmt() {
-        throw new IllegalStateException(
-                f("%s is not WhileStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not WhileStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifAssertStmt(Consumer<AssertStmt> action) {}
+    public void ifAssertStmt(Consumer<AssertStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifBlockStmt(Consumer<BlockStmt> action) {}
+    public void ifBlockStmt(Consumer<BlockStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifBreakStmt(Consumer<BreakStmt> action) {}
+    public void ifBreakStmt(Consumer<BreakStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifContinueStmt(Consumer<ContinueStmt> action) {}
+    public void ifContinueStmt(Consumer<ContinueStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifDoStmt(Consumer<DoStmt> action) {}
+    public void ifDoStmt(Consumer<DoStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifEmptyStmt(Consumer<EmptyStmt> action) {}
+    public void ifEmptyStmt(Consumer<EmptyStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifExplicitConstructorInvocationStmt(Consumer<ExplicitConstructorInvocationStmt> action) {}
+    public void ifExplicitConstructorInvocationStmt(Consumer<ExplicitConstructorInvocationStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifExpressionStmt(Consumer<ExpressionStmt> action) {}
+    public void ifExpressionStmt(Consumer<ExpressionStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifForStmt(Consumer<ForStmt> action) {}
+    public void ifForStmt(Consumer<ForStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifIfStmt(Consumer<IfStmt> action) {}
+    public void ifIfStmt(Consumer<IfStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifLabeledStmt(Consumer<LabeledStmt> action) {}
+    public void ifLabeledStmt(Consumer<LabeledStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifLocalClassDeclarationStmt(Consumer<LocalClassDeclarationStmt> action) {}
+    public void ifLocalClassDeclarationStmt(Consumer<LocalClassDeclarationStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifLocalRecordDeclarationStmt(Consumer<LocalRecordDeclarationStmt> action) {}
+    public void ifLocalRecordDeclarationStmt(Consumer<LocalRecordDeclarationStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifReturnStmt(Consumer<ReturnStmt> action) {}
+    public void ifReturnStmt(Consumer<ReturnStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifSwitchStmt(Consumer<SwitchStmt> action) {}
+    public void ifSwitchStmt(Consumer<SwitchStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifSynchronizedStmt(Consumer<SynchronizedStmt> action) {}
+    public void ifSynchronizedStmt(Consumer<SynchronizedStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifThrowStmt(Consumer<ThrowStmt> action) {}
+    public void ifThrowStmt(Consumer<ThrowStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifTryStmt(Consumer<TryStmt> action) {}
+    public void ifTryStmt(Consumer<TryStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifUnparsableStmt(Consumer<UnparsableStmt> action) {}
+    public void ifUnparsableStmt(Consumer<UnparsableStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifWhileStmt(Consumer<WhileStmt> action) {}
+    public void ifWhileStmt(Consumer<WhileStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public Optional<AssertStmt> toAssertStmt() {
@@ -462,8 +458,7 @@ public boolean isForEachStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ForEachStmt asForEachStmt() {
-        throw new IllegalStateException(
-                f("%s is not ForEachStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ForEachStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -472,7 +467,8 @@ public Optional<ForEachStmt> toForEachStmt() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifForEachStmt(Consumer<ForEachStmt> action) {}
+    public void ifForEachStmt(Consumer<ForEachStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isYieldStmt() {
@@ -481,8 +477,7 @@ public boolean isYieldStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public YieldStmt asYieldStmt() {
-        throw new IllegalStateException(
-                f("%s is not YieldStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not YieldStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -491,7 +486,8 @@ public Optional<YieldStmt> toYieldStmt() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifYieldStmt(Consumer<YieldStmt> action) {}
+    public void ifYieldStmt(Consumer<YieldStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyCatchAllStatement() {
@@ -499,19 +495,18 @@ public boolean isKeyCatchAllStatement() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyCatchAllStatement asKeyCatchAllStatement() {
-        throw new IllegalStateException(f(
-                "%s is not KeyCatchAllStatement, it is %s",
-                this, this.getClass().getSimpleName()));
+    public KeyCatchAllStmt asKeyCatchAllStatement() {
+        throw new IllegalStateException(f("%s is not KeyCatchAllStatement, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyCatchAllStatement> toKeyCatchAllStatement() {
+    public Optional<KeyCatchAllStmt> toKeyCatchAllStatement() {
         return Optional.empty();
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyCatchAllStatement(Consumer<KeyCatchAllStatement> action) {}
+    public void ifKeyCatchAllStatement(Consumer<KeyCatchAllStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyContextStatementBlock() {
@@ -520,9 +515,7 @@ public boolean isKeyContextStatementBlock() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public KeyContextStatementBlock asKeyContextStatementBlock() {
-        throw new IllegalStateException(f(
-                "%s is not KeyContextStatementBlock, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not KeyContextStatementBlock, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -536,22 +529,22 @@ public boolean isKeyMethodCallStatement() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyMethodCallStatement asKeyMethodCallStatement() {
-        throw new IllegalStateException(f(
-                "%s is not KeyMethodCallStatement, it is %s",
-                this, this.getClass().getSimpleName()));
+    public KeyMethodCallStmt asKeyMethodCallStatement() {
+        throw new IllegalStateException(f("%s is not KeyMethodCallStatement, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyMethodCallStatement> toKeyMethodCallStatement() {
+    public Optional<KeyMethodCallStmt> toKeyMethodCallStatement() {
         return Optional.empty();
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyMethodCallStatement(Consumer<KeyMethodCallStatement> action) {}
+    public void ifKeyMethodCallStatement(Consumer<KeyMethodCallStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyContextStatementBlock(Consumer<KeyContextStatementBlock> action) {}
+    public void ifKeyContextStatementBlock(Consumer<KeyContextStatementBlock> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyEscapeExpression() {
@@ -569,7 +562,8 @@ public Optional<KeyEscapeExpression> toKeyEscapeExpression() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyEscapeExpression(Consumer<KeyEscapeExpression> action) {}
+    public void ifKeyEscapeExpression(Consumer<KeyEscapeExpression> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyExecCtxtSV() {
@@ -578,8 +572,7 @@ public boolean isKeyExecCtxtSV() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public KeyExecCtxtSV asKeyExecCtxtSV() {
-        throw new IllegalStateException(
-                f("%s is not KeyExecCtxtSV, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not KeyExecCtxtSV, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -588,7 +581,8 @@ public Optional<KeyExecCtxtSV> toKeyExecCtxtSV() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyExecCtxtSV(Consumer<KeyExecCtxtSV> action) {}
+    public void ifKeyExecCtxtSV(Consumer<KeyExecCtxtSV> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyExecStatement() {
@@ -596,18 +590,18 @@ public boolean isKeyExecStatement() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyExecStatement asKeyExecStatement() {
-        throw new IllegalStateException(
-                f("%s is not KeyExecStatement, it is %s", this, this.getClass().getSimpleName()));
+    public KeyExecStmt asKeyExecStatement() {
+        throw new IllegalStateException(f("%s is not KeyExecStatement, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyExecStatement> toKeyExecStatement() {
+    public Optional<KeyExecStmt> toKeyExecStatement() {
         return Optional.empty();
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyExecStatement(Consumer<KeyExecStatement> action) {}
+    public void ifKeyExecStatement(Consumer<KeyExecStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyLoopScopeBlock() {
@@ -615,18 +609,18 @@ public boolean isKeyLoopScopeBlock() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyLoopScopeBlock asKeyLoopScopeBlock() {
-        throw new IllegalStateException(
-                f("%s is not KeyLoopScopeBlock, it is %s", this, this.getClass().getSimpleName()));
+    public KeyLoopScopeBlockStmt asKeyLoopScopeBlock() {
+        throw new IllegalStateException(f("%s is not KeyLoopScopeBlock, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyLoopScopeBlock> toKeyLoopScopeBlock() {
+    public Optional<KeyLoopScopeBlockStmt> toKeyLoopScopeBlock() {
         return Optional.empty();
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyLoopScopeBlock(Consumer<KeyLoopScopeBlock> action) {}
+    public void ifKeyLoopScopeBlock(Consumer<KeyLoopScopeBlockStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyMergePointStatement() {
@@ -634,19 +628,18 @@ public boolean isKeyMergePointStatement() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyMergePointStatement asKeyMergePointStatement() {
-        throw new IllegalStateException(f(
-                "%s is not KeyMergePointStatement, it is %s",
-                this, this.getClass().getSimpleName()));
+    public KeyMergePointStmt asKeyMergePointStatement() {
+        throw new IllegalStateException(f("%s is not KeyMergePointStatement, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyMergePointStatement> toKeyMergePointStatement() {
+    public Optional<KeyMergePointStmt> toKeyMergePointStatement() {
         return Optional.empty();
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyMergePointStatement(Consumer<KeyMergePointStatement> action) {}
+    public void ifKeyMergePointStatement(Consumer<KeyMergePointStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyMetaConstruct() {
@@ -655,8 +648,7 @@ public boolean isKeyMetaConstruct() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public KeyMetaConstruct asKeyMetaConstruct() {
-        throw new IllegalStateException(
-                f("%s is not KeyMetaConstruct, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not KeyMetaConstruct, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -665,7 +657,8 @@ public Optional<KeyMetaConstruct> toKeyMetaConstruct() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyMetaConstruct(Consumer<KeyMetaConstruct> action) {}
+    public void ifKeyMetaConstruct(Consumer<KeyMetaConstruct> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyMethodBodyStatement() {
@@ -674,9 +667,7 @@ public boolean isKeyMethodBodyStatement() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public KeyMethodBodyStatement asKeyMethodBodyStatement() {
-        throw new IllegalStateException(f(
-                "%s is not KeyMethodBodyStatement, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not KeyMethodBodyStatement, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -685,7 +676,8 @@ public Optional<KeyMethodBodyStatement> toKeyMethodBodyStatement() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyMethodBodyStatement(Consumer<KeyMethodBodyStatement> action) {}
+    public void ifKeyMethodBodyStatement(Consumer<KeyMethodBodyStatement> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyStatementSV() {
@@ -694,8 +686,7 @@ public boolean isKeyStatementSV() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public KeyStatementSV asKeyStatementSV() {
-        throw new IllegalStateException(
-                f("%s is not KeyStatementSV, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not KeyStatementSV, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -704,7 +695,8 @@ public Optional<KeyStatementSV> toKeyStatementSV() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyStatementSV(Consumer<KeyStatementSV> action) {}
+    public void ifKeyStatementSV(Consumer<KeyStatementSV> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyTransactionStatement() {
@@ -712,19 +704,37 @@ public boolean isKeyTransactionStatement() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public KeyTransactionStatement asKeyTransactionStatement() {
-        throw new IllegalStateException(f(
-                "%s is not KeyTransactionStatement, it is %s",
-                this, this.getClass().getSimpleName()));
+    public KeyTransactionStmt asKeyTransactionStatement() {
+        throw new IllegalStateException(f("%s is not KeyTransactionStatement, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public Optional<KeyTransactionStatement> toKeyTransactionStatement() {
+    public Optional<KeyTransactionStmt> toKeyTransactionStatement() {
         return Optional.empty();
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyTransactionStatement(Consumer<KeyTransactionStatement> action) {}
+    public void ifKeyTransactionStatement(Consumer<KeyTransactionStmt> action) {
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeYMarkerStatement() {
+        return false;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeYMarkerStatement asKeYMarkerStatement() {
+        throw new IllegalStateException(f("%s is not KeYMarkerStatement, it is %s", this, this.getClass().getSimpleName()));
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeYMarkerStatement> toKeYMarkerStatement() {
+        return Optional.empty();
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeYMarkerStatement(Consumer<KeYMarkerStatement> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlDocStmt() {
@@ -738,8 +748,7 @@ public boolean isJmlBeginStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlBeginStmt asJmlBeginStmt() {
-        throw new IllegalStateException(
-                f("%s is not JmlBeginStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlBeginStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -748,12 +757,12 @@ public Optional<JmlBeginStmt> toJmlBeginStmt() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlBeginStmt(Consumer<JmlBeginStmt> action) {}
+    public void ifJmlBeginStmt(Consumer<JmlBeginStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlDocStmt asJmlDocStmt() {
-        throw new IllegalStateException(
-                f("%s is not JmlDocStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlDocStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -762,7 +771,8 @@ public Optional<JmlDocStmt> toJmlDocStmt() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlDocStmt(Consumer<JmlDocStmt> action) {}
+    public void ifJmlDocStmt(Consumer<JmlDocStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlEndStmt() {
@@ -771,8 +781,7 @@ public boolean isJmlEndStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlEndStmt asJmlEndStmt() {
-        throw new IllegalStateException(
-                f("%s is not JmlEndStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlEndStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -781,7 +790,8 @@ public Optional<JmlEndStmt> toJmlEndStmt() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlEndStmt(Consumer<JmlEndStmt> action) {}
+    public void ifJmlEndStmt(Consumer<JmlEndStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlExpressionStmt() {
@@ -790,8 +800,7 @@ public boolean isJmlExpressionStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlExpressionStmt asJmlExpressionStmt() {
-        throw new IllegalStateException(
-                f("%s is not JmlExpressionStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlExpressionStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -800,7 +809,8 @@ public Optional<JmlExpressionStmt> toJmlExpressionStmt() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlExpressionStmt(Consumer<JmlExpressionStmt> action) {}
+    public void ifJmlExpressionStmt(Consumer<JmlExpressionStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlGhostStmt() {
@@ -809,8 +819,7 @@ public boolean isJmlGhostStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlGhostStmt asJmlGhostStmt() {
-        throw new IllegalStateException(
-                f("%s is not JmlGhostStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlGhostStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -819,7 +828,8 @@ public Optional<JmlGhostStmt> toJmlGhostStmt() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlGhostStmt(Consumer<JmlGhostStmt> action) {}
+    public void ifJmlGhostStmt(Consumer<JmlGhostStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlLabelStmt() {
@@ -828,8 +838,7 @@ public boolean isJmlLabelStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlLabelStmt asJmlLabelStmt() {
-        throw new IllegalStateException(
-                f("%s is not JmlLabelStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlLabelStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -838,7 +847,8 @@ public Optional<JmlLabelStmt> toJmlLabelStmt() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlLabelStmt(Consumer<JmlLabelStmt> action) {}
+    public void ifJmlLabelStmt(Consumer<JmlLabelStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlRefiningStmt() {
@@ -847,8 +857,7 @@ public boolean isJmlRefiningStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlRefiningStmt asJmlRefiningStmt() {
-        throw new IllegalStateException(
-                f("%s is not JmlRefiningStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlRefiningStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -857,7 +866,8 @@ public Optional<JmlRefiningStmt> toJmlRefiningStmt() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlRefiningStmt(Consumer<JmlRefiningStmt> action) {}
+    public void ifJmlRefiningStmt(Consumer<JmlRefiningStmt> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlStatement() {
@@ -866,8 +876,7 @@ public boolean isJmlStatement() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlStatement asJmlStatement() {
-        throw new IllegalStateException(
-                f("%s is not JmlStatement, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlStatement, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -876,7 +885,8 @@ public Optional<JmlStatement> toJmlStatement() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlStatement(Consumer<JmlStatement> action) {}
+    public void ifJmlStatement(Consumer<JmlStatement> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isJmlUnreachableStmt() {
@@ -885,8 +895,7 @@ public boolean isJmlUnreachableStmt() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public JmlUnreachableStmt asJmlUnreachableStmt() {
-        throw new IllegalStateException(f(
-                "%s is not JmlUnreachableStmt, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not JmlUnreachableStmt, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -895,5 +904,120 @@ public Optional<JmlUnreachableStmt> toJmlUnreachableStmt() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifJmlUnreachableStmt(Consumer<JmlUnreachableStmt> action) {}
+    public void ifJmlUnreachableStmt(Consumer<JmlUnreachableStmt> action) {
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeyCatchAllStmt() {
+        return false;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeyCatchAllStmt asKeyCatchAllStmt() {
+        throw new IllegalStateException(f("%s is not KeyCatchAllStmt, it is %s", this, this.getClass().getSimpleName()));
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeyCatchAllStmt> toKeyCatchAllStmt() {
+        return Optional.empty();
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeyCatchAllStmt(Consumer<KeyCatchAllStmt> action) {
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeyExecStmt() {
+        return false;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeyExecStmt asKeyExecStmt() {
+        throw new IllegalStateException(f("%s is not KeyExecStmt, it is %s", this, this.getClass().getSimpleName()));
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeyExecStmt> toKeyExecStmt() {
+        return Optional.empty();
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeyExecStmt(Consumer<KeyExecStmt> action) {
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeyLoopScopeBlockStmt() {
+        return false;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeyLoopScopeBlockStmt asKeyLoopScopeBlockStmt() {
+        throw new IllegalStateException(f("%s is not KeyLoopScopeBlockStmt, it is %s", this, this.getClass().getSimpleName()));
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeyLoopScopeBlockStmt> toKeyLoopScopeBlockStmt() {
+        return Optional.empty();
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeyLoopScopeBlockStmt(Consumer<KeyLoopScopeBlockStmt> action) {
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeyMergePointStmt() {
+        return false;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeyMergePointStmt asKeyMergePointStmt() {
+        throw new IllegalStateException(f("%s is not KeyMergePointStmt, it is %s", this, this.getClass().getSimpleName()));
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeyMergePointStmt> toKeyMergePointStmt() {
+        return Optional.empty();
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeyMergePointStmt(Consumer<KeyMergePointStmt> action) {
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeyMethodCallStmt() {
+        return false;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeyMethodCallStmt asKeyMethodCallStmt() {
+        throw new IllegalStateException(f("%s is not KeyMethodCallStmt, it is %s", this, this.getClass().getSimpleName()));
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeyMethodCallStmt> toKeyMethodCallStmt() {
+        return Optional.empty();
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeyMethodCallStmt(Consumer<KeyMethodCallStmt> action) {
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public boolean isKeyTransactionStmt() {
+        return false;
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public KeyTransactionStmt asKeyTransactionStmt() {
+        throw new IllegalStateException(f("%s is not KeyTransactionStmt, it is %s", this, this.getClass().getSimpleName()));
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public Optional<KeyTransactionStmt> toKeyTransactionStmt() {
+        return Optional.empty();
+    }
+
+    @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
+    public void ifKeyTransactionStmt(Consumer<KeyTransactionStmt> action) {
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntry.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntry.java
index feb168c46e..6f529fc162 100644
Binary files a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntry.java and b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchEntry.java differ
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java
index 207074b0d3..0c921bd585 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SwitchStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -137,7 +136,8 @@ public SwitchStmt setEntries(final @NonNull() NodeList<SwitchEntry> entries) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.ENTRIES, this.entries, entries);
-        if (this.entries != null) this.entries.setParentNode(null);
+        if (this.entries != null)
+            this.entries.setParentNode(null);
         this.entries = entries;
         setAsParentNodeOf(entries);
         return this;
@@ -150,7 +150,8 @@ public SwitchStmt setSelector(final @NonNull() Expression selector) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.SELECTOR, this.selector, selector);
-        if (this.selector != null) this.selector.setParentNode(null);
+        if (this.selector != null)
+            this.selector.setParentNode(null);
         this.selector = selector;
         setAsParentNodeOf(selector);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java
index 34a6a62493..4761876fa4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/SynchronizedStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -47,8 +46,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class SynchronizedStmt extends Statement
-        implements NodeWithBlockStmt<SynchronizedStmt>, NodeWithExpression<SynchronizedStmt> {
+public class SynchronizedStmt extends Statement implements NodeWithBlockStmt<SynchronizedStmt>, NodeWithExpression<SynchronizedStmt> {
 
     private Expression expression;
 
@@ -98,7 +96,8 @@ public SynchronizedStmt setExpression(final @NonNull() Expression expression) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
@@ -116,7 +115,8 @@ public SynchronizedStmt setBody(final @NonNull() BlockStmt body) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BODY, this.body, body);
-        if (this.body != null) this.body.setParentNode(null);
+        if (this.body != null)
+            this.body.setParentNode(null);
         this.body = body;
         setAsParentNodeOf(body);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java
index 18f18f63a5..1439552b9b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/ThrowStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -93,7 +92,8 @@ public ThrowStmt setExpression(final @NonNull() Expression expression) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java
index f7ff1fdb33..06683821e9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/TryStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -116,11 +115,7 @@ public TryStmt(final BlockStmt tryBlock, final NodeList<CatchClause> catchClause
     }
 
     @AllFieldsConstructor
-    public TryStmt(
-            NodeList<Expression> resources,
-            final BlockStmt tryBlock,
-            final NodeList<CatchClause> catchClauses,
-            final BlockStmt finallyBlock) {
+    public TryStmt(NodeList<Expression> resources, final BlockStmt tryBlock, final NodeList<CatchClause> catchClauses, final BlockStmt finallyBlock) {
         this(null, resources, tryBlock, catchClauses, finallyBlock);
     }
 
@@ -128,12 +123,7 @@ public TryStmt(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public TryStmt(
-            TokenRange tokenRange,
-            NodeList<Expression> resources,
-            BlockStmt tryBlock,
-            NodeList<CatchClause> catchClauses,
-            BlockStmt finallyBlock) {
+    public TryStmt(TokenRange tokenRange, NodeList<Expression> resources, BlockStmt tryBlock, NodeList<CatchClause> catchClauses, BlockStmt finallyBlock) {
         super(tokenRange);
         setResources(resources);
         setTryBlock(tryBlock);
@@ -181,7 +171,8 @@ public TryStmt setCatchClauses(final @NonNull() NodeList<CatchClause> catchClaus
             return this;
         }
         notifyPropertyChange(ObservableProperty.CATCH_CLAUSES, this.catchClauses, catchClauses);
-        if (this.catchClauses != null) this.catchClauses.setParentNode(null);
+        if (this.catchClauses != null)
+            this.catchClauses.setParentNode(null);
         this.catchClauses = catchClauses;
         setAsParentNodeOf(catchClauses);
         return this;
@@ -193,7 +184,8 @@ public TryStmt setFinallyBlock(final @Nullable() BlockStmt finallyBlock) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.FINALLY_BLOCK, this.finallyBlock, finallyBlock);
-        if (this.finallyBlock != null) this.finallyBlock.setParentNode(null);
+        if (this.finallyBlock != null)
+            this.finallyBlock.setParentNode(null);
         this.finallyBlock = finallyBlock;
         setAsParentNodeOf(finallyBlock);
         return this;
@@ -206,7 +198,8 @@ public TryStmt setTryBlock(final @NonNull() BlockStmt tryBlock) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TRY_BLOCK, this.tryBlock, tryBlock);
-        if (this.tryBlock != null) this.tryBlock.setParentNode(null);
+        if (this.tryBlock != null)
+            this.tryBlock.setParentNode(null);
         this.tryBlock = tryBlock;
         setAsParentNodeOf(tryBlock);
         return this;
@@ -219,7 +212,8 @@ public TryStmt setResources(final @NonNull() NodeList<Expression> resources) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.RESOURCES, this.resources, resources);
-        if (this.resources != null) this.resources.setParentNode(null);
+        if (this.resources != null)
+            this.resources.setParentNode(null);
         this.resources = resources;
         setAsParentNodeOf(resources);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/UnparsableStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/UnparsableStmt.java
index df64347a57..7b217072d4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/UnparsableStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/UnparsableStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.ast.Node.Parsedness.UNPARSABLE;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -32,6 +31,7 @@
 import com.github.javaparser.metamodel.UnparsableStmtMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * A statement that had parse errors.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java
index 6433d8862d..ea4705ec36 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/WhileStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -50,8 +49,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class WhileStmt extends Statement
-        implements NodeWithBody<WhileStmt>, NodeWithCondition<WhileStmt>, NodeWithContracts<WhileStmt> {
+public class WhileStmt extends Statement implements NodeWithBody<WhileStmt>, NodeWithCondition<WhileStmt>, NodeWithContracts<WhileStmt> {
 
     private NodeList<JmlContract> contracts;
 
@@ -117,7 +115,8 @@ public WhileStmt setBody(final @NonNull() Statement body) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.BODY, this.body, body);
-        if (this.body != null) this.body.setParentNode(null);
+        if (this.body != null)
+            this.body.setParentNode(null);
         this.body = body;
         setAsParentNodeOf(body);
         return this;
@@ -130,7 +129,8 @@ public WhileStmt setCondition(final @NonNull() Expression condition) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONDITION, this.condition, condition);
-        if (this.condition != null) this.condition.setParentNode(null);
+        if (this.condition != null)
+            this.condition.setParentNode(null);
         this.condition = condition;
         setAsParentNodeOf(condition);
         return this;
@@ -222,7 +222,8 @@ public WhileStmt setContracts(final @NonNull() NodeList<JmlContract> contracts)
             return this;
         }
         notifyPropertyChange(ObservableProperty.CONTRACTS, this.contracts, contracts);
-        if (this.contracts != null) this.contracts.setParentNode(null);
+        if (this.contracts != null)
+            this.contracts.setParentNode(null);
         this.contracts = contracts;
         setAsParentNodeOf(contracts);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/YieldStmt.java b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/YieldStmt.java
index 6a8e5b8897..70dff4bddd 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/YieldStmt.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/stmt/YieldStmt.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.stmt;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -90,7 +89,8 @@ public YieldStmt setExpression(final @NonNull() Expression expression) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXPRESSION, this.expression, expression);
-        if (this.expression != null) this.expression.setParentNode(null);
+        if (this.expression != null)
+            this.expression.setParentNode(null);
         this.expression = expression;
         setAsParentNodeOf(expression);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java
index a81e3ae3ee..53eb837183 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ArrayType.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.ast.NodeList.nodeList;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -121,7 +120,8 @@ public ArrayType setComponentType(final @NonNull() Type componentType) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.COMPONENT_TYPE, this.componentType, componentType);
-        if (this.componentType != null) this.componentType.setParentNode(null);
+        if (this.componentType != null)
+            this.componentType.setParentNode(null);
         this.componentType = componentType;
         setAsParentNodeOf(componentType);
         return this;
@@ -141,9 +141,7 @@ public static Type wrapInArrayTypes(Type type, List<ArrayBracketPair>... arrayBr
                 for (int j = arrayBracketPairList.size() - 1; j >= 0; j--) {
                     ArrayBracketPair pair = arrayBracketPairList.get(j);
                     if (type.getTokenRange().isPresent() && pair.getTokenRange().isPresent()) {
-                        TokenRange currentTokenRange = new TokenRange(
-                                type.getTokenRange().get().getBegin(),
-                                pair.getTokenRange().get().getEnd());
+                        TokenRange currentTokenRange = new TokenRange(type.getTokenRange().get().getBegin(), pair.getTokenRange().get().getEnd());
                         // The end range must be equals to the last array bracket pair in the list
                         // in the example below:
                         // Long[][]
@@ -163,12 +161,9 @@ public static Type wrapInArrayTypes(Type type, List<ArrayBracketPair>... arrayBr
      * Returns a {@code TokenRange} with the outermost ending token
      */
     private static TokenRange getOuterMostTokenRange(TokenRange tokenRange1, TokenRange tokenRange2) {
-        if (tokenRange2 == null) return tokenRange1;
-        if (tokenRange1
-                .getEnd()
-                .getRange()
-                .get()
-                .isAfter(tokenRange2.getEnd().getRange().get())) {
+        if (tokenRange2 == null)
+            return tokenRange1;
+        if (tokenRange1.getEnd().getRange().get().isAfter(tokenRange2.getEnd().getRange().get())) {
             return tokenRange1;
         }
         return new TokenRange(tokenRange1.getBegin(), tokenRange2.getEnd());
@@ -183,8 +178,7 @@ public static Pair<Type, List<ArrayBracketPair>> unwrapArrayTypes(Type type) {
         final List<ArrayBracketPair> arrayBracketPairs = new ArrayList<>(0);
         while (type instanceof ArrayType) {
             ArrayType arrayType = (ArrayType) type;
-            arrayBracketPairs.add(new ArrayBracketPair(
-                    type.getTokenRange().orElse(null), arrayType.getOrigin(), arrayType.getAnnotations()));
+            arrayBracketPairs.add(new ArrayBracketPair(type.getTokenRange().orElse(null), arrayType.getOrigin(), arrayType.getAnnotations()));
             type = arrayType.getComponentType();
         }
         return new Pair<>(type, arrayBracketPairs);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java
index 3d71d98d07..2f454fe282 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ClassOrInterfaceType.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import static java.util.stream.Collectors.joining;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -71,10 +70,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class ClassOrInterfaceType extends ReferenceType
-        implements NodeWithSimpleName<ClassOrInterfaceType>,
-                NodeWithAnnotations<ClassOrInterfaceType>,
-                NodeWithTypeArguments<ClassOrInterfaceType> {
+public class ClassOrInterfaceType extends ReferenceType implements NodeWithSimpleName<ClassOrInterfaceType>, NodeWithAnnotations<ClassOrInterfaceType>, NodeWithTypeArguments<ClassOrInterfaceType> {
 
     @OptionalProperty
     private ClassOrInterfaceType scope;
@@ -99,17 +95,12 @@ public ClassOrInterfaceType(final ClassOrInterfaceType scope, final String name)
         this(null, scope, new SimpleName(name), null, new NodeList<>());
     }
 
-    public ClassOrInterfaceType(
-            final ClassOrInterfaceType scope, final SimpleName name, final NodeList<Type> typeArguments) {
+    public ClassOrInterfaceType(final ClassOrInterfaceType scope, final SimpleName name, final NodeList<Type> typeArguments) {
         this(null, scope, name, typeArguments, new NodeList<>());
     }
 
     @AllFieldsConstructor
-    public ClassOrInterfaceType(
-            final ClassOrInterfaceType scope,
-            final SimpleName name,
-            final NodeList<Type> typeArguments,
-            final NodeList<AnnotationExpr> annotations) {
+    public ClassOrInterfaceType(final ClassOrInterfaceType scope, final SimpleName name, final NodeList<Type> typeArguments, final NodeList<AnnotationExpr> annotations) {
         this(null, scope, name, typeArguments, annotations);
     }
 
@@ -117,12 +108,7 @@ public ClassOrInterfaceType(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public ClassOrInterfaceType(
-            TokenRange tokenRange,
-            ClassOrInterfaceType scope,
-            SimpleName name,
-            NodeList<Type> typeArguments,
-            NodeList<AnnotationExpr> annotations) {
+    public ClassOrInterfaceType(TokenRange tokenRange, ClassOrInterfaceType scope, SimpleName name, NodeList<Type> typeArguments, NodeList<AnnotationExpr> annotations) {
         super(tokenRange, annotations);
         setScope(scope);
         setName(name);
@@ -177,7 +163,8 @@ public ClassOrInterfaceType setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -195,7 +182,8 @@ public ClassOrInterfaceType setScope(final @Nullable() ClassOrInterfaceType scop
             return this;
         }
         notifyPropertyChange(ObservableProperty.SCOPE, this.scope, scope);
-        if (this.scope != null) this.scope.setParentNode(null);
+        if (this.scope != null)
+            this.scope.setParentNode(null);
         this.scope = scope;
         setAsParentNodeOf(scope);
         return this;
@@ -218,7 +206,8 @@ public ClassOrInterfaceType setTypeArguments(final @Nullable() NodeList<Type> ty
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments);
-        if (this.typeArguments != null) this.typeArguments.setParentNode(null);
+        if (this.typeArguments != null)
+            this.typeArguments.setParentNode(null);
         this.typeArguments = typeArguments;
         setAsParentNodeOf(typeArguments);
         return this;
@@ -257,8 +246,7 @@ public String asString() {
         StringBuilder str = new StringBuilder();
         getScope().ifPresent(s -> str.append(s.asString()).append("."));
         str.append(name.asString());
-        getTypeArguments()
-                .ifPresent(ta -> str.append(ta.stream().map(Type::asString).collect(joining(",", "<", ">"))));
+        getTypeArguments().ifPresent(ta -> str.append(ta.stream().map(Type::asString).collect(joining(",", "<", ">"))));
         return str.toString();
     }
 
@@ -268,8 +256,7 @@ public String asString() {
      */
     @Override
     public String toDescriptor() {
-        return String.format(
-                "L%s;", resolve().erasure().asReferenceType().getQualifiedName().replace(".", "/"));
+        return String.format("L%s;", resolve().erasure().asReferenceType().getQualifiedName().replace(".", "/"));
     }
 
     @Generated("com.github.javaparser.generator.core.node.RemoveMethodGenerator")
@@ -362,9 +349,7 @@ public ResolvedType convertToUsage(Context context) {
         ResolvedTypeDeclaration typeDeclaration = ref.getCorrespondingDeclaration();
         List<ResolvedType> typeParameters = Collections.emptyList();
         if (getTypeArguments().isPresent()) {
-            typeParameters = getTypeArguments().get().stream()
-                    .map((pt) -> pt.convertToUsage(context))
-                    .collect(Collectors.toList());
+            typeParameters = getTypeArguments().get().stream().map((pt) -> pt.convertToUsage(context)).collect(Collectors.toList());
         }
         if (typeDeclaration.isTypeParameter()) {
             return new ResolvedTypeVariable(typeDeclaration.asTypeParameter());
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java
index 907dac0c28..b64b4f9bbc 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/IntersectionType.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import static java.util.stream.Collectors.joining;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -101,7 +100,8 @@ public IntersectionType setElements(final @NonNull() NodeList<ReferenceType> ele
             return this;
         }
         notifyPropertyChange(ObservableProperty.ELEMENTS, this.elements, elements);
-        if (this.elements != null) this.elements.setParentNode(null);
+        if (this.elements != null)
+            this.elements.setParentNode(null);
         this.elements = elements;
         setAsParentNodeOf(elements);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/LogicalType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/LogicalType.java
index 8d56918546..0d2fac9153 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/LogicalType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/LogicalType.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.type;
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -62,10 +61,7 @@
  *
  * @author Julio Vilmar Gesser
  */
-public class LogicalType extends ReferenceType
-        implements NodeWithSimpleName<LogicalType>,
-                NodeWithAnnotations<LogicalType>,
-                NodeWithTypeArguments<LogicalType> {
+public class LogicalType extends ReferenceType implements NodeWithSimpleName<LogicalType>, NodeWithAnnotations<LogicalType>, NodeWithTypeArguments<LogicalType> {
 
     private SimpleName name;
 
@@ -88,8 +84,7 @@ public LogicalType(final SimpleName name, final NodeList<Type> typeArguments) {
     }
 
     @AllFieldsConstructor
-    public LogicalType(
-            final SimpleName name, final NodeList<Type> typeArguments, final NodeList<AnnotationExpr> annotations) {
+    public LogicalType(final SimpleName name, final NodeList<Type> typeArguments, final NodeList<AnnotationExpr> annotations) {
         this(null, name, typeArguments, annotations);
     }
 
@@ -97,11 +92,7 @@ public LogicalType(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public LogicalType(
-            TokenRange tokenRange,
-            SimpleName name,
-            NodeList<Type> typeArguments,
-            NodeList<AnnotationExpr> annotations) {
+    public LogicalType(TokenRange tokenRange, SimpleName name, NodeList<Type> typeArguments, NodeList<AnnotationExpr> annotations) {
         super(tokenRange, annotations);
         setName(name);
         setTypeArguments(typeArguments);
@@ -116,7 +107,8 @@ public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
 
     @Override
     @Generated("com.github.javaparser.generator.core.node.AcceptGenerator")
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {}
+    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
     public SimpleName getName() {
@@ -130,7 +122,8 @@ public LogicalType setName(final SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -153,7 +146,8 @@ public LogicalType setTypeArguments(final NodeList<Type> typeArguments) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_ARGUMENTS, this.typeArguments, typeArguments);
-        if (this.typeArguments != null) this.typeArguments.setParentNode(null);
+        if (this.typeArguments != null)
+            this.typeArguments.setParentNode(null);
         this.typeArguments = typeArguments;
         setAsParentNodeOf(typeArguments);
         return this;
@@ -170,8 +164,7 @@ public LogicalType setAnnotations(NodeList<AnnotationExpr> annotations) {
      */
     @Override
     public String toDescriptor() {
-        return String.format(
-                "S%s;", resolve().asReferenceType().getQualifiedName().replace(".", "/"));
+        return String.format("S%s;", resolve().asReferenceType().getQualifiedName().replace(".", "/"));
     }
 
     @Override
@@ -201,9 +194,7 @@ public ResolvedType convertToUsage(Context context) {
         ResolvedTypeDeclaration typeDeclaration = ref.getCorrespondingDeclaration();
         List<ResolvedType> typeParameters = Collections.emptyList();
         if (getTypeArguments().isPresent()) {
-            typeParameters = getTypeArguments().get().stream()
-                    .map((pt) -> pt.convertToUsage(context))
-                    .collect(Collectors.toList());
+            typeParameters = getTypeArguments().get().stream().map((pt) -> pt.convertToUsage(context)).collect(Collectors.toList());
         }
         if (typeDeclaration.isTypeParameter()) {
             return new ResolvedTypeVariable(typeDeclaration.asTypeParameter());
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java
index 356fc00547..89b677666f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/PrimitiveType.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.StaticJavaParser.parseClassOrInterfaceType;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -44,6 +43,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.NonNull;
+import com.github.javaparser.ast.Node;
 
 /**
  * A primitive type.
@@ -88,6 +88,7 @@ public static PrimitiveType doubleType() {
     }
 
     public enum Primitive implements Stringable {
+
         BOOLEAN("Boolean", "Z"),
         CHAR("Character", "C"),
         BYTE("Byte", "B"),
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java
index 9c41977395..b3626937a1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/ReferenceType.java
@@ -30,6 +30,7 @@
 import com.github.javaparser.metamodel.ReferenceTypeMetaModel;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * Base class for reference types.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java
index 421cfc38dc..d37a587812 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/Type.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -90,7 +89,8 @@ public Type setAnnotations(final @NonNull() NodeList<AnnotationExpr> annotations
             return this;
         }
         notifyPropertyChange(ObservableProperty.ANNOTATIONS, this.annotations, annotations);
-        if (this.annotations != null) this.annotations.setParentNode(null);
+        if (this.annotations != null)
+            this.annotations.setParentNode(null);
         this.annotations = annotations;
         setAsParentNodeOf(annotations);
         return this;
@@ -167,8 +167,7 @@ public boolean isArrayType() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ArrayType asArrayType() {
-        throw new IllegalStateException(
-                f("%s is not ArrayType, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ArrayType, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -178,9 +177,7 @@ public boolean isClassOrInterfaceType() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ClassOrInterfaceType asClassOrInterfaceType() {
-        throw new IllegalStateException(f(
-                "%s is not ClassOrInterfaceType, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ClassOrInterfaceType, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -190,8 +187,7 @@ public boolean isIntersectionType() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public IntersectionType asIntersectionType() {
-        throw new IllegalStateException(
-                f("%s is not IntersectionType, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not IntersectionType, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -201,8 +197,7 @@ public boolean isPrimitiveType() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public PrimitiveType asPrimitiveType() {
-        throw new IllegalStateException(
-                f("%s is not PrimitiveType, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not PrimitiveType, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -212,8 +207,7 @@ public boolean isReferenceType() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public ReferenceType asReferenceType() {
-        throw new IllegalStateException(
-                f("%s is not ReferenceType, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not ReferenceType, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -223,8 +217,7 @@ public boolean isTypeParameter() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public TypeParameter asTypeParameter() {
-        throw new IllegalStateException(
-                f("%s is not TypeParameter, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not TypeParameter, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -234,8 +227,7 @@ public boolean isUnionType() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public UnionType asUnionType() {
-        throw new IllegalStateException(
-                f("%s is not UnionType, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not UnionType, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -245,8 +237,7 @@ public boolean isUnknownType() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public UnknownType asUnknownType() {
-        throw new IllegalStateException(
-                f("%s is not UnknownType, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not UnknownType, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -256,8 +247,7 @@ public boolean isVoidType() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public VoidType asVoidType() {
-        throw new IllegalStateException(
-                f("%s is not VoidType, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not VoidType, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -267,39 +257,48 @@ public boolean isWildcardType() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public WildcardType asWildcardType() {
-        throw new IllegalStateException(
-                f("%s is not WildcardType, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not WildcardType, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifArrayType(Consumer<ArrayType> action) {}
+    public void ifArrayType(Consumer<ArrayType> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifClassOrInterfaceType(Consumer<ClassOrInterfaceType> action) {}
+    public void ifClassOrInterfaceType(Consumer<ClassOrInterfaceType> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifIntersectionType(Consumer<IntersectionType> action) {}
+    public void ifIntersectionType(Consumer<IntersectionType> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifPrimitiveType(Consumer<PrimitiveType> action) {}
+    public void ifPrimitiveType(Consumer<PrimitiveType> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifReferenceType(Consumer<ReferenceType> action) {}
+    public void ifReferenceType(Consumer<ReferenceType> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifTypeParameter(Consumer<TypeParameter> action) {}
+    public void ifTypeParameter(Consumer<TypeParameter> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifUnionType(Consumer<UnionType> action) {}
+    public void ifUnionType(Consumer<UnionType> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifUnknownType(Consumer<UnknownType> action) {}
+    public void ifUnknownType(Consumer<UnknownType> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifVoidType(Consumer<VoidType> action) {}
+    public void ifVoidType(Consumer<VoidType> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifWildcardType(Consumer<WildcardType> action) {}
+    public void ifWildcardType(Consumer<WildcardType> action) {
+    }
 
     @Override
     public abstract ResolvedType resolve();
@@ -361,8 +360,7 @@ public boolean isVarType() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public VarType asVarType() {
-        throw new IllegalStateException(
-                f("%s is not VarType, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not VarType, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -372,9 +370,7 @@ public boolean isKeyMetaConstructType() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public KeyMetaConstructType asKeyMetaConstructType() {
-        throw new IllegalStateException(f(
-                "%s is not KeyMetaConstructType, it is %s",
-                this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not KeyMetaConstructType, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -383,7 +379,8 @@ public Optional<KeyMetaConstructType> toKeyMetaConstructType() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyMetaConstructType(Consumer<KeyMetaConstructType> action) {}
+    public void ifKeyMetaConstructType(Consumer<KeyMetaConstructType> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public boolean isKeyTypeSV() {
@@ -392,8 +389,7 @@ public boolean isKeyTypeSV() {
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public KeyTypeSV asKeyTypeSV() {
-        throw new IllegalStateException(
-                f("%s is not KeyTypeSV, it is %s", this, this.getClass().getSimpleName()));
+        throw new IllegalStateException(f("%s is not KeyTypeSV, it is %s", this, this.getClass().getSimpleName()));
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
@@ -402,7 +398,8 @@ public Optional<KeyTypeSV> toKeyTypeSV() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifKeyTypeSV(Consumer<KeyTypeSV> action) {}
+    public void ifKeyTypeSV(Consumer<KeyTypeSV> action) {
+    }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
     public Optional<VarType> toVarType() {
@@ -410,7 +407,8 @@ public Optional<VarType> toVarType() {
     }
 
     @Generated("com.github.javaparser.generator.core.node.TypeCastingGenerator")
-    public void ifVarType(Consumer<VarType> action) {}
+    public void ifVarType(Consumer<VarType> action) {
+    }
 
     @com.github.javaparser.ast.key.IgnoreLexPrinting()
     @Generated("com.github.javaparser.generator.core.node.PropertyGenerator")
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java
index a7dade2528..9091dfecba 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/TypeParameter.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import static java.util.stream.Collectors.joining;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -58,8 +57,7 @@
  * @author Julio Vilmar Gesser
  * @see com.github.javaparser.ast.nodeTypes.NodeWithTypeParameters
  */
-public class TypeParameter extends ReferenceType
-        implements NodeWithSimpleName<TypeParameter>, NodeWithAnnotations<TypeParameter> {
+public class TypeParameter extends ReferenceType implements NodeWithSimpleName<TypeParameter>, NodeWithAnnotations<TypeParameter> {
 
     private SimpleName name;
 
@@ -78,8 +76,7 @@ public TypeParameter(final String name, final NodeList<ClassOrInterfaceType> typ
     }
 
     @AllFieldsConstructor
-    public TypeParameter(
-            SimpleName name, NodeList<ClassOrInterfaceType> typeBound, NodeList<AnnotationExpr> annotations) {
+    public TypeParameter(SimpleName name, NodeList<ClassOrInterfaceType> typeBound, NodeList<AnnotationExpr> annotations) {
         this(null, name, typeBound, annotations);
     }
 
@@ -87,11 +84,7 @@ public TypeParameter(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public TypeParameter(
-            TokenRange tokenRange,
-            SimpleName name,
-            NodeList<ClassOrInterfaceType> typeBound,
-            NodeList<AnnotationExpr> annotations) {
+    public TypeParameter(TokenRange tokenRange, SimpleName name, NodeList<ClassOrInterfaceType> typeBound, NodeList<AnnotationExpr> annotations) {
         super(tokenRange, annotations);
         setName(name);
         setTypeBound(typeBound);
@@ -138,7 +131,8 @@ public TypeParameter setName(final @NonNull() SimpleName name) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.NAME, this.name, name);
-        if (this.name != null) this.name.setParentNode(null);
+        if (this.name != null)
+            this.name.setParentNode(null);
         this.name = name;
         setAsParentNodeOf(name);
         return this;
@@ -151,7 +145,8 @@ public TypeParameter setTypeBound(final @NonNull() NodeList<ClassOrInterfaceType
             return this;
         }
         notifyPropertyChange(ObservableProperty.TYPE_BOUND, this.typeBound, typeBound);
-        if (this.typeBound != null) this.typeBound.setParentNode(null);
+        if (this.typeBound != null)
+            this.typeBound.setParentNode(null);
         this.typeBound = typeBound;
         setAsParentNodeOf(typeBound);
         return this;
@@ -181,9 +176,7 @@ public boolean remove(Node node) {
     @Override
     public String asString() {
         StringBuilder str = new StringBuilder(getNameAsString());
-        getTypeBound()
-                .ifNonEmpty(l -> str.append(
-                        l.stream().map(ClassOrInterfaceType::asString).collect(joining("&", " extends ", ""))));
+        getTypeBound().ifNonEmpty(l -> str.append(l.stream().map(ClassOrInterfaceType::asString).collect(joining("&", " extends ", ""))));
         return str.toString();
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java
index 2bb4768d3d..8d3b684137 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnionType.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import static java.util.stream.Collectors.joining;
-
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Generated;
@@ -100,7 +99,8 @@ public UnionType setElements(final @NonNull() NodeList<ReferenceType> elements)
             return this;
         }
         notifyPropertyChange(ObservableProperty.ELEMENTS, this.elements, elements);
-        if (this.elements != null) this.elements.setParentNode(null);
+        if (this.elements != null)
+            this.elements.setParentNode(null);
         this.elements = elements;
         setAsParentNodeOf(elements);
         return this;
@@ -201,8 +201,7 @@ public Optional<UnionType> toUnionType() {
 
     @Override
     public ResolvedType convertToUsage(Context context) {
-        List<ResolvedType> resolvedElements =
-                getElements().stream().map(el -> el.convertToUsage(context)).collect(Collectors.toList());
+        List<ResolvedType> resolvedElements = getElements().stream().map(el -> el.convertToUsage(context)).collect(Collectors.toList());
         return new ResolvedUnionType(resolvedElements);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java
index a16fb78530..6206be0b88 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/UnknownType.java
@@ -35,6 +35,7 @@
 import com.github.javaparser.resolution.types.ResolvedType;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * An unknown parameter type object. It plays the role of a null object for
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/VarType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/VarType.java
index 344033fd8a..74b6813059 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/VarType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/VarType.java
@@ -144,22 +144,16 @@ public ResolvedType convertToUsage(Context context) {
                 if (iterType.isReferenceType()) {
                     // The type of a variable in a for-each loop with an
                     // Iterable with parameter type
-                    List<ResolvedType> parametersType =
-                            iterType.asReferenceType().typeParametersMap().getTypes();
+                    List<ResolvedType> parametersType = iterType.asReferenceType().typeParametersMap().getTypes();
                     if (parametersType.isEmpty()) {
-                        Optional<ResolvedTypeDeclaration> oObjectDeclaration =
-                                context.solveType(JAVA_LANG_OBJECT).getDeclaration();
-                        return oObjectDeclaration
-                                .map(decl -> ReferenceTypeImpl.undeterminedParameters(decl.asReferenceType()))
-                                .orElseThrow(() -> new UnsupportedOperationException());
+                        Optional<ResolvedTypeDeclaration> oObjectDeclaration = context.solveType(JAVA_LANG_OBJECT).getDeclaration();
+                        return oObjectDeclaration.map(decl -> ReferenceTypeImpl.undeterminedParameters(decl.asReferenceType())).orElseThrow(() -> new UnsupportedOperationException());
                     }
                     return parametersType.get(0);
                 }
             }
         }
-        return initializer
-                .map(Expression::calculateResolvedType)
-                .orElseThrow(() -> new IllegalStateException("Cannot resolve `var` which has no initializer."));
+        return initializer.map(Expression::calculateResolvedType).orElseThrow(() -> new IllegalStateException("Cannot resolve `var` which has no initializer."));
     }
 
     private Optional<ForEachStmt> forEachStmtWithVariableDeclarator(VariableDeclarator variableDeclarator) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java
index 631b4eed0e..f2697225c1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/VoidType.java
@@ -36,6 +36,7 @@
 import com.github.javaparser.resolution.types.ResolvedVoidType;
 import java.util.Optional;
 import java.util.function.Consumer;
+import com.github.javaparser.ast.Node;
 
 /**
  * The return type of a {@link com.github.javaparser.ast.body.MethodDeclaration}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java b/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java
index 7d9c8f3338..fcdc8003c6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/type/WildcardType.java
@@ -40,6 +40,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import org.jspecify.annotations.Nullable;
+import java.util.Objects;
 
 /**
  * A wildcard type argument. Examples:
@@ -66,10 +67,7 @@ public WildcardType(final ReferenceType extendedType) {
     }
 
     @AllFieldsConstructor
-    public WildcardType(
-            final ReferenceType extendedType,
-            final ReferenceType superType,
-            final NodeList<AnnotationExpr> annotations) {
+    public WildcardType(final ReferenceType extendedType, final ReferenceType superType, final NodeList<AnnotationExpr> annotations) {
         this(null, extendedType, superType, annotations);
     }
 
@@ -77,11 +75,7 @@ public WildcardType(
      * This constructor is used by the parser and is considered private.
      */
     @Generated("com.github.javaparser.generator.core.node.MainConstructorGenerator")
-    public WildcardType(
-            TokenRange tokenRange,
-            ReferenceType extendedType,
-            ReferenceType superType,
-            NodeList<AnnotationExpr> annotations) {
+    public WildcardType(TokenRange tokenRange, ReferenceType extendedType, ReferenceType superType, NodeList<AnnotationExpr> annotations) {
         super(tokenRange, annotations);
         setExtendedType(extendedType);
         setSuperType(superType);
@@ -122,7 +116,8 @@ public WildcardType setExtendedType(final @Nullable() ReferenceType extendedType
             return this;
         }
         notifyPropertyChange(ObservableProperty.EXTENDED_TYPE, this.extendedType, extendedType);
-        if (this.extendedType != null) this.extendedType.setParentNode(null);
+        if (this.extendedType != null)
+            this.extendedType.setParentNode(null);
         this.extendedType = extendedType;
         setAsParentNodeOf(extendedType);
         return this;
@@ -140,7 +135,8 @@ public WildcardType setSuperType(final @Nullable() ReferenceType superType) {
             return this;
         }
         notifyPropertyChange(ObservableProperty.SUPER_TYPE, this.superType, superType);
-        if (this.superType != null) this.superType.setParentNode(null);
+        if (this.superType != null)
+            this.superType.setParentNode(null);
         this.superType = superType;
         setAsParentNodeOf(superType);
         return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ProblemReporter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ProblemReporter.java
index 5d8927dc80..6aeeea9fc3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ProblemReporter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ProblemReporter.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.validator;
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
-
 import com.github.javaparser.Problem;
 import com.github.javaparser.TokenRange;
 import com.github.javaparser.ast.nodeTypes.NodeWithTokenRange;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ReservedKeywordValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ReservedKeywordValidator.java
index e61b82bc0d..fc19b73f25 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ReservedKeywordValidator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/ReservedKeywordValidator.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.ast.validator;
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
-
 import com.github.javaparser.ast.expr.Name;
 import com.github.javaparser.ast.expr.SimpleName;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/TypedValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/TypedValidator.java
index 6db3a9b41e..14277bd1ff 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/TypedValidator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/TypedValidator.java
@@ -43,9 +43,7 @@ default Processor processor() {
 
             @Override
             public void postProcess(ParseResult<? extends Node> result, ParserConfiguration configuration) {
-                result.getResult()
-                        .ifPresent(node -> accept((N) node, new ProblemReporter(problem -> result.getProblems()
-                                .add(problem))));
+                result.getResult().ifPresent(node -> accept((N) node, new ProblemReporter(problem -> result.getProblems().add(problem))));
             }
         };
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java10Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java10Validator.java
index 1ada1da74f..ae3172cc09 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java10Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java10Validator.java
@@ -32,8 +32,7 @@
  */
 public class Java10Validator extends Java9Validator {
 
-    final Validator varOnlyOnLocalVariableDefinitionAndForAndTry =
-            new SingleNodeTypeValidator<>(VarType.class, new VarValidator(false));
+    final Validator varOnlyOnLocalVariableDefinitionAndForAndTry = new SingleNodeTypeValidator<>(VarType.class, new VarValidator(false));
 
     public Java10Validator() {
         super();
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java14Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java14Validator.java
index b0aff6092f..7b712b4669 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java14Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java14Validator.java
@@ -46,8 +46,7 @@ public class Java14Validator extends Java13Validator {
      */
     final Validator recordAsTypeIdentifierNotAllowed = new RecordAsTypeIdentifierNotAllowed();
 
-    final Validator recordDeclarationValidator =
-            new SingleNodeTypeValidator<>(RecordDeclaration.class, new RecordDeclarationValidator());
+    final Validator recordDeclarationValidator = new SingleNodeTypeValidator<>(RecordDeclaration.class, new RecordDeclarationValidator());
 
     public Java14Validator() {
         super();
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java17Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java17Validator.java
index 1923e74224..c1a4552d75 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java17Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java17Validator.java
@@ -32,23 +32,9 @@
  */
 public class Java17Validator extends Java16Validator {
 
-    final Validator sealedNotAllowedAsIdentifier = new SimpleValidator<>(
-            ClassOrInterfaceDeclaration.class,
-            n -> n.getName().getIdentifier().equals("sealed"),
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "'sealed' identifier is not authorised in this context.",
-                            ParserConfiguration.LanguageLevel.JAVA_17)));
+    final Validator sealedNotAllowedAsIdentifier = new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> n.getName().getIdentifier().equals("sealed"), (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("'sealed' identifier is not authorised in this context.", ParserConfiguration.LanguageLevel.JAVA_17)));
 
-    final Validator permitsNotAllowedAsIdentifier = new SimpleValidator<>(
-            ClassOrInterfaceDeclaration.class,
-            n -> n.getName().getIdentifier().equals("permits"),
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "'permits' identifier is not authorised in this context.",
-                            ParserConfiguration.LanguageLevel.JAVA_17)));
+    final Validator permitsNotAllowedAsIdentifier = new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> n.getName().getIdentifier().equals("permits"), (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("'permits' identifier is not authorised in this context.", ParserConfiguration.LanguageLevel.JAVA_17)));
 
     public Java17Validator() {
         super();
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_0Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_0Validator.java
index cf8e5bab4e..d500db0f0e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_0Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_0Validator.java
@@ -43,267 +43,119 @@
  */
 public class Java1_0Validator extends Validators {
 
-    final Validator modifiersWithoutStrictfpAndDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods =
-            new ModifierValidator(false, false, false);
+    final Validator modifiersWithoutStrictfpAndDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods = new ModifierValidator(false, false, false);
 
-    final Validator noAssertKeyword = new SimpleValidator<>(
-            AssertStmt.class,
-            n -> true,
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "'assert' keyword is not supported.", ParserConfiguration.LanguageLevel.JAVA_1_4)));
+    final Validator noAssertKeyword = new SimpleValidator<>(AssertStmt.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("'assert' keyword is not supported.", ParserConfiguration.LanguageLevel.JAVA_1_4)));
 
     final Validator noAssertIdentifer = new TreeVisitorValidator((node, reporter) -> {
-        if (node instanceof NodeWithIdentifier
-                && ((NodeWithIdentifier) node).getIdentifier().equals("assert")) {
-            reporter.report(
-                    node,
-                    new UpgradeJavaMessage(
-                            "'assert' identifier is not supported.",
-                            ParserConfiguration.LanguageLevel.JAVA_1_4,
-                            false));
+        if (node instanceof NodeWithIdentifier && ((NodeWithIdentifier) node).getIdentifier().equals("assert")) {
+            reporter.report(node, new UpgradeJavaMessage("'assert' identifier is not supported.", ParserConfiguration.LanguageLevel.JAVA_1_4, false));
         }
     });
 
-    final Validator noInnerClasses = new SimpleValidator<>(
-            ClassOrInterfaceDeclaration.class,
-            n -> !n.isTopLevelType(),
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "inner classes or interfaces are not supported.",
-                            ParserConfiguration.LanguageLevel.JAVA_1_1)));
-
-    final Validator noReflection = new SimpleValidator<>(
-            ClassExpr.class,
-            n -> true,
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "Reflection is not supported.", ParserConfiguration.LanguageLevel.JAVA_1_1)));
+    final Validator noInnerClasses = new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> !n.isTopLevelType(), (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("inner classes or interfaces are not supported.", ParserConfiguration.LanguageLevel.JAVA_1_1)));
+
+    final Validator noReflection = new SimpleValidator<>(ClassExpr.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Reflection is not supported.", ParserConfiguration.LanguageLevel.JAVA_1_1)));
 
     final Validator noGenerics = new TreeVisitorValidator((node, reporter) -> {
         if (node instanceof NodeWithTypeArguments) {
-            if (((NodeWithTypeArguments<? extends Node>) node)
-                    .getTypeArguments()
-                    .isPresent()) {
-                reporter.report(
-                        node,
-                        new UpgradeJavaMessage(
-                                "Generics are not supported.", ParserConfiguration.LanguageLevel.JAVA_5));
+            if (((NodeWithTypeArguments<? extends Node>) node).getTypeArguments().isPresent()) {
+                reporter.report(node, new UpgradeJavaMessage("Generics are not supported.", ParserConfiguration.LanguageLevel.JAVA_5));
             }
         }
         if (node instanceof NodeWithTypeParameters) {
-            if (((NodeWithTypeParameters<? extends Node>) node)
-                    .getTypeParameters()
-                    .isNonEmpty()) {
-                reporter.report(
-                        node,
-                        new UpgradeJavaMessage(
-                                "Generics are not supported.", ParserConfiguration.LanguageLevel.JAVA_5));
+            if (((NodeWithTypeParameters<? extends Node>) node).getTypeParameters().isNonEmpty()) {
+                reporter.report(node, new UpgradeJavaMessage("Generics are not supported.", ParserConfiguration.LanguageLevel.JAVA_5));
             }
         }
     });
 
-    final SingleNodeTypeValidator<TryStmt> tryWithoutResources =
-            new SingleNodeTypeValidator<>(TryStmt.class, (n, reporter) -> {
-                if (n.getCatchClauses().isEmpty() && !n.getFinallyBlock().isPresent()) {
-                    reporter.report(
-                            n,
-                            new UpgradeJavaMessage(
-                                    "Try has no finally and no catch.", ParserConfiguration.LanguageLevel.JAVA_7));
-                }
-                if (n.getResources().isNonEmpty()) {
-                    reporter.report(
-                            n,
-                            new UpgradeJavaMessage(
-                                    "Catch with resource is not supported.", ParserConfiguration.LanguageLevel.JAVA_7));
-                }
-            });
+    final SingleNodeTypeValidator<TryStmt> tryWithoutResources = new SingleNodeTypeValidator<>(TryStmt.class, (n, reporter) -> {
+        if (n.getCatchClauses().isEmpty() && !n.getFinallyBlock().isPresent()) {
+            reporter.report(n, new UpgradeJavaMessage("Try has no finally and no catch.", ParserConfiguration.LanguageLevel.JAVA_7));
+        }
+        if (n.getResources().isNonEmpty()) {
+            reporter.report(n, new UpgradeJavaMessage("Catch with resource is not supported.", ParserConfiguration.LanguageLevel.JAVA_7));
+        }
+    });
 
     final Validator noAnnotations = new TreeVisitorValidator((node, reporter) -> {
         if (node instanceof AnnotationExpr || node instanceof AnnotationDeclaration) {
-            reporter.report(
-                    node,
-                    new UpgradeJavaMessage("Annotations are not supported.", ParserConfiguration.LanguageLevel.JAVA_5));
+            reporter.report(node, new UpgradeJavaMessage("Annotations are not supported.", ParserConfiguration.LanguageLevel.JAVA_5));
         }
     });
 
-    final Validator noEnums = new SimpleValidator<>(
-            EnumDeclaration.class,
-            n -> true,
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "Enumerations are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)));
-
-    final Validator noVarargs = new SimpleValidator<>(
-            Parameter.class,
-            Parameter::isVarArgs,
-            (n, reporter) -> reporter.report(
-                    n, new UpgradeJavaMessage("Varargs are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)));
-
-    final Validator noForEach = new SimpleValidator<>(
-            ForEachStmt.class,
-            n -> true,
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "For-each loops are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)));
-
-    final Validator noStaticImports = new SimpleValidator<>(
-            ImportDeclaration.class,
-            ImportDeclaration::isStatic,
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "Static imports are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)));
-
-    final Validator onlyOneLabelInSwitchCase = new SimpleValidator<>(
-            SwitchEntry.class,
-            n -> n.getLabels().size() > 1,
-            (n, reporter) -> reporter.report(
-                    n.getLabels().getParentNode().get(),
-                    new UpgradeJavaMessage(
-                            "Only one label allowed in a switch-case.", ParserConfiguration.LanguageLevel.JAVA_7)));
-
-    final Validator noYield = new SimpleValidator<>(
-            YieldStmt.class,
-            n -> true,
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "Only labels allowed in break statements.", ParserConfiguration.LanguageLevel.JAVA_13)));
+    final Validator noEnums = new SimpleValidator<>(EnumDeclaration.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Enumerations are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)));
+
+    final Validator noVarargs = new SimpleValidator<>(Parameter.class, Parameter::isVarArgs, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Varargs are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)));
+
+    final Validator noForEach = new SimpleValidator<>(ForEachStmt.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("For-each loops are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)));
+
+    final Validator noStaticImports = new SimpleValidator<>(ImportDeclaration.class, ImportDeclaration::isStatic, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Static imports are not supported.", ParserConfiguration.LanguageLevel.JAVA_5)));
+
+    final Validator onlyOneLabelInSwitchCase = new SimpleValidator<>(SwitchEntry.class, n -> n.getLabels().size() > 1, (n, reporter) -> reporter.report(n.getLabels().getParentNode().get(), new UpgradeJavaMessage("Only one label allowed in a switch-case.", ParserConfiguration.LanguageLevel.JAVA_7)));
+
+    final Validator noYield = new SimpleValidator<>(YieldStmt.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Only labels allowed in break statements.", ParserConfiguration.LanguageLevel.JAVA_13)));
 
     final Validator noBinaryIntegerLiterals = new NoBinaryIntegerLiteralsValidator();
 
     final Validator noUnderscoresInIntegerLiterals = new NoUnderscoresInIntegerLiteralsValidator();
 
-    final Validator noMultiCatch = new SimpleValidator<>(
-            UnionType.class,
-            n -> true,
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage("Multi-catch is not supported.", ParserConfiguration.LanguageLevel.JAVA_7)));
-
-    final Validator noLambdas = new SimpleValidator<>(
-            LambdaExpr.class,
-            n -> true,
-            (n, reporter) -> reporter.report(
-                    n, new UpgradeJavaMessage("Lambdas are not supported.", ParserConfiguration.LanguageLevel.JAVA_8)));
-
-    final Validator noModules = new SimpleValidator<>(
-            ModuleDeclaration.class,
-            n -> true,
-            (n, reporter) -> reporter.report(
-                    n, new UpgradeJavaMessage("Modules are not supported.", ParserConfiguration.LanguageLevel.JAVA_9)));
-
-    final Validator noSwitchExpressions = new SimpleValidator<>(
-            SwitchExpr.class,
-            n -> true,
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "Switch expressions are not supported.", ParserConfiguration.LanguageLevel.JAVA_12)));
-
-    final Validator noPatternMatchingInstanceOf = new SimpleValidator<>(
-            InstanceOfExpr.class,
-            n -> n.getPattern().isPresent(),
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "Use of patterns with instanceof is not supported.",
-                            ParserConfiguration.LanguageLevel.JAVA_14)));
-
-    final Validator noTextBlockLiteral = new SimpleValidator<>(
-            TextBlockLiteralExpr.class,
-            n -> true,
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "Text Block Literals are not supported.", ParserConfiguration.LanguageLevel.JAVA_15)));
-
-    final Validator noRecordDeclaration = new SimpleValidator<>(
-            RecordDeclaration.class,
-            n -> true,
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "Record Declarations are not supported.", ParserConfiguration.LanguageLevel.JAVA_14)));
-
-    final Validator noSealedClasses = new SimpleValidator<>(
-            ClassOrInterfaceDeclaration.class,
-            n -> n.hasModifier(Modifier.DefaultKeyword.SEALED) || n.hasModifier(Modifier.DefaultKeyword.NON_SEALED),
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "Sealed classes are not supported.", ParserConfiguration.LanguageLevel.JAVA_15)));
-
-    final Validator noPermitsListInClasses = new SimpleValidator<>(
-            ClassOrInterfaceDeclaration.class,
-            n -> n.getPermittedTypes().isNonEmpty(),
-            (n, reporter) -> reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "Permitted sub-classes are not supported.", ParserConfiguration.LanguageLevel.JAVA_17)));
+    final Validator noMultiCatch = new SimpleValidator<>(UnionType.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Multi-catch is not supported.", ParserConfiguration.LanguageLevel.JAVA_7)));
+
+    final Validator noLambdas = new SimpleValidator<>(LambdaExpr.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Lambdas are not supported.", ParserConfiguration.LanguageLevel.JAVA_8)));
+
+    final Validator noModules = new SimpleValidator<>(ModuleDeclaration.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Modules are not supported.", ParserConfiguration.LanguageLevel.JAVA_9)));
+
+    final Validator noSwitchExpressions = new SimpleValidator<>(SwitchExpr.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Switch expressions are not supported.", ParserConfiguration.LanguageLevel.JAVA_12)));
+
+    final Validator noPatternMatchingInstanceOf = new SimpleValidator<>(InstanceOfExpr.class, n -> n.getPattern().isPresent(), (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Use of patterns with instanceof is not supported.", ParserConfiguration.LanguageLevel.JAVA_14)));
+
+    final Validator noTextBlockLiteral = new SimpleValidator<>(TextBlockLiteralExpr.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Text Block Literals are not supported.", ParserConfiguration.LanguageLevel.JAVA_15)));
+
+    final Validator noRecordDeclaration = new SimpleValidator<>(RecordDeclaration.class, n -> true, (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Record Declarations are not supported.", ParserConfiguration.LanguageLevel.JAVA_14)));
+
+    final Validator noSealedClasses = new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> n.hasModifier(Modifier.DefaultKeyword.SEALED) || n.hasModifier(Modifier.DefaultKeyword.NON_SEALED), (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Sealed classes are not supported.", ParserConfiguration.LanguageLevel.JAVA_15)));
+
+    final Validator noPermitsListInClasses = new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> n.getPermittedTypes().isNonEmpty(), (n, reporter) -> reporter.report(n, new UpgradeJavaMessage("Permitted sub-classes are not supported.", ParserConfiguration.LanguageLevel.JAVA_17)));
 
     final Validator noSwitchNullDefault = new SingleNodeTypeValidator<>(SwitchEntry.class, (n, reporter) -> {
         if (n.getLabels().isNonEmpty() && n.isDefault()) {
-            reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "Switch case null, default not supported.", ParserConfiguration.LanguageLevel.JAVA_21));
+            reporter.report(n, new UpgradeJavaMessage("Switch case null, default not supported.", ParserConfiguration.LanguageLevel.JAVA_21));
         }
     });
 
     final Validator noSwitchPatterns = new SingleNodeTypeValidator<>(SwitchEntry.class, (n, reporter) -> {
         if (n.getGuard().isPresent() || n.getLabels().stream().anyMatch(expr -> expr.isComponentPatternExpr())) {
-            reporter.report(
-                    n,
-                    new UpgradeJavaMessage(
-                            "Switch patterns not supported.", ParserConfiguration.LanguageLevel.JAVA_21));
+            reporter.report(n, new UpgradeJavaMessage("Switch patterns not supported.", ParserConfiguration.LanguageLevel.JAVA_21));
         }
     });
 
     final Validator noRecordPatterns = new TreeVisitorValidator((node, reporter) -> {
         if (node instanceof RecordPatternExpr) {
-            reporter.report(
-                    node,
-                    new UpgradeJavaMessage(
-                            "Record patterns are not supported.", ParserConfiguration.LanguageLevel.JAVA_21));
+            reporter.report(node, new UpgradeJavaMessage("Record patterns are not supported.", ParserConfiguration.LanguageLevel.JAVA_21));
         }
     });
 
     final Validator noModuleImports = new TreeVisitorValidator((node, reporter) -> {
         if (node instanceof ImportDeclaration && ((ImportDeclaration) node).isModule()) {
-            reporter.report(
-                    node,
-                    new UpgradeJavaMessage(
-                            "Module imports are not supported", ParserConfiguration.LanguageLevel.JAVA_25));
+            reporter.report(node, new UpgradeJavaMessage("Module imports are not supported", ParserConfiguration.LanguageLevel.JAVA_25));
         }
     });
 
-    final Validator explicitConstructorInvocationMustBeFirstStatement =
-            new TreeVisitorValidator((Node node, ProblemReporter reporter) -> {
-                // Only validate this for ExplicitConstructorInvocationStmts that appear as a child of a block node.
-                // This will
-                // be the case for all such statements that are parsed as part of a compiling source file, but may not
-                // always
-                // be the case for code snippets being parsed.
-                if (node instanceof ExplicitConstructorInvocationStmt
-                        && node.getParentNode().isPresent()) {
-                    Node parent = node.getParentNode().get();
-                    if (parent instanceof BlockStmt
-                            && ((BlockStmt) parent).getStatements().indexOf(node) > 0) {
-                        reporter.report(
-                                node,
-                                new UpgradeJavaMessage(
-                                        "Flexible constructor bodies are not supported",
-                                        ParserConfiguration.LanguageLevel.JAVA_25));
-                    }
-                }
-            });
+    final Validator explicitConstructorInvocationMustBeFirstStatement = new TreeVisitorValidator((Node node, ProblemReporter reporter) -> {
+        // Only validate this for ExplicitConstructorInvocationStmts that appear as a child of a block node.
+        // This will
+        // be the case for all such statements that are parsed as part of a compiling source file, but may not
+        // always
+        // be the case for code snippets being parsed.
+        if (node instanceof ExplicitConstructorInvocationStmt && node.getParentNode().isPresent()) {
+            Node parent = node.getParentNode().get();
+            if (parent instanceof BlockStmt && ((BlockStmt) parent).getStatements().indexOf(node) > 0) {
+                reporter.report(node, new UpgradeJavaMessage("Flexible constructor bodies are not supported", ParserConfiguration.LanguageLevel.JAVA_25));
+            }
+        }
+    });
 
     public Java1_0Validator() {
         super(new CommonValidators());
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_1Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_1Validator.java
index bedf520e7c..3e2cff1526 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_1Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_1Validator.java
@@ -31,16 +31,10 @@
  */
 public class Java1_1Validator extends Java1_0Validator {
 
-    final Validator innerClasses =
-            new SingleNodeTypeValidator<>(ClassOrInterfaceDeclaration.class, (n, reporter) -> n.getParentNode()
-                    .ifPresent(p -> {
-                        if (p instanceof LocalClassDeclarationStmt && n.isInterface())
-                            reporter.report(
-                                    n,
-                                    new UpgradeJavaMessage(
-                                            "There is no such thing as a local interface.",
-                                            ParserConfiguration.LanguageLevel.JAVA_16));
-                    }));
+    final Validator innerClasses = new SingleNodeTypeValidator<>(ClassOrInterfaceDeclaration.class, (n, reporter) -> n.getParentNode().ifPresent(p -> {
+        if (p instanceof LocalClassDeclarationStmt && n.isInterface())
+            reporter.report(n, new UpgradeJavaMessage("There is no such thing as a local interface.", ParserConfiguration.LanguageLevel.JAVA_16));
+    }));
 
     public Java1_1Validator() {
         super();
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_2Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_2Validator.java
index efd7f90d54..f2c7881d9b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_2Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java1_2Validator.java
@@ -29,16 +29,13 @@
  */
 public class Java1_2Validator extends Java1_1Validator {
 
-    final Validator modifiersWithoutDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods =
-            new ModifierValidator(true, false, false);
+    final Validator modifiersWithoutDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods = new ModifierValidator(true, false, false);
 
     final Validator strictfpNotAllowed = new ReservedKeywordValidator("strictfp");
 
     public Java1_2Validator() {
         super();
-        replace(
-                modifiersWithoutStrictfpAndDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods,
-                modifiersWithoutDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods);
+        replace(modifiersWithoutStrictfpAndDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods, modifiersWithoutDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods);
         add(strictfpNotAllowed);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java22Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java22Validator.java
index aa6d0b7f7c..b45ebb3e7b 100755
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java22Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java22Validator.java
@@ -37,53 +37,47 @@
  */
 public class Java22Validator extends Java21Validator {
 
-    final Validator unnamedVarOnlyWhereAllowedByJep456 =
-            new SingleNodeTypeValidator<>(SimpleName.class, (name, reporter) -> {
-                if (!name.getIdentifier().equals("_")) {
-                    return;
-                }
-                if (reportNoParent(name, reporter)) {
-                    return;
-                }
-                Node parentNode = name.getParentNode().get();
-                if (parentNode instanceof VariableDeclarator || parentNode instanceof TypePatternExpr) {
+    final Validator unnamedVarOnlyWhereAllowedByJep456 = new SingleNodeTypeValidator<>(SimpleName.class, (name, reporter) -> {
+        if (!name.getIdentifier().equals("_")) {
+            return;
+        }
+        if (reportNoParent(name, reporter)) {
+            return;
+        }
+        Node parentNode = name.getParentNode().get();
+        if (parentNode instanceof VariableDeclarator || parentNode instanceof TypePatternExpr) {
+            return;
+        }
+        if (parentNode instanceof Parameter) {
+            Parameter parameter = (Parameter) parentNode;
+            if (reportNoParent(parameter, reporter)) {
+                return;
+            }
+            Node grandParent = parameter.getParentNode().get();
+            if (grandParent instanceof CatchClause || grandParent instanceof LambdaExpr) {
+                return;
+            }
+        }
+        try {
+            ForStmt enclosingFor = (ForStmt) Navigator.demandParentNode(name, ancestor -> ancestor instanceof ForStmt);
+            if (enclosingFor.getCompare().isPresent() && enclosingFor.getCompare().get().containsWithinRange(name)) {
+                // In a for compare, so now check that it's the LHS of an assignment
+                AssignExpr enclosingAssign = (AssignExpr) Navigator.demandParentNode(name, ancestor -> ancestor instanceof AssignExpr);
+                if (enclosingAssign.getTarget().containsWithinRange(name)) {
                     return;
                 }
-                if (parentNode instanceof Parameter) {
-                    Parameter parameter = (Parameter) parentNode;
-                    if (reportNoParent(parameter, reporter)) {
-                        return;
-                    }
-                    Node grandParent = parameter.getParentNode().get();
-                    if (grandParent instanceof CatchClause || grandParent instanceof LambdaExpr) {
-                        return;
-                    }
-                }
-                try {
-                    ForStmt enclosingFor =
-                            (ForStmt) Navigator.demandParentNode(name, ancestor -> ancestor instanceof ForStmt);
-                    if (enclosingFor.getCompare().isPresent()
-                            && enclosingFor.getCompare().get().containsWithinRange(name)) {
-                        // In a for compare, so now check that it's the LHS of an assignment
-                        AssignExpr enclosingAssign = (AssignExpr)
-                                Navigator.demandParentNode(name, ancestor -> ancestor instanceof AssignExpr);
-                        if (enclosingAssign.getTarget().containsWithinRange(name)) {
-                            return;
-                        }
-                    }
-                } catch (IllegalStateException e) {
-                    // Didn't find a ForStmt ancestor, so the "_" identifier should not be allowed here.
-                }
-                reporter.report(name, "Unnamed variables only supported in cases described by JEP456");
-            });
+            }
+        } catch (IllegalStateException e) {
+            // Didn't find a ForStmt ancestor, so the "_" identifier should not be allowed here.
+        }
+        reporter.report(name, "Unnamed variables only supported in cases described by JEP456");
+    });
 
-    final Validator matchAllPatternNotTopLevel =
-            new SingleNodeTypeValidator<>(MatchAllPatternExpr.class, (patternExpr, reporter) -> {
-                if (!patternExpr.getParentNode().isPresent()
-                        || !(patternExpr.getParentNode().get() instanceof PatternExpr)) {
-                    reporter.report(patternExpr, "MatchAllPatternExpr cannot be used as a top-level pattern");
-                }
-            });
+    final Validator matchAllPatternNotTopLevel = new SingleNodeTypeValidator<>(MatchAllPatternExpr.class, (patternExpr, reporter) -> {
+        if (!patternExpr.getParentNode().isPresent() || !(patternExpr.getParentNode().get() instanceof PatternExpr)) {
+            reporter.report(patternExpr, "MatchAllPatternExpr cannot be used as a top-level pattern");
+        }
+    });
 
     private boolean reportNoParent(Node node, ProblemReporter reporter) {
         if (node.getParentNode().isPresent()) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java5Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java5Validator.java
index 186aa9b96a..a67ddebfcc 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java5Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java5Validator.java
@@ -43,10 +43,7 @@ public class Java5Validator extends Java1_4Validator {
         if (node instanceof NodeWithTypeArguments) {
             Optional<NodeList<Type>> typeArguments = ((NodeWithTypeArguments<? extends Node>) node).getTypeArguments();
             if (typeArguments.isPresent() && typeArguments.get().isEmpty()) {
-                reporter.report(
-                        node,
-                        new UpgradeJavaMessage(
-                                "The diamond operator is not supported.", ParserConfiguration.LanguageLevel.JAVA_7));
+                reporter.report(node, new UpgradeJavaMessage("The diamond operator is not supported.", ParserConfiguration.LanguageLevel.JAVA_7));
             }
         }
     });
@@ -68,10 +65,7 @@ public class Java5Validator extends Java1_4Validator {
         VariableDeclarationExpr declaration = node.getVariable();
         // assert that the variable declaration expression has exactly one variable declarator
         if (declaration.getVariables().size() != 1) {
-            reporter.report(
-                    node,
-                    "A foreach statement's variable declaration must have exactly one variable " + "declarator. Given: "
-                            + declaration.getVariables().size() + ".");
+            reporter.report(node, "A foreach statement's variable declaration must have exactly one variable " + "declarator. Given: " + declaration.getVariables().size() + ".");
         }
     });
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java7Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java7Validator.java
index ce4ba37909..a49c40110e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java7Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java7Validator.java
@@ -30,27 +30,23 @@
  */
 public class Java7Validator extends Java6Validator {
 
-    final SingleNodeTypeValidator<TryStmt> tryWithLimitedResources =
-            new SingleNodeTypeValidator<>(TryStmt.class, (n, reporter) -> {
-                if (n.getCatchClauses().isEmpty()
-                        && n.getResources().isEmpty()
-                        && !n.getFinallyBlock().isPresent()) {
-                    reporter.report(n, "Try has no finally, no catch, and no resources.");
-                }
-                for (Expression resource : n.getResources()) {
-                    if (!resource.isVariableDeclarationExpr()) {
-                        reporter.report(n, "Try with resources only supports variable declarations.");
-                    }
-                }
-            });
+    final SingleNodeTypeValidator<TryStmt> tryWithLimitedResources = new SingleNodeTypeValidator<>(TryStmt.class, (n, reporter) -> {
+        if (n.getCatchClauses().isEmpty() && n.getResources().isEmpty() && !n.getFinallyBlock().isPresent()) {
+            reporter.report(n, "Try has no finally, no catch, and no resources.");
+        }
+        for (Expression resource : n.getResources()) {
+            if (!resource.isVariableDeclarationExpr()) {
+                reporter.report(n, "Try with resources only supports variable declarations.");
+            }
+        }
+    });
 
-    private final SingleNodeTypeValidator<UnionType> multiCatch =
-            new SingleNodeTypeValidator<>(UnionType.class, (n, reporter) -> {
-                // Case "0 elements" is caught elsewhere.
-                if (n.getElements().size() == 1) {
-                    reporter.report(n, "Union type (multi catch) must have at least two elements.");
-                }
-            });
+    private final SingleNodeTypeValidator<UnionType> multiCatch = new SingleNodeTypeValidator<>(UnionType.class, (n, reporter) -> {
+        // Case "0 elements" is caught elsewhere.
+        if (n.getElements().size() == 1) {
+            reporter.report(n, "Union type (multi catch) must have at least two elements.");
+        }
+    });
 
     public Java7Validator() {
         super();
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java8Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java8Validator.java
index 2ee334bded..0d72fffbe2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java8Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java8Validator.java
@@ -35,22 +35,19 @@ public class Java8Validator extends Java7Validator {
 
     final Validator modifiersWithoutPrivateInterfaceMethods = new ModifierValidator(true, true, false);
 
-    final Validator defaultMethodsInInterface =
-            new SingleNodeTypeValidator<>(ClassOrInterfaceDeclaration.class, (n, reporter) -> {
-                if (n.isInterface()) {
-                    n.getMethods().forEach(m -> {
-                        if (m.isDefault() && !m.getBody().isPresent()) {
-                            reporter.report(m, "'default' methods must have a body.");
-                        }
-                    });
+    final Validator defaultMethodsInInterface = new SingleNodeTypeValidator<>(ClassOrInterfaceDeclaration.class, (n, reporter) -> {
+        if (n.isInterface()) {
+            n.getMethods().forEach(m -> {
+                if (m.isDefault() && !m.getBody().isPresent()) {
+                    reporter.report(m, "'default' methods must have a body.");
                 }
             });
+        }
+    });
 
     public Java8Validator() {
         super();
-        replace(
-                modifiersWithoutDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods,
-                modifiersWithoutPrivateInterfaceMethods);
+        replace(modifiersWithoutDefaultAndStaticInterfaceMethodsAndPrivateInterfaceMethods, modifiersWithoutPrivateInterfaceMethods);
         add(defaultMethodsInInterface);
         remove(noLambdas);
         // TODO validate more annotation locations http://openjdk.java.net/jeps/104
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java9Validator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java9Validator.java
index 4b4aadd88a..cd97b9249b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java9Validator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/Java9Validator.java
@@ -37,14 +37,11 @@ public class Java9Validator extends Java8Validator {
 
     final Validator modifiers = new ModifierValidator(true, true, true);
 
-    final SingleNodeTypeValidator<TryStmt> tryWithResources =
-            new SingleNodeTypeValidator<>(TryStmt.class, (n, reporter) -> {
-                if (n.getCatchClauses().isEmpty()
-                        && n.getResources().isEmpty()
-                        && !n.getFinallyBlock().isPresent()) {
-                    reporter.report(n, "Try has no finally, no catch, and no resources.");
-                }
-            });
+    final SingleNodeTypeValidator<TryStmt> tryWithResources = new SingleNodeTypeValidator<>(TryStmt.class, (n, reporter) -> {
+        if (n.getCatchClauses().isEmpty() && n.getResources().isEmpty() && !n.getFinallyBlock().isPresent()) {
+            reporter.report(n, "Try has no finally, no catch, and no resources.");
+        }
+    });
 
     public Java9Validator() {
         super();
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/UpgradeJavaMessage.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/UpgradeJavaMessage.java
index f48a520369..82d75bd016 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/UpgradeJavaMessage.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/UpgradeJavaMessage.java
@@ -63,12 +63,6 @@ public final class UpgradeJavaMessage {
 
     @Override
     public String toString() {
-        return String.format(
-                        upgradeNeeded
-                                ? "%s Pay attention that this feature is supported starting from '%s' language level."
-                                : "%s Pay attention that this feature is no longer supported since '%s' language level.",
-                        this.reason,
-                        this.level.toString())
-                + " If you need that feature the language level must be configured in the configuration before parsing the source files.";
+        return String.format(upgradeNeeded ? "%s Pay attention that this feature is supported starting from '%s' language level." : "%s Pay attention that this feature is no longer supported since '%s' language level.", this.reason, this.level.toString()) + " If you need that feature the language level must be configured in the configuration before parsing the source files.";
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/CommonValidators.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/CommonValidators.java
index 6e3bb2f293..f7a11381d3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/CommonValidators.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/CommonValidators.java
@@ -38,57 +38,41 @@
 public class CommonValidators extends Validators {
 
     public CommonValidators() {
-        super(
-                new SimpleValidator<>(
-                        ClassOrInterfaceDeclaration.class,
-                        n -> !n.isInterface() && n.getExtendedTypes().size() > 1,
-                        (n, reporter) -> reporter.report(
-                                n.getExtendedTypes(1), "A class cannot extend more than one other class.")),
-                new SimpleValidator<>(
-                        ClassOrInterfaceDeclaration.class,
-                        n -> n.isInterface() && !n.getImplementedTypes().isEmpty(),
-                        (n, reporter) -> reporter.report(
-                                n.getImplementedTypes(0), "An interface cannot implement other interfaces.")),
-                new SingleNodeTypeValidator<>(ClassOrInterfaceDeclaration.class, (n, reporter) -> {
-                    if (n.isInterface()) {
-                        n.getMembers().forEach(mem -> {
-                            if (mem instanceof InitializerDeclaration) {
-                                reporter.report(mem, "An interface cannot have initializers.");
-                            }
-                        });
+        super(new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> !n.isInterface() && n.getExtendedTypes().size() > 1, (n, reporter) -> reporter.report(n.getExtendedTypes(1), "A class cannot extend more than one other class.")), new SimpleValidator<>(ClassOrInterfaceDeclaration.class, n -> n.isInterface() && !n.getImplementedTypes().isEmpty(), (n, reporter) -> reporter.report(n.getImplementedTypes(0), "An interface cannot implement other interfaces.")), new SingleNodeTypeValidator<>(ClassOrInterfaceDeclaration.class, (n, reporter) -> {
+            if (n.isInterface()) {
+                n.getMembers().forEach(mem -> {
+                    if (mem instanceof InitializerDeclaration) {
+                        reporter.report(mem, "An interface cannot have initializers.");
                     }
-                }),
-                new SingleNodeTypeValidator<>(AssignExpr.class, (n, reporter) -> {
-                    // https://docs.oracle.com/javase/specs/jls/se8/html/jls-15.html#jls-15.26
-                    Expression target = n.getTarget();
-                    while (target instanceof EnclosedExpr) {
-                        target = ((EnclosedExpr) target).getInner();
-                    }
-                    if (target instanceof NameExpr
-                            || target instanceof ArrayAccessExpr
-                            || target instanceof FieldAccessExpr) {
-                        return;
-                    }
-                    // weigl: KeY stuff
-                    if (target instanceof KeyPassiveExpression) {
-                        return;
-                    }
-                    reporter.report(n.getTarget(), "Illegal left hand side of an assignment.");
-                }),
-                new TreeVisitorValidator((node, problemReporter) -> {
-                    NodeMetaModel mm = node.getMetaModel();
-                    for (PropertyMetaModel ppm : mm.getAllPropertyMetaModels()) {
-                        if (ppm.isNonEmpty()) {
-                            if (ppm.isNodeList()) {
-                                NodeList<?> value = (NodeList<?>) ppm.getValue(node);
-                                if (value.isEmpty()) {
-                                    problemReporter.report(
-                                            node, "%s.%s can not be empty.", mm.getTypeName(), ppm.getName());
-                                }
-                            }
-                            // No need to check empty strings, it should be impossible to set them to ""
+                });
+            }
+        }), new SingleNodeTypeValidator<>(AssignExpr.class, (n, reporter) -> {
+            // https://docs.oracle.com/javase/specs/jls/se8/html/jls-15.html#jls-15.26
+            Expression target = n.getTarget();
+            while (target instanceof EnclosedExpr) {
+                target = ((EnclosedExpr) target).getInner();
+            }
+            if (target instanceof NameExpr || target instanceof ArrayAccessExpr || target instanceof FieldAccessExpr) {
+                return;
+            }
+            // weigl: KeY stuff
+            if (target instanceof KeyPassiveExpression) {
+                return;
+            }
+            reporter.report(n.getTarget(), "Illegal left hand side of an assignment.");
+        }), new TreeVisitorValidator((node, problemReporter) -> {
+            NodeMetaModel mm = node.getMetaModel();
+            for (PropertyMetaModel ppm : mm.getAllPropertyMetaModels()) {
+                if (ppm.isNonEmpty()) {
+                    if (ppm.isNodeList()) {
+                        NodeList<?> value = (NodeList<?>) ppm.getValue(node);
+                        if (value.isEmpty()) {
+                            problemReporter.report(node, "%s.%s can not be empty.", mm.getTypeName(), ppm.getName());
                         }
                     }
-                }));
+                    // No need to check empty strings, it should be impossible to set them to ""
+                }
+            }
+        }));
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/ModifierValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/ModifierValidator.java
index 50f473a36e..821ca2d8c4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/ModifierValidator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/ModifierValidator.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.ast.Modifier.DefaultKeyword.*;
 import static java.util.Arrays.asList;
-
 import com.github.javaparser.ast.Modifier;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.expr.LambdaExpr;
@@ -43,79 +42,28 @@
  */
 public class ModifierValidator extends VisitorValidator {
 
-    private final Modifier.Keyword[] interfaceWithNothingSpecial = new Modifier.Keyword[] {
-        PUBLIC,
-        PROTECTED,
-        ABSTRACT,
-        FINAL,
-        SYNCHRONIZED,
-        NATIVE,
-        STRICTFP, // JML
-        JML_PURE,
-        JML_STRICTLY_PURE,
-        JML_NULLABLE,
-        JML_NULLABLE_BY_DEFAULT,
-        JML_NON_NULL,
-        JML_NON_NULL_ELEMENTS,
-        JML_HELPER,
-        JML_TWO_STATE,
-        JML_NO_STATE,
-        JML_SPEC_PACKAGE,
-        JML_SPEC_PRIVATE,
-        JML_SPEC_PUBLIC,
-        JML_SPEC_PRIVATE
-    };
+    private final Modifier.DefaultKeyword[] interfaceWithNothingSpecial = new Modifier.DefaultKeyword[] { // JML
+    // JML
+    // JML
+    // JML
+    PUBLIC, PROTECTED, ABSTRACT, FINAL, SYNCHRONIZED, NATIVE, STRICTFP, JML_PURE, JML_STRICTLY_PURE, JML_NULLABLE, JML_NULLABLE_BY_DEFAULT, JML_NON_NULL, JML_NON_NULL_ELEMENTS, JML_HELPER, JML_TWO_STATE, JML_NO_STATE, JML_SPEC_PACKAGE, JML_SPEC_PRIVATE, JML_SPEC_PUBLIC, JML_SPEC_PRIVATE };
 
-    private final Modifier.Keyword[] interfaceWithStaticAndDefault = new Modifier.Keyword[] {
-        PUBLIC,
-        PROTECTED,
-        ABSTRACT,
-        STATIC,
-        FINAL,
-        SYNCHRONIZED,
-        NATIVE,
-        STRICTFP,
-        DEFAULT, // JML
-        JML_PURE,
-        JML_STRICTLY_PURE,
-        JML_NULLABLE,
-        JML_NULLABLE_BY_DEFAULT,
-        JML_NON_NULL,
-        JML_NON_NULL_ELEMENTS,
-        JML_HELPER,
-        JML_TWO_STATE,
-        JML_NO_STATE,
-        JML_SPEC_PACKAGE,
-        JML_SPEC_PRIVATE,
-        JML_SPEC_PUBLIC,
-        JML_SPEC_PRIVATE
-    };
+    private final Modifier.DefaultKeyword[] interfaceWithStaticAndDefault = new Modifier.DefaultKeyword[] { // JML
+    // JML
+    // JML
+    // JML
+    PUBLIC, // JML
+    PROTECTED, // JML
+    ABSTRACT, STATIC, FINAL, SYNCHRONIZED, NATIVE, STRICTFP, DEFAULT, JML_PURE, JML_STRICTLY_PURE, JML_NULLABLE, JML_NULLABLE_BY_DEFAULT, JML_NON_NULL, JML_NON_NULL_ELEMENTS, JML_HELPER, JML_TWO_STATE, JML_NO_STATE, JML_SPEC_PACKAGE, JML_SPEC_PRIVATE, JML_SPEC_PUBLIC, JML_SPEC_PRIVATE };
 
-    private final Modifier.Keyword[] interfaceWithStaticAndDefaultAndPrivate = new Modifier.Keyword[] {
-        PUBLIC,
-        PROTECTED,
-        PRIVATE,
-        ABSTRACT,
-        STATIC,
-        FINAL,
-        SYNCHRONIZED,
-        NATIVE,
-        STRICTFP,
-        DEFAULT, // JML
-        JML_PURE,
-        JML_STRICTLY_PURE,
-        JML_NULLABLE,
-        JML_NULLABLE_BY_DEFAULT,
-        JML_NON_NULL,
-        JML_NON_NULL_ELEMENTS,
-        JML_HELPER,
-        JML_TWO_STATE,
-        JML_NO_STATE,
-        JML_SPEC_PACKAGE,
-        JML_SPEC_PRIVATE,
-        JML_SPEC_PUBLIC,
-        JML_SPEC_PRIVATE
-    };
+    private final Modifier.DefaultKeyword[] interfaceWithStaticAndDefaultAndPrivate = new Modifier.DefaultKeyword[] { // JML
+    // JML
+    // JML
+    // JML
+    PUBLIC, // JML
+    PROTECTED, // JML
+    PRIVATE, // JML
+    ABSTRACT, STATIC, FINAL, SYNCHRONIZED, NATIVE, STRICTFP, DEFAULT, JML_PURE, JML_STRICTLY_PURE, JML_NULLABLE, JML_NULLABLE_BY_DEFAULT, JML_NON_NULL, JML_NON_NULL_ELEMENTS, JML_HELPER, JML_TWO_STATE, JML_NO_STATE, JML_SPEC_PACKAGE, JML_SPEC_PRIVATE, JML_SPEC_PUBLIC, JML_SPEC_PRIVATE };
 
     private final boolean hasStrictfp;
 
@@ -123,8 +71,7 @@ public class ModifierValidator extends VisitorValidator {
 
     private final boolean hasPrivateInterfaceMethods;
 
-    public ModifierValidator(
-            boolean hasStrictfp, boolean hasDefaultAndStaticInterfaceMethods, boolean hasPrivateInterfaceMethods) {
+    public ModifierValidator(boolean hasStrictfp, boolean hasDefaultAndStaticInterfaceMethods, boolean hasPrivateInterfaceMethods) {
         this.hasStrictfp = hasStrictfp;
         this.hasDefaultAndStaticInterfaceMethods = hasDefaultAndStaticInterfaceMethods;
         this.hasPrivateInterfaceMethods = hasPrivateInterfaceMethods;
@@ -142,76 +89,31 @@ public void visit(ClassOrInterfaceDeclaration n, ProblemReporter reporter) {
 
     private void validateClassModifiers(ClassOrInterfaceDeclaration n, ProblemReporter reporter) {
         if (n.isTopLevelType()) {
-            validateModifiers(
-                    n,
-                    reporter,
-                    PUBLIC,
-                    ABSTRACT,
-                    FINAL,
-                    STRICTFP,
-                    SEALED,
-                    NON_SEALED, // JML
-                    JML_PURE,
-                    JML_STRICTLY_PURE,
-                    JML_NULLABLE,
-                    JML_NULLABLE_BY_DEFAULT,
-                    JML_NON_NULL,
-                    JML_NON_NULL_ELEMENTS,
-                    JML_HELPER,
-                    JML_TWO_STATE,
-                    JML_NO_STATE,
-                    JML_SPEC_PACKAGE,
-                    JML_SPEC_PRIVATE,
-                    JML_SPEC_PUBLIC,
-                    JML_SPEC_PRIVATE);
+            // JML
+            // JML
+            // JML
+            // JML
+            validateModifiers(// JML
+            n, // JML
+            reporter, PUBLIC, ABSTRACT, FINAL, STRICTFP, SEALED, NON_SEALED, JML_PURE, JML_STRICTLY_PURE, JML_NULLABLE, JML_NULLABLE_BY_DEFAULT, JML_NON_NULL, JML_NON_NULL_ELEMENTS, JML_HELPER, JML_TWO_STATE, JML_NO_STATE, JML_SPEC_PACKAGE, JML_SPEC_PRIVATE, JML_SPEC_PUBLIC, JML_SPEC_PRIVATE);
         } else if (n.isNestedType()) {
-            validateModifiers(
-                    n,
-                    reporter,
-                    PUBLIC,
-                    PROTECTED,
-                    PRIVATE,
-                    ABSTRACT,
-                    STATIC,
-                    FINAL,
-                    STRICTFP,
-                    SEALED,
-                    NON_SEALED, // JML
-                    JML_PURE,
-                    JML_STRICTLY_PURE,
-                    JML_NULLABLE,
-                    JML_NULLABLE_BY_DEFAULT,
-                    JML_NON_NULL,
-                    JML_NON_NULL_ELEMENTS,
-                    JML_HELPER,
-                    JML_TWO_STATE,
-                    JML_NO_STATE,
-                    JML_SPEC_PACKAGE,
-                    JML_SPEC_PRIVATE,
-                    JML_SPEC_PUBLIC,
-                    JML_SPEC_PRIVATE);
+            // JML
+            // JML
+            // JML
+            // JML
+            validateModifiers(// JML
+            n, // JML
+            reporter, // JML
+            PUBLIC, // JML
+            PROTECTED, // JML
+            PRIVATE, ABSTRACT, STATIC, FINAL, STRICTFP, SEALED, NON_SEALED, JML_PURE, JML_STRICTLY_PURE, JML_NULLABLE, JML_NULLABLE_BY_DEFAULT, JML_NON_NULL, JML_NON_NULL_ELEMENTS, JML_HELPER, JML_TWO_STATE, JML_NO_STATE, JML_SPEC_PACKAGE, JML_SPEC_PRIVATE, JML_SPEC_PUBLIC, JML_SPEC_PRIVATE);
         } else if (n.isLocalClassDeclaration()) {
-            validateModifiers(
-                    n,
-                    reporter,
-                    ABSTRACT,
-                    FINAL,
-                    STRICTFP,
-                    SEALED,
-                    NON_SEALED, // JML
-                    JML_PURE,
-                    JML_STRICTLY_PURE,
-                    JML_NULLABLE,
-                    JML_NULLABLE_BY_DEFAULT,
-                    JML_NON_NULL,
-                    JML_NON_NULL_ELEMENTS,
-                    JML_HELPER,
-                    JML_TWO_STATE,
-                    JML_NO_STATE,
-                    JML_SPEC_PACKAGE,
-                    JML_SPEC_PRIVATE,
-                    JML_SPEC_PUBLIC,
-                    JML_SPEC_PRIVATE);
+            // JML
+            // JML
+            // JML
+            // JML
+            validateModifiers(// JML
+            n, reporter, ABSTRACT, FINAL, STRICTFP, SEALED, NON_SEALED, JML_PURE, JML_STRICTLY_PURE, JML_NULLABLE, JML_NULLABLE_BY_DEFAULT, JML_NON_NULL, JML_NON_NULL_ELEMENTS, JML_HELPER, JML_TWO_STATE, JML_NO_STATE, JML_SPEC_PACKAGE, JML_SPEC_PRIVATE, JML_SPEC_PUBLIC, JML_SPEC_PRIVATE);
         }
     }
 
@@ -247,89 +149,32 @@ public void visit(AnnotationMemberDeclaration n, ProblemReporter reporter) {
 
     @Override
     public void visit(ConstructorDeclaration n, ProblemReporter reporter) {
-        validateModifiers(
-                n,
-                reporter,
-                PUBLIC,
-                PROTECTED,
-                PRIVATE, // JML
-                JML_PURE,
-                JML_STRICTLY_PURE,
-                JML_NULLABLE,
-                JML_NULLABLE_BY_DEFAULT,
-                JML_NON_NULL,
-                JML_NON_NULL_ELEMENTS,
-                JML_HELPER,
-                JML_TWO_STATE,
-                JML_NO_STATE,
-                JML_SPEC_PACKAGE,
-                JML_SPEC_PRIVATE,
-                JML_SPEC_PUBLIC,
-                JML_SPEC_PRIVATE);
-        n.getParameters()
-                .forEach(p -> validateModifiers(
-                        p,
-                        reporter,
-                        FINAL,
-                        JML_NULLABLE,
-                        JML_NULLABLE_BY_DEFAULT,
-                        JML_NON_NULL,
-                        JML_NON_NULL_ELEMENTS));
+        // JML
+        // JML
+        // JML
+        validateModifiers(n, reporter, PUBLIC, PROTECTED, PRIVATE, JML_PURE, JML_STRICTLY_PURE, JML_NULLABLE, JML_NULLABLE_BY_DEFAULT, JML_NON_NULL, JML_NON_NULL_ELEMENTS, JML_HELPER, JML_TWO_STATE, JML_NO_STATE, JML_SPEC_PACKAGE, JML_SPEC_PRIVATE, JML_SPEC_PUBLIC, JML_SPEC_PRIVATE);
+        n.getParameters().forEach(p -> validateModifiers(p, reporter, FINAL, JML_NULLABLE, JML_NULLABLE_BY_DEFAULT, JML_NON_NULL, JML_NON_NULL_ELEMENTS));
         super.visit(n, reporter);
     }
 
     @Override
     public void visit(JmlFieldDeclaration n, ProblemReporter reporter) {
         // Adds model, ghost, and instance to the allowed modifiers
-        validateModifiers(
-                n.getDecl(),
-                reporter,
-                PUBLIC,
-                PROTECTED,
-                PRIVATE,
-                STATIC,
-                FINAL,
-                TRANSIENT,
-                VOLATILE,
-                JML_NULLABLE,
-                JML_NULLABLE_BY_DEFAULT,
-                JML_NON_NULL,
-                JML_NON_NULL_ELEMENTS,
-                JML_GHOST,
-                JML_MODEL,
-                JML_INSTANCE);
+        validateModifiers(n.getDecl(), reporter, PUBLIC, PROTECTED, PRIVATE, STATIC, FINAL, TRANSIENT, VOLATILE, JML_NULLABLE, JML_NULLABLE_BY_DEFAULT, JML_NON_NULL, JML_NON_NULL_ELEMENTS, JML_GHOST, JML_MODEL, JML_INSTANCE);
         super.visit(n.getDecl(), reporter);
     }
 
     @Override
     public void visit(FieldDeclaration n, ProblemReporter reporter) {
-        validateModifiers(
-                n,
-                reporter,
-                PUBLIC,
-                PROTECTED,
-                PRIVATE,
-                STATIC,
-                FINAL,
-                TRANSIENT,
-                VOLATILE,
-                JML_NULLABLE,
-                JML_NULLABLE_BY_DEFAULT,
-                JML_NON_NULL,
-                JML_NON_NULL_ELEMENTS,
-                JML_SPEC_PACKAGE,
-                JML_SPEC_PRIVATE,
-                JML_SPEC_PUBLIC,
-                JML_SPEC_PRIVATE);
+        validateModifiers(n, reporter, PUBLIC, PROTECTED, PRIVATE, STATIC, FINAL, TRANSIENT, VOLATILE, JML_NULLABLE, JML_NULLABLE_BY_DEFAULT, JML_NON_NULL, JML_NON_NULL_ELEMENTS, JML_SPEC_PACKAGE, JML_SPEC_PRIVATE, JML_SPEC_PUBLIC, JML_SPEC_PRIVATE);
         super.visit(n, reporter);
     }
 
     @Override
     public void visit(MethodDeclaration n, ProblemReporter reporter) {
         if (n.isAbstract()) {
-            final SeparatedItemStringBuilder builder =
-                    new SeparatedItemStringBuilder("Cannot be 'abstract' and also '", "', '", "'.");
-            for (Modifier.Keyword m : asList(PRIVATE, STATIC, FINAL, NATIVE, STRICTFP, SYNCHRONIZED)) {
+            final SeparatedItemStringBuilder builder = new SeparatedItemStringBuilder("Cannot be 'abstract' and also '", "', '", "'.");
+            for (Modifier.DefaultKeyword m : asList(PRIVATE, STATIC, FINAL, NATIVE, STRICTFP, SYNCHRONIZED)) {
                 if (n.hasModifier(m)) {
                     builder.append(m.asString());
                 }
@@ -351,43 +196,20 @@ public void visit(MethodDeclaration n, ProblemReporter reporter) {
                         validateModifiers(n, reporter, interfaceWithNothingSpecial);
                     }
                 } else {
-                    validateModifiers(
-                            n,
-                            reporter,
-                            PUBLIC,
-                            PROTECTED,
-                            PRIVATE,
-                            ABSTRACT,
-                            STATIC,
-                            FINAL,
-                            SYNCHRONIZED,
-                            NATIVE,
-                            STRICTFP, // JML
-                            JML_PURE,
-                            JML_STRICTLY_PURE,
-                            JML_NULLABLE,
-                            JML_NULLABLE_BY_DEFAULT,
-                            JML_NON_NULL,
-                            JML_NON_NULL_ELEMENTS,
-                            JML_HELPER,
-                            JML_TWO_STATE,
-                            JML_NO_STATE,
-                            JML_SPEC_PACKAGE,
-                            JML_SPEC_PRIVATE,
-                            JML_SPEC_PUBLIC,
-                            JML_SPEC_PRIVATE);
+                    // JML
+                    // JML
+                    // JML
+                    // JML
+                    validateModifiers(// JML
+                    n, // JML
+                    reporter, // JML
+                    PUBLIC, // JML
+                    PROTECTED, // JML
+                    PRIVATE, ABSTRACT, STATIC, FINAL, SYNCHRONIZED, NATIVE, STRICTFP, JML_PURE, JML_STRICTLY_PURE, JML_NULLABLE, JML_NULLABLE_BY_DEFAULT, JML_NON_NULL, JML_NON_NULL_ELEMENTS, JML_HELPER, JML_TWO_STATE, JML_NO_STATE, JML_SPEC_PACKAGE, JML_SPEC_PRIVATE, JML_SPEC_PUBLIC, JML_SPEC_PRIVATE);
                 }
             }
         }
-        n.getParameters()
-                .forEach(p -> validateModifiers(
-                        p,
-                        reporter,
-                        FINAL,
-                        JML_NULLABLE,
-                        JML_NULLABLE_BY_DEFAULT,
-                        JML_NON_NULL,
-                        JML_NON_NULL_ELEMENTS));
+        n.getParameters().forEach(p -> validateModifiers(p, reporter, FINAL, JML_NULLABLE, JML_NULLABLE_BY_DEFAULT, JML_NON_NULL, JML_NON_NULL_ELEMENTS));
         super.visit(n, reporter);
     }
 
@@ -418,8 +240,7 @@ public void visit(ModuleRequiresDirective n, ProblemReporter reporter) {
         super.visit(n, reporter);
     }
 
-    private <T extends NodeWithModifiers<?> & NodeWithTokenRange<?>> void validateModifiers(
-            T n, ProblemReporter reporter, Modifier.Keyword... allowedModifiers) {
+    private <T extends NodeWithModifiers<?> & NodeWithTokenRange<?>> void validateModifiers(T n, ProblemReporter reporter, Modifier.DefaultKeyword... allowedModifiers) {
         validateAtMostOneOf(n, reporter, PUBLIC, PROTECTED, PRIVATE);
         validateAtMostOneOf(n, reporter, FINAL, ABSTRACT);
         validateAtMostOneOf(n, reporter, JML_INSTANCE, STATIC);
@@ -436,10 +257,10 @@ private <T extends NodeWithModifiers<?> & NodeWithTokenRange<?>> void validateMo
         }
     }
 
-    private Modifier.Keyword[] removeModifierFromArray(Modifier.Keyword m, Modifier.Keyword[] allowedModifiers) {
-        final List<Modifier.Keyword> newModifiers = new ArrayList<>(asList(allowedModifiers));
+    private Modifier.DefaultKeyword[] removeModifierFromArray(Modifier.DefaultKeyword m, Modifier.DefaultKeyword[] allowedModifiers) {
+        final List<Modifier.DefaultKeyword> newModifiers = new ArrayList<>(asList(allowedModifiers));
         newModifiers.remove(m);
-        allowedModifiers = newModifiers.toArray(new Modifier.Keyword[0]);
+        allowedModifiers = newModifiers.toArray(new Modifier.DefaultKeyword[0]);
         return allowedModifiers;
     }
 
@@ -452,17 +273,16 @@ private boolean arrayContains(Object[] items, Object searchItem) {
         return false;
     }
 
-    private <T extends NodeWithModifiers<?> & NodeWithTokenRange<?>> void validateAtMostOneOf(
-            T t, ProblemReporter reporter, Modifier.DefaultKeyword... modifiers) {
-        List<Modifier.Keyword> foundModifiers = new ArrayList<>();
-        for (Modifier.Keyword m : modifiers) {
+    private <T extends NodeWithModifiers<?> & NodeWithTokenRange<?>> void validateAtMostOneOf(T t, ProblemReporter reporter, Modifier.DefaultKeyword... modifiers) {
+        List<Modifier.DefaultKeyword> foundModifiers = new ArrayList<>();
+        for (Modifier.DefaultKeyword m : modifiers) {
             if (t.hasModifier(m)) {
                 foundModifiers.add(m);
             }
         }
         if (foundModifiers.size() > 1) {
             SeparatedItemStringBuilder builder = new SeparatedItemStringBuilder("Can have only one of '", "', '", "'.");
-            for (Modifier.Keyword m : foundModifiers) {
+            for (Modifier.DefaultKeyword m : foundModifiers) {
                 builder.append(m.asString());
             }
             reporter.report(t, builder.toString());
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/RecordDeclarationValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/RecordDeclarationValidator.java
index 57e26a78e1..19d6f755ab 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/RecordDeclarationValidator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/RecordDeclarationValidator.java
@@ -40,9 +40,7 @@ private void forbidAbstractModifier(RecordDeclaration n, ProblemReporter reporte
     }
 
     private void forbidNonStaticFieldsInRecords(RecordDeclaration n, ProblemReporter reporter) {
-        long nonStaticFieldCount = n.getFields().stream()
-                .filter(fieldDeclaration -> !fieldDeclaration.isStatic())
-                .count();
+        long nonStaticFieldCount = n.getFields().stream().filter(fieldDeclaration -> !fieldDeclaration.isStatic()).count();
         if (nonStaticFieldCount > 0) {
             reporter.report(n, "Record Declarations must have zero non-static fields.");
         }
@@ -77,18 +75,11 @@ private void forbidNonStaticFieldsInRecords(RecordDeclaration n, ProblemReporter
      */
     private void validateRecordComponentAccessorMethods(RecordDeclaration n, ProblemReporter reporter) {
         n.getParameters().forEach(parameter -> {
-            n.getMethodsByName(parameter.getNameAsString()).stream()
-                    .filter(methodDeclaration ->
-                            methodDeclaration.getParameters().isEmpty())
-                    .forEach(methodDeclaration -> {
-                        if (!methodDeclaration.getType().equals(parameter.getType())) {
-                            reporter.report(
-                                    n,
-                                    String.format(
-                                            "Incorrect component accessor return type. Expected: '%s', found: '%s'.",
-                                            parameter.getTypeAsString(), methodDeclaration.getTypeAsString()));
-                        }
-                    });
+            n.getMethodsByName(parameter.getNameAsString()).stream().filter(methodDeclaration -> methodDeclaration.getParameters().isEmpty()).forEach(methodDeclaration -> {
+                if (!methodDeclaration.getType().equals(parameter.getType())) {
+                    reporter.report(n, String.format("Incorrect component accessor return type. Expected: '%s', found: '%s'.", parameter.getTypeAsString(), methodDeclaration.getTypeAsString()));
+                }
+            });
         });
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/VarValidator.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/VarValidator.java
index 9078f2a8cb..cd943927d9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/VarValidator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/language_level_validations/chunks/VarValidator.java
@@ -58,10 +58,7 @@ public void accept(VarType node, ProblemReporter reporter) {
         if (!variableDeclarator.isPresent()) {
             // Java 11's var in lambda's
             if (varAllowedInLambdaParameters) {
-                boolean valid = node.findAncestor(Parameter.class)
-                        .flatMap(Node::getParentNode)
-                        .map((Node p) -> p instanceof LambdaExpr)
-                        .orElse(false);
+                boolean valid = node.findAncestor(Parameter.class).flatMap(Node::getParentNode).map((Node p) -> p instanceof LambdaExpr).orElse(false);
                 if (valid) {
                     return;
                 }
@@ -93,10 +90,7 @@ public void accept(VarType node, ProblemReporter reporter) {
                     return;
                 }
                 container.ifPresent(c -> {
-                    boolean positionIsFine = c instanceof ForStmt
-                            || c instanceof ForEachStmt
-                            || c instanceof ExpressionStmt
-                            || c instanceof TryStmt;
+                    boolean positionIsFine = c instanceof ForStmt || c instanceof ForEachStmt || c instanceof ExpressionStmt || c instanceof TryStmt;
                     if (!positionIsFine) {
                         reportIllegalPosition(node, reporter);
                     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java10PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java10PostProcessor.java
index 9b7b821754..8edbc4b843 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java10PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java10PostProcessor.java
@@ -58,9 +58,7 @@ public void postProcess(ParseResult<? extends Node> result, ParserConfiguration
         }
 
         private boolean matchForbiddenContext(ClassOrInterfaceType cit) {
-            return cit.getParentNode().isPresent()
-                    && FORBIDEN_PARENT_CONTEXT_TO_DETECT_POTENTIAL_VAR_TYPE.stream()
-                            .anyMatch(cl -> cl.isInstance(cit.getParentNode().get()));
+            return cit.getParentNode().isPresent() && FORBIDEN_PARENT_CONTEXT_TO_DETECT_POTENTIAL_VAR_TYPE.stream().anyMatch(cl -> cl.isInstance(cit.getParentNode().get()));
         }
     };
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java11PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java11PostProcessor.java
index 961940538b..15c5c6f76e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java11PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java11PostProcessor.java
@@ -23,4 +23,5 @@
 /**
  * Processes the generic AST into a Java 11 AST and validates it.
  */
-public class Java11PostProcessor extends Java10PostProcessor {}
+public class Java11PostProcessor extends Java10PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java12PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java12PostProcessor.java
index b215015055..7f3e8bd521 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java12PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java12PostProcessor.java
@@ -23,4 +23,5 @@
 /**
  * Processes the generic AST into a Java 12 AST and validates it.
  */
-public class Java12PostProcessor extends Java11PostProcessor {}
+public class Java12PostProcessor extends Java11PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java13PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java13PostProcessor.java
index 0b6879f7d4..09db3a2ba2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java13PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java13PostProcessor.java
@@ -23,4 +23,5 @@
 /**
  * Processes the generic AST into a Java 13 AST and validates it.
  */
-public class Java13PostProcessor extends Java12PostProcessor {}
+public class Java13PostProcessor extends Java12PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java14PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java14PostProcessor.java
index f30f6fad99..b997103e29 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java14PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java14PostProcessor.java
@@ -23,4 +23,5 @@
 /**
  * Processes the generic AST into a Java 14 AST and validates it.
  */
-public class Java14PostProcessor extends Java13PostProcessor {}
+public class Java14PostProcessor extends Java13PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java15PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java15PostProcessor.java
index f9495536eb..ee4efb1eab 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java15PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java15PostProcessor.java
@@ -23,4 +23,5 @@
 /**
  * Processes the generic AST into a Java 15 AST and validates it.
  */
-public class Java15PostProcessor extends Java14PostProcessor {}
+public class Java15PostProcessor extends Java14PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java16PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java16PostProcessor.java
index 33b0f26956..3e3cab8290 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java16PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java16PostProcessor.java
@@ -23,4 +23,5 @@
 /**
  * Processes the generic AST into a Java 16 AST and validates it.
  */
-public class Java16PostProcessor extends Java15PostProcessor {}
+public class Java16PostProcessor extends Java15PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java17PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java17PostProcessor.java
index f08e93857a..0b22335701 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java17PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java17PostProcessor.java
@@ -23,4 +23,5 @@
 /**
  * Processes the generic AST into a Java 17 AST and validates it.
  */
-public class Java17PostProcessor extends Java16PostProcessor {}
+public class Java17PostProcessor extends Java16PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java18PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java18PostProcessor.java
index 503e148b17..282d8e43df 100755
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java18PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java18PostProcessor.java
@@ -22,4 +22,5 @@
 /**
  * Processes the generic AST into a Java 18 AST and validates it.
  */
-public class Java18PostProcessor extends Java17PostProcessor {}
+public class Java18PostProcessor extends Java17PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java19PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java19PostProcessor.java
index 814b3e55dd..b4a5c937c2 100755
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java19PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java19PostProcessor.java
@@ -22,4 +22,5 @@
 /**
  * Processes the generic AST into a Java 19 AST and validates it.
  */
-public class Java19PostProcessor extends Java18PostProcessor {}
+public class Java19PostProcessor extends Java18PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java20PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java20PostProcessor.java
index 29a3b29ee5..739530784b 100755
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java20PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java20PostProcessor.java
@@ -22,4 +22,5 @@
 /**
  * Processes the generic AST into a Java 20 AST and validates it.
  */
-public class Java20PostProcessor extends Java19PostProcessor {}
+public class Java20PostProcessor extends Java19PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java21PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java21PostProcessor.java
index 23ee9b08f3..c1e2d82aab 100755
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java21PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java21PostProcessor.java
@@ -22,4 +22,5 @@
 /**
  * Processes the generic AST into a Java 21 AST and validates it.
  */
-public class Java21PostProcessor extends Java20PostProcessor {}
+public class Java21PostProcessor extends Java20PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java22PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java22PostProcessor.java
index 2de4ce912f..1ed66336ab 100755
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java22PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java22PostProcessor.java
@@ -22,4 +22,5 @@
 /**
  * Processes the generic AST into a Java 22 AST and validates it.
  */
-public class Java22PostProcessor extends Java21PostProcessor {}
+public class Java22PostProcessor extends Java21PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java23PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java23PostProcessor.java
index 6eb348a3ec..6470358c8f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java23PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java23PostProcessor.java
@@ -24,4 +24,5 @@
  * Post-processor for Java 23 language features.
  * Java 23 does not introduce new syntax changes requiring post-processing.
  */
-public class Java23PostProcessor extends Java22PostProcessor {}
+public class Java23PostProcessor extends Java22PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java24PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java24PostProcessor.java
index c5c87fc7eb..c10eba45e7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java24PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java24PostProcessor.java
@@ -24,4 +24,5 @@
  * Post-processor for Java 24 language features.
  * Java 24 does not introduce new syntax changes requiring post-processing.
  */
-public class Java24PostProcessor extends Java23PostProcessor {}
+public class Java24PostProcessor extends Java23PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java25PostProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java25PostProcessor.java
index a828f63d75..ae8b8c02be 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java25PostProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/validator/postprocessors/Java25PostProcessor.java
@@ -23,4 +23,5 @@
 /**
  * Post-processor for Java 25 language features.
  */
-public class Java25PostProcessor extends Java24PostProcessor {}
+public class Java25PostProcessor extends Java24PostProcessor {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java
index 40d21fa01e..71b5743f65 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/CloneVisitor.java
@@ -30,11 +30,12 @@
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
-import com.github.javaparser.ast.jml.clauses.JmlClauseLabel;
+import com.github.javaparser.ast.jml.clauses.JmlLabledClause;
 import com.github.javaparser.ast.jml.clauses.JmlSignalsClause;
 import com.github.javaparser.ast.jml.clauses.JmlSignalsOnlyClause;
 import com.github.javaparser.ast.jml.clauses.JmlSimpleExprClause;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -56,11 +57,9 @@ public Visitable visit(final CompilationUnit n, final Object arg) {
         ModuleDeclaration module = cloneNode(n.getModule(), arg);
         PackageDeclaration packageDeclaration = cloneNode(n.getPackageDeclaration(), arg);
         NodeList<TypeDeclaration<?>> types = cloneList(n.getTypes(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        CompilationUnit r =
-                new CompilationUnit(n.getTokenRange().orElse(null), packageDeclaration, imports, types, module);
+        CompilationUnit r = new CompilationUnit(n.getTokenRange().orElse(null), packageDeclaration, imports, types, module);
         n.getStorage().ifPresent(s -> r.setStorage(s.getPath(), s.getEncoding()));
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
@@ -73,8 +72,7 @@ public Visitable visit(final CompilationUnit n, final Object arg) {
     public Visitable visit(final PackageDeclaration n, final Object arg) {
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
         Name name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         PackageDeclaration r = new PackageDeclaration(n.getTokenRange().orElse(null), annotations, name);
         r.setComment(comment);
@@ -88,8 +86,7 @@ public Visitable visit(final TypeParameter n, final Object arg) {
         SimpleName name = cloneNode(n.getName(), arg);
         NodeList<ClassOrInterfaceType> typeBound = cloneList(n.getTypeBound(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         TypeParameter r = new TypeParameter(n.getTokenRange().orElse(null), name, typeBound, annotations);
         r.setComment(comment);
@@ -100,8 +97,7 @@ public Visitable visit(final TypeParameter n, final Object arg) {
 
     @Override
     public Visitable visit(final LineComment n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         LineComment r = new LineComment(n.getTokenRange().orElse(null), n.getContent());
         r.setComment(comment);
@@ -112,8 +108,7 @@ public Visitable visit(final LineComment n, final Object arg) {
 
     @Override
     public Visitable visit(final BlockComment n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         BlockComment r = new BlockComment(n.getTokenRange().orElse(null), n.getContent());
         r.setComment(comment);
@@ -132,20 +127,9 @@ public Visitable visit(final ClassOrInterfaceDeclaration n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        ClassOrInterfaceDeclaration r = new ClassOrInterfaceDeclaration(
-                n.getTokenRange().orElse(null),
-                modifiers,
-                annotations,
-                n.isInterface(),
-                name,
-                typeParameters,
-                extendedTypes,
-                implementedTypes,
-                permittedTypes,
-                members);
+        ClassOrInterfaceDeclaration r = new ClassOrInterfaceDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, n.isInterface(), name, typeParameters, extendedTypes, implementedTypes, permittedTypes, members);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -160,11 +144,9 @@ public Visitable visit(final EnumDeclaration n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        EnumDeclaration r = new EnumDeclaration(
-                n.getTokenRange().orElse(null), modifiers, annotations, name, implementedTypes, entries, members);
+        EnumDeclaration r = new EnumDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, name, implementedTypes, entries, members);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -177,11 +159,9 @@ public Visitable visit(final EnumConstantDeclaration n, final Object arg) {
         NodeList<BodyDeclaration<?>> classBody = cloneList(n.getClassBody(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        EnumConstantDeclaration r =
-                new EnumConstantDeclaration(n.getTokenRange().orElse(null), annotations, name, arguments, classBody);
+        EnumConstantDeclaration r = new EnumConstantDeclaration(n.getTokenRange().orElse(null), annotations, name, arguments, classBody);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -194,11 +174,9 @@ public Visitable visit(final AnnotationDeclaration n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        AnnotationDeclaration r =
-                new AnnotationDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, name, members);
+        AnnotationDeclaration r = new AnnotationDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, name, members);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -212,11 +190,9 @@ public Visitable visit(final AnnotationMemberDeclaration n, final Object arg) {
         SimpleName name = cloneNode(n.getName(), arg);
         Type type = cloneNode(n.getType(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        AnnotationMemberDeclaration r = new AnnotationMemberDeclaration(
-                n.getTokenRange().orElse(null), modifiers, annotations, type, name, defaultValue);
+        AnnotationMemberDeclaration r = new AnnotationMemberDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, type, name, defaultValue);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -228,8 +204,7 @@ public Visitable visit(final FieldDeclaration n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         NodeList<VariableDeclarator> variables = cloneList(n.getVariables(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         FieldDeclaration r = new FieldDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, variables);
         r.setComment(comment);
@@ -243,8 +218,7 @@ public Visitable visit(final VariableDeclarator n, final Object arg) {
         Expression initializer = cloneNode(n.getInitializer(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
         Type type = cloneNode(n.getType(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         VariableDeclarator r = new VariableDeclarator(n.getTokenRange().orElse(null), type, name, initializer);
         r.setComment(comment);
@@ -264,20 +238,9 @@ public Visitable visit(final ConstructorDeclaration n, final Object arg) {
         NodeList<ReferenceType> thrownExceptions = cloneList(n.getThrownExceptions(), arg);
         NodeList<TypeParameter> typeParameters = cloneList(n.getTypeParameters(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        ConstructorDeclaration r = new ConstructorDeclaration(
-                n.getTokenRange().orElse(null),
-                modifiers,
-                annotations,
-                typeParameters,
-                name,
-                parameters,
-                thrownExceptions,
-                body,
-                receiverParameter,
-                contracts);
+        ConstructorDeclaration r = new ConstructorDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, typeParameters, name, parameters, thrownExceptions, body, receiverParameter, contracts);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -296,21 +259,9 @@ public Visitable visit(final MethodDeclaration n, final Object arg) {
         NodeList<ReferenceType> thrownExceptions = cloneList(n.getThrownExceptions(), arg);
         NodeList<TypeParameter> typeParameters = cloneList(n.getTypeParameters(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        MethodDeclaration r = new MethodDeclaration(
-                n.getTokenRange().orElse(null),
-                modifiers,
-                annotations,
-                typeParameters,
-                type,
-                name,
-                parameters,
-                thrownExceptions,
-                body,
-                receiverParameter,
-                contracts);
+        MethodDeclaration r = new MethodDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, typeParameters, type, name, parameters, thrownExceptions, body, receiverParameter, contracts);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -324,11 +275,9 @@ public Visitable visit(final Parameter n, final Object arg) {
         SimpleName name = cloneNode(n.getName(), arg);
         Type type = cloneNode(n.getType(), arg);
         NodeList<AnnotationExpr> varArgsAnnotations = cloneList(n.getVarArgsAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        Parameter r = new Parameter(
-                n.getTokenRange().orElse(null), modifiers, annotations, type, n.isVarArgs(), varArgsAnnotations, name);
+        Parameter r = new Parameter(n.getTokenRange().orElse(null), modifiers, annotations, type, n.isVarArgs(), varArgsAnnotations, name);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -339,8 +288,7 @@ public Visitable visit(final Parameter n, final Object arg) {
     public Visitable visit(final InitializerDeclaration n, final Object arg) {
         BlockStmt body = cloneNode(n.getBody(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         InitializerDeclaration r = new InitializerDeclaration(n.getTokenRange().orElse(null), n.isStatic(), body);
         r.setComment(comment);
@@ -351,11 +299,9 @@ public Visitable visit(final InitializerDeclaration n, final Object arg) {
 
     @Override
     public Visitable visit(final TraditionalJavadocComment n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        TraditionalJavadocComment r =
-                new TraditionalJavadocComment(n.getTokenRange().orElse(null), n.getContent());
+        TraditionalJavadocComment r = new TraditionalJavadocComment(n.getTokenRange().orElse(null), n.getContent());
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -368,11 +314,9 @@ public Visitable visit(final ClassOrInterfaceType n, final Object arg) {
         ClassOrInterfaceType scope = cloneNode(n.getScope(), arg);
         NodeList<Type> typeArguments = cloneList(n.getTypeArguments().orElse(null), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        ClassOrInterfaceType r =
-                new ClassOrInterfaceType(n.getTokenRange().orElse(null), scope, name, typeArguments, annotations);
+        ClassOrInterfaceType r = new ClassOrInterfaceType(n.getTokenRange().orElse(null), scope, name, typeArguments, annotations);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -382,8 +326,7 @@ public Visitable visit(final ClassOrInterfaceType n, final Object arg) {
     @Override
     public Visitable visit(final PrimitiveType n, final Object arg) {
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         PrimitiveType r = new PrimitiveType(n.getTokenRange().orElse(null), n.getType(), annotations);
         r.setComment(comment);
@@ -396,8 +339,7 @@ public Visitable visit(final PrimitiveType n, final Object arg) {
     public Visitable visit(final ArrayType n, final Object arg) {
         Type componentType = cloneNode(n.getComponentType(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ArrayType r = new ArrayType(n.getTokenRange().orElse(null), componentType, n.getOrigin(), annotations);
         r.setComment(comment);
@@ -410,8 +352,7 @@ public Visitable visit(final ArrayType n, final Object arg) {
     public Visitable visit(final ArrayCreationLevel n, final Object arg) {
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
         Expression dimension = cloneNode(n.getDimension(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ArrayCreationLevel r = new ArrayCreationLevel(n.getTokenRange().orElse(null), dimension, annotations);
         r.setComment(comment);
@@ -424,8 +365,7 @@ public Visitable visit(final ArrayCreationLevel n, final Object arg) {
     public Visitable visit(final IntersectionType n, final Object arg) {
         NodeList<ReferenceType> elements = cloneList(n.getElements(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         IntersectionType r = new IntersectionType(n.getTokenRange().orElse(null), elements);
         r.setComment(comment);
@@ -438,8 +378,7 @@ public Visitable visit(final IntersectionType n, final Object arg) {
     public Visitable visit(final UnionType n, final Object arg) {
         NodeList<ReferenceType> elements = cloneList(n.getElements(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         UnionType r = new UnionType(n.getTokenRange().orElse(null), elements);
         r.setComment(comment);
@@ -451,8 +390,7 @@ public Visitable visit(final UnionType n, final Object arg) {
     @Override
     public Visitable visit(final VoidType n, final Object arg) {
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         VoidType r = new VoidType(n.getTokenRange().orElse(null));
         r.setComment(comment);
@@ -466,8 +404,7 @@ public Visitable visit(final WildcardType n, final Object arg) {
         ReferenceType extendedType = cloneNode(n.getExtendedType(), arg);
         ReferenceType superType = cloneNode(n.getSuperType(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         WildcardType r = new WildcardType(n.getTokenRange().orElse(null), extendedType, superType, annotations);
         r.setComment(comment);
@@ -479,8 +416,7 @@ public Visitable visit(final WildcardType n, final Object arg) {
     @Override
     public Visitable visit(final UnknownType n, final Object arg) {
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         UnknownType r = new UnknownType(n.getTokenRange().orElse(null));
         r.setComment(comment);
@@ -493,8 +429,7 @@ public Visitable visit(final UnknownType n, final Object arg) {
     public Visitable visit(final ArrayAccessExpr n, final Object arg) {
         Expression index = cloneNode(n.getIndex(), arg);
         Expression name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ArrayAccessExpr r = new ArrayAccessExpr(n.getTokenRange().orElse(null), name, index);
         r.setComment(comment);
@@ -508,8 +443,7 @@ public Visitable visit(final ArrayCreationExpr n, final Object arg) {
         Type elementType = cloneNode(n.getElementType(), arg);
         ArrayInitializerExpr initializer = cloneNode(n.getInitializer(), arg);
         NodeList<ArrayCreationLevel> levels = cloneList(n.getLevels(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ArrayCreationExpr r = new ArrayCreationExpr(n.getTokenRange().orElse(null), elementType, levels, initializer);
         r.setComment(comment);
@@ -521,8 +455,7 @@ public Visitable visit(final ArrayCreationExpr n, final Object arg) {
     @Override
     public Visitable visit(final ArrayInitializerExpr n, final Object arg) {
         NodeList<Expression> values = cloneList(n.getValues(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ArrayInitializerExpr r = new ArrayInitializerExpr(n.getTokenRange().orElse(null), values);
         r.setComment(comment);
@@ -535,8 +468,7 @@ public Visitable visit(final ArrayInitializerExpr n, final Object arg) {
     public Visitable visit(final AssignExpr n, final Object arg) {
         Expression target = cloneNode(n.getTarget(), arg);
         Expression value = cloneNode(n.getValue(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         AssignExpr r = new AssignExpr(n.getTokenRange().orElse(null), target, value, n.getOperator());
         r.setComment(comment);
@@ -549,8 +481,7 @@ public Visitable visit(final AssignExpr n, final Object arg) {
     public Visitable visit(final BinaryExpr n, final Object arg) {
         Expression left = cloneNode(n.getLeft(), arg);
         Expression right = cloneNode(n.getRight(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         BinaryExpr r = new BinaryExpr(n.getTokenRange().orElse(null), left, right, n.getOperator());
         r.setComment(comment);
@@ -563,8 +494,7 @@ public Visitable visit(final BinaryExpr n, final Object arg) {
     public Visitable visit(final CastExpr n, final Object arg) {
         Expression expression = cloneNode(n.getExpression(), arg);
         Type type = cloneNode(n.getType(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         CastExpr r = new CastExpr(n.getTokenRange().orElse(null), type, expression);
         r.setComment(comment);
@@ -576,8 +506,7 @@ public Visitable visit(final CastExpr n, final Object arg) {
     @Override
     public Visitable visit(final ClassExpr n, final Object arg) {
         Type type = cloneNode(n.getType(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ClassExpr r = new ClassExpr(n.getTokenRange().orElse(null), type);
         r.setComment(comment);
@@ -591,8 +520,7 @@ public Visitable visit(final ConditionalExpr n, final Object arg) {
         Expression condition = cloneNode(n.getCondition(), arg);
         Expression elseExpr = cloneNode(n.getElseExpr(), arg);
         Expression thenExpr = cloneNode(n.getThenExpr(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ConditionalExpr r = new ConditionalExpr(n.getTokenRange().orElse(null), condition, thenExpr, elseExpr);
         r.setComment(comment);
@@ -604,8 +532,7 @@ public Visitable visit(final ConditionalExpr n, final Object arg) {
     @Override
     public Visitable visit(final EnclosedExpr n, final Object arg) {
         Expression inner = cloneNode(n.getInner(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         EnclosedExpr r = new EnclosedExpr(n.getTokenRange().orElse(null), inner);
         r.setComment(comment);
@@ -619,8 +546,7 @@ public Visitable visit(final FieldAccessExpr n, final Object arg) {
         SimpleName name = cloneNode(n.getName(), arg);
         Expression scope = cloneNode(n.getScope(), arg);
         NodeList<Type> typeArguments = cloneList(n.getTypeArguments().orElse(null), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         FieldAccessExpr r = new FieldAccessExpr(n.getTokenRange().orElse(null), scope, typeArguments, name);
         r.setComment(comment);
@@ -634,8 +560,7 @@ public Visitable visit(final InstanceOfExpr n, final Object arg) {
         Expression expression = cloneNode(n.getExpression(), arg);
         PatternExpr pattern = cloneNode(n.getPattern(), arg);
         ReferenceType type = cloneNode(n.getType(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         InstanceOfExpr r = new InstanceOfExpr(n.getTokenRange().orElse(null), expression, type, pattern);
         r.setComment(comment);
@@ -646,8 +571,7 @@ public Visitable visit(final InstanceOfExpr n, final Object arg) {
 
     @Override
     public Visitable visit(final StringLiteralExpr n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         StringLiteralExpr r = new StringLiteralExpr(n.getTokenRange().orElse(null), n.getValue());
         r.setComment(comment);
@@ -658,8 +582,7 @@ public Visitable visit(final StringLiteralExpr n, final Object arg) {
 
     @Override
     public Visitable visit(final IntegerLiteralExpr n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         IntegerLiteralExpr r = new IntegerLiteralExpr(n.getTokenRange().orElse(null), n.getValue());
         r.setComment(comment);
@@ -670,8 +593,7 @@ public Visitable visit(final IntegerLiteralExpr n, final Object arg) {
 
     @Override
     public Visitable visit(final LongLiteralExpr n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         LongLiteralExpr r = new LongLiteralExpr(n.getTokenRange().orElse(null), n.getValue());
         r.setComment(comment);
@@ -682,8 +604,7 @@ public Visitable visit(final LongLiteralExpr n, final Object arg) {
 
     @Override
     public Visitable visit(final CharLiteralExpr n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         CharLiteralExpr r = new CharLiteralExpr(n.getTokenRange().orElse(null), n.getValue());
         r.setComment(comment);
@@ -694,8 +615,7 @@ public Visitable visit(final CharLiteralExpr n, final Object arg) {
 
     @Override
     public Visitable visit(final DoubleLiteralExpr n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         DoubleLiteralExpr r = new DoubleLiteralExpr(n.getTokenRange().orElse(null), n.getValue());
         r.setComment(comment);
@@ -706,8 +626,7 @@ public Visitable visit(final DoubleLiteralExpr n, final Object arg) {
 
     @Override
     public Visitable visit(final BooleanLiteralExpr n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         BooleanLiteralExpr r = new BooleanLiteralExpr(n.getTokenRange().orElse(null), n.isValue());
         r.setComment(comment);
@@ -718,8 +637,7 @@ public Visitable visit(final BooleanLiteralExpr n, final Object arg) {
 
     @Override
     public Visitable visit(final NullLiteralExpr n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         NullLiteralExpr r = new NullLiteralExpr(n.getTokenRange().orElse(null));
         r.setComment(comment);
@@ -734,8 +652,7 @@ public Visitable visit(final MethodCallExpr n, final Object arg) {
         SimpleName name = cloneNode(n.getName(), arg);
         Expression scope = cloneNode(n.getScope(), arg);
         NodeList<Type> typeArguments = cloneList(n.getTypeArguments().orElse(null), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         MethodCallExpr r = new MethodCallExpr(n.getTokenRange().orElse(null), scope, typeArguments, name, arguments);
         r.setComment(comment);
@@ -747,8 +664,7 @@ public Visitable visit(final MethodCallExpr n, final Object arg) {
     @Override
     public Visitable visit(final NameExpr n, final Object arg) {
         SimpleName name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         NameExpr r = new NameExpr(n.getTokenRange().orElse(null), name);
         r.setComment(comment);
@@ -759,17 +675,14 @@ public Visitable visit(final NameExpr n, final Object arg) {
 
     @Override
     public Visitable visit(final ObjectCreationExpr n, final Object arg) {
-        NodeList<BodyDeclaration<?>> anonymousClassBody =
-                cloneList(n.getAnonymousClassBody().orElse(null), arg);
+        NodeList<BodyDeclaration<?>> anonymousClassBody = cloneList(n.getAnonymousClassBody().orElse(null), arg);
         NodeList<Expression> arguments = cloneList(n.getArguments(), arg);
         Expression scope = cloneNode(n.getScope(), arg);
         ClassOrInterfaceType type = cloneNode(n.getType(), arg);
         NodeList<Type> typeArguments = cloneList(n.getTypeArguments().orElse(null), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        ObjectCreationExpr r = new ObjectCreationExpr(
-                n.getTokenRange().orElse(null), scope, type, typeArguments, arguments, anonymousClassBody);
+        ObjectCreationExpr r = new ObjectCreationExpr(n.getTokenRange().orElse(null), scope, type, typeArguments, arguments, anonymousClassBody);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -779,8 +692,7 @@ public Visitable visit(final ObjectCreationExpr n, final Object arg) {
     @Override
     public Visitable visit(final Name n, final Object arg) {
         Name qualifier = cloneNode(n.getQualifier(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         Name r = new Name(n.getTokenRange().orElse(null), qualifier, n.getIdentifier());
         r.setComment(comment);
@@ -791,8 +703,7 @@ public Visitable visit(final Name n, final Object arg) {
 
     @Override
     public Visitable visit(final SimpleName n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         SimpleName r = new SimpleName(n.getTokenRange().orElse(null), n.getIdentifier());
         r.setComment(comment);
@@ -804,8 +715,7 @@ public Visitable visit(final SimpleName n, final Object arg) {
     @Override
     public Visitable visit(final ThisExpr n, final Object arg) {
         Name typeName = cloneNode(n.getTypeName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ThisExpr r = new ThisExpr(n.getTokenRange().orElse(null), typeName);
         r.setComment(comment);
@@ -817,8 +727,7 @@ public Visitable visit(final ThisExpr n, final Object arg) {
     @Override
     public Visitable visit(final SuperExpr n, final Object arg) {
         Name typeName = cloneNode(n.getTypeName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         SuperExpr r = new SuperExpr(n.getTokenRange().orElse(null), typeName);
         r.setComment(comment);
@@ -830,8 +739,7 @@ public Visitable visit(final SuperExpr n, final Object arg) {
     @Override
     public Visitable visit(final UnaryExpr n, final Object arg) {
         Expression expression = cloneNode(n.getExpression(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         UnaryExpr r = new UnaryExpr(n.getTokenRange().orElse(null), expression, n.getOperator());
         r.setComment(comment);
@@ -845,11 +753,9 @@ public Visitable visit(final VariableDeclarationExpr n, final Object arg) {
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         NodeList<VariableDeclarator> variables = cloneList(n.getVariables(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        VariableDeclarationExpr r =
-                new VariableDeclarationExpr(n.getTokenRange().orElse(null), modifiers, annotations, variables);
+        VariableDeclarationExpr r = new VariableDeclarationExpr(n.getTokenRange().orElse(null), modifiers, annotations, variables);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -859,8 +765,7 @@ public Visitable visit(final VariableDeclarationExpr n, final Object arg) {
     @Override
     public Visitable visit(final MarkerAnnotationExpr n, final Object arg) {
         Name name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         MarkerAnnotationExpr r = new MarkerAnnotationExpr(n.getTokenRange().orElse(null), name);
         r.setComment(comment);
@@ -873,11 +778,9 @@ public Visitable visit(final MarkerAnnotationExpr n, final Object arg) {
     public Visitable visit(final SingleMemberAnnotationExpr n, final Object arg) {
         Expression memberValue = cloneNode(n.getMemberValue(), arg);
         Name name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        SingleMemberAnnotationExpr r =
-                new SingleMemberAnnotationExpr(n.getTokenRange().orElse(null), name, memberValue);
+        SingleMemberAnnotationExpr r = new SingleMemberAnnotationExpr(n.getTokenRange().orElse(null), name, memberValue);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -888,8 +791,7 @@ public Visitable visit(final SingleMemberAnnotationExpr n, final Object arg) {
     public Visitable visit(final NormalAnnotationExpr n, final Object arg) {
         NodeList<MemberValuePair> pairs = cloneList(n.getPairs(), arg);
         Name name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         NormalAnnotationExpr r = new NormalAnnotationExpr(n.getTokenRange().orElse(null), name, pairs);
         r.setComment(comment);
@@ -902,8 +804,7 @@ public Visitable visit(final NormalAnnotationExpr n, final Object arg) {
     public Visitable visit(final MemberValuePair n, final Object arg) {
         SimpleName name = cloneNode(n.getName(), arg);
         Expression value = cloneNode(n.getValue(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         MemberValuePair r = new MemberValuePair(n.getTokenRange().orElse(null), name, value);
         r.setComment(comment);
@@ -917,11 +818,9 @@ public Visitable visit(final ExplicitConstructorInvocationStmt n, final Object a
         NodeList<Expression> arguments = cloneList(n.getArguments(), arg);
         Expression expression = cloneNode(n.getExpression(), arg);
         NodeList<Type> typeArguments = cloneList(n.getTypeArguments().orElse(null), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        ExplicitConstructorInvocationStmt r = new ExplicitConstructorInvocationStmt(
-                n.getTokenRange().orElse(null), typeArguments, n.isThis(), expression, arguments);
+        ExplicitConstructorInvocationStmt r = new ExplicitConstructorInvocationStmt(n.getTokenRange().orElse(null), typeArguments, n.isThis(), expression, arguments);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -931,11 +830,9 @@ public Visitable visit(final ExplicitConstructorInvocationStmt n, final Object a
     @Override
     public Visitable visit(final LocalClassDeclarationStmt n, final Object arg) {
         ClassOrInterfaceDeclaration classDeclaration = cloneNode(n.getClassDeclaration(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        LocalClassDeclarationStmt r =
-                new LocalClassDeclarationStmt(n.getTokenRange().orElse(null), classDeclaration);
+        LocalClassDeclarationStmt r = new LocalClassDeclarationStmt(n.getTokenRange().orElse(null), classDeclaration);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -945,11 +842,9 @@ public Visitable visit(final LocalClassDeclarationStmt n, final Object arg) {
     @Override
     public Visitable visit(final LocalRecordDeclarationStmt n, final Object arg) {
         RecordDeclaration recordDeclaration = cloneNode(n.getRecordDeclaration(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        LocalRecordDeclarationStmt r =
-                new LocalRecordDeclarationStmt(n.getTokenRange().orElse(null), recordDeclaration);
+        LocalRecordDeclarationStmt r = new LocalRecordDeclarationStmt(n.getTokenRange().orElse(null), recordDeclaration);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -960,8 +855,7 @@ public Visitable visit(final LocalRecordDeclarationStmt n, final Object arg) {
     public Visitable visit(final AssertStmt n, final Object arg) {
         Expression check = cloneNode(n.getCheck(), arg);
         Expression message = cloneNode(n.getMessage(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         AssertStmt r = new AssertStmt(n.getTokenRange().orElse(null), check, message);
         r.setComment(comment);
@@ -974,8 +868,7 @@ public Visitable visit(final AssertStmt n, final Object arg) {
     public Visitable visit(final BlockStmt n, final Object arg) {
         NodeList<JmlContract> contracts = cloneList(n.getContracts(), arg);
         NodeList<Statement> statements = cloneList(n.getStatements(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         BlockStmt r = new BlockStmt(n.getTokenRange().orElse(null), statements, contracts);
         r.setComment(comment);
@@ -988,8 +881,7 @@ public Visitable visit(final BlockStmt n, final Object arg) {
     public Visitable visit(final LabeledStmt n, final Object arg) {
         SimpleName label = cloneNode(n.getLabel(), arg);
         Statement statement = cloneNode(n.getStatement(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         LabeledStmt r = new LabeledStmt(n.getTokenRange().orElse(null), label, statement);
         r.setComment(comment);
@@ -1000,8 +892,7 @@ public Visitable visit(final LabeledStmt n, final Object arg) {
 
     @Override
     public Visitable visit(final EmptyStmt n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         EmptyStmt r = new EmptyStmt(n.getTokenRange().orElse(null));
         r.setComment(comment);
@@ -1013,8 +904,7 @@ public Visitable visit(final EmptyStmt n, final Object arg) {
     @Override
     public Visitable visit(final ExpressionStmt n, final Object arg) {
         Expression expression = cloneNode(n.getExpression(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ExpressionStmt r = new ExpressionStmt(n.getTokenRange().orElse(null), expression);
         r.setComment(comment);
@@ -1027,8 +917,7 @@ public Visitable visit(final ExpressionStmt n, final Object arg) {
     public Visitable visit(final SwitchStmt n, final Object arg) {
         NodeList<SwitchEntry> entries = cloneList(n.getEntries(), arg);
         Expression selector = cloneNode(n.getSelector(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         SwitchStmt r = new SwitchStmt(n.getTokenRange().orElse(null), selector, entries);
         r.setComment(comment);
@@ -1042,11 +931,9 @@ public Visitable visit(final SwitchEntry n, final Object arg) {
         Expression guard = cloneNode(n.getGuard(), arg);
         NodeList<Expression> labels = cloneList(n.getLabels(), arg);
         NodeList<Statement> statements = cloneList(n.getStatements(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        SwitchEntry r =
-                new SwitchEntry(n.getTokenRange().orElse(null), labels, n.getType(), statements, n.isDefault(), guard);
+        SwitchEntry r = new SwitchEntry(n.getTokenRange().orElse(null), labels, n.getType(), statements, n.isDefault(), guard);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1056,8 +943,7 @@ public Visitable visit(final SwitchEntry n, final Object arg) {
     @Override
     public Visitable visit(final BreakStmt n, final Object arg) {
         SimpleName label = cloneNode(n.getLabel(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         BreakStmt r = new BreakStmt(n.getTokenRange().orElse(null), label);
         r.setComment(comment);
@@ -1069,8 +955,7 @@ public Visitable visit(final BreakStmt n, final Object arg) {
     @Override
     public Visitable visit(final ReturnStmt n, final Object arg) {
         Expression expression = cloneNode(n.getExpression(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ReturnStmt r = new ReturnStmt(n.getTokenRange().orElse(null), expression);
         r.setComment(comment);
@@ -1084,8 +969,7 @@ public Visitable visit(final IfStmt n, final Object arg) {
         Expression condition = cloneNode(n.getCondition(), arg);
         Statement elseStmt = cloneNode(n.getElseStmt(), arg);
         Statement thenStmt = cloneNode(n.getThenStmt(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         IfStmt r = new IfStmt(n.getTokenRange().orElse(null), condition, thenStmt, elseStmt);
         r.setComment(comment);
@@ -1099,8 +983,7 @@ public Visitable visit(final WhileStmt n, final Object arg) {
         Statement body = cloneNode(n.getBody(), arg);
         Expression condition = cloneNode(n.getCondition(), arg);
         NodeList<JmlContract> contracts = cloneList(n.getContracts(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         WhileStmt r = new WhileStmt(n.getTokenRange().orElse(null), condition, body, contracts);
         r.setComment(comment);
@@ -1112,8 +995,7 @@ public Visitable visit(final WhileStmt n, final Object arg) {
     @Override
     public Visitable visit(final ContinueStmt n, final Object arg) {
         SimpleName label = cloneNode(n.getLabel(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ContinueStmt r = new ContinueStmt(n.getTokenRange().orElse(null), label);
         r.setComment(comment);
@@ -1127,8 +1009,7 @@ public Visitable visit(final DoStmt n, final Object arg) {
         Statement body = cloneNode(n.getBody(), arg);
         Expression condition = cloneNode(n.getCondition(), arg);
         NodeList<JmlContract> contracts = cloneList(n.getContracts(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         DoStmt r = new DoStmt(n.getTokenRange().orElse(null), body, condition, contracts);
         r.setComment(comment);
@@ -1143,8 +1024,7 @@ public Visitable visit(final ForEachStmt n, final Object arg) {
         NodeList<JmlContract> contracts = cloneList(n.getContracts(), arg);
         Expression iterable = cloneNode(n.getIterable(), arg);
         VariableDeclarationExpr variable = cloneNode(n.getVariable(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ForEachStmt r = new ForEachStmt(n.getTokenRange().orElse(null), variable, iterable, body, contracts);
         r.setComment(comment);
@@ -1160,8 +1040,7 @@ public Visitable visit(final ForStmt n, final Object arg) {
         NodeList<JmlContract> contracts = cloneList(n.getContracts(), arg);
         NodeList<Expression> initialization = cloneList(n.getInitialization(), arg);
         NodeList<Expression> update = cloneList(n.getUpdate(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ForStmt r = new ForStmt(n.getTokenRange().orElse(null), initialization, compare, update, body, contracts);
         r.setComment(comment);
@@ -1173,8 +1052,7 @@ public Visitable visit(final ForStmt n, final Object arg) {
     @Override
     public Visitable visit(final ThrowStmt n, final Object arg) {
         Expression expression = cloneNode(n.getExpression(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ThrowStmt r = new ThrowStmt(n.getTokenRange().orElse(null), expression);
         r.setComment(comment);
@@ -1187,8 +1065,7 @@ public Visitable visit(final ThrowStmt n, final Object arg) {
     public Visitable visit(final SynchronizedStmt n, final Object arg) {
         BlockStmt body = cloneNode(n.getBody(), arg);
         Expression expression = cloneNode(n.getExpression(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         SynchronizedStmt r = new SynchronizedStmt(n.getTokenRange().orElse(null), expression, body);
         r.setComment(comment);
@@ -1203,8 +1080,7 @@ public Visitable visit(final TryStmt n, final Object arg) {
         BlockStmt finallyBlock = cloneNode(n.getFinallyBlock(), arg);
         NodeList<Expression> resources = cloneList(n.getResources(), arg);
         BlockStmt tryBlock = cloneNode(n.getTryBlock(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         TryStmt r = new TryStmt(n.getTokenRange().orElse(null), resources, tryBlock, catchClauses, finallyBlock);
         r.setComment(comment);
@@ -1217,8 +1093,7 @@ public Visitable visit(final TryStmt n, final Object arg) {
     public Visitable visit(final CatchClause n, final Object arg) {
         BlockStmt body = cloneNode(n.getBody(), arg);
         Parameter parameter = cloneNode(n.getParameter(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         CatchClause r = new CatchClause(n.getTokenRange().orElse(null), parameter, body);
         r.setComment(comment);
@@ -1232,8 +1107,7 @@ public Visitable visit(final LambdaExpr n, final Object arg) {
         Statement body = cloneNode(n.getBody(), arg);
         NodeList<JmlContract> contracts = cloneList(n.getContracts(), arg);
         NodeList<Parameter> parameters = cloneList(n.getParameters(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         LambdaExpr r = new LambdaExpr(n.getTokenRange().orElse(null), parameters, body, n.isEnclosingParameters());
         r.setComment(comment);
@@ -1246,11 +1120,9 @@ public Visitable visit(final LambdaExpr n, final Object arg) {
     public Visitable visit(final MethodReferenceExpr n, final Object arg) {
         Expression scope = cloneNode(n.getScope(), arg);
         NodeList<Type> typeArguments = cloneList(n.getTypeArguments().orElse(null), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        MethodReferenceExpr r =
-                new MethodReferenceExpr(n.getTokenRange().orElse(null), scope, typeArguments, n.getIdentifier());
+        MethodReferenceExpr r = new MethodReferenceExpr(n.getTokenRange().orElse(null), scope, typeArguments, n.getIdentifier());
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1260,8 +1132,7 @@ public Visitable visit(final MethodReferenceExpr n, final Object arg) {
     @Override
     public Visitable visit(final TypeExpr n, final Object arg) {
         Type type = cloneNode(n.getType(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         TypeExpr r = new TypeExpr(n.getTokenRange().orElse(null), type);
         r.setComment(comment);
@@ -1285,11 +1156,9 @@ public Visitable visit(NodeList n, Object arg) {
     @Override
     public Node visit(final ImportDeclaration n, final Object arg) {
         Name name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        ImportDeclaration r = new ImportDeclaration(
-                n.getTokenRange().orElse(null), name, n.isStatic(), n.isAsterisk(), n.isModule(), n.isJmlModel());
+        ImportDeclaration r = new ImportDeclaration(n.getTokenRange().orElse(null), name, n.isStatic(), n.isAsterisk(), n.isModule(), n.isJmlModel());
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1301,11 +1170,9 @@ public Visitable visit(final ModuleDeclaration n, final Object arg) {
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
         NodeList<ModuleDirective> directives = cloneList(n.getDirectives(), arg);
         Name name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        ModuleDeclaration r =
-                new ModuleDeclaration(n.getTokenRange().orElse(null), annotations, name, n.isOpen(), directives);
+        ModuleDeclaration r = new ModuleDeclaration(n.getTokenRange().orElse(null), annotations, name, n.isOpen(), directives);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1316,11 +1183,9 @@ public Visitable visit(final ModuleDeclaration n, final Object arg) {
     public Visitable visit(final ModuleRequiresDirective n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         Name name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        ModuleRequiresDirective r =
-                new ModuleRequiresDirective(n.getTokenRange().orElse(null), modifiers, name);
+        ModuleRequiresDirective r = new ModuleRequiresDirective(n.getTokenRange().orElse(null), modifiers, name);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1362,8 +1227,7 @@ private <N extends Node> NodeList<N> cloneList(NodeList<N> list, Object arg) {
     public Visitable visit(final ModuleExportsDirective n, final Object arg) {
         NodeList<Name> moduleNames = cloneList(n.getModuleNames(), arg);
         Name name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ModuleExportsDirective r = new ModuleExportsDirective(n.getTokenRange().orElse(null), name, moduleNames);
         r.setComment(comment);
@@ -1376,11 +1240,9 @@ public Visitable visit(final ModuleExportsDirective n, final Object arg) {
     public Visitable visit(final ModuleProvidesDirective n, final Object arg) {
         Name name = cloneNode(n.getName(), arg);
         NodeList<Name> with = cloneList(n.getWith(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        ModuleProvidesDirective r =
-                new ModuleProvidesDirective(n.getTokenRange().orElse(null), name, with);
+        ModuleProvidesDirective r = new ModuleProvidesDirective(n.getTokenRange().orElse(null), name, with);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1390,8 +1252,7 @@ public Visitable visit(final ModuleProvidesDirective n, final Object arg) {
     @Override
     public Visitable visit(final ModuleUsesDirective n, final Object arg) {
         Name name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ModuleUsesDirective r = new ModuleUsesDirective(n.getTokenRange().orElse(null), name);
         r.setComment(comment);
@@ -1404,8 +1265,7 @@ public Visitable visit(final ModuleUsesDirective n, final Object arg) {
     public Visitable visit(final ModuleOpensDirective n, final Object arg) {
         NodeList<Name> moduleNames = cloneList(n.getModuleNames(), arg);
         Name name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ModuleOpensDirective r = new ModuleOpensDirective(n.getTokenRange().orElse(null), name, moduleNames);
         r.setComment(comment);
@@ -1416,8 +1276,7 @@ public Visitable visit(final ModuleOpensDirective n, final Object arg) {
 
     @Override
     public Visitable visit(final UnparsableStmt n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         UnparsableStmt r = new UnparsableStmt(n.getTokenRange().orElse(null));
         r.setComment(comment);
@@ -1431,8 +1290,7 @@ public Visitable visit(final ReceiverParameter n, final Object arg) {
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
         Name name = cloneNode(n.getName(), arg);
         Type type = cloneNode(n.getType(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         ReceiverParameter r = new ReceiverParameter(n.getTokenRange().orElse(null), annotations, type, name);
         r.setComment(comment);
@@ -1444,8 +1302,7 @@ public Visitable visit(final ReceiverParameter n, final Object arg) {
     @Override
     public Visitable visit(final VarType n, final Object arg) {
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         VarType r = new VarType(n.getTokenRange().orElse(null));
         r.setComment(comment);
@@ -1456,8 +1313,7 @@ public Visitable visit(final VarType n, final Object arg) {
 
     @Override
     public Visitable visit(final Modifier n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         Modifier r = new Modifier(n.getTokenRange().orElse(null), n.getKeyword());
         r.setComment(comment);
@@ -1470,8 +1326,7 @@ public Visitable visit(final Modifier n, final Object arg) {
     public Visitable visit(final SwitchExpr n, final Object arg) {
         NodeList<SwitchEntry> entries = cloneList(n.getEntries(), arg);
         Expression selector = cloneNode(n.getSelector(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         SwitchExpr r = new SwitchExpr(n.getTokenRange().orElse(null), selector, entries);
         r.setComment(comment);
@@ -1489,8 +1344,7 @@ private void copyData(Node source, Node destination) {
     @Override
     public Visitable visit(final YieldStmt n, final Object arg) {
         Expression expression = cloneNode(n.getExpression(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         YieldStmt r = new YieldStmt(n.getTokenRange().orElse(null), expression);
         r.setComment(comment);
@@ -1501,8 +1355,7 @@ public Visitable visit(final YieldStmt n, final Object arg) {
 
     @Override
     public Visitable visit(final TextBlockLiteralExpr n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         TextBlockLiteralExpr r = new TextBlockLiteralExpr(n.getTokenRange().orElse(null), n.getValue());
         r.setComment(comment);
@@ -1516,8 +1369,7 @@ public Visitable visit(final TypePatternExpr n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
         Type type = cloneNode(n.getType(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         TypePatternExpr r = new TypePatternExpr(n.getTokenRange().orElse(null), modifiers, type, name);
         r.setComment(comment);
@@ -1530,11 +1382,9 @@ public Visitable visit(final TypePatternExpr n, final Object arg) {
     public Visitable visit(final JmlQuantifiedExpr n, final Object arg) {
         NodeList<Expression> expressions = cloneList(n.getExpressions(), arg);
         NodeList<Parameter> variables = cloneList(n.getVariables(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        JmlQuantifiedExpr r =
-                new JmlQuantifiedExpr(n.getTokenRange().orElse(null), n.getBinder(), variables, expressions);
+        JmlQuantifiedExpr r = new JmlQuantifiedExpr(n.getTokenRange().orElse(null), n.getBinder(), variables, expressions);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1542,14 +1392,13 @@ public Visitable visit(final JmlQuantifiedExpr n, final Object arg) {
     }
 
     @Override
-    public Visitable visit(final JmlClauseLabel n, final Object arg) {
-        Expression expr = cloneNode(n.getExpr(), arg);
+    public Visitable visit(final JmlLabledClause n, final Object arg) {
+        Expression expression = cloneNode(n.getExpression(), arg);
         SimpleName label = cloneNode(n.getLabel(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        JmlClauseLabel r = new JmlClauseLabel(n.getTokenRange().orElse(null), n.getKind(), label, expr);
+        JmlLabledClause r = new JmlLabledClause(n.getTokenRange().orElse(null), n.getKind(), label, expression);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1560,8 +1409,7 @@ public Visitable visit(final JmlClauseLabel n, final Object arg) {
     public Visitable visit(final JmlExpressionStmt n, final Object arg) {
         Expression expression = cloneNode(n.getExpression(), arg);
         NodeList<SimpleName> jmlTags = cloneList(n.getJmlTags(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlExpressionStmt r = new JmlExpressionStmt(n.getTokenRange().orElse(null), jmlTags, n.getKind(), expression);
         r.setComment(comment);
@@ -1574,8 +1422,7 @@ public Visitable visit(final JmlExpressionStmt n, final Object arg) {
     public Visitable visit(final JmlLabelExpr n, final Object arg) {
         Expression expression = cloneNode(n.getExpression(), arg);
         SimpleName label = cloneNode(n.getLabel(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlLabelExpr r = new JmlLabelExpr(n.getTokenRange().orElse(null), n.getKind(), label, expression);
         r.setComment(comment);
@@ -1588,8 +1435,7 @@ public Visitable visit(final JmlLabelExpr n, final Object arg) {
     public Visitable visit(final JmlLetExpr n, final Object arg) {
         Expression body = cloneNode(n.getBody(), arg);
         VariableDeclarationExpr variables = cloneNode(n.getVariables(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlLetExpr r = new JmlLetExpr(n.getTokenRange().orElse(null), variables, body);
         r.setComment(comment);
@@ -1601,8 +1447,7 @@ public Visitable visit(final JmlLetExpr n, final Object arg) {
     @Override
     public Visitable visit(final JmlMultiCompareExpr n, final Object arg) {
         NodeList<Expression> expressions = cloneList(n.getExpressions(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlMultiCompareExpr r = new JmlMultiCompareExpr(n.getTokenRange().orElse(null), expressions, n.getOperators());
         r.setComment(comment);
@@ -1616,11 +1461,9 @@ public Visitable visit(final JmlSimpleExprClause n, final Object arg) {
         Expression expression = cloneNode(n.getExpression(), arg);
         NodeList<SimpleName> heaps = cloneList(n.getHeaps().orElse(null), arg);
         SimpleName name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        JmlSimpleExprClause r =
-                new JmlSimpleExprClause(n.getTokenRange().orElse(null), n.getKind(), name, heaps, expression);
+        JmlSimpleExprClause r = new JmlSimpleExprClause(n.getTokenRange().orElse(null), n.getKind(), name, heaps, expression);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1632,8 +1475,7 @@ public Visitable visit(final JmlSignalsClause n, final Object arg) {
         Expression expression = cloneNode(n.getExpression(), arg);
         Parameter parameter = cloneNode(n.getParameter(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlSignalsClause r = new JmlSignalsClause(n.getTokenRange().orElse(null), name, parameter, expression);
         r.setComment(comment);
@@ -1646,8 +1488,7 @@ public Visitable visit(final JmlSignalsClause n, final Object arg) {
     public Visitable visit(final JmlSignalsOnlyClause n, final Object arg) {
         NodeList<Type> types = cloneList(n.getTypes(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlSignalsOnlyClause r = new JmlSignalsOnlyClause(n.getTokenRange().orElse(null), types);
         r.setComment(comment);
@@ -1659,8 +1500,7 @@ public Visitable visit(final JmlSignalsOnlyClause n, final Object arg) {
     @Override
     public Visitable visit(final JmlUnreachableStmt n, final Object arg) {
         NodeList<SimpleName> jmlTags = cloneList(n.getJmlTags(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlUnreachableStmt r = new JmlUnreachableStmt(n.getTokenRange().orElse(null), jmlTags);
         r.setComment(comment);
@@ -1673,8 +1513,7 @@ public Visitable visit(final JmlUnreachableStmt n, final Object arg) {
     public Visitable visit(final JmlCallableClause n, final Object arg) {
         NodeList<JmlMethodSignature> methodSignatures = cloneList(n.getMethodSignatures(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlCallableClause r = new JmlCallableClause(n.getTokenRange().orElse(null), name, methodSignatures);
         r.setComment(comment);
@@ -1687,8 +1526,7 @@ public Visitable visit(final JmlCallableClause n, final Object arg) {
     public Visitable visit(final JmlForallClause n, final Object arg) {
         NodeList<Parameter> boundedVariables = cloneList(n.getBoundedVariables(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlForallClause r = new JmlForallClause(n.getTokenRange().orElse(null), boundedVariables);
         r.setComment(comment);
@@ -1700,8 +1538,7 @@ public Visitable visit(final JmlForallClause n, final Object arg) {
     @Override
     public Visitable visit(final JmlRefiningStmt n, final Object arg) {
         NodeList<SimpleName> jmlTags = cloneList(n.getJmlTags(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlRefiningStmt r = new JmlRefiningStmt(n.getTokenRange().orElse(null), jmlTags);
         r.setComment(comment);
@@ -1711,14 +1548,13 @@ public Visitable visit(final JmlRefiningStmt n, final Object arg) {
     }
 
     @Override
-    public Visitable visit(final JmlClauseIf n, final Object arg) {
+    public Visitable visit(final JmlConditionalClause n, final Object arg) {
         Expression condition = cloneNode(n.getCondition(), arg);
-        Expression then = cloneNode(n.getThen(), arg);
+        Expression expression = cloneNode(n.getExpression(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        JmlClauseIf r = new JmlClauseIf(n.getTokenRange().orElse(null), name, condition, n.getKind(), then);
+        JmlConditionalClause r = new JmlConditionalClause(n.getTokenRange().orElse(null), name, condition, n.getKind(), expression);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1733,11 +1569,9 @@ public Visitable visit(final JmlClassExprDeclaration n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        JmlClassExprDeclaration r =
-                new JmlClassExprDeclaration(n.getTokenRange().orElse(null), jmlTags, modifiers, kind, name, invariant);
+        JmlClassExprDeclaration r = new JmlClassExprDeclaration(n.getTokenRange().orElse(null), jmlTags, modifiers, kind, name, invariant);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1752,11 +1586,9 @@ public Visitable visit(final JmlClassAccessibleDeclaration n, final Object arg)
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         Expression variable = cloneNode(n.getVariable(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        JmlClassAccessibleDeclaration r = new JmlClassAccessibleDeclaration(
-                n.getTokenRange().orElse(null), jmlTags, modifiers, variable, expressions, measuredBy);
+        JmlClassAccessibleDeclaration r = new JmlClassAccessibleDeclaration(n.getTokenRange().orElse(null), jmlTags, modifiers, variable, expressions, measuredBy);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1770,11 +1602,9 @@ public Visitable visit(final JmlRepresentsDeclaration n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         Name name = cloneNode(n.getName(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        JmlRepresentsDeclaration r =
-                new JmlRepresentsDeclaration(n.getTokenRange().orElse(null), jmlTags, modifiers, name, expr);
+        JmlRepresentsDeclaration r = new JmlRepresentsDeclaration(n.getTokenRange().orElse(null), jmlTags, modifiers, name, expr);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1788,18 +1618,9 @@ public Visitable visit(final JmlContract n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
         NodeList<JmlContract> subContracts = cloneList(n.getSubContracts(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        JmlContract r = new JmlContract(
-                n.getTokenRange().orElse(null),
-                jmlTags,
-                n.getType(),
-                n.getBehavior(),
-                name,
-                modifiers,
-                clauses,
-                subContracts);
+        JmlContract r = new JmlContract(n.getTokenRange().orElse(null), jmlTags, n.getType(), n.getBehavior(), name, modifiers, clauses, subContracts);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1810,11 +1631,9 @@ public Visitable visit(final JmlContract n, final Object arg) {
     public Visitable visit(final JmlSetComprehensionExpr n, final Object arg) {
         VariableDeclarator binding = cloneNode(n.getBinding(), arg);
         Expression predicate = cloneNode(n.getPredicate(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        JmlSetComprehensionExpr r =
-                new JmlSetComprehensionExpr(n.getTokenRange().orElse(null), binding, predicate);
+        JmlSetComprehensionExpr r = new JmlSetComprehensionExpr(n.getTokenRange().orElse(null), binding, predicate);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1825,8 +1644,7 @@ public Visitable visit(final JmlSetComprehensionExpr n, final Object arg) {
     public Visitable visit(final JmlGhostStmt n, final Object arg) {
         NodeList<SimpleName> jmlTags = cloneList(n.getJmlTags(), arg);
         Statement statement = cloneNode(n.getStatement(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlGhostStmt r = new JmlGhostStmt(n.getTokenRange().orElse(null), jmlTags, statement);
         r.setComment(comment);
@@ -1845,19 +1663,9 @@ public Visitable visit(final RecordDeclaration n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        RecordDeclaration r = new RecordDeclaration(
-                n.getTokenRange().orElse(null),
-                modifiers,
-                annotations,
-                name,
-                parameters,
-                typeParameters,
-                implementedTypes,
-                members,
-                receiverParameter);
+        RecordDeclaration r = new RecordDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, name, parameters, typeParameters, implementedTypes, members, receiverParameter);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1872,11 +1680,9 @@ public Visitable visit(final CompactConstructorDeclaration n, final Object arg)
         NodeList<ReferenceType> thrownExceptions = cloneList(n.getThrownExceptions(), arg);
         NodeList<TypeParameter> typeParameters = cloneList(n.getTypeParameters(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        CompactConstructorDeclaration r = new CompactConstructorDeclaration(
-                n.getTokenRange().orElse(null), modifiers, annotations, typeParameters, name, thrownExceptions, body);
+        CompactConstructorDeclaration r = new CompactConstructorDeclaration(n.getTokenRange().orElse(null), modifiers, annotations, typeParameters, name, thrownExceptions, body);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1888,8 +1694,7 @@ public Visitable visit(final RecordPatternExpr n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         NodeList<ComponentPatternExpr> patternList = cloneList(n.getPatternList(), arg);
         Type type = cloneNode(n.getType(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         RecordPatternExpr r = new RecordPatternExpr(n.getTokenRange().orElse(null), modifiers, type, patternList);
         r.setComment(comment);
@@ -1901,8 +1706,7 @@ public Visitable visit(final RecordPatternExpr n, final Object arg) {
     @Override
     public Visitable visit(final MatchAllPatternExpr n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         MatchAllPatternExpr r = new MatchAllPatternExpr(n.getTokenRange().orElse(null), modifiers);
         r.setComment(comment);
@@ -1913,8 +1717,7 @@ public Visitable visit(final MatchAllPatternExpr n, final Object arg) {
 
     @Override
     public Visitable visit(final MarkdownComment n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         MarkdownComment r = new MarkdownComment(n.getTokenRange().orElse(null), n.getContent());
         r.setComment(comment);
@@ -1927,8 +1730,7 @@ public Visitable visit(final MarkdownComment n, final Object arg) {
     public Visitable visit(final KeyCcatchBreak n, final Object arg) {
         BlockStmt block = cloneNode(n.getBlock(), arg);
         Name label = cloneNode(n.getLabel(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyCcatchBreak r = new KeyCcatchBreak(n.getTokenRange().orElse(null), label, block);
         r.setComment(comment);
@@ -1941,8 +1743,7 @@ public Visitable visit(final KeyCcatchBreak n, final Object arg) {
     public Visitable visit(final KeyCcatchContinue n, final Object arg) {
         BlockStmt block = cloneNode(n.getBlock(), arg);
         Name label = cloneNode(n.getLabel(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyCcatchContinue r = new KeyCcatchContinue(n.getTokenRange().orElse(null), label, block);
         r.setComment(comment);
@@ -1955,8 +1756,7 @@ public Visitable visit(final KeyCcatchContinue n, final Object arg) {
     public Visitable visit(final KeyCcatchParameter n, final Object arg) {
         BlockStmt block = cloneNode(n.getBlock(), arg);
         Parameter parameter = cloneNode(n.getParameter(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyCcatchParameter r = new KeyCcatchParameter(n.getTokenRange().orElse(null), parameter, block);
         r.setComment(comment);
@@ -1969,8 +1769,7 @@ public Visitable visit(final KeyCcatchParameter n, final Object arg) {
     public Visitable visit(final KeyCcatchReturn n, final Object arg) {
         BlockStmt block = cloneNode(n.getBlock(), arg);
         Parameter parameter = cloneNode(n.getParameter(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyCcatchReturn r = new KeyCcatchReturn(n.getTokenRange().orElse(null), parameter, block);
         r.setComment(comment);
@@ -1980,13 +1779,12 @@ public Visitable visit(final KeyCcatchReturn n, final Object arg) {
     }
 
     @Override
-    public Visitable visit(final KeyCatchAllStatement n, final Object arg) {
+    public Visitable visit(final KeyCatchAllStmt n, final Object arg) {
         BlockStmt block = cloneNode(n.getBlock(), arg);
         Name label = cloneNode(n.getLabel(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        KeyCatchAllStatement r = new KeyCatchAllStatement(n.getTokenRange().orElse(null), label, block);
+        KeyCatchAllStmt r = new KeyCatchAllStmt(n.getTokenRange().orElse(null), label, block);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -1997,8 +1795,7 @@ public Visitable visit(final KeyCatchAllStatement n, final Object arg) {
     public Visitable visit(final KeyEscapeExpression n, final Object arg) {
         NodeList<Expression> arguments = cloneList(n.getArguments().orElse(null), arg);
         Name callee = cloneNode(n.getCallee(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyEscapeExpression r = new KeyEscapeExpression(n.getTokenRange().orElse(null), callee, arguments);
         r.setComment(comment);
@@ -2008,13 +1805,12 @@ public Visitable visit(final KeyEscapeExpression n, final Object arg) {
     }
 
     @Override
-    public Visitable visit(final KeyExecStatement n, final Object arg) {
+    public Visitable visit(final KeyExecStmt n, final Object arg) {
         NodeList<KeyCcatchBranch> branches = cloneList(n.getBranches(), arg);
         BlockStmt execBlock = cloneNode(n.getExecBlock(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        KeyExecStatement r = new KeyExecStatement(n.getTokenRange().orElse(null), execBlock, branches);
+        KeyExecStmt r = new KeyExecStmt(n.getTokenRange().orElse(null), execBlock, branches);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -2026,8 +1822,7 @@ public Visitable visit(final KeyExecutionContext n, final Object arg) {
         Type context = cloneNode(n.getContext(), arg);
         Expression instance = cloneNode(n.getInstance(), arg);
         KeyMethodSignature signature = cloneNode(n.getSignature(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyExecutionContext r = new KeyExecutionContext(n.getTokenRange().orElse(null), context, signature, instance);
         r.setComment(comment);
@@ -2037,13 +1832,12 @@ public Visitable visit(final KeyExecutionContext n, final Object arg) {
     }
 
     @Override
-    public Visitable visit(final KeyLoopScopeBlock n, final Object arg) {
+    public Visitable visit(final KeyLoopScopeBlockStmt n, final Object arg) {
         BlockStmt block = cloneNode(n.getBlock(), arg);
         Expression indexPV = cloneNode(n.getIndexPV(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        KeyLoopScopeBlock r = new KeyLoopScopeBlock(n.getTokenRange().orElse(null), indexPV, block);
+        KeyLoopScopeBlockStmt r = new KeyLoopScopeBlockStmt(n.getTokenRange().orElse(null), indexPV, block);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -2051,12 +1845,11 @@ public Visitable visit(final KeyLoopScopeBlock n, final Object arg) {
     }
 
     @Override
-    public Visitable visit(final KeyMergePointStatement n, final Object arg) {
+    public Visitable visit(final KeyMergePointStmt n, final Object arg) {
         Expression expr = cloneNode(n.getExpr(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        KeyMergePointStatement r = new KeyMergePointStatement(n.getTokenRange().orElse(null), expr);
+        KeyMergePointStmt r = new KeyMergePointStmt(n.getTokenRange().orElse(null), expr);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -2068,8 +1861,7 @@ public Visitable visit(final KeyMethodBodyStatement n, final Object arg) {
         Expression expr = cloneNode(n.getExpr(), arg);
         Name name = cloneNode(n.getName(), arg);
         Type source = cloneNode(n.getSource(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyMethodBodyStatement r = new KeyMethodBodyStatement(n.getTokenRange().orElse(null), name, expr, source);
         r.setComment(comment);
@@ -2079,14 +1871,13 @@ public Visitable visit(final KeyMethodBodyStatement n, final Object arg) {
     }
 
     @Override
-    public Visitable visit(final KeyMethodCallStatement n, final Object arg) {
+    public Visitable visit(final KeyMethodCallStmt n, final Object arg) {
         BlockStmt block = cloneNode(n.getBlock(), arg);
         KeyAbstractExecutionContext context = cloneNode(n.getContext(), arg);
         Name name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        KeyMethodCallStatement r = new KeyMethodCallStatement(n.getTokenRange().orElse(null), name, context, block);
+        KeyMethodCallStmt r = new KeyMethodCallStmt(n.getTokenRange().orElse(null), name, context, block);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -2097,8 +1888,7 @@ public Visitable visit(final KeyMethodCallStatement n, final Object arg) {
     public Visitable visit(final KeyMethodSignature n, final Object arg) {
         Name name = cloneNode(n.getName(), arg);
         NodeList<Type> paramTypes = cloneList(n.getParamTypes(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyMethodSignature r = new KeyMethodSignature(n.getTokenRange().orElse(null), name, paramTypes);
         r.setComment(comment);
@@ -2108,26 +1898,10 @@ public Visitable visit(final KeyMethodSignature n, final Object arg) {
     }
 
     @Override
-    public Visitable visit(final KeyRangeExpression n, final Object arg) {
-        Expression lower = cloneNode(n.getLower(), arg);
-        Expression upper = cloneNode(n.getUpper(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+    public Visitable visit(final KeyTransactionStmt n, final Object arg) {
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        KeyRangeExpression r = new KeyRangeExpression(n.getTokenRange().orElse(null), lower, upper);
-        r.setComment(comment);
-        n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
-        copyData(n, r);
-        return r;
-    }
-
-    @Override
-    public Visitable visit(final KeyTransactionStatement n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
-        Comment comment = cloneNode(n.getComment(), arg);
-        KeyTransactionStatement r =
-                new KeyTransactionStatement(n.getTokenRange().orElse(null), n.getType());
+        KeyTransactionStmt r = new KeyTransactionStmt(n.getTokenRange().orElse(null), n.getType());
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -2141,11 +1915,9 @@ public Visitable visit(final KeyContextStatementBlock n, final Object arg) {
         KeyMethodSignatureSV signature = cloneNode(n.getSignature(), arg);
         NodeList<Statement> statements = cloneList(n.getStatements(), arg);
         KeyTypeSV tr = cloneNode(n.getTr(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        KeyContextStatementBlock r = new KeyContextStatementBlock(
-                n.getTokenRange().orElse(null), statements, context, tr, signature, expression);
+        KeyContextStatementBlock r = new KeyContextStatementBlock(n.getTokenRange().orElse(null), statements, context, tr, signature, expression);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -2154,8 +1926,7 @@ public Visitable visit(final KeyContextStatementBlock n, final Object arg) {
 
     @Override
     public Visitable visit(final KeyExecCtxtSV n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyExecCtxtSV r = new KeyExecCtxtSV(n.getTokenRange().orElse(null), n.getText());
         r.setComment(comment);
@@ -2166,8 +1937,7 @@ public Visitable visit(final KeyExecCtxtSV n, final Object arg) {
 
     @Override
     public Visitable visit(final KeyExpressionSV n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyExpressionSV r = new KeyExpressionSV(n.getTokenRange().orElse(null), n.getText());
         r.setComment(comment);
@@ -2178,8 +1948,7 @@ public Visitable visit(final KeyExpressionSV n, final Object arg) {
 
     @Override
     public Visitable visit(final KeyJumpLabelSV n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyJumpLabelSV r = new KeyJumpLabelSV(n.getTokenRange().orElse(null), n.getText());
         r.setComment(comment);
@@ -2191,11 +1960,9 @@ public Visitable visit(final KeyJumpLabelSV n, final Object arg) {
     @Override
     public Visitable visit(final KeyMetaConstructExpression n, final Object arg) {
         Expression child = cloneNode(n.getChild(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        KeyMetaConstructExpression r =
-                new KeyMetaConstructExpression(n.getTokenRange().orElse(null), n.getText(), child);
+        KeyMetaConstructExpression r = new KeyMetaConstructExpression(n.getTokenRange().orElse(null), n.getText(), child);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -2206,8 +1973,7 @@ public Visitable visit(final KeyMetaConstructExpression n, final Object arg) {
     public Visitable visit(final KeyMetaConstruct n, final Object arg) {
         Node child = cloneNode(n.getChild(), arg);
         NodeList<Node> schemas = cloneList(n.getSchemas(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyMetaConstruct r = new KeyMetaConstruct(n.getTokenRange().orElse(null), n.getKind(), child, schemas);
         r.setComment(comment);
@@ -2220,11 +1986,9 @@ public Visitable visit(final KeyMetaConstruct n, final Object arg) {
     public Visitable visit(final KeyMetaConstructType n, final Object arg) {
         Expression expr = cloneNode(n.getExpr(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        KeyMetaConstructType r =
-                new KeyMetaConstructType(n.getTokenRange().orElse(null), annotations, n.getKind(), expr);
+        KeyMetaConstructType r = new KeyMetaConstructType(n.getTokenRange().orElse(null), annotations, n.getKind(), expr);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -2233,8 +1997,7 @@ public Visitable visit(final KeyMetaConstructType n, final Object arg) {
 
     @Override
     public Visitable visit(final KeyMethodSignatureSV n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyMethodSignatureSV r = new KeyMethodSignatureSV(n.getTokenRange().orElse(null), n.getText());
         r.setComment(comment);
@@ -2246,8 +2009,7 @@ public Visitable visit(final KeyMethodSignatureSV n, final Object arg) {
     @Override
     public Visitable visit(final KeyPassiveExpression n, final Object arg) {
         Expression expr = cloneNode(n.getExpr(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyPassiveExpression r = new KeyPassiveExpression(n.getTokenRange().orElse(null), expr);
         r.setComment(comment);
@@ -2258,8 +2020,7 @@ public Visitable visit(final KeyPassiveExpression n, final Object arg) {
 
     @Override
     public Visitable visit(final KeyProgramVariableSV n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyProgramVariableSV r = new KeyProgramVariableSV(n.getTokenRange().orElse(null), n.getText());
         r.setComment(comment);
@@ -2270,8 +2031,7 @@ public Visitable visit(final KeyProgramVariableSV n, final Object arg) {
 
     @Override
     public Visitable visit(final KeyStatementSV n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyStatementSV r = new KeyStatementSV(n.getTokenRange().orElse(null), n.getText());
         r.setComment(comment);
@@ -2283,8 +2043,7 @@ public Visitable visit(final KeyStatementSV n, final Object arg) {
     @Override
     public Visitable visit(final KeyTypeSV n, final Object arg) {
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyTypeSV r = new KeyTypeSV(n.getTokenRange().orElse(null), n.getText());
         r.setComment(comment);
@@ -2295,8 +2054,7 @@ public Visitable visit(final KeyTypeSV n, final Object arg) {
 
     @Override
     public Visitable visit(final KeyCcatchSV n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyCcatchSV r = new KeyCcatchSV(n.getTokenRange().orElse(null), n.getText());
         r.setComment(comment);
@@ -2307,8 +2065,7 @@ public Visitable visit(final KeyCcatchSV n, final Object arg) {
 
     @Override
     public Visitable visit(final KeyExecutionContextSV n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         KeyExecutionContextSV r = new KeyExecutionContextSV(n.getTokenRange().orElse(null), n.getText());
         r.setComment(comment);
@@ -2323,11 +2080,9 @@ public Visitable visit(final JmlMethodDeclaration n, final Object arg) {
         NodeList<SimpleName> jmlTags = cloneList(n.getJmlTags(), arg);
         MethodDeclaration methodDeclaration = cloneNode(n.getMethodDeclaration(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        JmlMethodDeclaration r =
-                new JmlMethodDeclaration(n.getTokenRange().orElse(null), jmlTags, methodDeclaration, contract);
+        JmlMethodDeclaration r = new JmlMethodDeclaration(n.getTokenRange().orElse(null), jmlTags, methodDeclaration, contract);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -2339,8 +2094,7 @@ public Visitable visit(final JmlBinaryInfixExpr n, final Object arg) {
         Expression left = cloneNode(n.getLeft(), arg);
         SimpleName operator = cloneNode(n.getOperator(), arg);
         Expression right = cloneNode(n.getRight(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlBinaryInfixExpr r = new JmlBinaryInfixExpr(n.getTokenRange().orElse(null), left, right, operator);
         r.setComment(comment);
@@ -2353,8 +2107,7 @@ public Visitable visit(final JmlBinaryInfixExpr n, final Object arg) {
     public Visitable visit(final JmlDocDeclaration n, final Object arg) {
         NodeList<JmlDoc> jmlComments = cloneList(n.getJmlComments(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlDocDeclaration r = new JmlDocDeclaration(n.getTokenRange().orElse(null), jmlComments);
         r.setComment(comment);
@@ -2366,8 +2119,7 @@ public Visitable visit(final JmlDocDeclaration n, final Object arg) {
     @Override
     public Visitable visit(final JmlDocStmt n, final Object arg) {
         NodeList<JmlDoc> jmlComments = cloneList(n.getJmlComments(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlDocStmt r = new JmlDocStmt(n.getTokenRange().orElse(null), jmlComments);
         r.setComment(comment);
@@ -2376,18 +2128,6 @@ public Visitable visit(final JmlDocStmt n, final Object arg) {
         return r;
     }
 
-    @Override
-    public Visitable visit(final JmlDoc n, final Object arg) {
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
-        Comment comment = cloneNode(n.getComment(), arg);
-        JmlDoc r = new JmlDoc(n.getTokenRange().orElse(null), n.getContent());
-        r.setComment(comment);
-        n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
-        copyData(n, r);
-        return r;
-    }
-
     @Override
     public Visitable visit(final JmlDocType n, final Object arg) {
         NodeList<JmlDoc> jmlComments = cloneList(n.getJmlComments(), arg);
@@ -2395,11 +2135,9 @@ public Visitable visit(final JmlDocType n, final Object arg) {
         NodeList<Modifier> modifiers = cloneList(n.getModifiers(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        JmlDocType r =
-                new JmlDocType(n.getTokenRange().orElse(null), modifiers, annotations, name, members, jmlComments);
+        JmlDocType r = new JmlDocType(n.getTokenRange().orElse(null), modifiers, annotations, name, members, jmlComments);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -2411,8 +2149,7 @@ public Visitable visit(final JmlFieldDeclaration n, final Object arg) {
         FieldDeclaration decl = cloneNode(n.getDecl(), arg);
         NodeList<SimpleName> jmlTags = cloneList(n.getJmlTags(), arg);
         NodeList<AnnotationExpr> annotations = cloneList(n.getAnnotations(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlFieldDeclaration r = new JmlFieldDeclaration(n.getTokenRange().orElse(null), jmlTags, decl);
         r.setComment(comment);
@@ -2425,8 +2162,7 @@ public Visitable visit(final JmlFieldDeclaration n, final Object arg) {
     public Visitable visit(final JmlOldClause n, final Object arg) {
         VariableDeclarationExpr declarations = cloneNode(n.getDeclarations(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlOldClause r = new JmlOldClause(n.getTokenRange().orElse(null), declarations);
         r.setComment(comment);
@@ -2438,8 +2174,7 @@ public Visitable visit(final JmlOldClause n, final Object arg) {
     @Override
     public Visitable visit(final JmlTypeExpr n, final Object arg) {
         Type type = cloneNode(n.getType(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlTypeExpr r = new JmlTypeExpr(n.getTokenRange().orElse(null), type);
         r.setComment(comment);
@@ -2453,11 +2188,9 @@ public Visitable visit(final JmlMultiExprClause n, final Object arg) {
         NodeList<Expression> expressions = cloneList(n.getExpressions(), arg);
         NodeList<SimpleName> heaps = cloneList(n.getHeaps().orElse(null), arg);
         SimpleName name = cloneNode(n.getName(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
-        JmlMultiExprClause r =
-                new JmlMultiExprClause(n.getTokenRange().orElse(null), n.getKind(), name, heaps, expressions);
+        JmlMultiExprClause r = new JmlMultiExprClause(n.getTokenRange().orElse(null), n.getKind(), name, heaps, expressions);
         r.setComment(comment);
         n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
         copyData(n, r);
@@ -2467,8 +2200,7 @@ public Visitable visit(final JmlMultiExprClause n, final Object arg) {
     @Override
     public Visitable visit(final JmlBeginStmt n, final Object arg) {
         NodeList<SimpleName> jmlTags = cloneList(n.getJmlTags(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlBeginStmt r = new JmlBeginStmt(n.getTokenRange().orElse(null), jmlTags);
         r.setComment(comment);
@@ -2480,8 +2212,7 @@ public Visitable visit(final JmlBeginStmt n, final Object arg) {
     @Override
     public Visitable visit(final JmlEndStmt n, final Object arg) {
         NodeList<SimpleName> jmlTags = cloneList(n.getJmlTags(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlEndStmt r = new JmlEndStmt(n.getTokenRange().orElse(null), jmlTags);
         r.setComment(comment);
@@ -2494,8 +2225,7 @@ public Visitable visit(final JmlEndStmt n, final Object arg) {
     public Visitable visit(final JmlLabelStmt n, final Object arg) {
         NodeList<SimpleName> jmlTags = cloneList(n.getJmlTags(), arg);
         SimpleName label = cloneNode(n.getLabel(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlLabelStmt r = new JmlLabelStmt(n.getTokenRange().orElse(null), jmlTags, label);
         r.setComment(comment);
@@ -2509,8 +2239,7 @@ public Visitable visit(final JmlMethodSignature n, final Object arg) {
         NodeList<Type> argumentTypes = cloneList(n.getArgumentTypes(), arg);
         SimpleName name = cloneNode(n.getName(), arg);
         Type receiver = cloneNode(n.getReceiver(), arg);
-        NodeList<Comment> associatedSpecificationComments =
-                cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
         Comment comment = cloneNode(n.getComment(), arg);
         JmlMethodSignature r = new JmlMethodSignature(n.getTokenRange().orElse(null), receiver, name, argumentTypes);
         r.setComment(comment);
@@ -2518,4 +2247,43 @@ public Visitable visit(final JmlMethodSignature n, final Object arg) {
         copyData(n, r);
         return r;
     }
+
+    @Override
+    public Visitable visit(final JmlDoc n, final Object arg) {
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        Comment comment = cloneNode(n.getComment(), arg);
+        JmlDoc r = new JmlDoc(n.getTokenRange().orElse(null), n.getContent());
+        r.setComment(comment);
+        n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
+        copyData(n, r);
+        return r;
+    }
+
+    @Override
+    public Visitable visit(final KeYMarkerStatement n, final Object arg) {
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        Comment comment = cloneNode(n.getComment(), arg);
+        KeYMarkerStatement r = new KeYMarkerStatement(n.getTokenRange().orElse(null), n.getKind());
+        r.setComment(comment);
+        n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
+        copyData(n, r);
+        return r;
+    }
+
+    @Override
+    public Visitable visit(final JmlInfFlowClause n, final Object arg) {
+        NodeList<Expression> by = cloneList(n.getBy(), arg);
+        NodeList<Expression> declassifies = cloneList(n.getDeclassifies(), arg);
+        NodeList<Expression> erases = cloneList(n.getErases(), arg);
+        NodeList<Expression> expressions = cloneList(n.getExpressions(), arg);
+        NodeList<Expression> newObjects = cloneList(n.getNewObjects(), arg);
+        SimpleName name = cloneNode(n.getName(), arg);
+        NodeList<Comment> associatedSpecificationComments = cloneList(n.getAssociatedSpecificationComments().orElse(null), arg);
+        Comment comment = cloneNode(n.getComment(), arg);
+        JmlInfFlowClause r = new JmlInfFlowClause(n.getTokenRange().orElse(null), n.getKind(), name, by, declassifies, erases, expressions, newObjects);
+        r.setComment(comment);
+        n.getOrphanComments().stream().map(Comment::clone).forEach(r::addOrphanComment);
+        copyData(n, r);
+        return r;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java
index 607a3f9ecb..3c8bcede7c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/EqualsVisitor.java
@@ -30,6 +30,7 @@
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -141,880 +142,1262 @@ private boolean objEquals(final Object n, final Object n2) {
     @Override
     public Boolean visit(final CompilationUnit n, final Visitable arg) {
         final CompilationUnit n2 = (CompilationUnit) arg;
-        if (!nodesEquals(n.getImports(), n2.getImports())) return false;
-        if (!nodeEquals(n.getModule(), n2.getModule())) return false;
-        if (!nodeEquals(n.getPackageDeclaration(), n2.getPackageDeclaration())) return false;
-        if (!nodesEquals(n.getTypes(), n2.getTypes())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getImports(), n2.getImports()))
+            return false;
+        if (!nodeEquals(n.getModule(), n2.getModule()))
+            return false;
+        if (!nodeEquals(n.getPackageDeclaration(), n2.getPackageDeclaration()))
+            return false;
+        if (!nodesEquals(n.getTypes(), n2.getTypes()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final PackageDeclaration n, final Visitable arg) {
         final PackageDeclaration n2 = (PackageDeclaration) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final TypeParameter n, final Visitable arg) {
         final TypeParameter n2 = (TypeParameter) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getTypeBound(), n2.getTypeBound())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getTypeBound(), n2.getTypeBound()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final LineComment n, final Visitable arg) {
         final LineComment n2 = (LineComment) arg;
-        if (!objEquals(n.getContent(), n2.getContent())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getContent(), n2.getContent()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final BlockComment n, final Visitable arg) {
         final BlockComment n2 = (BlockComment) arg;
-        if (!objEquals(n.getContent(), n2.getContent())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getContent(), n2.getContent()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ClassOrInterfaceDeclaration n, final Visitable arg) {
         final ClassOrInterfaceDeclaration n2 = (ClassOrInterfaceDeclaration) arg;
-        if (!nodesEquals(n.getExtendedTypes(), n2.getExtendedTypes())) return false;
-        if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) return false;
-        if (!objEquals(n.isCompact(), n2.isCompact())) return false;
-        if (!objEquals(n.isInterface(), n2.isInterface())) return false;
-        if (!nodesEquals(n.getPermittedTypes(), n2.getPermittedTypes())) return false;
-        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false;
-        if (!nodesEquals(n.getMembers(), n2.getMembers())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getExtendedTypes(), n2.getExtendedTypes()))
+            return false;
+        if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes()))
+            return false;
+        if (!objEquals(n.isCompact(), n2.isCompact()))
+            return false;
+        if (!objEquals(n.isInterface(), n2.isInterface()))
+            return false;
+        if (!nodesEquals(n.getPermittedTypes(), n2.getPermittedTypes()))
+            return false;
+        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters()))
+            return false;
+        if (!nodesEquals(n.getMembers(), n2.getMembers()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final EnumDeclaration n, final Visitable arg) {
         final EnumDeclaration n2 = (EnumDeclaration) arg;
-        if (!nodesEquals(n.getEntries(), n2.getEntries())) return false;
-        if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) return false;
-        if (!nodesEquals(n.getMembers(), n2.getMembers())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getEntries(), n2.getEntries()))
+            return false;
+        if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes()))
+            return false;
+        if (!nodesEquals(n.getMembers(), n2.getMembers()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final EnumConstantDeclaration n, final Visitable arg) {
         final EnumConstantDeclaration n2 = (EnumConstantDeclaration) arg;
-        if (!nodesEquals(n.getArguments(), n2.getArguments())) return false;
-        if (!nodesEquals(n.getClassBody(), n2.getClassBody())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getArguments(), n2.getArguments()))
+            return false;
+        if (!nodesEquals(n.getClassBody(), n2.getClassBody()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final AnnotationDeclaration n, final Visitable arg) {
         final AnnotationDeclaration n2 = (AnnotationDeclaration) arg;
-        if (!nodesEquals(n.getMembers(), n2.getMembers())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getMembers(), n2.getMembers()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final AnnotationMemberDeclaration n, final Visitable arg) {
         final AnnotationMemberDeclaration n2 = (AnnotationMemberDeclaration) arg;
-        if (!nodeEquals(n.getDefaultValue(), n2.getDefaultValue())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getDefaultValue(), n2.getDefaultValue()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final FieldDeclaration n, final Visitable arg) {
         final FieldDeclaration n2 = (FieldDeclaration) arg;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodesEquals(n.getVariables(), n2.getVariables())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodesEquals(n.getVariables(), n2.getVariables()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final VariableDeclarator n, final Visitable arg) {
         final VariableDeclarator n2 = (VariableDeclarator) arg;
-        if (!nodeEquals(n.getInitializer(), n2.getInitializer())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getInitializer(), n2.getInitializer()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ConstructorDeclaration n, final Visitable arg) {
         final ConstructorDeclaration n2 = (ConstructorDeclaration) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getParameters(), n2.getParameters())) return false;
-        if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) return false;
-        if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false;
-        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getParameters(), n2.getParameters()))
+            return false;
+        if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter()))
+            return false;
+        if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions()))
+            return false;
+        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MethodDeclaration n, final Visitable arg) {
         final MethodDeclaration n2 = (MethodDeclaration) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getParameters(), n2.getParameters())) return false;
-        if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) return false;
-        if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false;
-        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getParameters(), n2.getParameters()))
+            return false;
+        if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter()))
+            return false;
+        if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions()))
+            return false;
+        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final Parameter n, final Visitable arg) {
         final Parameter n2 = (Parameter) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!objEquals(n.isVarArgs(), n2.isVarArgs())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getVarArgsAnnotations(), n2.getVarArgsAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!objEquals(n.isVarArgs(), n2.isVarArgs()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getVarArgsAnnotations(), n2.getVarArgsAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final InitializerDeclaration n, final Visitable arg) {
         final InitializerDeclaration n2 = (InitializerDeclaration) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!objEquals(n.isStatic(), n2.isStatic())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!objEquals(n.isStatic(), n2.isStatic()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final TraditionalJavadocComment n, final Visitable arg) {
         final TraditionalJavadocComment n2 = (TraditionalJavadocComment) arg;
-        if (!objEquals(n.getContent(), n2.getContent())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getContent(), n2.getContent()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ClassOrInterfaceType n, final Visitable arg) {
         final ClassOrInterfaceType n2 = (ClassOrInterfaceType) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getScope(), n2.getScope())) return false;
-        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getScope(), n2.getScope()))
+            return false;
+        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final PrimitiveType n, final Visitable arg) {
         final PrimitiveType n2 = (PrimitiveType) arg;
-        if (!objEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ArrayType n, final Visitable arg) {
         final ArrayType n2 = (ArrayType) arg;
-        if (!nodeEquals(n.getComponentType(), n2.getComponentType())) return false;
-        if (!objEquals(n.getOrigin(), n2.getOrigin())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getComponentType(), n2.getComponentType()))
+            return false;
+        if (!objEquals(n.getOrigin(), n2.getOrigin()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ArrayCreationLevel n, final Visitable arg) {
         final ArrayCreationLevel n2 = (ArrayCreationLevel) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodeEquals(n.getDimension(), n2.getDimension())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodeEquals(n.getDimension(), n2.getDimension()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final IntersectionType n, final Visitable arg) {
         final IntersectionType n2 = (IntersectionType) arg;
-        if (!nodesEquals(n.getElements(), n2.getElements())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getElements(), n2.getElements()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final UnionType n, final Visitable arg) {
         final UnionType n2 = (UnionType) arg;
-        if (!nodesEquals(n.getElements(), n2.getElements())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getElements(), n2.getElements()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final VoidType n, final Visitable arg) {
         final VoidType n2 = (VoidType) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final WildcardType n, final Visitable arg) {
         final WildcardType n2 = (WildcardType) arg;
-        if (!nodeEquals(n.getExtendedType(), n2.getExtendedType())) return false;
-        if (!nodeEquals(n.getSuperType(), n2.getSuperType())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExtendedType(), n2.getExtendedType()))
+            return false;
+        if (!nodeEquals(n.getSuperType(), n2.getSuperType()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final UnknownType n, final Visitable arg) {
         final UnknownType n2 = (UnknownType) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ArrayAccessExpr n, final Visitable arg) {
         final ArrayAccessExpr n2 = (ArrayAccessExpr) arg;
-        if (!nodeEquals(n.getIndex(), n2.getIndex())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getIndex(), n2.getIndex()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ArrayCreationExpr n, final Visitable arg) {
         final ArrayCreationExpr n2 = (ArrayCreationExpr) arg;
-        if (!nodeEquals(n.getElementType(), n2.getElementType())) return false;
-        if (!nodeEquals(n.getInitializer(), n2.getInitializer())) return false;
-        if (!nodesEquals(n.getLevels(), n2.getLevels())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getElementType(), n2.getElementType()))
+            return false;
+        if (!nodeEquals(n.getInitializer(), n2.getInitializer()))
+            return false;
+        if (!nodesEquals(n.getLevels(), n2.getLevels()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ArrayInitializerExpr n, final Visitable arg) {
         final ArrayInitializerExpr n2 = (ArrayInitializerExpr) arg;
-        if (!nodesEquals(n.getValues(), n2.getValues())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getValues(), n2.getValues()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final AssignExpr n, final Visitable arg) {
         final AssignExpr n2 = (AssignExpr) arg;
-        if (!objEquals(n.getOperator(), n2.getOperator())) return false;
-        if (!nodeEquals(n.getTarget(), n2.getTarget())) return false;
-        if (!nodeEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getOperator(), n2.getOperator()))
+            return false;
+        if (!nodeEquals(n.getTarget(), n2.getTarget()))
+            return false;
+        if (!nodeEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final BinaryExpr n, final Visitable arg) {
         final BinaryExpr n2 = (BinaryExpr) arg;
-        if (!nodeEquals(n.getLeft(), n2.getLeft())) return false;
-        if (!objEquals(n.getOperator(), n2.getOperator())) return false;
-        if (!nodeEquals(n.getRight(), n2.getRight())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getLeft(), n2.getLeft()))
+            return false;
+        if (!objEquals(n.getOperator(), n2.getOperator()))
+            return false;
+        if (!nodeEquals(n.getRight(), n2.getRight()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final CastExpr n, final Visitable arg) {
         final CastExpr n2 = (CastExpr) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ClassExpr n, final Visitable arg) {
         final ClassExpr n2 = (ClassExpr) arg;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ConditionalExpr n, final Visitable arg) {
         final ConditionalExpr n2 = (ConditionalExpr) arg;
-        if (!nodeEquals(n.getCondition(), n2.getCondition())) return false;
-        if (!nodeEquals(n.getElseExpr(), n2.getElseExpr())) return false;
-        if (!nodeEquals(n.getThenExpr(), n2.getThenExpr())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getCondition(), n2.getCondition()))
+            return false;
+        if (!nodeEquals(n.getElseExpr(), n2.getElseExpr()))
+            return false;
+        if (!nodeEquals(n.getThenExpr(), n2.getThenExpr()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final EnclosedExpr n, final Visitable arg) {
         final EnclosedExpr n2 = (EnclosedExpr) arg;
-        if (!nodeEquals(n.getInner(), n2.getInner())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getInner(), n2.getInner()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final FieldAccessExpr n, final Visitable arg) {
         final FieldAccessExpr n2 = (FieldAccessExpr) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getScope(), n2.getScope())) return false;
-        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getScope(), n2.getScope()))
+            return false;
+        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final InstanceOfExpr n, final Visitable arg) {
         final InstanceOfExpr n2 = (InstanceOfExpr) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodeEquals(n.getPattern(), n2.getPattern())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodeEquals(n.getPattern(), n2.getPattern()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final StringLiteralExpr n, final Visitable arg) {
         final StringLiteralExpr n2 = (StringLiteralExpr) arg;
-        if (!objEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final IntegerLiteralExpr n, final Visitable arg) {
         final IntegerLiteralExpr n2 = (IntegerLiteralExpr) arg;
-        if (!objEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final LongLiteralExpr n, final Visitable arg) {
         final LongLiteralExpr n2 = (LongLiteralExpr) arg;
-        if (!objEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final CharLiteralExpr n, final Visitable arg) {
         final CharLiteralExpr n2 = (CharLiteralExpr) arg;
-        if (!objEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final DoubleLiteralExpr n, final Visitable arg) {
         final DoubleLiteralExpr n2 = (DoubleLiteralExpr) arg;
-        if (!objEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final BooleanLiteralExpr n, final Visitable arg) {
         final BooleanLiteralExpr n2 = (BooleanLiteralExpr) arg;
-        if (!objEquals(n.isValue(), n2.isValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.isValue(), n2.isValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final NullLiteralExpr n, final Visitable arg) {
         final NullLiteralExpr n2 = (NullLiteralExpr) arg;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MethodCallExpr n, final Visitable arg) {
         final MethodCallExpr n2 = (MethodCallExpr) arg;
-        if (!nodesEquals(n.getArguments(), n2.getArguments())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getScope(), n2.getScope())) return false;
-        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getArguments(), n2.getArguments()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getScope(), n2.getScope()))
+            return false;
+        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final NameExpr n, final Visitable arg) {
         final NameExpr n2 = (NameExpr) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ObjectCreationExpr n, final Visitable arg) {
         final ObjectCreationExpr n2 = (ObjectCreationExpr) arg;
-        if (!nodesEquals(n.getAnonymousClassBody(), n2.getAnonymousClassBody())) return false;
-        if (!nodesEquals(n.getArguments(), n2.getArguments())) return false;
-        if (!nodeEquals(n.getScope(), n2.getScope())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAnonymousClassBody(), n2.getAnonymousClassBody()))
+            return false;
+        if (!nodesEquals(n.getArguments(), n2.getArguments()))
+            return false;
+        if (!nodeEquals(n.getScope(), n2.getScope()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final Name n, final Visitable arg) {
         final Name n2 = (Name) arg;
-        if (!objEquals(n.getIdentifier(), n2.getIdentifier())) return false;
-        if (!nodeEquals(n.getQualifier(), n2.getQualifier())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getIdentifier(), n2.getIdentifier()))
+            return false;
+        if (!nodeEquals(n.getQualifier(), n2.getQualifier()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SimpleName n, final Visitable arg) {
         final SimpleName n2 = (SimpleName) arg;
-        if (!objEquals(n.getIdentifier(), n2.getIdentifier())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getIdentifier(), n2.getIdentifier()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ThisExpr n, final Visitable arg) {
         final ThisExpr n2 = (ThisExpr) arg;
-        if (!nodeEquals(n.getTypeName(), n2.getTypeName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getTypeName(), n2.getTypeName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SuperExpr n, final Visitable arg) {
         final SuperExpr n2 = (SuperExpr) arg;
-        if (!nodeEquals(n.getTypeName(), n2.getTypeName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getTypeName(), n2.getTypeName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final UnaryExpr n, final Visitable arg) {
         final UnaryExpr n2 = (UnaryExpr) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!objEquals(n.getOperator(), n2.getOperator())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!objEquals(n.getOperator(), n2.getOperator()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final VariableDeclarationExpr n, final Visitable arg) {
         final VariableDeclarationExpr n2 = (VariableDeclarationExpr) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodesEquals(n.getVariables(), n2.getVariables())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodesEquals(n.getVariables(), n2.getVariables()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MarkerAnnotationExpr n, final Visitable arg) {
         final MarkerAnnotationExpr n2 = (MarkerAnnotationExpr) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SingleMemberAnnotationExpr n, final Visitable arg) {
         final SingleMemberAnnotationExpr n2 = (SingleMemberAnnotationExpr) arg;
-        if (!nodeEquals(n.getMemberValue(), n2.getMemberValue())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
-        return true;
+        if (!nodeEquals(n.getMemberValue(), n2.getMemberValue()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
+        return true;
     }
 
     @Override
     public Boolean visit(final NormalAnnotationExpr n, final Visitable arg) {
         final NormalAnnotationExpr n2 = (NormalAnnotationExpr) arg;
-        if (!nodesEquals(n.getPairs(), n2.getPairs())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getPairs(), n2.getPairs()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MemberValuePair n, final Visitable arg) {
         final MemberValuePair n2 = (MemberValuePair) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ExplicitConstructorInvocationStmt n, final Visitable arg) {
         final ExplicitConstructorInvocationStmt n2 = (ExplicitConstructorInvocationStmt) arg;
-        if (!nodesEquals(n.getArguments(), n2.getArguments())) return false;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!objEquals(n.isThis(), n2.isThis())) return false;
-        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getArguments(), n2.getArguments()))
+            return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!objEquals(n.isThis(), n2.isThis()))
+            return false;
+        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final LocalClassDeclarationStmt n, final Visitable arg) {
         final LocalClassDeclarationStmt n2 = (LocalClassDeclarationStmt) arg;
-        if (!nodeEquals(n.getClassDeclaration(), n2.getClassDeclaration())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getClassDeclaration(), n2.getClassDeclaration()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final LocalRecordDeclarationStmt n, final Visitable arg) {
         final LocalRecordDeclarationStmt n2 = (LocalRecordDeclarationStmt) arg;
-        if (!nodeEquals(n.getRecordDeclaration(), n2.getRecordDeclaration())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getRecordDeclaration(), n2.getRecordDeclaration()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final AssertStmt n, final Visitable arg) {
         final AssertStmt n2 = (AssertStmt) arg;
-        if (!nodeEquals(n.getCheck(), n2.getCheck())) return false;
-        if (!nodeEquals(n.getMessage(), n2.getMessage())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getCheck(), n2.getCheck()))
+            return false;
+        if (!nodeEquals(n.getMessage(), n2.getMessage()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final BlockStmt n, final Visitable arg) {
         final BlockStmt n2 = (BlockStmt) arg;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodesEquals(n.getStatements(), n2.getStatements())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodesEquals(n.getStatements(), n2.getStatements()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final LabeledStmt n, final Visitable arg) {
         final LabeledStmt n2 = (LabeledStmt) arg;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodeEquals(n.getStatement(), n2.getStatement())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodeEquals(n.getStatement(), n2.getStatement()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final EmptyStmt n, final Visitable arg) {
         final EmptyStmt n2 = (EmptyStmt) arg;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ExpressionStmt n, final Visitable arg) {
         final ExpressionStmt n2 = (ExpressionStmt) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SwitchStmt n, final Visitable arg) {
         final SwitchStmt n2 = (SwitchStmt) arg;
-        if (!nodesEquals(n.getEntries(), n2.getEntries())) return false;
-        if (!nodeEquals(n.getSelector(), n2.getSelector())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getEntries(), n2.getEntries()))
+            return false;
+        if (!nodeEquals(n.getSelector(), n2.getSelector()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SwitchEntry n, final Visitable arg) {
         final SwitchEntry n2 = (SwitchEntry) arg;
-        if (!nodeEquals(n.getGuard(), n2.getGuard())) return false;
-        if (!objEquals(n.isDefault(), n2.isDefault())) return false;
-        if (!nodesEquals(n.getLabels(), n2.getLabels())) return false;
-        if (!nodesEquals(n.getStatements(), n2.getStatements())) return false;
-        if (!objEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getGuard(), n2.getGuard()))
+            return false;
+        if (!objEquals(n.isDefault(), n2.isDefault()))
+            return false;
+        if (!nodesEquals(n.getLabels(), n2.getLabels()))
+            return false;
+        if (!nodesEquals(n.getStatements(), n2.getStatements()))
+            return false;
+        if (!objEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final BreakStmt n, final Visitable arg) {
         final BreakStmt n2 = (BreakStmt) arg;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ReturnStmt n, final Visitable arg) {
         final ReturnStmt n2 = (ReturnStmt) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final IfStmt n, final Visitable arg) {
         final IfStmt n2 = (IfStmt) arg;
-        if (!nodeEquals(n.getCondition(), n2.getCondition())) return false;
-        if (!nodeEquals(n.getElseStmt(), n2.getElseStmt())) return false;
-        if (!nodeEquals(n.getThenStmt(), n2.getThenStmt())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getCondition(), n2.getCondition()))
+            return false;
+        if (!nodeEquals(n.getElseStmt(), n2.getElseStmt()))
+            return false;
+        if (!nodeEquals(n.getThenStmt(), n2.getThenStmt()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final WhileStmt n, final Visitable arg) {
         final WhileStmt n2 = (WhileStmt) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getCondition(), n2.getCondition())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getCondition(), n2.getCondition()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ContinueStmt n, final Visitable arg) {
         final ContinueStmt n2 = (ContinueStmt) arg;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final DoStmt n, final Visitable arg) {
         final DoStmt n2 = (DoStmt) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getCondition(), n2.getCondition())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getCondition(), n2.getCondition()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ForEachStmt n, final Visitable arg) {
         final ForEachStmt n2 = (ForEachStmt) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodeEquals(n.getIterable(), n2.getIterable())) return false;
-        if (!nodeEquals(n.getVariable(), n2.getVariable())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodeEquals(n.getIterable(), n2.getIterable()))
+            return false;
+        if (!nodeEquals(n.getVariable(), n2.getVariable()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ForStmt n, final Visitable arg) {
         final ForStmt n2 = (ForStmt) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getCompare(), n2.getCompare())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodesEquals(n.getInitialization(), n2.getInitialization())) return false;
-        if (!nodesEquals(n.getUpdate(), n2.getUpdate())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getCompare(), n2.getCompare()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodesEquals(n.getInitialization(), n2.getInitialization()))
+            return false;
+        if (!nodesEquals(n.getUpdate(), n2.getUpdate()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ThrowStmt n, final Visitable arg) {
         final ThrowStmt n2 = (ThrowStmt) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SynchronizedStmt n, final Visitable arg) {
         final SynchronizedStmt n2 = (SynchronizedStmt) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final TryStmt n, final Visitable arg) {
         final TryStmt n2 = (TryStmt) arg;
-        if (!nodesEquals(n.getCatchClauses(), n2.getCatchClauses())) return false;
-        if (!nodeEquals(n.getFinallyBlock(), n2.getFinallyBlock())) return false;
-        if (!nodesEquals(n.getResources(), n2.getResources())) return false;
-        if (!nodeEquals(n.getTryBlock(), n2.getTryBlock())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getCatchClauses(), n2.getCatchClauses()))
+            return false;
+        if (!nodeEquals(n.getFinallyBlock(), n2.getFinallyBlock()))
+            return false;
+        if (!nodesEquals(n.getResources(), n2.getResources()))
+            return false;
+        if (!nodeEquals(n.getTryBlock(), n2.getTryBlock()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final CatchClause n, final Visitable arg) {
         final CatchClause n2 = (CatchClause) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getParameter(), n2.getParameter())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getParameter(), n2.getParameter()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final LambdaExpr n, final Visitable arg) {
         final LambdaExpr n2 = (LambdaExpr) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!objEquals(n.isEnclosingParameters(), n2.isEnclosingParameters())) return false;
-        if (!nodesEquals(n.getParameters(), n2.getParameters())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!objEquals(n.isEnclosingParameters(), n2.isEnclosingParameters()))
+            return false;
+        if (!nodesEquals(n.getParameters(), n2.getParameters()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MethodReferenceExpr n, final Visitable arg) {
         final MethodReferenceExpr n2 = (MethodReferenceExpr) arg;
-        if (!objEquals(n.getIdentifier(), n2.getIdentifier())) return false;
-        if (!nodeEquals(n.getScope(), n2.getScope())) return false;
-        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getIdentifier(), n2.getIdentifier()))
+            return false;
+        if (!nodeEquals(n.getScope(), n2.getScope()))
+            return false;
+        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final TypeExpr n, final Visitable arg) {
         final TypeExpr n2 = (TypeExpr) arg;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ImportDeclaration n, final Visitable arg) {
         final ImportDeclaration n2 = (ImportDeclaration) arg;
-        if (!objEquals(n.isAsterisk(), n2.isAsterisk())) return false;
-        if (!objEquals(n.isJmlModel(), n2.isJmlModel())) return false;
-        if (!objEquals(n.isModule(), n2.isModule())) return false;
-        if (!objEquals(n.isStatic(), n2.isStatic())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.isAsterisk(), n2.isAsterisk()))
+            return false;
+        if (!objEquals(n.isJmlModel(), n2.isJmlModel()))
+            return false;
+        if (!objEquals(n.isModule(), n2.isModule()))
+            return false;
+        if (!objEquals(n.isStatic(), n2.isStatic()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
@@ -1026,852 +1409,1234 @@ public Boolean visit(NodeList n, Visitable arg) {
     @Override
     public Boolean visit(final ModuleDeclaration n, final Visitable arg) {
         final ModuleDeclaration n2 = (ModuleDeclaration) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getDirectives(), n2.getDirectives())) return false;
-        if (!objEquals(n.isOpen(), n2.isOpen())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getDirectives(), n2.getDirectives()))
+            return false;
+        if (!objEquals(n.isOpen(), n2.isOpen()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ModuleRequiresDirective n, final Visitable arg) {
         final ModuleRequiresDirective n2 = (ModuleRequiresDirective) arg;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override()
     public Boolean visit(final ModuleExportsDirective n, final Visitable arg) {
         final ModuleExportsDirective n2 = (ModuleExportsDirective) arg;
-        if (!nodesEquals(n.getModuleNames(), n2.getModuleNames())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getModuleNames(), n2.getModuleNames()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override()
     public Boolean visit(final ModuleProvidesDirective n, final Visitable arg) {
         final ModuleProvidesDirective n2 = (ModuleProvidesDirective) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getWith(), n2.getWith())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getWith(), n2.getWith()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override()
     public Boolean visit(final ModuleUsesDirective n, final Visitable arg) {
         final ModuleUsesDirective n2 = (ModuleUsesDirective) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ModuleOpensDirective n, final Visitable arg) {
         final ModuleOpensDirective n2 = (ModuleOpensDirective) arg;
-        if (!nodesEquals(n.getModuleNames(), n2.getModuleNames())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getModuleNames(), n2.getModuleNames()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final UnparsableStmt n, final Visitable arg) {
         final UnparsableStmt n2 = (UnparsableStmt) arg;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ReceiverParameter n, final Visitable arg) {
         final ReceiverParameter n2 = (ReceiverParameter) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final VarType n, final Visitable arg) {
         final VarType n2 = (VarType) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final Modifier n, final Visitable arg) {
         final Modifier n2 = (Modifier) arg;
-        if (!objEquals(n.getKeyword(), n2.getKeyword())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getKeyword(), n2.getKeyword()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SwitchExpr n, final Visitable arg) {
         final SwitchExpr n2 = (SwitchExpr) arg;
-        if (!nodesEquals(n.getEntries(), n2.getEntries())) return false;
-        if (!nodeEquals(n.getSelector(), n2.getSelector())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getEntries(), n2.getEntries()))
+            return false;
+        if (!nodeEquals(n.getSelector(), n2.getSelector()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final YieldStmt n, final Visitable arg) {
         final YieldStmt n2 = (YieldStmt) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final TextBlockLiteralExpr n, final Visitable arg) {
         final TextBlockLiteralExpr n2 = (TextBlockLiteralExpr) arg;
-        if (!objEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final TypePatternExpr n, final Visitable arg) {
         final TypePatternExpr n2 = (TypePatternExpr) arg;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final JmlClauseLabel n, final Visitable arg) {
-        final JmlClauseLabel n2 = (JmlClauseLabel) arg;
-        if (!nodeEquals(n.getExpr(), n2.getExpr())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+    public Boolean visit(final JmlLabledClause n, final Visitable arg) {
+        final JmlLabledClause n2 = (JmlLabledClause) arg;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlExpressionStmt n, final Visitable arg) {
         final JmlExpressionStmt n2 = (JmlExpressionStmt) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlQuantifiedExpr n, final Visitable arg) {
         final JmlQuantifiedExpr n2 = (JmlQuantifiedExpr) arg;
-        if (!objEquals(n.getBinder(), n2.getBinder())) return false;
-        if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false;
-        if (!nodesEquals(n.getVariables(), n2.getVariables())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getBinder(), n2.getBinder()))
+            return false;
+        if (!nodesEquals(n.getExpressions(), n2.getExpressions()))
+            return false;
+        if (!nodesEquals(n.getVariables(), n2.getVariables()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlLabelExpr n, final Visitable arg) {
         final JmlLabelExpr n2 = (JmlLabelExpr) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlLetExpr n, final Visitable arg) {
         final JmlLetExpr n2 = (JmlLetExpr) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getVariables(), n2.getVariables())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getVariables(), n2.getVariables()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlMultiCompareExpr n, final Visitable arg) {
         final JmlMultiCompareExpr n2 = (JmlMultiCompareExpr) arg;
-        if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false;
-        if (!objEquals(n.getOperators(), n2.getOperators())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getExpressions(), n2.getExpressions()))
+            return false;
+        if (!objEquals(n.getOperators(), n2.getOperators()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlSimpleExprClause n, final Visitable arg) {
         final JmlSimpleExprClause n2 = (JmlSimpleExprClause) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getHeaps(), n2.getHeaps())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getHeaps(), n2.getHeaps()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlSignalsClause n, final Visitable arg) {
         final JmlSignalsClause n2 = (JmlSignalsClause) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodeEquals(n.getParameter(), n2.getParameter())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodeEquals(n.getParameter(), n2.getParameter()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlSignalsOnlyClause n, final Visitable arg) {
         final JmlSignalsOnlyClause n2 = (JmlSignalsOnlyClause) arg;
-        if (!nodesEquals(n.getTypes(), n2.getTypes())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getTypes(), n2.getTypes()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlUnreachableStmt n, final Visitable arg) {
         final JmlUnreachableStmt n2 = (JmlUnreachableStmt) arg;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlCallableClause n, final Visitable arg) {
         final JmlCallableClause n2 = (JmlCallableClause) arg;
-        if (!nodesEquals(n.getMethodSignatures(), n2.getMethodSignatures())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getMethodSignatures(), n2.getMethodSignatures()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlForallClause n, final Visitable arg) {
         final JmlForallClause n2 = (JmlForallClause) arg;
-        if (!nodesEquals(n.getBoundedVariables(), n2.getBoundedVariables())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getBoundedVariables(), n2.getBoundedVariables()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlRefiningStmt n, final Visitable arg) {
         final JmlRefiningStmt n2 = (JmlRefiningStmt) arg;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final JmlClauseIf n, final Visitable arg) {
-        final JmlClauseIf n2 = (JmlClauseIf) arg;
-        if (!nodeEquals(n.getCondition(), n2.getCondition())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodeEquals(n.getThen(), n2.getThen())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+    public Boolean visit(final JmlConditionalClause n, final Visitable arg) {
+        final JmlConditionalClause n2 = (JmlConditionalClause) arg;
+        if (!nodeEquals(n.getCondition(), n2.getCondition()))
+            return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlClassExprDeclaration n, final Visitable arg) {
         final JmlClassExprDeclaration n2 = (JmlClassExprDeclaration) arg;
-        if (!nodeEquals(n.getInvariant(), n2.getInvariant())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodeEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getInvariant(), n2.getInvariant()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodeEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlClassAccessibleDeclaration n, final Visitable arg) {
         final JmlClassAccessibleDeclaration n2 = (JmlClassAccessibleDeclaration) arg;
-        if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodeEquals(n.getMeasuredBy(), n2.getMeasuredBy())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getVariable(), n2.getVariable())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
-        return true;
-    }
-
+        if (!nodesEquals(n.getExpressions(), n2.getExpressions()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodeEquals(n.getMeasuredBy(), n2.getMeasuredBy()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getVariable(), n2.getVariable()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
+        return true;
+    }
+
     @Override
     public Boolean visit(final JmlRepresentsDeclaration n, final Visitable arg) {
         final JmlRepresentsDeclaration n2 = (JmlRepresentsDeclaration) arg;
-        if (!nodeEquals(n.getExpr(), n2.getExpr())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpr(), n2.getExpr()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlContract n, final Visitable arg) {
         final JmlContract n2 = (JmlContract) arg;
-        if (!objEquals(n.getBehavior(), n2.getBehavior())) return false;
-        if (!nodesEquals(n.getClauses(), n2.getClauses())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getSubContracts(), n2.getSubContracts())) return false;
-        if (!objEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getBehavior(), n2.getBehavior()))
+            return false;
+        if (!nodesEquals(n.getClauses(), n2.getClauses()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getSubContracts(), n2.getSubContracts()))
+            return false;
+        if (!objEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlSetComprehensionExpr n, final Visitable arg) {
         final JmlSetComprehensionExpr n2 = (JmlSetComprehensionExpr) arg;
-        if (!nodeEquals(n.getBinding(), n2.getBinding())) return false;
-        if (!nodeEquals(n.getPredicate(), n2.getPredicate())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBinding(), n2.getBinding()))
+            return false;
+        if (!nodeEquals(n.getPredicate(), n2.getPredicate()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlGhostStmt n, final Visitable arg) {
         final JmlGhostStmt n2 = (JmlGhostStmt) arg;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodeEquals(n.getStatement(), n2.getStatement())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodeEquals(n.getStatement(), n2.getStatement()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final RecordDeclaration n, final Visitable arg) {
         final RecordDeclaration n2 = (RecordDeclaration) arg;
-        if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) return false;
-        if (!nodesEquals(n.getParameters(), n2.getParameters())) return false;
-        if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) return false;
-        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false;
-        if (!nodesEquals(n.getMembers(), n2.getMembers())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes()))
+            return false;
+        if (!nodesEquals(n.getParameters(), n2.getParameters()))
+            return false;
+        if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter()))
+            return false;
+        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters()))
+            return false;
+        if (!nodesEquals(n.getMembers(), n2.getMembers()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final CompactConstructorDeclaration n, final Visitable arg) {
         final CompactConstructorDeclaration n2 = (CompactConstructorDeclaration) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false;
-        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions()))
+            return false;
+        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyCcatchBreak n, final Visitable arg) {
         final KeyCcatchBreak n2 = (KeyCcatchBreak) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyCcatchContinue n, final Visitable arg) {
         final KeyCcatchContinue n2 = (KeyCcatchContinue) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyCcatchParameter n, final Visitable arg) {
         final KeyCcatchParameter n2 = (KeyCcatchParameter) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getParameter(), n2.getParameter())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getParameter(), n2.getParameter()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyCcatchReturn n, final Visitable arg) {
         final KeyCcatchReturn n2 = (KeyCcatchReturn) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getParameter(), n2.getParameter())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getParameter(), n2.getParameter()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final KeyCatchAllStatement n, final Visitable arg) {
-        final KeyCatchAllStatement n2 = (KeyCatchAllStatement) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+    public Boolean visit(final KeyCatchAllStmt n, final Visitable arg) {
+        final KeyCatchAllStmt n2 = (KeyCatchAllStmt) arg;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyEscapeExpression n, final Visitable arg) {
         final KeyEscapeExpression n2 = (KeyEscapeExpression) arg;
-        if (!nodesEquals(n.getArguments(), n2.getArguments())) return false;
-        if (!nodeEquals(n.getCallee(), n2.getCallee())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getArguments(), n2.getArguments()))
+            return false;
+        if (!nodeEquals(n.getCallee(), n2.getCallee()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final KeyExecStatement n, final Visitable arg) {
-        final KeyExecStatement n2 = (KeyExecStatement) arg;
-        if (!nodesEquals(n.getBranches(), n2.getBranches())) return false;
-        if (!nodeEquals(n.getExecBlock(), n2.getExecBlock())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+    public Boolean visit(final KeyExecStmt n, final Visitable arg) {
+        final KeyExecStmt n2 = (KeyExecStmt) arg;
+        if (!nodesEquals(n.getBranches(), n2.getBranches()))
+            return false;
+        if (!nodeEquals(n.getExecBlock(), n2.getExecBlock()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyExecutionContext n, final Visitable arg) {
         final KeyExecutionContext n2 = (KeyExecutionContext) arg;
-        if (!nodeEquals(n.getContext(), n2.getContext())) return false;
-        if (!nodeEquals(n.getInstance(), n2.getInstance())) return false;
-        if (!nodeEquals(n.getSignature(), n2.getSignature())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getContext(), n2.getContext()))
+            return false;
+        if (!nodeEquals(n.getInstance(), n2.getInstance()))
+            return false;
+        if (!nodeEquals(n.getSignature(), n2.getSignature()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final KeyLoopScopeBlock n, final Visitable arg) {
-        final KeyLoopScopeBlock n2 = (KeyLoopScopeBlock) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getIndexPV(), n2.getIndexPV())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+    public Boolean visit(final KeyLoopScopeBlockStmt n, final Visitable arg) {
+        final KeyLoopScopeBlockStmt n2 = (KeyLoopScopeBlockStmt) arg;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getIndexPV(), n2.getIndexPV()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final KeyMergePointStatement n, final Visitable arg) {
-        final KeyMergePointStatement n2 = (KeyMergePointStatement) arg;
-        if (!nodeEquals(n.getExpr(), n2.getExpr())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+    public Boolean visit(final KeyMergePointStmt n, final Visitable arg) {
+        final KeyMergePointStmt n2 = (KeyMergePointStmt) arg;
+        if (!nodeEquals(n.getExpr(), n2.getExpr()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyMethodBodyStatement n, final Visitable arg) {
         final KeyMethodBodyStatement n2 = (KeyMethodBodyStatement) arg;
-        if (!nodeEquals(n.getExpr(), n2.getExpr())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getSource(), n2.getSource())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpr(), n2.getExpr()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getSource(), n2.getSource()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final KeyMethodCallStatement n, final Visitable arg) {
-        final KeyMethodCallStatement n2 = (KeyMethodCallStatement) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getContext(), n2.getContext())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+    public Boolean visit(final KeyMethodCallStmt n, final Visitable arg) {
+        final KeyMethodCallStmt n2 = (KeyMethodCallStmt) arg;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getContext(), n2.getContext()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyMethodSignature n, final Visitable arg) {
         final KeyMethodSignature n2 = (KeyMethodSignature) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getParamTypes(), n2.getParamTypes())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final KeyRangeExpression n, final Visitable arg) {
-        final KeyRangeExpression n2 = (KeyRangeExpression) arg;
-        if (!nodeEquals(n.getLower(), n2.getLower())) return false;
-        if (!nodeEquals(n.getUpper(), n2.getUpper())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getParamTypes(), n2.getParamTypes()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final KeyTransactionStatement n, final Visitable arg) {
-        final KeyTransactionStatement n2 = (KeyTransactionStatement) arg;
-        if (!objEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+    public Boolean visit(final KeyTransactionStmt n, final Visitable arg) {
+        final KeyTransactionStmt n2 = (KeyTransactionStmt) arg;
+        if (!objEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyContextStatementBlock n, final Visitable arg) {
         final KeyContextStatementBlock n2 = (KeyContextStatementBlock) arg;
-        if (!nodeEquals(n.getContext(), n2.getContext())) return false;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodeEquals(n.getSignature(), n2.getSignature())) return false;
-        if (!nodesEquals(n.getStatements(), n2.getStatements())) return false;
-        if (!nodeEquals(n.getTr(), n2.getTr())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getContext(), n2.getContext()))
+            return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodeEquals(n.getSignature(), n2.getSignature()))
+            return false;
+        if (!nodesEquals(n.getStatements(), n2.getStatements()))
+            return false;
+        if (!nodeEquals(n.getTr(), n2.getTr()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyExecCtxtSV n, final Visitable arg) {
         final KeyExecCtxtSV n2 = (KeyExecCtxtSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyExpressionSV n, final Visitable arg) {
         final KeyExpressionSV n2 = (KeyExpressionSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyJumpLabelSV n, final Visitable arg) {
         final KeyJumpLabelSV n2 = (KeyJumpLabelSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyMetaConstructExpression n, final Visitable arg) {
         final KeyMetaConstructExpression n2 = (KeyMetaConstructExpression) arg;
-        if (!nodeEquals(n.getChild(), n2.getChild())) return false;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getChild(), n2.getChild()))
+            return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyMetaConstruct n, final Visitable arg) {
         final KeyMetaConstruct n2 = (KeyMetaConstruct) arg;
-        if (!nodeEquals(n.getChild(), n2.getChild())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodesEquals(n.getSchemas(), n2.getSchemas())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getChild(), n2.getChild()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodesEquals(n.getSchemas(), n2.getSchemas()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyMetaConstructType n, final Visitable arg) {
         final KeyMetaConstructType n2 = (KeyMetaConstructType) arg;
-        if (!nodeEquals(n.getExpr(), n2.getExpr())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpr(), n2.getExpr()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyMethodSignatureSV n, final Visitable arg) {
         final KeyMethodSignatureSV n2 = (KeyMethodSignatureSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyPassiveExpression n, final Visitable arg) {
         final KeyPassiveExpression n2 = (KeyPassiveExpression) arg;
-        if (!nodeEquals(n.getExpr(), n2.getExpr())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getExpr(), n2.getExpr()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyProgramVariableSV n, final Visitable arg) {
         final KeyProgramVariableSV n2 = (KeyProgramVariableSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyStatementSV n, final Visitable arg) {
         final KeyStatementSV n2 = (KeyStatementSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyTypeSV n, final Visitable arg) {
         final KeyTypeSV n2 = (KeyTypeSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyCcatchSV n, final Visitable arg) {
         final KeyCcatchSV n2 = (KeyCcatchSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyExecutionContextSV n, final Visitable arg) {
         final KeyExecutionContextSV n2 = (KeyExecutionContextSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final RecordPatternExpr n, final Visitable arg) {
         final RecordPatternExpr n2 = (RecordPatternExpr) arg;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodesEquals(n.getPatternList(), n2.getPatternList())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodesEquals(n.getPatternList(), n2.getPatternList()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MatchAllPatternExpr n, final Visitable arg) {
         final MatchAllPatternExpr n2 = (MatchAllPatternExpr) arg;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MarkdownComment n, final Visitable arg) {
         final MarkdownComment n2 = (MarkdownComment) arg;
-        if (!objEquals(n.getContent(), n2.getContent())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!objEquals(n.getContent(), n2.getContent()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlMethodDeclaration n, final Visitable arg) {
         final JmlMethodDeclaration n2 = (JmlMethodDeclaration) arg;
-        if (!nodeEquals(n.getContract(), n2.getContract())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodeEquals(n.getMethodDeclaration(), n2.getMethodDeclaration())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getContract(), n2.getContract()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodeEquals(n.getMethodDeclaration(), n2.getMethodDeclaration()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlBinaryInfixExpr n, final Visitable arg) {
         final JmlBinaryInfixExpr n2 = (JmlBinaryInfixExpr) arg;
-        if (!nodeEquals(n.getLeft(), n2.getLeft())) return false;
-        if (!nodeEquals(n.getOperator(), n2.getOperator())) return false;
-        if (!nodeEquals(n.getRight(), n2.getRight())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getLeft(), n2.getLeft()))
+            return false;
+        if (!nodeEquals(n.getOperator(), n2.getOperator()))
+            return false;
+        if (!nodeEquals(n.getRight(), n2.getRight()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlDocDeclaration n, final Visitable arg) {
         final JmlDocDeclaration n2 = (JmlDocDeclaration) arg;
-        if (!nodesEquals(n.getJmlComments(), n2.getJmlComments())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getJmlComments(), n2.getJmlComments()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlDocStmt n, final Visitable arg) {
         final JmlDocStmt n2 = (JmlDocStmt) arg;
-        if (!nodesEquals(n.getJmlComments(), n2.getJmlComments())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final JmlDoc n, final Visitable arg) {
-        final JmlDoc n2 = (JmlDoc) arg;
-        if (!objEquals(n.getContent(), n2.getContent())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getJmlComments(), n2.getJmlComments()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlDocType n, final Visitable arg) {
         final JmlDocType n2 = (JmlDocType) arg;
-        if (!nodesEquals(n.getJmlComments(), n2.getJmlComments())) return false;
-        if (!nodesEquals(n.getMembers(), n2.getMembers())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getJmlComments(), n2.getJmlComments()))
+            return false;
+        if (!nodesEquals(n.getMembers(), n2.getMembers()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlFieldDeclaration n, final Visitable arg) {
         final JmlFieldDeclaration n2 = (JmlFieldDeclaration) arg;
-        if (!nodeEquals(n.getDecl(), n2.getDecl())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getDecl(), n2.getDecl()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlOldClause n, final Visitable arg) {
         final JmlOldClause n2 = (JmlOldClause) arg;
-        if (!nodeEquals(n.getDeclarations(), n2.getDeclarations())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getDeclarations(), n2.getDeclarations()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlTypeExpr n, final Visitable arg) {
         final JmlTypeExpr n2 = (JmlTypeExpr) arg;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlMultiExprClause n, final Visitable arg) {
         final JmlMultiExprClause n2 = (JmlMultiExprClause) arg;
-        if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false;
-        if (!nodesEquals(n.getHeaps(), n2.getHeaps())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getExpressions(), n2.getExpressions()))
+            return false;
+        if (!nodesEquals(n.getHeaps(), n2.getHeaps()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlBeginStmt n, final Visitable arg) {
         final JmlBeginStmt n2 = (JmlBeginStmt) arg;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlEndStmt n, final Visitable arg) {
         final JmlEndStmt n2 = (JmlEndStmt) arg;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlLabelStmt n, final Visitable arg) {
         final JmlLabelStmt n2 = (JmlLabelStmt) arg;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlMethodSignature n, final Visitable arg) {
         final JmlMethodSignature n2 = (JmlMethodSignature) arg;
-        if (!nodesEquals(n.getArgumentTypes(), n2.getArgumentTypes())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getReceiver(), n2.getReceiver())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        if (!nodeEquals(n.getComment(), n2.getComment())) return false;
+        if (!nodesEquals(n.getArgumentTypes(), n2.getArgumentTypes()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getReceiver(), n2.getReceiver()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
+        return true;
+    }
+
+    @Override
+    public Boolean visit(final JmlDoc n, final Visitable arg) {
+        final JmlDoc n2 = (JmlDoc) arg;
+        if (!objEquals(n.getContent(), n2.getContent()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
+        return true;
+    }
+
+    @Override
+    public Boolean visit(final KeYMarkerStatement n, final Visitable arg) {
+        final KeYMarkerStatement n2 = (KeYMarkerStatement) arg;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
+        return true;
+    }
+
+    @Override
+    public Boolean visit(final JmlInfFlowClause n, final Visitable arg) {
+        final JmlInfFlowClause n2 = (JmlInfFlowClause) arg;
+        if (!nodesEquals(n.getBy(), n2.getBy()))
+            return false;
+        if (!nodesEquals(n.getDeclassifies(), n2.getDeclassifies()))
+            return false;
+        if (!nodesEquals(n.getErases(), n2.getErases()))
+            return false;
+        if (!nodesEquals(n.getExpressions(), n2.getExpressions()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodesEquals(n.getNewObjects(), n2.getNewObjects()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        if (!nodeEquals(n.getComment(), n2.getComment()))
+            return false;
         return true;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java
index 222ddf14cc..4e94da1c4c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericListVisitorAdapter.java
@@ -60,27 +60,33 @@ public List<R> visit(final AnnotationDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getMembers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -91,31 +97,38 @@ public List<R> visit(final AnnotationMemberDeclaration n, final A arg) {
         List<R> tmp;
         if (n.getDefaultValue().isPresent()) {
             tmp = n.getDefaultValue().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -126,19 +139,23 @@ public List<R> visit(final ArrayAccessExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getIndex().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -149,23 +166,28 @@ public List<R> visit(final ArrayCreationExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getElementType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getInitializer().isPresent()) {
             tmp = n.getInitializer().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getLevels().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -176,19 +198,23 @@ public List<R> visit(final ArrayCreationLevel n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getDimension().isPresent()) {
             tmp = n.getDimension().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -199,15 +225,18 @@ public List<R> visit(final ArrayInitializerExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getValues().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -218,19 +247,23 @@ public List<R> visit(final ArrayType n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getComponentType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -241,19 +274,23 @@ public List<R> visit(final AssertStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getCheck().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getMessage().isPresent()) {
             tmp = n.getMessage().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -264,19 +301,23 @@ public List<R> visit(final AssignExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getTarget().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getValue().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -287,19 +328,23 @@ public List<R> visit(final BinaryExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getLeft().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getRight().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -310,11 +355,13 @@ public List<R> visit(final BlockComment n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -325,19 +372,23 @@ public List<R> visit(final BlockStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getContracts().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getStatements().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -348,11 +399,13 @@ public List<R> visit(final BooleanLiteralExpr n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -363,15 +416,18 @@ public List<R> visit(final BreakStmt n, final A arg) {
         List<R> tmp;
         if (n.getLabel().isPresent()) {
             tmp = n.getLabel().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -382,19 +438,23 @@ public List<R> visit(final CastExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpression().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -405,19 +465,23 @@ public List<R> visit(final CatchClause n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getBody().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getParameter().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -428,11 +492,13 @@ public List<R> visit(final CharLiteralExpr n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -443,15 +509,18 @@ public List<R> visit(final ClassExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -462,43 +531,53 @@ public List<R> visit(final ClassOrInterfaceDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExtendedTypes().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getImplementedTypes().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getPermittedTypes().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getTypeParameters().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getMembers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -509,27 +588,33 @@ public List<R> visit(final ClassOrInterfaceType n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getScope().isPresent()) {
             tmp = n.getScope().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getTypeArguments().isPresent()) {
             tmp = n.getTypeArguments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -540,27 +625,33 @@ public List<R> visit(final CompilationUnit n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getImports().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getModule().isPresent()) {
             tmp = n.getModule().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getPackageDeclaration().isPresent()) {
             tmp = n.getPackageDeclaration().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getTypes().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -571,23 +662,28 @@ public List<R> visit(final ConditionalExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getCondition().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getElseExpr().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getThenExpr().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -598,47 +694,58 @@ public List<R> visit(final ConstructorDeclaration n, final A arg) {
         List<R> tmp;
         if (n.getBody().isPresent()) {
             tmp = n.getBody().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getContracts().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getParameters().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getReceiverParameter().isPresent()) {
             tmp = n.getReceiverParameter().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getThrownExceptions().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getTypeParameters().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -649,15 +756,18 @@ public List<R> visit(final ContinueStmt n, final A arg) {
         List<R> tmp;
         if (n.getLabel().isPresent()) {
             tmp = n.getLabel().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -668,23 +778,28 @@ public List<R> visit(final DoStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getBody().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getCondition().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getContracts().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -695,11 +810,13 @@ public List<R> visit(final DoubleLiteralExpr n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -710,11 +827,13 @@ public List<R> visit(final EmptyStmt n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -725,15 +844,18 @@ public List<R> visit(final EnclosedExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getInner().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -744,27 +866,33 @@ public List<R> visit(final EnumConstantDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getArguments().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getClassBody().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -775,35 +903,43 @@ public List<R> visit(final EnumDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getEntries().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getImplementedTypes().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getMembers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -814,23 +950,28 @@ public List<R> visit(final ExplicitConstructorInvocationStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getArguments().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getExpression().isPresent()) {
             tmp = n.getExpression().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getTypeArguments().isPresent()) {
             tmp = n.getTypeArguments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -841,15 +982,18 @@ public List<R> visit(final ExpressionStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpression().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -860,23 +1004,28 @@ public List<R> visit(final FieldAccessExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getScope().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getTypeArguments().isPresent()) {
             tmp = n.getTypeArguments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -887,23 +1036,28 @@ public List<R> visit(final FieldDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getVariables().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -914,31 +1068,38 @@ public List<R> visit(final ForStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getBody().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getCompare().isPresent()) {
             tmp = n.getCompare().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getContracts().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getInitialization().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getUpdate().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -949,27 +1110,33 @@ public List<R> visit(final ForEachStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getBody().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getContracts().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getIterable().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getVariable().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -980,23 +1147,28 @@ public List<R> visit(final IfStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getCondition().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getElseStmt().isPresent()) {
             tmp = n.getElseStmt().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getThenStmt().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1007,15 +1179,18 @@ public List<R> visit(final ImportDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1026,19 +1201,23 @@ public List<R> visit(final InitializerDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getBody().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1049,23 +1228,28 @@ public List<R> visit(final InstanceOfExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpression().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getPattern().isPresent()) {
             tmp = n.getPattern().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1076,11 +1260,13 @@ public List<R> visit(final IntegerLiteralExpr n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1091,19 +1277,23 @@ public List<R> visit(final IntersectionType n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getElements().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1114,11 +1304,13 @@ public List<R> visit(final TraditionalJavadocComment n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1129,19 +1321,23 @@ public List<R> visit(final LabeledStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getLabel().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getStatement().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1152,23 +1348,28 @@ public List<R> visit(final LambdaExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getBody().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getContracts().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getParameters().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1179,11 +1380,13 @@ public List<R> visit(final LineComment n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1194,15 +1397,18 @@ public List<R> visit(final LocalClassDeclarationStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getClassDeclaration().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1213,15 +1419,18 @@ public List<R> visit(final LocalRecordDeclarationStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getRecordDeclaration().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1232,11 +1441,13 @@ public List<R> visit(final LongLiteralExpr n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1247,15 +1458,18 @@ public List<R> visit(final MarkerAnnotationExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1266,19 +1480,23 @@ public List<R> visit(final MemberValuePair n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getValue().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1289,27 +1507,33 @@ public List<R> visit(final MethodCallExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getArguments().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getScope().isPresent()) {
             tmp = n.getScope().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getTypeArguments().isPresent()) {
             tmp = n.getTypeArguments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1320,51 +1544,63 @@ public List<R> visit(final MethodDeclaration n, final A arg) {
         List<R> tmp;
         if (n.getBody().isPresent()) {
             tmp = n.getBody().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getContracts().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getParameters().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getReceiverParameter().isPresent()) {
             tmp = n.getReceiverParameter().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getThrownExceptions().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getTypeParameters().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1375,19 +1611,23 @@ public List<R> visit(final MethodReferenceExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getScope().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getTypeArguments().isPresent()) {
             tmp = n.getTypeArguments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1398,15 +1638,18 @@ public List<R> visit(final NameExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1417,15 +1660,18 @@ public List<R> visit(final Name n, final A arg) {
         List<R> tmp;
         if (n.getQualifier().isPresent()) {
             tmp = n.getQualifier().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1436,19 +1682,23 @@ public List<R> visit(final NormalAnnotationExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getPairs().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1459,11 +1709,13 @@ public List<R> visit(final NullLiteralExpr n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1474,31 +1726,38 @@ public List<R> visit(final ObjectCreationExpr n, final A arg) {
         List<R> tmp;
         if (n.getAnonymousClassBody().isPresent()) {
             tmp = n.getAnonymousClassBody().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getArguments().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getScope().isPresent()) {
             tmp = n.getScope().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getTypeArguments().isPresent()) {
             tmp = n.getTypeArguments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1509,19 +1768,23 @@ public List<R> visit(final PackageDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1532,31 +1795,38 @@ public List<R> visit(final Parameter n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getVarArgsAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1567,15 +1837,18 @@ public List<R> visit(final PrimitiveType n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1586,15 +1859,18 @@ public List<R> visit(final ReturnStmt n, final A arg) {
         List<R> tmp;
         if (n.getExpression().isPresent()) {
             tmp = n.getExpression().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1605,11 +1881,13 @@ public List<R> visit(final SimpleName n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1620,19 +1898,23 @@ public List<R> visit(final SingleMemberAnnotationExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getMemberValue().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1643,11 +1925,13 @@ public List<R> visit(final StringLiteralExpr n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1658,15 +1942,18 @@ public List<R> visit(final SuperExpr n, final A arg) {
         List<R> tmp;
         if (n.getTypeName().isPresent()) {
             tmp = n.getTypeName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1677,23 +1964,28 @@ public List<R> visit(final SwitchEntry n, final A arg) {
         List<R> tmp;
         if (n.getGuard().isPresent()) {
             tmp = n.getGuard().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getLabels().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getStatements().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1704,19 +1996,23 @@ public List<R> visit(final SwitchStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getEntries().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getSelector().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1727,19 +2023,23 @@ public List<R> visit(final SynchronizedStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getBody().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getExpression().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1750,15 +2050,18 @@ public List<R> visit(final ThisExpr n, final A arg) {
         List<R> tmp;
         if (n.getTypeName().isPresent()) {
             tmp = n.getTypeName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1769,15 +2072,18 @@ public List<R> visit(final ThrowStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpression().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1788,27 +2094,33 @@ public List<R> visit(final TryStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getCatchClauses().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getFinallyBlock().isPresent()) {
             tmp = n.getFinallyBlock().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getResources().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getTryBlock().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1819,15 +2131,18 @@ public List<R> visit(final TypeExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1838,23 +2153,28 @@ public List<R> visit(final TypeParameter n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getTypeBound().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1865,15 +2185,18 @@ public List<R> visit(final UnaryExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpression().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1884,19 +2207,23 @@ public List<R> visit(final UnionType n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getElements().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1907,15 +2234,18 @@ public List<R> visit(final UnknownType n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1926,23 +2256,28 @@ public List<R> visit(final VariableDeclarationExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getVariables().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1953,23 +2288,28 @@ public List<R> visit(final VariableDeclarator n, final A arg) {
         List<R> tmp;
         if (n.getInitializer().isPresent()) {
             tmp = n.getInitializer().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1980,15 +2320,18 @@ public List<R> visit(final VoidType n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -1999,23 +2342,28 @@ public List<R> visit(final WhileStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getBody().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getCondition().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getContracts().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2026,34 +2374,35 @@ public List<R> visit(final WildcardType n, final A arg) {
         List<R> tmp;
         if (n.getExtendedType().isPresent()) {
             tmp = n.getExtendedType().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getSuperType().isPresent()) {
             tmp = n.getSuperType().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
 
     @Override
-    public List<R> visit(NodeList n, A arg) {
-        return ((NodeList<? extends Node>) n)
-                .stream()
-                        .filter(Objects::nonNull)
-                        .flatMap(v -> v.accept(this, arg).stream())
-                        .collect(Collectors.toList());
+    public List<R> visit(NodeList<?> n, A arg) {
+        return ((NodeList<? extends Node>) n).stream().filter(Objects::nonNull).flatMap(v -> v.accept(this, arg).stream()).collect(Collectors.toList());
     }
 
     @Override
@@ -2062,23 +2411,28 @@ public List<R> visit(final ModuleDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getDirectives().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2089,19 +2443,23 @@ public List<R> visit(final ModuleExportsDirective n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getModuleNames().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2112,19 +2470,23 @@ public List<R> visit(final ModuleOpensDirective n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getModuleNames().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2135,19 +2497,23 @@ public List<R> visit(final ModuleProvidesDirective n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getWith().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2158,19 +2524,23 @@ public List<R> visit(final ModuleRequiresDirective n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2181,15 +2551,18 @@ public List<R> visit(final ModuleUsesDirective n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2200,11 +2573,13 @@ public List<R> visit(final UnparsableStmt n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2215,23 +2590,28 @@ public List<R> visit(final ReceiverParameter n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2242,15 +2622,18 @@ public List<R> visit(final VarType n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2261,11 +2644,13 @@ public List<R> visit(final Modifier n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2276,19 +2661,23 @@ public List<R> visit(final SwitchExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getEntries().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getSelector().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2299,15 +2688,18 @@ public List<R> visit(final YieldStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpression().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2318,11 +2710,13 @@ public List<R> visit(final TextBlockLiteralExpr n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2333,23 +2727,28 @@ public List<R> visit(final TypePatternExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2360,46 +2759,55 @@ public List<R> visit(final JmlQuantifiedExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpressions().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getVariables().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
 
     @Override
-    public List<R> visit(final JmlClauseLabel n, final A arg) {
+    public List<R> visit(final JmlLabledClause n, final A arg) {
         List<R> result = new ArrayList<>();
         List<R> tmp;
         {
-            tmp = n.getExpr().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            tmp = n.getExpression().accept(this, arg);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getLabel().isPresent()) {
             tmp = n.getLabel().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2410,19 +2818,23 @@ public List<R> visit(final JmlExpressionStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpression().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2433,19 +2845,23 @@ public List<R> visit(final JmlLabelExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpression().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getLabel().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2456,19 +2872,23 @@ public List<R> visit(final JmlLetExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getBody().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getVariables().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2479,15 +2899,18 @@ public List<R> visit(final JmlMultiCompareExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpressions().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2498,23 +2921,28 @@ public List<R> visit(final JmlSimpleExprClause n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpression().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getHeaps().isPresent()) {
             tmp = n.getHeaps().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2525,23 +2953,28 @@ public List<R> visit(final JmlSignalsClause n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpression().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getParameter().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2552,19 +2985,23 @@ public List<R> visit(final JmlSignalsOnlyClause n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getTypes().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2575,15 +3012,18 @@ public List<R> visit(final JmlUnreachableStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2594,19 +3034,23 @@ public List<R> visit(final JmlCallableClause n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getMethodSignatures().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2617,19 +3061,23 @@ public List<R> visit(final JmlForallClause n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getBoundedVariables().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2640,42 +3088,50 @@ public List<R> visit(final JmlRefiningStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
 
     @Override
-    public List<R> visit(final JmlClauseIf n, final A arg) {
+    public List<R> visit(final JmlConditionalClause n, final A arg) {
         List<R> result = new ArrayList<>();
         List<R> tmp;
         {
             tmp = n.getCondition().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
-            tmp = n.getThen().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            tmp = n.getExpression().accept(this, arg);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2686,35 +3142,43 @@ public List<R> visit(final JmlClassExprDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getInvariant().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getKind().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2725,35 +3189,43 @@ public List<R> visit(final JmlClassAccessibleDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpressions().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getMeasuredBy().isPresent()) {
             tmp = n.getMeasuredBy().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getVariable().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2764,31 +3236,38 @@ public List<R> visit(final JmlRepresentsDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpr().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2799,31 +3278,38 @@ public List<R> visit(final JmlContract n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getClauses().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getSubContracts().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2834,19 +3320,23 @@ public List<R> visit(final JmlSetComprehensionExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getBinding().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getPredicate().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2857,19 +3347,23 @@ public List<R> visit(final JmlGhostStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getStatement().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2880,43 +3374,53 @@ public List<R> visit(final RecordDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getImplementedTypes().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getParameters().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getReceiverParameter().isPresent()) {
             tmp = n.getReceiverParameter().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getTypeParameters().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getMembers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2927,35 +3431,43 @@ public List<R> visit(final CompactConstructorDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getBody().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getThrownExceptions().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getTypeParameters().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2966,19 +3478,23 @@ public List<R> visit(final KeyCcatchBreak n, final A arg) {
         List<R> tmp;
         if (n.getBlock().isPresent()) {
             tmp = n.getBlock().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getLabel().isPresent()) {
             tmp = n.getLabel().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -2989,19 +3505,23 @@ public List<R> visit(final KeyCcatchContinue n, final A arg) {
         List<R> tmp;
         if (n.getBlock().isPresent()) {
             tmp = n.getBlock().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getLabel().isPresent()) {
             tmp = n.getLabel().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3012,19 +3532,23 @@ public List<R> visit(final KeyCcatchParameter n, final A arg) {
         List<R> tmp;
         if (n.getBlock().isPresent()) {
             tmp = n.getBlock().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getParameter().isPresent()) {
             tmp = n.getParameter().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3035,42 +3559,50 @@ public List<R> visit(final KeyCcatchReturn n, final A arg) {
         List<R> tmp;
         if (n.getBlock().isPresent()) {
             tmp = n.getBlock().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getParameter().isPresent()) {
             tmp = n.getParameter().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
 
     @Override
-    public List<R> visit(final KeyCatchAllStatement n, final A arg) {
+    public List<R> visit(final KeyCatchAllStmt n, final A arg) {
         List<R> result = new ArrayList<>();
         List<R> tmp;
         {
             tmp = n.getBlock().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getLabel().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3081,42 +3613,50 @@ public List<R> visit(final KeyEscapeExpression n, final A arg) {
         List<R> tmp;
         if (n.getArguments().isPresent()) {
             tmp = n.getArguments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getCallee().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
 
     @Override
-    public List<R> visit(final KeyExecStatement n, final A arg) {
+    public List<R> visit(final KeyExecStmt n, final A arg) {
         List<R> result = new ArrayList<>();
         List<R> tmp;
         {
             tmp = n.getBranches().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getExecBlock().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3127,65 +3667,77 @@ public List<R> visit(final KeyExecutionContext n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getContext().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getInstance().isPresent()) {
             tmp = n.getInstance().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getSignature().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
 
     @Override
-    public List<R> visit(final KeyLoopScopeBlock n, final A arg) {
+    public List<R> visit(final KeyLoopScopeBlockStmt n, final A arg) {
         List<R> result = new ArrayList<>();
         List<R> tmp;
         {
             tmp = n.getBlock().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getIndexPV().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
 
     @Override
-    public List<R> visit(final KeyMergePointStatement n, final A arg) {
+    public List<R> visit(final KeyMergePointStmt n, final A arg) {
         List<R> result = new ArrayList<>();
         List<R> tmp;
         {
             tmp = n.getExpr().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3196,50 +3748,60 @@ public List<R> visit(final KeyMethodBodyStatement n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpr().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getSource().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
 
     @Override
-    public List<R> visit(final KeyMethodCallStatement n, final A arg) {
+    public List<R> visit(final KeyMethodCallStmt n, final A arg) {
         List<R> result = new ArrayList<>();
         List<R> tmp;
         {
             tmp = n.getBlock().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getContext().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3250,57 +3812,40 @@ public List<R> visit(final KeyMethodSignature n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getParamTypes().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
 
     @Override
-    public List<R> visit(final KeyRangeExpression n, final A arg) {
+    public List<R> visit(final KeyTransactionStmt n, final A arg) {
         List<R> result = new ArrayList<>();
         List<R> tmp;
-        {
-            tmp = n.getLower().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
-        }
-        {
-            tmp = n.getUpper().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
-        }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
-        }
-        return result;
-    }
-
-    @Override
-    public List<R> visit(final KeyTransactionStatement n, final A arg) {
-        List<R> result = new ArrayList<>();
-        List<R> tmp;
-        if (n.getAssociatedSpecificationComments().isPresent()) {
-            tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
-        }
-        if (n.getComment().isPresent()) {
-            tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3311,31 +3856,38 @@ public List<R> visit(final KeyContextStatementBlock n, final A arg) {
         List<R> tmp;
         if (n.getContext().isPresent()) {
             tmp = n.getContext().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getExpression().isPresent()) {
             tmp = n.getExpression().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getSignature().isPresent()) {
             tmp = n.getSignature().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getStatements().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getTr().isPresent()) {
             tmp = n.getTr().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3346,11 +3898,13 @@ public List<R> visit(final KeyExecCtxtSV n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3361,11 +3915,13 @@ public List<R> visit(final KeyExpressionSV n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3376,11 +3932,13 @@ public List<R> visit(final KeyJumpLabelSV n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3391,15 +3949,18 @@ public List<R> visit(final KeyMetaConstructExpression n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getChild().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3410,19 +3971,23 @@ public List<R> visit(final KeyMetaConstruct n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getChild().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getSchemas().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3433,19 +3998,23 @@ public List<R> visit(final KeyMetaConstructType n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpr().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3456,11 +4025,13 @@ public List<R> visit(final KeyMethodSignatureSV n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3471,15 +4042,18 @@ public List<R> visit(final KeyPassiveExpression n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpr().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3490,11 +4064,13 @@ public List<R> visit(final KeyProgramVariableSV n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3505,11 +4081,13 @@ public List<R> visit(final KeyStatementSV n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3520,15 +4098,18 @@ public List<R> visit(final KeyTypeSV n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3539,11 +4120,13 @@ public List<R> visit(final KeyCcatchSV n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3554,11 +4137,13 @@ public List<R> visit(final KeyExecutionContextSV n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3569,23 +4154,28 @@ public List<R> visit(final RecordPatternExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getPatternList().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3596,15 +4186,18 @@ public List<R> visit(final MatchAllPatternExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3615,11 +4208,13 @@ public List<R> visit(final MarkdownComment n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3630,27 +4225,33 @@ public List<R> visit(final JmlMethodDeclaration n, final A arg) {
         List<R> tmp;
         if (n.getContract().isPresent()) {
             tmp = n.getContract().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getMethodDeclaration().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3661,23 +4262,28 @@ public List<R> visit(final JmlBinaryInfixExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getLeft().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getOperator().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getRight().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3688,19 +4294,23 @@ public List<R> visit(final JmlDocDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getJmlComments().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3711,15 +4321,18 @@ public List<R> visit(final JmlDocStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getJmlComments().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3730,11 +4343,13 @@ public List<R> visit(final JmlDoc n, final A arg) {
         List<R> tmp;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3745,31 +4360,38 @@ public List<R> visit(final JmlDocType n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getJmlComments().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getMembers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getModifiers().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3780,23 +4402,28 @@ public List<R> visit(final JmlFieldDeclaration n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getDecl().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getAnnotations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3807,19 +4434,23 @@ public List<R> visit(final JmlOldClause n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getDeclarations().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3830,15 +4461,18 @@ public List<R> visit(final JmlTypeExpr n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getType().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3849,23 +4483,28 @@ public List<R> visit(final JmlMultiExprClause n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getExpressions().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getHeaps().isPresent()) {
             tmp = n.getHeaps().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getName().isPresent()) {
             tmp = n.getName().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3876,15 +4515,18 @@ public List<R> visit(final JmlBeginStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3895,15 +4537,18 @@ public List<R> visit(final JmlEndStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3914,19 +4559,23 @@ public List<R> visit(final JmlLabelStmt n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getJmlTags().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getLabel().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
@@ -3937,23 +4586,92 @@ public List<R> visit(final JmlMethodSignature n, final A arg) {
         List<R> tmp;
         {
             tmp = n.getArgumentTypes().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         {
             tmp = n.getName().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getReceiver().isPresent()) {
             tmp = n.getReceiver().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
+        }
+        if (n.getAssociatedSpecificationComments().isPresent()) {
+            tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
+            if (tmp != null)
+                result.addAll(tmp);
+        }
+        if (n.getComment().isPresent()) {
+            tmp = n.getComment().get().accept(this, arg);
+            if (tmp != null)
+                result.addAll(tmp);
+        }
+        return result;
+    }
+
+    @Override
+    public List<R> visit(final KeYMarkerStatement n, final A arg) {
+        List<R> result = new ArrayList<>();
+        List<R> tmp;
+        if (n.getAssociatedSpecificationComments().isPresent()) {
+            tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
+            if (tmp != null)
+                result.addAll(tmp);
+        }
+        if (n.getComment().isPresent()) {
+            tmp = n.getComment().get().accept(this, arg);
+            if (tmp != null)
+                result.addAll(tmp);
+        }
+        return result;
+    }
+
+    @Override
+    public List<R> visit(final JmlInfFlowClause n, final A arg) {
+        List<R> result = new ArrayList<>();
+        List<R> tmp;
+        {
+            tmp = n.getBy().accept(this, arg);
+            if (tmp != null)
+                result.addAll(tmp);
+        }
+        {
+            tmp = n.getDeclassifies().accept(this, arg);
+            if (tmp != null)
+                result.addAll(tmp);
+        }
+        {
+            tmp = n.getErases().accept(this, arg);
+            if (tmp != null)
+                result.addAll(tmp);
+        }
+        {
+            tmp = n.getExpressions().accept(this, arg);
+            if (tmp != null)
+                result.addAll(tmp);
+        }
+        {
+            tmp = n.getNewObjects().accept(this, arg);
+            if (tmp != null)
+                result.addAll(tmp);
+        }
+        if (n.getName().isPresent()) {
+            tmp = n.getName().get().accept(this, arg);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             tmp = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         if (n.getComment().isPresent()) {
             tmp = n.getComment().get().accept(this, arg);
-            if (tmp != null) result.addAll(tmp);
+            if (tmp != null)
+                result.addAll(tmp);
         }
         return result;
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java
index fe57ecd673..4166ebfa69 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitor.java
@@ -28,10 +28,8 @@
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
+import com.github.javaparser.ast.jml.doc.*;
 import com.github.javaparser.ast.jml.doc.JmlDoc;
-import com.github.javaparser.ast.jml.doc.JmlDocDeclaration;
-import com.github.javaparser.ast.jml.doc.JmlDocStmt;
-import com.github.javaparser.ast.jml.doc.JmlDocType;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -216,7 +214,7 @@ public interface GenericVisitor<R, A> {
 
     R visit(TypeExpr n, A arg);
 
-    R visit(NodeList n, A arg);
+    R visit(NodeList<?> n, A arg);
 
     R visit(Name n, A arg);
 
@@ -266,27 +264,25 @@ public interface GenericVisitor<R, A> {
 
     R visit(KeyCcatchReturn n, A arg);
 
-    R visit(KeyCatchAllStatement n, A arg);
+    R visit(KeyCatchAllStmt n, A arg);
 
     R visit(KeyEscapeExpression n, A arg);
 
-    R visit(KeyExecStatement n, A arg);
+    R visit(KeyExecStmt n, A arg);
 
     R visit(KeyExecutionContext n, A arg);
 
-    R visit(KeyLoopScopeBlock n, A arg);
+    R visit(KeyLoopScopeBlockStmt n, A arg);
 
-    R visit(KeyMergePointStatement n, A arg);
+    R visit(KeyMergePointStmt n, A arg);
 
     R visit(KeyMethodBodyStatement n, A arg);
 
-    R visit(KeyMethodCallStatement n, A arg);
+    R visit(KeyMethodCallStmt n, A arg);
 
     R visit(KeyMethodSignature n, A arg);
 
-    R visit(KeyRangeExpression n, A arg);
-
-    R visit(KeyTransactionStatement n, A arg);
+    R visit(KeyTransactionStmt n, A arg);
 
     R visit(KeyContextStatementBlock n, A arg);
 
@@ -318,7 +314,7 @@ public interface GenericVisitor<R, A> {
 
     R visit(JmlQuantifiedExpr n, A arg);
 
-    R visit(JmlClauseLabel n, A arg);
+    R visit(JmlLabledClause n, A arg);
 
     R visit(JmlExpressionStmt n, A arg);
 
@@ -342,7 +338,7 @@ public interface GenericVisitor<R, A> {
 
     R visit(JmlRefiningStmt n, A arg);
 
-    R visit(JmlClauseIf n, A arg);
+    R visit(JmlConditionalClause n, A arg);
 
     R visit(JmlClassExprDeclaration n, A arg);
 
@@ -383,4 +379,8 @@ public interface GenericVisitor<R, A> {
     R visit(JmlLabelStmt n, A arg);
 
     R visit(JmlMethodSignature n, A arg);
+
+    R visit(KeYMarkerStatement n, A arg);
+
+    R visit(JmlInfFlowClause n, A arg);
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
index 8c71a81a3c..b1065cc660 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
@@ -55,27 +55,33 @@ public R visit(final AnnotationDeclaration n, final A arg) {
         R result;
         {
             result = n.getMembers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -85,31 +91,38 @@ public R visit(final AnnotationMemberDeclaration n, final A arg) {
         R result;
         if (n.getDefaultValue().isPresent()) {
             result = n.getDefaultValue().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -119,19 +132,23 @@ public R visit(final ArrayAccessExpr n, final A arg) {
         R result;
         {
             result = n.getIndex().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -141,23 +158,28 @@ public R visit(final ArrayCreationExpr n, final A arg) {
         R result;
         {
             result = n.getElementType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getInitializer().isPresent()) {
             result = n.getInitializer().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getLevels().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -167,15 +189,18 @@ public R visit(final ArrayInitializerExpr n, final A arg) {
         R result;
         {
             result = n.getValues().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -185,19 +210,23 @@ public R visit(final AssertStmt n, final A arg) {
         R result;
         {
             result = n.getCheck().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getMessage().isPresent()) {
             result = n.getMessage().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -207,19 +236,23 @@ public R visit(final AssignExpr n, final A arg) {
         R result;
         {
             result = n.getTarget().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getValue().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -229,19 +262,23 @@ public R visit(final BinaryExpr n, final A arg) {
         R result;
         {
             result = n.getLeft().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getRight().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -251,19 +288,23 @@ public R visit(final BlockStmt n, final A arg) {
         R result;
         {
             result = n.getContracts().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getStatements().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -273,11 +314,13 @@ public R visit(final BooleanLiteralExpr n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -287,15 +330,18 @@ public R visit(final BreakStmt n, final A arg) {
         R result;
         if (n.getLabel().isPresent()) {
             result = n.getLabel().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -305,19 +351,23 @@ public R visit(final CastExpr n, final A arg) {
         R result;
         {
             result = n.getExpression().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -327,19 +377,23 @@ public R visit(final CatchClause n, final A arg) {
         R result;
         {
             result = n.getBody().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getParameter().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -349,11 +403,13 @@ public R visit(final CharLiteralExpr n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -363,15 +419,18 @@ public R visit(final ClassExpr n, final A arg) {
         R result;
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -381,43 +440,53 @@ public R visit(final ClassOrInterfaceDeclaration n, final A arg) {
         R result;
         {
             result = n.getExtendedTypes().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getImplementedTypes().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getPermittedTypes().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getTypeParameters().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getMembers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -427,27 +496,33 @@ public R visit(final ClassOrInterfaceType n, final A arg) {
         R result;
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getScope().isPresent()) {
             result = n.getScope().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getTypeArguments().isPresent()) {
             result = n.getTypeArguments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -457,27 +532,33 @@ public R visit(final CompilationUnit n, final A arg) {
         R result;
         {
             result = n.getImports().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getModule().isPresent()) {
             result = n.getModule().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getPackageDeclaration().isPresent()) {
             result = n.getPackageDeclaration().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getTypes().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -487,23 +568,28 @@ public R visit(final ConditionalExpr n, final A arg) {
         R result;
         {
             result = n.getCondition().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getElseExpr().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getThenExpr().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -513,47 +599,58 @@ public R visit(final ConstructorDeclaration n, final A arg) {
         R result;
         if (n.getBody().isPresent()) {
             result = n.getBody().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getContracts().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getParameters().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getReceiverParameter().isPresent()) {
             result = n.getReceiverParameter().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getThrownExceptions().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getTypeParameters().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -563,15 +660,18 @@ public R visit(final ContinueStmt n, final A arg) {
         R result;
         if (n.getLabel().isPresent()) {
             result = n.getLabel().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -581,23 +681,28 @@ public R visit(final DoStmt n, final A arg) {
         R result;
         {
             result = n.getBody().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getCondition().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getContracts().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -607,11 +712,13 @@ public R visit(final DoubleLiteralExpr n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -621,11 +728,13 @@ public R visit(final EmptyStmt n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -635,15 +744,18 @@ public R visit(final EnclosedExpr n, final A arg) {
         R result;
         {
             result = n.getInner().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -653,27 +765,33 @@ public R visit(final EnumConstantDeclaration n, final A arg) {
         R result;
         {
             result = n.getArguments().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getClassBody().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -683,35 +801,43 @@ public R visit(final EnumDeclaration n, final A arg) {
         R result;
         {
             result = n.getEntries().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getImplementedTypes().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getMembers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -721,23 +847,28 @@ public R visit(final ExplicitConstructorInvocationStmt n, final A arg) {
         R result;
         {
             result = n.getArguments().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getExpression().isPresent()) {
             result = n.getExpression().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getTypeArguments().isPresent()) {
             result = n.getTypeArguments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -747,15 +878,18 @@ public R visit(final ExpressionStmt n, final A arg) {
         R result;
         {
             result = n.getExpression().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -765,23 +899,28 @@ public R visit(final FieldAccessExpr n, final A arg) {
         R result;
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getScope().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getTypeArguments().isPresent()) {
             result = n.getTypeArguments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -791,23 +930,28 @@ public R visit(final FieldDeclaration n, final A arg) {
         R result;
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getVariables().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -817,27 +961,33 @@ public R visit(final ForEachStmt n, final A arg) {
         R result;
         {
             result = n.getBody().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getContracts().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getIterable().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getVariable().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -847,31 +997,38 @@ public R visit(final ForStmt n, final A arg) {
         R result;
         {
             result = n.getBody().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getCompare().isPresent()) {
             result = n.getCompare().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getContracts().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getInitialization().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getUpdate().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -881,23 +1038,28 @@ public R visit(final IfStmt n, final A arg) {
         R result;
         {
             result = n.getCondition().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getElseStmt().isPresent()) {
             result = n.getElseStmt().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getThenStmt().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -907,19 +1069,23 @@ public R visit(final InitializerDeclaration n, final A arg) {
         R result;
         {
             result = n.getBody().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -929,23 +1095,28 @@ public R visit(final InstanceOfExpr n, final A arg) {
         R result;
         {
             result = n.getExpression().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getPattern().isPresent()) {
             result = n.getPattern().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -955,11 +1126,13 @@ public R visit(final IntegerLiteralExpr n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -969,11 +1142,13 @@ public R visit(final TraditionalJavadocComment n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -983,19 +1158,23 @@ public R visit(final LabeledStmt n, final A arg) {
         R result;
         {
             result = n.getLabel().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getStatement().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1005,11 +1184,13 @@ public R visit(final LongLiteralExpr n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1019,15 +1200,18 @@ public R visit(final MarkerAnnotationExpr n, final A arg) {
         R result;
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1037,19 +1221,23 @@ public R visit(final MemberValuePair n, final A arg) {
         R result;
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getValue().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1059,27 +1247,33 @@ public R visit(final MethodCallExpr n, final A arg) {
         R result;
         {
             result = n.getArguments().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getScope().isPresent()) {
             result = n.getScope().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getTypeArguments().isPresent()) {
             result = n.getTypeArguments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1089,51 +1283,63 @@ public R visit(final MethodDeclaration n, final A arg) {
         R result;
         if (n.getBody().isPresent()) {
             result = n.getBody().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getContracts().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getParameters().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getReceiverParameter().isPresent()) {
             result = n.getReceiverParameter().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getThrownExceptions().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getTypeParameters().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1143,15 +1349,18 @@ public R visit(final NameExpr n, final A arg) {
         R result;
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1161,19 +1370,23 @@ public R visit(final NormalAnnotationExpr n, final A arg) {
         R result;
         {
             result = n.getPairs().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1183,11 +1396,13 @@ public R visit(final NullLiteralExpr n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1197,31 +1412,38 @@ public R visit(final ObjectCreationExpr n, final A arg) {
         R result;
         if (n.getAnonymousClassBody().isPresent()) {
             result = n.getAnonymousClassBody().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getArguments().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getScope().isPresent()) {
             result = n.getScope().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getTypeArguments().isPresent()) {
             result = n.getTypeArguments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1231,19 +1453,23 @@ public R visit(final PackageDeclaration n, final A arg) {
         R result;
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1253,31 +1479,38 @@ public R visit(final Parameter n, final A arg) {
         R result;
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getVarArgsAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1287,15 +1520,18 @@ public R visit(final PrimitiveType n, final A arg) {
         R result;
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1305,15 +1541,18 @@ public R visit(final Name n, final A arg) {
         R result;
         if (n.getQualifier().isPresent()) {
             result = n.getQualifier().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1323,11 +1562,13 @@ public R visit(final SimpleName n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1337,19 +1578,23 @@ public R visit(final ArrayType n, final A arg) {
         R result;
         {
             result = n.getComponentType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1359,19 +1604,23 @@ public R visit(final ArrayCreationLevel n, final A arg) {
         R result;
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getDimension().isPresent()) {
             result = n.getDimension().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1381,19 +1630,23 @@ public R visit(final IntersectionType n, final A arg) {
         R result;
         {
             result = n.getElements().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1403,19 +1656,23 @@ public R visit(final UnionType n, final A arg) {
         R result;
         {
             result = n.getElements().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1425,15 +1682,18 @@ public R visit(final ReturnStmt n, final A arg) {
         R result;
         if (n.getExpression().isPresent()) {
             result = n.getExpression().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1443,19 +1703,23 @@ public R visit(final SingleMemberAnnotationExpr n, final A arg) {
         R result;
         {
             result = n.getMemberValue().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1465,11 +1729,13 @@ public R visit(final StringLiteralExpr n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1479,15 +1745,18 @@ public R visit(final SuperExpr n, final A arg) {
         R result;
         if (n.getTypeName().isPresent()) {
             result = n.getTypeName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1497,23 +1766,28 @@ public R visit(final SwitchEntry n, final A arg) {
         R result;
         if (n.getGuard().isPresent()) {
             result = n.getGuard().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getLabels().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getStatements().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1523,19 +1797,23 @@ public R visit(final SwitchStmt n, final A arg) {
         R result;
         {
             result = n.getEntries().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getSelector().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1545,19 +1823,23 @@ public R visit(final SynchronizedStmt n, final A arg) {
         R result;
         {
             result = n.getBody().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getExpression().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1567,15 +1849,18 @@ public R visit(final ThisExpr n, final A arg) {
         R result;
         if (n.getTypeName().isPresent()) {
             result = n.getTypeName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1585,15 +1870,18 @@ public R visit(final ThrowStmt n, final A arg) {
         R result;
         {
             result = n.getExpression().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1603,27 +1891,33 @@ public R visit(final TryStmt n, final A arg) {
         R result;
         {
             result = n.getCatchClauses().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getFinallyBlock().isPresent()) {
             result = n.getFinallyBlock().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getResources().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getTryBlock().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1633,15 +1927,18 @@ public R visit(final LocalClassDeclarationStmt n, final A arg) {
         R result;
         {
             result = n.getClassDeclaration().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1651,15 +1948,18 @@ public R visit(final LocalRecordDeclarationStmt n, final A arg) {
         R result;
         {
             result = n.getRecordDeclaration().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1669,23 +1969,28 @@ public R visit(final TypeParameter n, final A arg) {
         R result;
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getTypeBound().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1695,15 +2000,18 @@ public R visit(final UnaryExpr n, final A arg) {
         R result;
         {
             result = n.getExpression().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1713,15 +2021,18 @@ public R visit(final UnknownType n, final A arg) {
         R result;
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1731,23 +2042,28 @@ public R visit(final VariableDeclarationExpr n, final A arg) {
         R result;
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getVariables().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1757,23 +2073,28 @@ public R visit(final VariableDeclarator n, final A arg) {
         R result;
         if (n.getInitializer().isPresent()) {
             result = n.getInitializer().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1783,15 +2104,18 @@ public R visit(final VoidType n, final A arg) {
         R result;
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1801,23 +2125,28 @@ public R visit(final WhileStmt n, final A arg) {
         R result;
         {
             result = n.getBody().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getCondition().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getContracts().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1827,23 +2156,28 @@ public R visit(final WildcardType n, final A arg) {
         R result;
         if (n.getExtendedType().isPresent()) {
             result = n.getExtendedType().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getSuperType().isPresent()) {
             result = n.getSuperType().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1853,23 +2187,28 @@ public R visit(final LambdaExpr n, final A arg) {
         R result;
         {
             result = n.getBody().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getContracts().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getParameters().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1879,19 +2218,23 @@ public R visit(final MethodReferenceExpr n, final A arg) {
         R result;
         {
             result = n.getScope().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getTypeArguments().isPresent()) {
             result = n.getTypeArguments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1901,15 +2244,18 @@ public R visit(final TypeExpr n, final A arg) {
         R result;
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1919,15 +2265,18 @@ public R visit(final ImportDeclaration n, final A arg) {
         R result;
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1937,11 +2286,13 @@ public R visit(final BlockComment n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -1951,17 +2302,19 @@ public R visit(final LineComment n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
 
     @Override
-    public R visit(NodeList n, A arg) {
+    public R visit(NodeList<?> n, A arg) {
         for (final Object v : n) {
             R result = ((Node) v).accept(this, arg);
             if (result != null) {
@@ -1976,23 +2329,28 @@ public R visit(final ModuleDeclaration n, final A arg) {
         R result;
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getDirectives().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2002,19 +2360,23 @@ public R visit(final ModuleRequiresDirective n, final A arg) {
         R result;
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2024,19 +2386,23 @@ public R visit(final ModuleExportsDirective n, final A arg) {
         R result;
         {
             result = n.getModuleNames().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2046,19 +2412,23 @@ public R visit(final ModuleProvidesDirective n, final A arg) {
         R result;
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getWith().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2068,15 +2438,18 @@ public R visit(final ModuleUsesDirective n, final A arg) {
         R result;
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2086,19 +2459,23 @@ public R visit(final ModuleOpensDirective n, final A arg) {
         R result;
         {
             result = n.getModuleNames().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2108,11 +2485,13 @@ public R visit(final UnparsableStmt n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2122,23 +2501,28 @@ public R visit(final ReceiverParameter n, final A arg) {
         R result;
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2148,15 +2532,18 @@ public R visit(final VarType n, final A arg) {
         R result;
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2166,11 +2553,13 @@ public R visit(final Modifier n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2180,19 +2569,23 @@ public R visit(final SwitchExpr n, final A arg) {
         R result;
         {
             result = n.getEntries().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getSelector().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2202,15 +2595,18 @@ public R visit(final YieldStmt n, final A arg) {
         R result;
         {
             result = n.getExpression().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2220,11 +2616,13 @@ public R visit(final TextBlockLiteralExpr n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2234,23 +2632,28 @@ public R visit(final TypePatternExpr n, final A arg) {
         R result;
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2260,45 +2663,54 @@ public R visit(final JmlQuantifiedExpr n, final A arg) {
         R result;
         {
             result = n.getExpressions().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getVariables().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
 
     @Override
-    public R visit(final JmlClauseLabel n, final A arg) {
+    public R visit(final JmlLabledClause n, final A arg) {
         R result;
         {
-            result = n.getExpr().accept(this, arg);
-            if (result != null) return result;
+            result = n.getExpression().accept(this, arg);
+            if (result != null)
+                return result;
         }
         if (n.getLabel().isPresent()) {
             result = n.getLabel().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2308,19 +2720,23 @@ public R visit(final JmlExpressionStmt n, final A arg) {
         R result;
         {
             result = n.getExpression().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2330,19 +2746,23 @@ public R visit(final JmlLabelExpr n, final A arg) {
         R result;
         {
             result = n.getExpression().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getLabel().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2352,19 +2772,23 @@ public R visit(final JmlLetExpr n, final A arg) {
         R result;
         {
             result = n.getBody().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getVariables().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2374,15 +2798,18 @@ public R visit(final JmlMultiCompareExpr n, final A arg) {
         R result;
         {
             result = n.getExpressions().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2392,23 +2819,28 @@ public R visit(final JmlSimpleExprClause n, final A arg) {
         R result;
         {
             result = n.getExpression().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getHeaps().isPresent()) {
             result = n.getHeaps().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2418,23 +2850,28 @@ public R visit(final JmlSignalsClause n, final A arg) {
         R result;
         {
             result = n.getExpression().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getParameter().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2444,19 +2881,23 @@ public R visit(final JmlSignalsOnlyClause n, final A arg) {
         R result;
         {
             result = n.getTypes().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2466,15 +2907,18 @@ public R visit(final JmlUnreachableStmt n, final A arg) {
         R result;
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2484,19 +2928,23 @@ public R visit(final JmlCallableClause n, final A arg) {
         R result;
         {
             result = n.getMethodSignatures().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2506,19 +2954,23 @@ public R visit(final JmlForallClause n, final A arg) {
         R result;
         {
             result = n.getBoundedVariables().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2528,41 +2980,49 @@ public R visit(final JmlRefiningStmt n, final A arg) {
         R result;
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
 
     @Override
-    public R visit(final JmlClauseIf n, final A arg) {
+    public R visit(final JmlConditionalClause n, final A arg) {
         R result;
         {
             result = n.getCondition().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
-            result = n.getThen().accept(this, arg);
-            if (result != null) return result;
+            result = n.getExpression().accept(this, arg);
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2572,35 +3032,43 @@ public R visit(final JmlClassExprDeclaration n, final A arg) {
         R result;
         {
             result = n.getInvariant().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getKind().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2610,35 +3078,43 @@ public R visit(final JmlClassAccessibleDeclaration n, final A arg) {
         R result;
         {
             result = n.getExpressions().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getMeasuredBy().isPresent()) {
             result = n.getMeasuredBy().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getVariable().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2648,31 +3124,38 @@ public R visit(final JmlRepresentsDeclaration n, final A arg) {
         R result;
         {
             result = n.getExpr().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2682,31 +3165,38 @@ public R visit(final JmlContract n, final A arg) {
         R result;
         {
             result = n.getClauses().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getSubContracts().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2716,19 +3206,23 @@ public R visit(final JmlSetComprehensionExpr n, final A arg) {
         R result;
         {
             result = n.getBinding().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getPredicate().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2738,19 +3232,23 @@ public R visit(final JmlGhostStmt n, final A arg) {
         R result;
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getStatement().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2760,43 +3258,53 @@ public R visit(final RecordDeclaration n, final A arg) {
         R result;
         {
             result = n.getImplementedTypes().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getParameters().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getReceiverParameter().isPresent()) {
             result = n.getReceiverParameter().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getTypeParameters().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getMembers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2806,35 +3314,43 @@ public R visit(final CompactConstructorDeclaration n, final A arg) {
         R result;
         {
             result = n.getBody().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getThrownExceptions().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getTypeParameters().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2844,19 +3360,23 @@ public R visit(final KeyCcatchBreak n, final A arg) {
         R result;
         if (n.getBlock().isPresent()) {
             result = n.getBlock().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getLabel().isPresent()) {
             result = n.getLabel().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2866,19 +3386,23 @@ public R visit(final KeyCcatchContinue n, final A arg) {
         R result;
         if (n.getBlock().isPresent()) {
             result = n.getBlock().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getLabel().isPresent()) {
             result = n.getLabel().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2888,19 +3412,23 @@ public R visit(final KeyCcatchParameter n, final A arg) {
         R result;
         if (n.getBlock().isPresent()) {
             result = n.getBlock().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getParameter().isPresent()) {
             result = n.getParameter().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2910,41 +3438,49 @@ public R visit(final KeyCcatchReturn n, final A arg) {
         R result;
         if (n.getBlock().isPresent()) {
             result = n.getBlock().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getParameter().isPresent()) {
             result = n.getParameter().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
 
     @Override
-    public R visit(final KeyCatchAllStatement n, final A arg) {
+    public R visit(final KeyCatchAllStmt n, final A arg) {
         R result;
         {
             result = n.getBlock().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getLabel().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2954,41 +3490,49 @@ public R visit(final KeyEscapeExpression n, final A arg) {
         R result;
         if (n.getArguments().isPresent()) {
             result = n.getArguments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getCallee().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
 
     @Override
-    public R visit(final KeyExecStatement n, final A arg) {
+    public R visit(final KeyExecStmt n, final A arg) {
         R result;
         {
             result = n.getBranches().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getExecBlock().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -2998,63 +3542,75 @@ public R visit(final KeyExecutionContext n, final A arg) {
         R result;
         {
             result = n.getContext().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getInstance().isPresent()) {
             result = n.getInstance().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getSignature().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
 
     @Override
-    public R visit(final KeyLoopScopeBlock n, final A arg) {
+    public R visit(final KeyLoopScopeBlockStmt n, final A arg) {
         R result;
         {
             result = n.getBlock().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getIndexPV().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
 
     @Override
-    public R visit(final KeyMergePointStatement n, final A arg) {
+    public R visit(final KeyMergePointStmt n, final A arg) {
         R result;
         {
             result = n.getExpr().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3064,49 +3620,59 @@ public R visit(final KeyMethodBodyStatement n, final A arg) {
         R result;
         {
             result = n.getExpr().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getSource().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
 
     @Override
-    public R visit(final KeyMethodCallStatement n, final A arg) {
+    public R visit(final KeyMethodCallStmt n, final A arg) {
         R result;
         {
             result = n.getBlock().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getContext().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3116,55 +3682,39 @@ public R visit(final KeyMethodSignature n, final A arg) {
         R result;
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getParamTypes().accept(this, arg);
-            if (result != null) return result;
-        }
-        if (n.getAssociatedSpecificationComments().isPresent()) {
-            result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
-        }
-        if (n.getComment().isPresent()) {
-            result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final KeyRangeExpression n, final A arg) {
-        R result;
-        {
-            result = n.getLower().accept(this, arg);
-            if (result != null) return result;
-        }
-        {
-            result = n.getUpper().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
 
     @Override
-    public R visit(final KeyTransactionStatement n, final A arg) {
+    public R visit(final KeyTransactionStmt n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3174,31 +3724,38 @@ public R visit(final KeyContextStatementBlock n, final A arg) {
         R result;
         if (n.getContext().isPresent()) {
             result = n.getContext().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getExpression().isPresent()) {
             result = n.getExpression().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getSignature().isPresent()) {
             result = n.getSignature().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getStatements().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getTr().isPresent()) {
             result = n.getTr().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3208,11 +3765,13 @@ public R visit(final KeyExecCtxtSV n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3222,11 +3781,13 @@ public R visit(final KeyExpressionSV n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3236,11 +3797,13 @@ public R visit(final KeyJumpLabelSV n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3250,15 +3813,18 @@ public R visit(final KeyMetaConstructExpression n, final A arg) {
         R result;
         {
             result = n.getChild().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3268,19 +3834,23 @@ public R visit(final KeyMetaConstruct n, final A arg) {
         R result;
         {
             result = n.getChild().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getSchemas().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3290,19 +3860,23 @@ public R visit(final KeyMetaConstructType n, final A arg) {
         R result;
         {
             result = n.getExpr().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3312,11 +3886,13 @@ public R visit(final KeyMethodSignatureSV n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3326,15 +3902,18 @@ public R visit(final KeyPassiveExpression n, final A arg) {
         R result;
         {
             result = n.getExpr().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3344,11 +3923,13 @@ public R visit(final KeyProgramVariableSV n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3358,11 +3939,13 @@ public R visit(final KeyStatementSV n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3372,15 +3955,18 @@ public R visit(final KeyTypeSV n, final A arg) {
         R result;
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3390,11 +3976,13 @@ public R visit(final KeyCcatchSV n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3404,11 +3992,13 @@ public R visit(final KeyExecutionContextSV n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3418,23 +4008,28 @@ public R visit(final RecordPatternExpr n, final A arg) {
         R result;
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getPatternList().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3444,15 +4039,18 @@ public R visit(final MatchAllPatternExpr n, final A arg) {
         R result;
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3462,11 +4060,13 @@ public R visit(final MarkdownComment n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3476,27 +4076,33 @@ public R visit(final JmlMethodDeclaration n, final A arg) {
         R result;
         if (n.getContract().isPresent()) {
             result = n.getContract().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getMethodDeclaration().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3506,23 +4112,28 @@ public R visit(final JmlBinaryInfixExpr n, final A arg) {
         R result;
         {
             result = n.getLeft().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getOperator().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getRight().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3532,19 +4143,23 @@ public R visit(final JmlDocDeclaration n, final A arg) {
         R result;
         {
             result = n.getJmlComments().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3554,15 +4169,18 @@ public R visit(final JmlDocStmt n, final A arg) {
         R result;
         {
             result = n.getJmlComments().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3572,11 +4190,13 @@ public R visit(final JmlDoc n, final A arg) {
         R result;
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3586,31 +4206,38 @@ public R visit(final JmlDocType n, final A arg) {
         R result;
         {
             result = n.getJmlComments().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getMembers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getModifiers().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3620,23 +4247,28 @@ public R visit(final JmlFieldDeclaration n, final A arg) {
         R result;
         {
             result = n.getDecl().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getAnnotations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3646,19 +4278,23 @@ public R visit(final JmlOldClause n, final A arg) {
         R result;
         {
             result = n.getDeclarations().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3668,15 +4304,18 @@ public R visit(final JmlTypeExpr n, final A arg) {
         R result;
         {
             result = n.getType().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3686,23 +4325,28 @@ public R visit(final JmlMultiExprClause n, final A arg) {
         R result;
         {
             result = n.getExpressions().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getHeaps().isPresent()) {
             result = n.getHeaps().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getName().isPresent()) {
             result = n.getName().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3712,15 +4356,18 @@ public R visit(final JmlBeginStmt n, final A arg) {
         R result;
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3730,15 +4377,18 @@ public R visit(final JmlEndStmt n, final A arg) {
         R result;
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3748,19 +4398,23 @@ public R visit(final JmlLabelStmt n, final A arg) {
         R result;
         {
             result = n.getJmlTags().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getLabel().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         return null;
     }
@@ -3770,23 +4424,90 @@ public R visit(final JmlMethodSignature n, final A arg) {
         R result;
         {
             result = n.getArgumentTypes().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         {
             result = n.getName().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getReceiver().isPresent()) {
             result = n.getReceiver().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getAssociatedSpecificationComments().isPresent()) {
             result = n.getAssociatedSpecificationComments().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
         }
         if (n.getComment().isPresent()) {
             result = n.getComment().get().accept(this, arg);
-            if (result != null) return result;
+            if (result != null)
+                return result;
+        }
+        return null;
+    }
+
+    @Override
+    public R visit(final KeYMarkerStatement n, final A arg) {
+        R result;
+        if (n.getAssociatedSpecificationComments().isPresent()) {
+            result = n.getAssociatedSpecificationComments().get().accept(this, arg);
+            if (result != null)
+                return result;
+        }
+        if (n.getComment().isPresent()) {
+            result = n.getComment().get().accept(this, arg);
+            if (result != null)
+                return result;
+        }
+        return null;
+    }
+
+    @Override
+    public R visit(final JmlInfFlowClause n, final A arg) {
+        R result;
+        {
+            result = n.getBy().accept(this, arg);
+            if (result != null)
+                return result;
+        }
+        {
+            result = n.getDeclassifies().accept(this, arg);
+            if (result != null)
+                return result;
+        }
+        {
+            result = n.getErases().accept(this, arg);
+            if (result != null)
+                return result;
+        }
+        {
+            result = n.getExpressions().accept(this, arg);
+            if (result != null)
+                return result;
+        }
+        {
+            result = n.getNewObjects().accept(this, arg);
+            if (result != null)
+                return result;
+        }
+        if (n.getName().isPresent()) {
+            result = n.getName().get().accept(this, arg);
+            if (result != null)
+                return result;
+        }
+        if (n.getAssociatedSpecificationComments().isPresent()) {
+            result = n.getAssociatedSpecificationComments().get().accept(this, arg);
+            if (result != null)
+                return result;
+        }
+        if (n.getComment().isPresent()) {
+            result = n.getComment().get().accept(this, arg);
+            if (result != null)
+                return result;
         }
         return null;
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorWithDefaults.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorWithDefaults.java
index cc7156cb3b..8057727688 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorWithDefaults.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorWithDefaults.java
@@ -22,11 +22,17 @@
 
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
-import com.github.javaparser.ast.comments.*;
+import com.github.javaparser.ast.comments.BlockComment;
+import com.github.javaparser.ast.comments.LineComment;
+import com.github.javaparser.ast.comments.MarkdownComment;
+import com.github.javaparser.ast.comments.TraditionalJavadocComment;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
-import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
+import com.github.javaparser.ast.jml.doc.JmlDocDeclaration;
+import com.github.javaparser.ast.jml.doc.JmlDocStmt;
+import com.github.javaparser.ast.jml.doc.JmlDocType;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -471,7 +477,7 @@ public R visit(final LineComment n, final A arg) {
     }
 
     @Override
-    public R visit(NodeList n, A arg) {
+    public R visit(NodeList<?> n, A arg) {
         return defaultAction(n, arg);
     }
 
@@ -551,7 +557,7 @@ public R visit(final JmlQuantifiedExpr n, final A arg) {
     }
 
     @Override
-    public R visit(final JmlClauseLabel n, final A arg) {
+    public R visit(final JmlLabledClause n, final A arg) {
         return defaultAction(n, arg);
     }
 
@@ -611,7 +617,7 @@ public R visit(final JmlRefiningStmt n, final A arg) {
     }
 
     @Override
-    public R visit(final JmlClauseIf n, final A arg) {
+    public R visit(final JmlConditionalClause n, final A arg) {
         return defaultAction(n, arg);
     }
 
@@ -691,7 +697,7 @@ public R visit(final KeyCcatchReturn n, final A arg) {
     }
 
     @Override
-    public R visit(final KeyCatchAllStatement n, final A arg) {
+    public R visit(final KeyCatchAllStmt n, final A arg) {
         return defaultAction(n, arg);
     }
 
@@ -701,7 +707,7 @@ public R visit(final KeyEscapeExpression n, final A arg) {
     }
 
     @Override
-    public R visit(final KeyExecStatement n, final A arg) {
+    public R visit(final KeyExecStmt n, final A arg) {
         return defaultAction(n, arg);
     }
 
@@ -711,12 +717,12 @@ public R visit(final KeyExecutionContext n, final A arg) {
     }
 
     @Override
-    public R visit(final KeyLoopScopeBlock n, final A arg) {
+    public R visit(final KeyLoopScopeBlockStmt n, final A arg) {
         return defaultAction(n, arg);
     }
 
     @Override
-    public R visit(final KeyMergePointStatement n, final A arg) {
+    public R visit(final KeyMergePointStmt n, final A arg) {
         return defaultAction(n, arg);
     }
 
@@ -726,7 +732,7 @@ public R visit(final KeyMethodBodyStatement n, final A arg) {
     }
 
     @Override
-    public R visit(final KeyMethodCallStatement n, final A arg) {
+    public R visit(final KeyMethodCallStmt n, final A arg) {
         return defaultAction(n, arg);
     }
 
@@ -736,12 +742,7 @@ public R visit(final KeyMethodSignature n, final A arg) {
     }
 
     @Override
-    public R visit(final KeyRangeExpression n, final A arg) {
-        return defaultAction(n, arg);
-    }
-
-    @Override
-    public R visit(final KeyTransactionStatement n, final A arg) {
+    public R visit(final KeyTransactionStmt n, final A arg) {
         return defaultAction(n, arg);
     }
 
@@ -884,4 +885,14 @@ public R visit(final JmlLabelStmt n, final A arg) {
     public R visit(final JmlMethodSignature n, final A arg) {
         return defaultAction(n, arg);
     }
+
+    @Override
+    public R visit(final KeYMarkerStatement n, final A arg) {
+        return defaultAction(n, arg);
+    }
+
+    @Override
+    public R visit(final JmlInfFlowClause n, final A arg) {
+        return defaultAction(n, arg);
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java
index 2fb9fef203..c8767d2157 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/HashCodeVisitor.java
@@ -30,6 +30,7 @@
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -55,619 +56,230 @@ public static int hashCode(final Node node) {
     }
 
     public Integer visit(final AnnotationDeclaration n, final Void arg) {
-        return (n.getMembers().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final AnnotationMemberDeclaration n, final Void arg) {
-        return (n.getDefaultValue().isPresent() ? n.getDefaultValue().get().accept(this, arg) : 0) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getDefaultValue().isPresent() ? n.getDefaultValue().get().accept(this, arg) : 0) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ArrayAccessExpr n, final Void arg) {
-        return (n.getIndex().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getIndex().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ArrayCreationExpr n, final Void arg) {
-        return (n.getElementType().accept(this, arg)) * 31
-                + (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31
-                + (n.getLevels().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getElementType().accept(this, arg)) * 31 + (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31 + (n.getLevels().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ArrayCreationLevel n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getDimension().isPresent() ? n.getDimension().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getDimension().isPresent() ? n.getDimension().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ArrayInitializerExpr n, final Void arg) {
-        return (n.getValues().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getValues().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ArrayType n, final Void arg) {
-        return (n.getComponentType().accept(this, arg)) * 31
-                + (n.getOrigin().hashCode()) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getComponentType().accept(this, arg)) * 31 + (n.getOrigin().hashCode()) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final AssertStmt n, final Void arg) {
-        return (n.getCheck().accept(this, arg)) * 31
-                + (n.getMessage().isPresent() ? n.getMessage().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getCheck().accept(this, arg)) * 31 + (n.getMessage().isPresent() ? n.getMessage().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final AssignExpr n, final Void arg) {
-        return (n.getOperator().hashCode()) * 31
-                + (n.getTarget().accept(this, arg)) * 31
-                + (n.getValue().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getOperator().hashCode()) * 31 + (n.getTarget().accept(this, arg)) * 31 + (n.getValue().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final BinaryExpr n, final Void arg) {
-        return (n.getLeft().accept(this, arg)) * 31
-                + (n.getOperator().hashCode()) * 31
-                + (n.getRight().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getLeft().accept(this, arg)) * 31 + (n.getOperator().hashCode()) * 31 + (n.getRight().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final BlockComment n, final Void arg) {
-        return (n.getContent().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getContent().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final BlockStmt n, final Void arg) {
-        return (n.getContracts().accept(this, arg)) * 31
-                + (n.getStatements().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getContracts().accept(this, arg)) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final BooleanLiteralExpr n, final Void arg) {
-        return (n.isValue() ? 1 : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.isValue() ? 1 : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final BreakStmt n, final Void arg) {
-        return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final CastExpr n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final CatchClause n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getParameter().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getParameter().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final CharLiteralExpr n, final Void arg) {
-        return (n.getValue().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getValue().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ClassExpr n, final Void arg) {
-        return (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ClassOrInterfaceDeclaration n, final Void arg) {
-        return (n.getExtendedTypes().accept(this, arg)) * 31
-                + (n.getImplementedTypes().accept(this, arg)) * 31
-                + (n.isCompact() ? 1 : 0) * 31
-                + (n.isInterface() ? 1 : 0) * 31
-                + (n.getPermittedTypes().accept(this, arg)) * 31
-                + (n.getTypeParameters().accept(this, arg)) * 31
-                + (n.getMembers().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExtendedTypes().accept(this, arg)) * 31 + (n.getImplementedTypes().accept(this, arg)) * 31 + (n.isCompact() ? 1 : 0) * 31 + (n.isInterface() ? 1 : 0) * 31 + (n.getPermittedTypes().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ClassOrInterfaceType n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31
-                + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final CompilationUnit n, final Void arg) {
-        return (n.getImports().accept(this, arg)) * 31
-                + (n.getModule().isPresent() ? n.getModule().get().accept(this, arg) : 0) * 31
-                + (n.getPackageDeclaration().isPresent()
-                                ? n.getPackageDeclaration().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getTypes().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getImports().accept(this, arg)) * 31 + (n.getModule().isPresent() ? n.getModule().get().accept(this, arg) : 0) * 31 + (n.getPackageDeclaration().isPresent() ? n.getPackageDeclaration().get().accept(this, arg) : 0) * 31 + (n.getTypes().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ConditionalExpr n, final Void arg) {
-        return (n.getCondition().accept(this, arg)) * 31
-                + (n.getElseExpr().accept(this, arg)) * 31
-                + (n.getThenExpr().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getCondition().accept(this, arg)) * 31 + (n.getElseExpr().accept(this, arg)) * 31 + (n.getThenExpr().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ConstructorDeclaration n, final Void arg) {
-        return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getParameters().accept(this, arg)) * 31
-                + (n.getReceiverParameter().isPresent()
-                                ? n.getReceiverParameter().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getThrownExceptions().accept(this, arg)) * 31
-                + (n.getTypeParameters().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ContinueStmt n, final Void arg) {
-        return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final DoStmt n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getCondition().accept(this, arg)) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getCondition().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final DoubleLiteralExpr n, final Void arg) {
-        return (n.getValue().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getValue().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final EmptyStmt n, final Void arg) {
-        return (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final EnclosedExpr n, final Void arg) {
-        return (n.getInner().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getInner().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final EnumConstantDeclaration n, final Void arg) {
-        return (n.getArguments().accept(this, arg)) * 31
-                + (n.getClassBody().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getArguments().accept(this, arg)) * 31 + (n.getClassBody().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final EnumDeclaration n, final Void arg) {
-        return (n.getEntries().accept(this, arg)) * 31
-                + (n.getImplementedTypes().accept(this, arg)) * 31
-                + (n.getMembers().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getEntries().accept(this, arg)) * 31 + (n.getImplementedTypes().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ExplicitConstructorInvocationStmt n, final Void arg) {
-        return (n.getArguments().accept(this, arg)) * 31
-                + (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31
-                + (n.isThis() ? 1 : 0) * 31
-                + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getArguments().accept(this, arg)) * 31 + (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31 + (n.isThis() ? 1 : 0) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ExpressionStmt n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final FieldAccessExpr n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getScope().accept(this, arg)) * 31
-                + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getScope().accept(this, arg)) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final FieldDeclaration n, final Void arg) {
-        return (n.getModifiers().accept(this, arg)) * 31
-                + (n.getVariables().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getModifiers().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ForStmt n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getCompare().isPresent() ? n.getCompare().get().accept(this, arg) : 0) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.getInitialization().accept(this, arg)) * 31
-                + (n.getUpdate().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getCompare().isPresent() ? n.getCompare().get().accept(this, arg) : 0) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getInitialization().accept(this, arg)) * 31 + (n.getUpdate().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ForEachStmt n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.getIterable().accept(this, arg)) * 31
-                + (n.getVariable().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getIterable().accept(this, arg)) * 31 + (n.getVariable().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final IfStmt n, final Void arg) {
-        return (n.getCondition().accept(this, arg)) * 31
-                + (n.getElseStmt().isPresent() ? n.getElseStmt().get().accept(this, arg) : 0) * 31
-                + (n.getThenStmt().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getCondition().accept(this, arg)) * 31 + (n.getElseStmt().isPresent() ? n.getElseStmt().get().accept(this, arg) : 0) * 31 + (n.getThenStmt().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ImportDeclaration n, final Void arg) {
-        return (n.isAsterisk() ? 1 : 0) * 31
-                + (n.isJmlModel() ? 1 : 0) * 31
-                + (n.isModule() ? 1 : 0) * 31
-                + (n.isStatic() ? 1 : 0) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.isAsterisk() ? 1 : 0) * 31 + (n.isJmlModel() ? 1 : 0) * 31 + (n.isModule() ? 1 : 0) * 31 + (n.isStatic() ? 1 : 0) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final InitializerDeclaration n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.isStatic() ? 1 : 0) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.isStatic() ? 1 : 0) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final InstanceOfExpr n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getPattern().isPresent() ? n.getPattern().get().accept(this, arg) : 0) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getPattern().isPresent() ? n.getPattern().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final IntegerLiteralExpr n, final Void arg) {
-        return (n.getValue().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getValue().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final IntersectionType n, final Void arg) {
-        return (n.getElements().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getElements().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final TraditionalJavadocComment n, final Void arg) {
-        return (n.getContent().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getContent().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final LabeledStmt n, final Void arg) {
-        return (n.getLabel().accept(this, arg)) * 31
-                + (n.getStatement().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getLabel().accept(this, arg)) * 31 + (n.getStatement().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final LambdaExpr n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.isEnclosingParameters() ? 1 : 0) * 31
-                + (n.getParameters().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.isEnclosingParameters() ? 1 : 0) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final LineComment n, final Void arg) {
-        return (n.getContent().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getContent().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final LocalClassDeclarationStmt n, final Void arg) {
-        return (n.getClassDeclaration().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getClassDeclaration().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final LocalRecordDeclarationStmt n, final Void arg) {
-        return (n.getRecordDeclaration().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getRecordDeclaration().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final LongLiteralExpr n, final Void arg) {
-        return (n.getValue().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getValue().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final MarkerAnnotationExpr n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final MemberValuePair n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getValue().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getValue().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final MethodCallExpr n, final Void arg) {
-        return (n.getArguments().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31
-                + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getArguments().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final MethodDeclaration n, final Void arg) {
-        return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getParameters().accept(this, arg)) * 31
-                + (n.getReceiverParameter().isPresent()
-                                ? n.getReceiverParameter().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getThrownExceptions().accept(this, arg)) * 31
-                + (n.getTypeParameters().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final MethodReferenceExpr n, final Void arg) {
-        return (n.getIdentifier().hashCode()) * 31
-                + (n.getScope().accept(this, arg)) * 31
-                + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getIdentifier().hashCode()) * 31 + (n.getScope().accept(this, arg)) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final NameExpr n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final Name n, final Void arg) {
-        return (n.getIdentifier().hashCode()) * 31
-                + (n.getQualifier().isPresent() ? n.getQualifier().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getIdentifier().hashCode()) * 31 + (n.getQualifier().isPresent() ? n.getQualifier().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
-    public Integer visit(NodeList n, Void arg) {
+    public Integer visit(NodeList<?> n, Void arg) {
         int result = 0;
         for (Object node : n) {
             result += 31 * ((Visitable) node).accept(this, arg);
@@ -676,1215 +288,522 @@ public Integer visit(NodeList n, Void arg) {
     }
 
     public Integer visit(final NormalAnnotationExpr n, final Void arg) {
-        return (n.getPairs().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getPairs().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final NullLiteralExpr n, final Void arg) {
-        return (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ObjectCreationExpr n, final Void arg) {
-        return (n.getAnonymousClassBody().isPresent()
-                                ? n.getAnonymousClassBody().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getArguments().accept(this, arg)) * 31
-                + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAnonymousClassBody().isPresent() ? n.getAnonymousClassBody().get().accept(this, arg) : 0) * 31 + (n.getArguments().accept(this, arg)) * 31 + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final PackageDeclaration n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final Parameter n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.isVarArgs() ? 1 : 0) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getVarArgsAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.isVarArgs() ? 1 : 0) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getVarArgsAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final PrimitiveType n, final Void arg) {
-        return (n.getType().hashCode()) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getType().hashCode()) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ReturnStmt n, final Void arg) {
-        return (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SimpleName n, final Void arg) {
-        return (n.getIdentifier().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getIdentifier().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SingleMemberAnnotationExpr n, final Void arg) {
-        return (n.getMemberValue().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getMemberValue().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final StringLiteralExpr n, final Void arg) {
-        return (n.getValue().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getValue().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SuperExpr n, final Void arg) {
-        return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SwitchEntry n, final Void arg) {
-        return (n.getGuard().isPresent() ? n.getGuard().get().accept(this, arg) : 0) * 31
-                + (n.isDefault() ? 1 : 0) * 31
-                + (n.getLabels().accept(this, arg)) * 31
-                + (n.getStatements().accept(this, arg)) * 31
-                + (n.getType().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getGuard().isPresent() ? n.getGuard().get().accept(this, arg) : 0) * 31 + (n.isDefault() ? 1 : 0) * 31 + (n.getLabels().accept(this, arg)) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getType().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SwitchStmt n, final Void arg) {
-        return (n.getEntries().accept(this, arg)) * 31
-                + (n.getSelector().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getEntries().accept(this, arg)) * 31 + (n.getSelector().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SynchronizedStmt n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getExpression().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getExpression().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ThisExpr n, final Void arg) {
-        return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ThrowStmt n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final TryStmt n, final Void arg) {
-        return (n.getCatchClauses().accept(this, arg)) * 31
-                + (n.getFinallyBlock().isPresent() ? n.getFinallyBlock().get().accept(this, arg) : 0) * 31
-                + (n.getResources().accept(this, arg)) * 31
-                + (n.getTryBlock().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getCatchClauses().accept(this, arg)) * 31 + (n.getFinallyBlock().isPresent() ? n.getFinallyBlock().get().accept(this, arg) : 0) * 31 + (n.getResources().accept(this, arg)) * 31 + (n.getTryBlock().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final TypeExpr n, final Void arg) {
-        return (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final TypeParameter n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getTypeBound().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getTypeBound().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final UnaryExpr n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getOperator().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getOperator().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final UnionType n, final Void arg) {
-        return (n.getElements().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getElements().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final UnknownType n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final VariableDeclarationExpr n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getVariables().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final VariableDeclarator n, final Void arg) {
-        return (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final VoidType n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final WhileStmt n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getCondition().accept(this, arg)) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getCondition().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final WildcardType n, final Void arg) {
-        return (n.getExtendedType().isPresent() ? n.getExtendedType().get().accept(this, arg) : 0) * 31
-                + (n.getSuperType().isPresent() ? n.getSuperType().get().accept(this, arg) : 0) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExtendedType().isPresent() ? n.getExtendedType().get().accept(this, arg) : 0) * 31 + (n.getSuperType().isPresent() ? n.getSuperType().get().accept(this, arg) : 0) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ModuleDeclaration n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getDirectives().accept(this, arg)) * 31
-                + (n.isOpen() ? 1 : 0) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getDirectives().accept(this, arg)) * 31 + (n.isOpen() ? 1 : 0) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ModuleRequiresDirective n, final Void arg) {
-        return (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override()
     public Integer visit(final ModuleExportsDirective n, final Void arg) {
-        return (n.getModuleNames().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getModuleNames().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override()
     public Integer visit(final ModuleProvidesDirective n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getWith().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getWith().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override()
     public Integer visit(final ModuleUsesDirective n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final ModuleOpensDirective n, final Void arg) {
-        return (n.getModuleNames().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getModuleNames().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final UnparsableStmt n, final Void arg) {
-        return (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final ReceiverParameter n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final VarType n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final Modifier n, final Void arg) {
-        return (n.getKeyword().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getKeyword().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final SwitchExpr n, final Void arg) {
-        return (n.getEntries().accept(this, arg)) * 31
-                + (n.getSelector().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getEntries().accept(this, arg)) * 31 + (n.getSelector().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final YieldStmt n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final TextBlockLiteralExpr n, final Void arg) {
-        return (n.getValue().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getValue().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final TypePatternExpr n, final Void arg) {
-        return (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlQuantifiedExpr n, final Void arg) {
-        return (n.getBinder().hashCode()) * 31
-                + (n.getExpressions().accept(this, arg)) * 31
-                + (n.getVariables().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBinder().hashCode()) * 31 + (n.getExpressions().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final JmlClauseLabel n, final Void arg) {
-        return (n.getExpr().accept(this, arg)) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+    public Integer visit(final JmlLabledClause n, final Void arg) {
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlExpressionStmt n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlLabelExpr n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getLabel().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getLabel().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlLetExpr n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getVariables().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlMultiCompareExpr n, final Void arg) {
-        return (n.getExpressions().accept(this, arg)) * 31
-                + (n.getOperators().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpressions().accept(this, arg)) * 31 + (n.getOperators().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlSimpleExprClause n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getHeaps().isPresent() ? n.getHeaps().get().accept(this, arg) : 0) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getHeaps().isPresent() ? n.getHeaps().get().accept(this, arg) : 0) * 31 + (n.getKind().hashCode()) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlSignalsClause n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getParameter().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getParameter().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlSignalsOnlyClause n, final Void arg) {
-        return (n.getTypes().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getTypes().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlUnreachableStmt n, final Void arg) {
-        return (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getJmlTags().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlCallableClause n, final Void arg) {
-        return (n.getMethodSignatures().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getMethodSignatures().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlForallClause n, final Void arg) {
-        return (n.getBoundedVariables().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBoundedVariables().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlRefiningStmt n, final Void arg) {
-        return (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getJmlTags().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final JmlClauseIf n, final Void arg) {
-        return (n.getCondition().accept(this, arg)) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getThen().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+    public Integer visit(final JmlConditionalClause n, final Void arg) {
+        return (n.getCondition().accept(this, arg)) * 31 + (n.getExpression().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlClassExprDeclaration n, final Void arg) {
-        return (n.getInvariant().accept(this, arg)) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getKind().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getInvariant().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getKind().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlClassAccessibleDeclaration n, final Void arg) {
-        return (n.getExpressions().accept(this, arg)) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getMeasuredBy().isPresent() ? n.getMeasuredBy().get().accept(this, arg) : 0) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getVariable().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpressions().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getMeasuredBy().isPresent() ? n.getMeasuredBy().get().accept(this, arg) : 0) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getVariable().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlRepresentsDeclaration n, final Void arg) {
-        return (n.getExpr().accept(this, arg)) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpr().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlContract n, final Void arg) {
-        return (n.getBehavior().hashCode()) * 31
-                + (n.getClauses().accept(this, arg)) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getSubContracts().accept(this, arg)) * 31
-                + (n.getType().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBehavior().hashCode()) * 31 + (n.getClauses().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getSubContracts().accept(this, arg)) * 31 + (n.getType().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlSetComprehensionExpr n, final Void arg) {
-        return (n.getBinding().accept(this, arg)) * 31
-                + (n.getPredicate().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBinding().accept(this, arg)) * 31 + (n.getPredicate().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlGhostStmt n, final Void arg) {
-        return (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getStatement().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getJmlTags().accept(this, arg)) * 31 + (n.getStatement().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final RecordDeclaration n, final Void arg) {
-        return (n.getImplementedTypes().accept(this, arg)) * 31
-                + (n.getParameters().accept(this, arg)) * 31
-                + (n.getReceiverParameter().isPresent()
-                                ? n.getReceiverParameter().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getTypeParameters().accept(this, arg)) * 31
-                + (n.getMembers().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getImplementedTypes().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final CompactConstructorDeclaration n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getThrownExceptions().accept(this, arg)) * 31
-                + (n.getTypeParameters().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final RecordPatternExpr n, final Void arg) {
-        return (n.getModifiers().accept(this, arg)) * 31
-                + (n.getPatternList().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getModifiers().accept(this, arg)) * 31 + (n.getPatternList().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyCcatchBreak n, final Void arg) {
-        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31
-                + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31 + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyCcatchContinue n, final Void arg) {
-        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31
-                + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31 + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyCcatchParameter n, final Void arg) {
-        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31
-                + (n.getParameter().isPresent() ? n.getParameter().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31 + (n.getParameter().isPresent() ? n.getParameter().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyCcatchReturn n, final Void arg) {
-        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31
-                + (n.getParameter().isPresent() ? n.getParameter().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31 + (n.getParameter().isPresent() ? n.getParameter().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final KeyCatchAllStatement n, final Void arg) {
-        return (n.getBlock().accept(this, arg)) * 31
-                + (n.getLabel().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+    public Integer visit(final KeyCatchAllStmt n, final Void arg) {
+        return (n.getBlock().accept(this, arg)) * 31 + (n.getLabel().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyEscapeExpression n, final Void arg) {
-        return (n.getArguments().isPresent() ? n.getArguments().get().accept(this, arg) : 0) * 31
-                + (n.getCallee().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getArguments().isPresent() ? n.getArguments().get().accept(this, arg) : 0) * 31 + (n.getCallee().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final KeyExecStatement n, final Void arg) {
-        return (n.getBranches().accept(this, arg)) * 31
-                + (n.getExecBlock().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+    public Integer visit(final KeyExecStmt n, final Void arg) {
+        return (n.getBranches().accept(this, arg)) * 31 + (n.getExecBlock().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyExecutionContext n, final Void arg) {
-        return (n.getContext().accept(this, arg)) * 31
-                + (n.getInstance().isPresent() ? n.getInstance().get().accept(this, arg) : 0) * 31
-                + (n.getSignature().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getContext().accept(this, arg)) * 31 + (n.getInstance().isPresent() ? n.getInstance().get().accept(this, arg) : 0) * 31 + (n.getSignature().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final KeyLoopScopeBlock n, final Void arg) {
-        return (n.getBlock().accept(this, arg)) * 31
-                + (n.getIndexPV().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+    public Integer visit(final KeyLoopScopeBlockStmt n, final Void arg) {
+        return (n.getBlock().accept(this, arg)) * 31 + (n.getIndexPV().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final KeyMergePointStatement n, final Void arg) {
-        return (n.getExpr().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+    public Integer visit(final KeyMergePointStmt n, final Void arg) {
+        return (n.getExpr().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyMethodBodyStatement n, final Void arg) {
-        return (n.getExpr().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getSource().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpr().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getSource().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final KeyMethodCallStatement n, final Void arg) {
-        return (n.getBlock().accept(this, arg)) * 31
-                + (n.getContext().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+    public Integer visit(final KeyMethodCallStmt n, final Void arg) {
+        return (n.getBlock().accept(this, arg)) * 31 + (n.getContext().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyMethodSignature n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getParamTypes().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getParamTypes().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final KeyRangeExpression n, final Void arg) {
-        return (n.getLower().accept(this, arg)) * 31
-                + (n.getUpper().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
-    }
-
-    @Override
-    public Integer visit(final KeyTransactionStatement n, final Void arg) {
-        return (n.getType().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+    public Integer visit(final KeyTransactionStmt n, final Void arg) {
+        return (n.getType().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyContextStatementBlock n, final Void arg) {
-        return (n.getContext().isPresent() ? n.getContext().get().accept(this, arg) : 0) * 31
-                + (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31
-                + (n.getSignature().isPresent() ? n.getSignature().get().accept(this, arg) : 0) * 31
-                + (n.getStatements().accept(this, arg)) * 31
-                + (n.getTr().isPresent() ? n.getTr().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getContext().isPresent() ? n.getContext().get().accept(this, arg) : 0) * 31 + (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31 + (n.getSignature().isPresent() ? n.getSignature().get().accept(this, arg) : 0) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getTr().isPresent() ? n.getTr().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyExecCtxtSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyExpressionSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyJumpLabelSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyMetaConstructExpression n, final Void arg) {
-        return (n.getChild().accept(this, arg)) * 31
-                + (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getChild().accept(this, arg)) * 31 + (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyMetaConstruct n, final Void arg) {
-        return (n.getChild().accept(this, arg)) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getSchemas().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getChild().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getSchemas().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyMetaConstructType n, final Void arg) {
-        return (n.getExpr().accept(this, arg)) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpr().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyMethodSignatureSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyPassiveExpression n, final Void arg) {
-        return (n.getExpr().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpr().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyProgramVariableSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyStatementSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyTypeSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyCcatchSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyExecutionContextSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final MatchAllPatternExpr n, final Void arg) {
-        return (n.getModifiers().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getModifiers().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final MarkdownComment n, final Void arg) {
-        return (n.getContent().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getContent().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlMethodDeclaration n, final Void arg) {
-        return (n.getContract().isPresent() ? n.getContract().get().accept(this, arg) : 0) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getMethodDeclaration().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getContract().isPresent() ? n.getContract().get().accept(this, arg) : 0) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getMethodDeclaration().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlBinaryInfixExpr n, final Void arg) {
-        return (n.getLeft().accept(this, arg)) * 31
-                + (n.getOperator().accept(this, arg)) * 31
-                + (n.getRight().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getLeft().accept(this, arg)) * 31 + (n.getOperator().accept(this, arg)) * 31 + (n.getRight().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlDocDeclaration n, final Void arg) {
-        return (n.getJmlComments().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getJmlComments().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlDocStmt n, final Void arg) {
-        return (n.getJmlComments().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getJmlComments().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlDoc n, final Void arg) {
-        return (n.getContent().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getContent().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlDocType n, final Void arg) {
-        return (n.getJmlComments().accept(this, arg)) * 31
-                + (n.getMembers().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getJmlComments().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlFieldDeclaration n, final Void arg) {
-        return (n.getDecl().accept(this, arg)) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getDecl().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlOldClause n, final Void arg) {
-        return (n.getDeclarations().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getDeclarations().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlTypeExpr n, final Void arg) {
-        return (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlMultiExprClause n, final Void arg) {
-        return (n.getExpressions().accept(this, arg)) * 31
-                + (n.getHeaps().isPresent() ? n.getHeaps().get().accept(this, arg) : 0) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getExpressions().accept(this, arg)) * 31 + (n.getHeaps().isPresent() ? n.getHeaps().get().accept(this, arg) : 0) * 31 + (n.getKind().hashCode()) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlBeginStmt n, final Void arg) {
-        return (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getJmlTags().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlEndStmt n, final Void arg) {
-        return (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getJmlTags().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlLabelStmt n, final Void arg) {
-        return (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getLabel().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getJmlTags().accept(this, arg)) * 31 + (n.getLabel().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlMethodSignature n, final Void arg) {
-        return (n.getArgumentTypes().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getReceiver().isPresent() ? n.getReceiver().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+        return (n.getArgumentTypes().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getReceiver().isPresent() ? n.getReceiver().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+    }
+
+    @Override
+    public Integer visit(final KeYMarkerStatement n, final Void arg) {
+        return n.getKind() * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
+    }
+
+    @Override
+    public Integer visit(final JmlInfFlowClause n, final Void arg) {
+        return (n.getBy().accept(this, arg)) * 31 + (n.getDeclassifies().accept(this, arg)) * 31 + (n.getErases().accept(this, arg)) * 31 + (n.getExpressions().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getNewObjects().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0) * 31 + (n.getComment().isPresent() ? n.getComment().get().accept(this, arg) : 0);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java
index 3ea04cbd3e..79b0a1d3a5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ModifierVisitor.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.removeElementByObjectIdentity;
 import static com.github.javaparser.utils.Utils.replaceElementByObjectIdentity;
-
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.comments.BlockComment;
@@ -34,6 +33,7 @@
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -67,7 +67,8 @@ public Visitable visit(final AnnotationDeclaration n, final A arg) {
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setMembers(members);
@@ -81,13 +82,13 @@ public Visitable visit(final AnnotationDeclaration n, final A arg) {
     public Visitable visit(final AnnotationMemberDeclaration n, final A arg) {
         NodeList<AnnotationExpr> annotations = modifyList(n.getAnnotations(), arg);
         NodeList<Modifier> modifiers = modifyList(n.getModifiers(), arg);
-        Expression defaultValue =
-                n.getDefaultValue().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        Expression defaultValue = n.getDefaultValue().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
         Type type = (Type) n.getType().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null || type == null) return null;
+        if (name == null || type == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setDefaultValue(defaultValue);
@@ -104,7 +105,8 @@ public Visitable visit(final ArrayAccessExpr n, final A arg) {
         Expression name = (Expression) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (index == null || name == null) return null;
+        if (index == null || name == null)
+            return null;
         n.setIndex(index);
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -115,13 +117,12 @@ public Visitable visit(final ArrayAccessExpr n, final A arg) {
     @Override
     public Visitable visit(final ArrayCreationExpr n, final A arg) {
         Type elementType = (Type) n.getElementType().accept(this, arg);
-        ArrayInitializerExpr initializer = n.getInitializer()
-                .map(s -> (ArrayInitializerExpr) s.accept(this, arg))
-                .orElse(null);
+        ArrayInitializerExpr initializer = n.getInitializer().map(s -> (ArrayInitializerExpr) s.accept(this, arg)).orElse(null);
         NodeList<ArrayCreationLevel> levels = modifyList(n.getLevels(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (elementType == null || levels.isEmpty()) return null;
+        if (elementType == null || levels.isEmpty())
+            return null;
         n.setElementType(elementType);
         n.setInitializer(initializer);
         n.setLevels(levels);
@@ -144,11 +145,11 @@ public Visitable visit(final ArrayInitializerExpr n, final A arg) {
     @Override
     public Visitable visit(final AssertStmt n, final A arg) {
         Expression check = (Expression) n.getCheck().accept(this, arg);
-        Expression message =
-                n.getMessage().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        Expression message = n.getMessage().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (check == null) return null;
+        if (check == null)
+            return null;
         n.setCheck(check);
         n.setMessage(message);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -162,7 +163,8 @@ public Visitable visit(final AssignExpr n, final A arg) {
         Expression value = (Expression) n.getValue().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (target == null || value == null) return null;
+        if (target == null || value == null)
+            return null;
         n.setTarget(target);
         n.setValue(value);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -176,8 +178,10 @@ public Visitable visit(final BinaryExpr n, final A arg) {
         Expression right = (Expression) n.getRight().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (left == null) return right;
-        if (right == null) return left;
+        if (left == null)
+            return right;
+        if (right == null)
+            return left;
         n.setLeft(left);
         n.setRight(right);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -209,8 +213,7 @@ public Visitable visit(final BooleanLiteralExpr n, final A arg) {
 
     @Override
     public Visitable visit(final BreakStmt n, final A arg) {
-        SimpleName label =
-                n.getLabel().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
+        SimpleName label = n.getLabel().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
         n.setLabel(label);
@@ -225,7 +228,8 @@ public Visitable visit(final CastExpr n, final A arg) {
         Type type = (Type) n.getType().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expression == null || type == null) return null;
+        if (expression == null || type == null)
+            return null;
         n.setExpression(expression);
         n.setType(type);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -239,7 +243,8 @@ public Visitable visit(final CatchClause n, final A arg) {
         Parameter parameter = (Parameter) n.getParameter().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (body == null || parameter == null) return null;
+        if (body == null || parameter == null)
+            return null;
         n.setBody(body);
         n.setParameter(parameter);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -261,7 +266,8 @@ public Visitable visit(final ClassExpr n, final A arg) {
         Type type = (Type) n.getType().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (type == null) return null;
+        if (type == null)
+            return null;
         n.setType(type);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -280,7 +286,8 @@ public Visitable visit(final ClassOrInterfaceDeclaration n, final A arg) {
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setExtendedTypes(extendedTypes);
@@ -300,15 +307,14 @@ public Visitable visit(final RecordDeclaration n, final A arg) {
         NodeList<Modifier> modifiers = modifyList(n.getModifiers(), arg);
         NodeList<ClassOrInterfaceType> implementedTypes = modifyList(n.getImplementedTypes(), arg);
         NodeList<Parameter> parameters = modifyList(n.getParameters(), arg);
-        ReceiverParameter receiverParameter = n.getReceiverParameter()
-                .map(s -> (ReceiverParameter) s.accept(this, arg))
-                .orElse(null);
+        ReceiverParameter receiverParameter = n.getReceiverParameter().map(s -> (ReceiverParameter) s.accept(this, arg)).orElse(null);
         NodeList<TypeParameter> typeParameters = modifyList(n.getTypeParameters(), arg);
         NodeList<BodyDeclaration<?>> members = modifyList(n.getMembers(), arg);
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setImplementedTypes(implementedTypes);
@@ -326,13 +332,12 @@ public Visitable visit(final RecordDeclaration n, final A arg) {
     public Visitable visit(final ClassOrInterfaceType n, final A arg) {
         NodeList<AnnotationExpr> annotations = modifyList(n.getAnnotations(), arg);
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
-        ClassOrInterfaceType scope = n.getScope()
-                .map(s -> (ClassOrInterfaceType) s.accept(this, arg))
-                .orElse(null);
+        ClassOrInterfaceType scope = n.getScope().map(s -> (ClassOrInterfaceType) s.accept(this, arg)).orElse(null);
         NodeList<Type> typeArguments = modifyList(n.getTypeArguments(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setName(name);
         n.setScope(scope);
@@ -345,11 +350,8 @@ public Visitable visit(final ClassOrInterfaceType n, final A arg) {
     @Override
     public Visitable visit(final CompilationUnit n, final A arg) {
         NodeList<ImportDeclaration> imports = modifyList(n.getImports(), arg);
-        ModuleDeclaration module =
-                n.getModule().map(s -> (ModuleDeclaration) s.accept(this, arg)).orElse(null);
-        PackageDeclaration packageDeclaration = n.getPackageDeclaration()
-                .map(s -> (PackageDeclaration) s.accept(this, arg))
-                .orElse(null);
+        ModuleDeclaration module = n.getModule().map(s -> (ModuleDeclaration) s.accept(this, arg)).orElse(null);
+        PackageDeclaration packageDeclaration = n.getPackageDeclaration().map(s -> (PackageDeclaration) s.accept(this, arg)).orElse(null);
         NodeList<TypeDeclaration<?>> types = modifyList(n.getTypes(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
@@ -369,7 +371,8 @@ public Visitable visit(final ConditionalExpr n, final A arg) {
         Expression thenExpr = (Expression) n.getThenExpr().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (condition == null || elseExpr == null || thenExpr == null) return null;
+        if (condition == null || elseExpr == null || thenExpr == null)
+            return null;
         n.setCondition(condition);
         n.setElseExpr(elseExpr);
         n.setThenExpr(thenExpr);
@@ -386,14 +389,13 @@ public Visitable visit(final ConstructorDeclaration n, final A arg) {
         NodeList<JmlContract> contracts = modifyList(n.getContracts(), arg);
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
         NodeList<Parameter> parameters = modifyList(n.getParameters(), arg);
-        ReceiverParameter receiverParameter = n.getReceiverParameter()
-                .map(s -> (ReceiverParameter) s.accept(this, arg))
-                .orElse(null);
+        ReceiverParameter receiverParameter = n.getReceiverParameter().map(s -> (ReceiverParameter) s.accept(this, arg)).orElse(null);
         NodeList<ReferenceType> thrownExceptions = modifyList(n.getThrownExceptions(), arg);
         NodeList<TypeParameter> typeParameters = modifyList(n.getTypeParameters(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setBody(body);
@@ -418,7 +420,8 @@ public Visitable visit(final CompactConstructorDeclaration n, final A arg) {
         NodeList<TypeParameter> typeParameters = modifyList(n.getTypeParameters(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (body == null || name == null) return null;
+        if (body == null || name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setBody(body);
@@ -432,8 +435,7 @@ public Visitable visit(final CompactConstructorDeclaration n, final A arg) {
 
     @Override
     public Visitable visit(final ContinueStmt n, final A arg) {
-        SimpleName label =
-                n.getLabel().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
+        SimpleName label = n.getLabel().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
         n.setLabel(label);
@@ -449,7 +451,8 @@ public Visitable visit(final DoStmt n, final A arg) {
         NodeList<JmlContract> contracts = modifyList(n.getContracts(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (body == null || condition == null) return null;
+        if (body == null || condition == null)
+            return null;
         n.setBody(body);
         n.setCondition(condition);
         n.setContracts(contracts);
@@ -481,7 +484,8 @@ public Visitable visit(final EnclosedExpr n, final A arg) {
         Expression inner = (Expression) n.getInner().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (inner == null) return null;
+        if (inner == null)
+            return null;
         n.setInner(inner);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -496,7 +500,8 @@ public Visitable visit(final EnumConstantDeclaration n, final A arg) {
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setArguments(arguments);
         n.setClassBody(classBody);
@@ -516,7 +521,8 @@ public Visitable visit(final EnumDeclaration n, final A arg) {
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setEntries(entries);
@@ -531,8 +537,7 @@ public Visitable visit(final EnumDeclaration n, final A arg) {
     @Override
     public Visitable visit(final ExplicitConstructorInvocationStmt n, final A arg) {
         NodeList<Expression> arguments = modifyList(n.getArguments(), arg);
-        Expression expression =
-                n.getExpression().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        Expression expression = n.getExpression().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         NodeList<Type> typeArguments = modifyList(n.getTypeArguments(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
@@ -549,7 +554,8 @@ public Visitable visit(final ExpressionStmt n, final A arg) {
         Expression expression = (Expression) n.getExpression().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expression == null) return null;
+        if (expression == null)
+            return null;
         n.setExpression(expression);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -563,7 +569,8 @@ public Visitable visit(final FieldAccessExpr n, final A arg) {
         NodeList<Type> typeArguments = modifyList(n.getTypeArguments(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null || scope == null) return null;
+        if (name == null || scope == null)
+            return null;
         n.setName(name);
         n.setScope(scope);
         n.setTypeArguments(typeArguments);
@@ -579,7 +586,8 @@ public Visitable visit(final FieldDeclaration n, final A arg) {
         NodeList<VariableDeclarator> variables = modifyList(n.getVariables(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (variables.isEmpty()) return null;
+        if (variables.isEmpty())
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setVariables(variables);
@@ -593,11 +601,11 @@ public Visitable visit(final ForEachStmt n, final A arg) {
         Statement body = (Statement) n.getBody().accept(this, arg);
         NodeList<JmlContract> contracts = modifyList(n.getContracts(), arg);
         Expression iterable = (Expression) n.getIterable().accept(this, arg);
-        VariableDeclarationExpr variable =
-                (VariableDeclarationExpr) n.getVariable().accept(this, arg);
+        VariableDeclarationExpr variable = (VariableDeclarationExpr) n.getVariable().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (body == null || iterable == null || variable == null) return null;
+        if (body == null || iterable == null || variable == null)
+            return null;
         n.setBody(body);
         n.setContracts(contracts);
         n.setIterable(iterable);
@@ -610,14 +618,14 @@ public Visitable visit(final ForEachStmt n, final A arg) {
     @Override
     public Visitable visit(final ForStmt n, final A arg) {
         Statement body = (Statement) n.getBody().accept(this, arg);
-        Expression compare =
-                n.getCompare().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        Expression compare = n.getCompare().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         NodeList<JmlContract> contracts = modifyList(n.getContracts(), arg);
         NodeList<Expression> initialization = modifyList(n.getInitialization(), arg);
         NodeList<Expression> update = modifyList(n.getUpdate(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (body == null) return null;
+        if (body == null)
+            return null;
         n.setBody(body);
         n.setCompare(compare);
         n.setContracts(contracts);
@@ -631,12 +639,12 @@ public Visitable visit(final ForStmt n, final A arg) {
     @Override
     public Visitable visit(final IfStmt n, final A arg) {
         Expression condition = (Expression) n.getCondition().accept(this, arg);
-        Statement elseStmt =
-                n.getElseStmt().map(s -> (Statement) s.accept(this, arg)).orElse(null);
+        Statement elseStmt = n.getElseStmt().map(s -> (Statement) s.accept(this, arg)).orElse(null);
         Statement thenStmt = (Statement) n.getThenStmt().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (condition == null || thenStmt == null) return null;
+        if (condition == null || thenStmt == null)
+            return null;
         n.setCondition(condition);
         n.setElseStmt(elseStmt);
         n.setThenStmt(thenStmt);
@@ -651,7 +659,8 @@ public Visitable visit(final InitializerDeclaration n, final A arg) {
         BlockStmt body = (BlockStmt) n.getBody().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (body == null) return null;
+        if (body == null)
+            return null;
         n.setAnnotations(annotations);
         n.setBody(body);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -662,12 +671,12 @@ public Visitable visit(final InitializerDeclaration n, final A arg) {
     @Override
     public Visitable visit(final InstanceOfExpr n, final A arg) {
         Expression expression = (Expression) n.getExpression().accept(this, arg);
-        PatternExpr pattern =
-                n.getPattern().map(s -> (PatternExpr) s.accept(this, arg)).orElse(null);
+        PatternExpr pattern = n.getPattern().map(s -> (PatternExpr) s.accept(this, arg)).orElse(null);
         ReferenceType type = (ReferenceType) n.getType().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expression == null || type == null) return null;
+        if (expression == null || type == null)
+            return null;
         n.setExpression(expression);
         n.setPattern(pattern);
         n.setType(type);
@@ -700,7 +709,8 @@ public Visitable visit(final LabeledStmt n, final A arg) {
         Statement statement = (Statement) n.getStatement().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (label == null || statement == null) return null;
+        if (label == null || statement == null)
+            return null;
         n.setLabel(label);
         n.setStatement(statement);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -722,7 +732,8 @@ public Visitable visit(final MarkerAnnotationExpr n, final A arg) {
         Name name = (Name) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -735,7 +746,8 @@ public Visitable visit(final MemberValuePair n, final A arg) {
         Expression value = (Expression) n.getValue().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null || value == null) return null;
+        if (name == null || value == null)
+            return null;
         n.setName(name);
         n.setValue(value);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -747,12 +759,12 @@ public Visitable visit(final MemberValuePair n, final A arg) {
     public Visitable visit(final MethodCallExpr n, final A arg) {
         NodeList<Expression> arguments = modifyList(n.getArguments(), arg);
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
-        Expression scope =
-                n.getScope().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        Expression scope = n.getScope().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         NodeList<Type> typeArguments = modifyList(n.getTypeArguments(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setArguments(arguments);
         n.setName(name);
         n.setScope(scope);
@@ -771,14 +783,13 @@ public Visitable visit(final MethodDeclaration n, final A arg) {
         NodeList<JmlContract> contracts = modifyList(n.getContracts(), arg);
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
         NodeList<Parameter> parameters = modifyList(n.getParameters(), arg);
-        ReceiverParameter receiverParameter = n.getReceiverParameter()
-                .map(s -> (ReceiverParameter) s.accept(this, arg))
-                .orElse(null);
+        ReceiverParameter receiverParameter = n.getReceiverParameter().map(s -> (ReceiverParameter) s.accept(this, arg)).orElse(null);
         NodeList<ReferenceType> thrownExceptions = modifyList(n.getThrownExceptions(), arg);
         NodeList<TypeParameter> typeParameters = modifyList(n.getTypeParameters(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (type == null || name == null) return null;
+        if (type == null || name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setBody(body);
@@ -799,7 +810,8 @@ public Visitable visit(final NameExpr n, final A arg) {
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -812,7 +824,8 @@ public Visitable visit(final NormalAnnotationExpr n, final A arg) {
         Name name = (Name) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setPairs(pairs);
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -833,13 +846,13 @@ public Visitable visit(final NullLiteralExpr n, final A arg) {
     public Visitable visit(final ObjectCreationExpr n, final A arg) {
         NodeList<BodyDeclaration<?>> anonymousClassBody = modifyList(n.getAnonymousClassBody(), arg);
         NodeList<Expression> arguments = modifyList(n.getArguments(), arg);
-        Expression scope =
-                n.getScope().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        Expression scope = n.getScope().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         ClassOrInterfaceType type = (ClassOrInterfaceType) n.getType().accept(this, arg);
         NodeList<Type> typeArguments = modifyList(n.getTypeArguments(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (type == null) return null;
+        if (type == null)
+            return null;
         n.setAnonymousClassBody(anonymousClassBody);
         n.setArguments(arguments);
         n.setScope(scope);
@@ -856,7 +869,8 @@ public Visitable visit(final PackageDeclaration n, final A arg) {
         Name name = (Name) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -873,7 +887,8 @@ public Visitable visit(final Parameter n, final A arg) {
         NodeList<AnnotationExpr> varArgsAnnotations = modifyList(n.getVarArgsAnnotations(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null || type == null) return null;
+        if (name == null || type == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setName(name);
@@ -921,7 +936,8 @@ public Visitable visit(final ArrayType n, final A arg) {
         Type componentType = (Type) n.getComponentType().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (componentType == null) return null;
+        if (componentType == null)
+            return null;
         n.setAnnotations(annotations);
         n.setComponentType(componentType);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -932,8 +948,7 @@ public Visitable visit(final ArrayType n, final A arg) {
     @Override
     public Visitable visit(final ArrayCreationLevel n, final A arg) {
         NodeList<AnnotationExpr> annotations = modifyList(n.getAnnotations(), arg);
-        Expression dimension =
-                n.getDimension().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        Expression dimension = n.getDimension().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
         n.setAnnotations(annotations);
@@ -949,7 +964,8 @@ public Visitable visit(final IntersectionType n, final A arg) {
         NodeList<ReferenceType> elements = modifyList(n.getElements(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (elements.isEmpty()) return null;
+        if (elements.isEmpty())
+            return null;
         n.setAnnotations(annotations);
         n.setElements(elements);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -963,7 +979,8 @@ public Visitable visit(final UnionType n, final A arg) {
         NodeList<ReferenceType> elements = modifyList(n.getElements(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (elements.isEmpty()) return null;
+        if (elements.isEmpty())
+            return null;
         n.setAnnotations(annotations);
         n.setElements(elements);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -973,8 +990,7 @@ public Visitable visit(final UnionType n, final A arg) {
 
     @Override
     public Visitable visit(final ReturnStmt n, final A arg) {
-        Expression expression =
-                n.getExpression().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        Expression expression = n.getExpression().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
         n.setExpression(expression);
@@ -989,7 +1005,8 @@ public Visitable visit(final SingleMemberAnnotationExpr n, final A arg) {
         Name name = (Name) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (memberValue == null || name == null) return null;
+        if (memberValue == null || name == null)
+            return null;
         n.setMemberValue(memberValue);
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1019,8 +1036,7 @@ public Visitable visit(final SuperExpr n, final A arg) {
 
     @Override
     public Visitable visit(final SwitchEntry n, final A arg) {
-        Expression guard =
-                n.getGuard().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        Expression guard = n.getGuard().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         NodeList<Expression> labels = modifyList(n.getLabels(), arg);
         NodeList<Statement> statements = modifyList(n.getStatements(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
@@ -1039,7 +1055,8 @@ public Visitable visit(final SwitchStmt n, final A arg) {
         Expression selector = (Expression) n.getSelector().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (selector == null) return null;
+        if (selector == null)
+            return null;
         n.setEntries(entries);
         n.setSelector(selector);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1053,7 +1070,8 @@ public Visitable visit(final SynchronizedStmt n, final A arg) {
         Expression expression = (Expression) n.getExpression().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (body == null || expression == null) return null;
+        if (body == null || expression == null)
+            return null;
         n.setBody(body);
         n.setExpression(expression);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1077,7 +1095,8 @@ public Visitable visit(final ThrowStmt n, final A arg) {
         Expression expression = (Expression) n.getExpression().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expression == null) return null;
+        if (expression == null)
+            return null;
         n.setExpression(expression);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -1087,13 +1106,13 @@ public Visitable visit(final ThrowStmt n, final A arg) {
     @Override
     public Visitable visit(final TryStmt n, final A arg) {
         NodeList<CatchClause> catchClauses = modifyList(n.getCatchClauses(), arg);
-        BlockStmt finallyBlock =
-                n.getFinallyBlock().map(s -> (BlockStmt) s.accept(this, arg)).orElse(null);
+        BlockStmt finallyBlock = n.getFinallyBlock().map(s -> (BlockStmt) s.accept(this, arg)).orElse(null);
         NodeList<Expression> resources = modifyList(n.getResources(), arg);
         BlockStmt tryBlock = (BlockStmt) n.getTryBlock().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (tryBlock == null) return null;
+        if (tryBlock == null)
+            return null;
         n.setCatchClauses(catchClauses);
         n.setFinallyBlock(finallyBlock);
         n.setResources(resources);
@@ -1105,11 +1124,11 @@ public Visitable visit(final TryStmt n, final A arg) {
 
     @Override
     public Visitable visit(final LocalClassDeclarationStmt n, final A arg) {
-        ClassOrInterfaceDeclaration classDeclaration =
-                (ClassOrInterfaceDeclaration) n.getClassDeclaration().accept(this, arg);
+        ClassOrInterfaceDeclaration classDeclaration = (ClassOrInterfaceDeclaration) n.getClassDeclaration().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (classDeclaration == null) return null;
+        if (classDeclaration == null)
+            return null;
         n.setClassDeclaration(classDeclaration);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -1118,11 +1137,11 @@ public Visitable visit(final LocalClassDeclarationStmt n, final A arg) {
 
     @Override
     public Visitable visit(final LocalRecordDeclarationStmt n, final A arg) {
-        RecordDeclaration recordDeclaration =
-                (RecordDeclaration) n.getRecordDeclaration().accept(this, arg);
+        RecordDeclaration recordDeclaration = (RecordDeclaration) n.getRecordDeclaration().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (recordDeclaration == null) return null;
+        if (recordDeclaration == null)
+            return null;
         n.setRecordDeclaration(recordDeclaration);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -1136,7 +1155,8 @@ public Visitable visit(final TypeParameter n, final A arg) {
         NodeList<ClassOrInterfaceType> typeBound = modifyList(n.getTypeBound(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setName(name);
         n.setTypeBound(typeBound);
@@ -1150,7 +1170,8 @@ public Visitable visit(final UnaryExpr n, final A arg) {
         Expression expression = (Expression) n.getExpression().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expression == null) return null;
+        if (expression == null)
+            return null;
         n.setExpression(expression);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -1175,7 +1196,8 @@ public Visitable visit(final VariableDeclarationExpr n, final A arg) {
         NodeList<VariableDeclarator> variables = modifyList(n.getVariables(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (variables.isEmpty()) return null;
+        if (variables.isEmpty())
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setVariables(variables);
@@ -1186,13 +1208,13 @@ public Visitable visit(final VariableDeclarationExpr n, final A arg) {
 
     @Override
     public Visitable visit(final VariableDeclarator n, final A arg) {
-        Expression initializer =
-                n.getInitializer().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        Expression initializer = n.getInitializer().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
         Type type = (Type) n.getType().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null || type == null) return null;
+        if (name == null || type == null)
+            return null;
         n.setInitializer(initializer);
         n.setName(name);
         n.setType(type);
@@ -1219,7 +1241,8 @@ public Visitable visit(final WhileStmt n, final A arg) {
         NodeList<JmlContract> contracts = modifyList(n.getContracts(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (body == null || condition == null) return null;
+        if (body == null || condition == null)
+            return null;
         n.setBody(body);
         n.setCondition(condition);
         n.setContracts(contracts);
@@ -1231,11 +1254,8 @@ public Visitable visit(final WhileStmt n, final A arg) {
     @Override
     public Visitable visit(final WildcardType n, final A arg) {
         NodeList<AnnotationExpr> annotations = modifyList(n.getAnnotations(), arg);
-        ReferenceType extendedType = n.getExtendedType()
-                .map(s -> (ReferenceType) s.accept(this, arg))
-                .orElse(null);
-        ReferenceType superType =
-                n.getSuperType().map(s -> (ReferenceType) s.accept(this, arg)).orElse(null);
+        ReferenceType extendedType = n.getExtendedType().map(s -> (ReferenceType) s.accept(this, arg)).orElse(null);
+        ReferenceType superType = n.getSuperType().map(s -> (ReferenceType) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
         n.setAnnotations(annotations);
@@ -1253,7 +1273,8 @@ public Visitable visit(final LambdaExpr n, final A arg) {
         NodeList<Parameter> parameters = modifyList(n.getParameters(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (body == null) return null;
+        if (body == null)
+            return null;
         n.setBody(body);
         n.setContracts(contracts);
         n.setParameters(parameters);
@@ -1268,7 +1289,8 @@ public Visitable visit(final MethodReferenceExpr n, final A arg) {
         NodeList<Type> typeArguments = modifyList(n.getTypeArguments(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (scope == null) return null;
+        if (scope == null)
+            return null;
         n.setScope(scope);
         n.setTypeArguments(typeArguments);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1281,7 +1303,8 @@ public Visitable visit(final TypeExpr n, final A arg) {
         Type type = (Type) n.getType().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (type == null) return null;
+        if (type == null)
+            return null;
         n.setType(type);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -1289,7 +1312,7 @@ public Visitable visit(final TypeExpr n, final A arg) {
     }
 
     @Override
-    public Visitable visit(NodeList n, A arg) {
+    public Visitable visit(NodeList<?> n, A arg) {
         if (n.isEmpty()) {
             return n;
         }
@@ -1301,9 +1324,9 @@ public Visitable visit(NodeList n, A arg) {
         }
         for (Pair<Node, Node> change : changeList) {
             if (change.b == null) {
-                removeElementByObjectIdentity(n, change.a);
+                removeElementByObjectIdentity((NodeList<Node>) n, change.a);
             } else {
-                replaceElementByObjectIdentity(n, change.a, change.b);
+                replaceElementByObjectIdentity((NodeList<Node>) n, change.a, change.b);
             }
         }
         return n;
@@ -1314,7 +1337,8 @@ public Node visit(final ImportDeclaration n, final A arg) {
         Name name = (Name) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -1353,7 +1377,8 @@ public Visitable visit(final ModuleDeclaration n, final A arg) {
         Name name = (Name) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setDirectives(directives);
         n.setName(name);
@@ -1367,7 +1392,8 @@ public Visitable visit(final ModuleRequiresDirective n, final A arg) {
         Name name = (Name) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setModifiers(modifiers);
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1381,7 +1407,8 @@ public Visitable visit(final ModuleExportsDirective n, final A arg) {
         Name name = (Name) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setModuleNames(moduleNames);
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1395,7 +1422,8 @@ public Visitable visit(final ModuleProvidesDirective n, final A arg) {
         NodeList<Name> with = modifyList(n.getWith(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setName(name);
         n.setWith(with);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1408,7 +1436,8 @@ public Visitable visit(final ModuleUsesDirective n, final A arg) {
         Name name = (Name) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -1421,7 +1450,8 @@ public Visitable visit(final ModuleOpensDirective n, final A arg) {
         Name name = (Name) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setModuleNames(moduleNames);
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1445,7 +1475,8 @@ public Visitable visit(final ReceiverParameter n, final A arg) {
         Type type = (Type) n.getType().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null || type == null) return null;
+        if (name == null || type == null)
+            return null;
         n.setAnnotations(annotations);
         n.setName(name);
         n.setType(type);
@@ -1480,7 +1511,8 @@ public Visitable visit(final SwitchExpr n, final A arg) {
         Expression selector = (Expression) n.getSelector().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (selector == null) return null;
+        if (selector == null)
+            return null;
         n.setEntries(entries);
         n.setSelector(selector);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1493,7 +1525,8 @@ public Visitable visit(final YieldStmt n, final A arg) {
         Expression expression = (Expression) n.getExpression().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expression == null) return null;
+        if (expression == null)
+            return null;
         n.setExpression(expression);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -1516,7 +1549,8 @@ public Visitable visit(final TypePatternExpr n, final A arg) {
         Type type = (Type) n.getType().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null || type == null) return null;
+        if (name == null || type == null)
+            return null;
         n.setModifiers(modifiers);
         n.setName(name);
         n.setType(type);
@@ -1554,8 +1588,7 @@ public Visitable visit(final KeyCcatchContinue n, final A arg) {
     @Override
     public Visitable visit(final KeyCcatchParameter n, final A arg) {
         BlockStmt block = n.getBlock().map(s -> (BlockStmt) s.accept(this, arg)).orElse(null);
-        Parameter parameter =
-                n.getParameter().map(s -> (Parameter) s.accept(this, arg)).orElse(null);
+        Parameter parameter = n.getParameter().map(s -> (Parameter) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
         n.setBlock(block);
@@ -1568,8 +1601,7 @@ public Visitable visit(final KeyCcatchParameter n, final A arg) {
     @Override
     public Visitable visit(final KeyCcatchReturn n, final A arg) {
         BlockStmt block = n.getBlock().map(s -> (BlockStmt) s.accept(this, arg)).orElse(null);
-        Parameter parameter =
-                n.getParameter().map(s -> (Parameter) s.accept(this, arg)).orElse(null);
+        Parameter parameter = n.getParameter().map(s -> (Parameter) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
         n.setBlock(block);
@@ -1580,12 +1612,13 @@ public Visitable visit(final KeyCcatchReturn n, final A arg) {
     }
 
     @Override
-    public Visitable visit(final KeyCatchAllStatement n, final A arg) {
+    public Visitable visit(final KeyCatchAllStmt n, final A arg) {
         BlockStmt block = (BlockStmt) n.getBlock().accept(this, arg);
         Name label = (Name) n.getLabel().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (block == null || label == null) return null;
+        if (block == null || label == null)
+            return null;
         n.setBlock(block);
         n.setLabel(label);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1599,7 +1632,8 @@ public Visitable visit(final KeyEscapeExpression n, final A arg) {
         Name callee = (Name) n.getCallee().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (callee == null) return null;
+        if (callee == null)
+            return null;
         n.setArguments(arguments);
         n.setCallee(callee);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1608,12 +1642,13 @@ public Visitable visit(final KeyEscapeExpression n, final A arg) {
     }
 
     @Override
-    public Visitable visit(final KeyExecStatement n, final A arg) {
+    public Visitable visit(final KeyExecStmt n, final A arg) {
         NodeList<KeyCcatchBranch> branches = modifyList(n.getBranches(), arg);
         BlockStmt execBlock = (BlockStmt) n.getExecBlock().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (execBlock == null) return null;
+        if (execBlock == null)
+            return null;
         n.setBranches(branches);
         n.setExecBlock(execBlock);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1624,12 +1659,12 @@ public Visitable visit(final KeyExecStatement n, final A arg) {
     @Override
     public Visitable visit(final KeyExecutionContext n, final A arg) {
         Type context = (Type) n.getContext().accept(this, arg);
-        Expression instance =
-                n.getInstance().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        Expression instance = n.getInstance().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         KeyMethodSignature signature = (KeyMethodSignature) n.getSignature().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (context == null || signature == null) return null;
+        if (context == null || signature == null)
+            return null;
         n.setContext(context);
         n.setInstance(instance);
         n.setSignature(signature);
@@ -1639,12 +1674,13 @@ public Visitable visit(final KeyExecutionContext n, final A arg) {
     }
 
     @Override
-    public Visitable visit(final KeyLoopScopeBlock n, final A arg) {
+    public Visitable visit(final KeyLoopScopeBlockStmt n, final A arg) {
         BlockStmt block = (BlockStmt) n.getBlock().accept(this, arg);
         Expression indexPV = (Expression) n.getIndexPV().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (block == null || indexPV == null) return null;
+        if (block == null || indexPV == null)
+            return null;
         n.setBlock(block);
         n.setIndexPV(indexPV);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1653,11 +1689,12 @@ public Visitable visit(final KeyLoopScopeBlock n, final A arg) {
     }
 
     @Override
-    public Visitable visit(final KeyMergePointStatement n, final A arg) {
+    public Visitable visit(final KeyMergePointStmt n, final A arg) {
         Expression expr = (Expression) n.getExpr().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expr == null) return null;
+        if (expr == null)
+            return null;
         n.setExpr(expr);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -1671,7 +1708,8 @@ public Visitable visit(final KeyMethodBodyStatement n, final A arg) {
         Type source = (Type) n.getSource().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expr == null || source == null) return null;
+        if (expr == null || source == null)
+            return null;
         n.setExpr(expr);
         n.setName(name);
         n.setSource(source);
@@ -1681,14 +1719,14 @@ public Visitable visit(final KeyMethodBodyStatement n, final A arg) {
     }
 
     @Override
-    public Visitable visit(final KeyMethodCallStatement n, final A arg) {
+    public Visitable visit(final KeyMethodCallStmt n, final A arg) {
         BlockStmt block = (BlockStmt) n.getBlock().accept(this, arg);
-        KeyAbstractExecutionContext context =
-                (KeyAbstractExecutionContext) n.getContext().accept(this, arg);
+        KeyAbstractExecutionContext context = (KeyAbstractExecutionContext) n.getContext().accept(this, arg);
         Name name = n.getName().map(s -> (Name) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (block == null || context == null) return null;
+        if (block == null || context == null)
+            return null;
         n.setBlock(block);
         n.setContext(context);
         n.setName(name);
@@ -1703,7 +1741,8 @@ public Visitable visit(final KeyMethodSignature n, final A arg) {
         NodeList<Type> paramTypes = modifyList(n.getParamTypes(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setName(name);
         n.setParamTypes(paramTypes);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1712,21 +1751,7 @@ public Visitable visit(final KeyMethodSignature n, final A arg) {
     }
 
     @Override
-    public Visitable visit(final KeyRangeExpression n, final A arg) {
-        Expression lower = (Expression) n.getLower().accept(this, arg);
-        Expression upper = (Expression) n.getUpper().accept(this, arg);
-        NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
-        Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (lower == null || upper == null) return null;
-        n.setLower(lower);
-        n.setUpper(upper);
-        n.setAssociatedSpecificationComments(associatedSpecificationComments);
-        n.setComment(comment);
-        return n;
-    }
-
-    @Override
-    public Visitable visit(final KeyTransactionStatement n, final A arg) {
+    public Visitable visit(final KeyTransactionStmt n, final A arg) {
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1736,14 +1761,9 @@ public Visitable visit(final KeyTransactionStatement n, final A arg) {
 
     @Override
     public Visitable visit(final KeyContextStatementBlock n, final A arg) {
-        KeyExecCtxtSV context =
-                n.getContext().map(s -> (KeyExecCtxtSV) s.accept(this, arg)).orElse(null);
-        KeyExpressionSV expression = n.getExpression()
-                .map(s -> (KeyExpressionSV) s.accept(this, arg))
-                .orElse(null);
-        KeyMethodSignatureSV signature = n.getSignature()
-                .map(s -> (KeyMethodSignatureSV) s.accept(this, arg))
-                .orElse(null);
+        KeyExecCtxtSV context = n.getContext().map(s -> (KeyExecCtxtSV) s.accept(this, arg)).orElse(null);
+        KeyExpressionSV expression = n.getExpression().map(s -> (KeyExpressionSV) s.accept(this, arg)).orElse(null);
+        KeyMethodSignatureSV signature = n.getSignature().map(s -> (KeyMethodSignatureSV) s.accept(this, arg)).orElse(null);
         NodeList<Statement> statements = modifyList(n.getStatements(), arg);
         KeyTypeSV tr = n.getTr().map(s -> (KeyTypeSV) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
@@ -1790,7 +1810,8 @@ public Visitable visit(final KeyMetaConstructExpression n, final A arg) {
         Expression child = (Expression) n.getChild().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (child == null) return null;
+        if (child == null)
+            return null;
         n.setChild(child);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -1803,7 +1824,8 @@ public Visitable visit(final KeyMetaConstruct n, final A arg) {
         NodeList<Node> schemas = modifyList(n.getSchemas(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (child == null) return null;
+        if (child == null)
+            return null;
         n.setChild(child);
         n.setSchemas(schemas);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1817,7 +1839,8 @@ public Visitable visit(final KeyMetaConstructType n, final A arg) {
         Expression expr = (Expression) n.getExpr().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expr == null) return null;
+        if (expr == null)
+            return null;
         n.setAnnotations(annotations);
         n.setExpr(expr);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1839,7 +1862,8 @@ public Visitable visit(final KeyPassiveExpression n, final A arg) {
         Expression expr = (Expression) n.getExpr().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expr == null) return null;
+        if (expr == null)
+            return null;
         n.setExpr(expr);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -1900,7 +1924,8 @@ public Visitable visit(final RecordPatternExpr n, final A arg) {
         Type type = (Type) n.getType().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (type == null) return null;
+        if (type == null)
+            return null;
         n.setModifiers(modifiers);
         n.setPatternList(patternList);
         n.setType(type);
@@ -1930,15 +1955,15 @@ public Visitable visit(final MarkdownComment n, final A arg) {
     }
 
     @Override
-    public Visitable visit(final JmlClauseLabel n, final A arg) {
-        Expression expr = (Expression) n.getExpr().accept(this, arg);
-        SimpleName label =
-                n.getLabel().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
+    public Visitable visit(final JmlLabledClause n, final A arg) {
+        Expression expression = (Expression) n.getExpression().accept(this, arg);
+        SimpleName label = n.getLabel().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
         SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expr == null) return null;
-        n.setExpr(expr);
+        if (expression == null)
+            return null;
+        n.setExpression(expression);
         n.setLabel(label);
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1952,7 +1977,8 @@ public Visitable visit(final JmlExpressionStmt n, final A arg) {
         NodeList<SimpleName> jmlTags = modifyList(n.getJmlTags(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expression == null) return null;
+        if (expression == null)
+            return null;
         n.setExpression(expression);
         n.setJmlTags(jmlTags);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1966,7 +1992,8 @@ public Visitable visit(final JmlQuantifiedExpr n, final A arg) {
         NodeList<Parameter> variables = modifyList(n.getVariables(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expressions.isEmpty() || variables.isEmpty()) return null;
+        if (expressions.isEmpty() || variables.isEmpty())
+            return null;
         n.setExpressions(expressions);
         n.setVariables(variables);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1980,7 +2007,8 @@ public Visitable visit(final JmlLabelExpr n, final A arg) {
         SimpleName label = (SimpleName) n.getLabel().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expression == null || label == null) return null;
+        if (expression == null || label == null)
+            return null;
         n.setExpression(expression);
         n.setLabel(label);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -1991,11 +2019,11 @@ public Visitable visit(final JmlLabelExpr n, final A arg) {
     @Override
     public Visitable visit(final JmlLetExpr n, final A arg) {
         Expression body = (Expression) n.getBody().accept(this, arg);
-        VariableDeclarationExpr variables =
-                (VariableDeclarationExpr) n.getVariables().accept(this, arg);
+        VariableDeclarationExpr variables = (VariableDeclarationExpr) n.getVariables().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (body == null || variables == null) return null;
+        if (body == null || variables == null)
+            return null;
         n.setBody(body);
         n.setVariables(variables);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -2008,7 +2036,8 @@ public Visitable visit(final JmlMultiCompareExpr n, final A arg) {
         NodeList<Expression> expressions = modifyList(n.getExpressions(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expressions.isEmpty()) return null;
+        if (expressions.isEmpty())
+            return null;
         n.setExpressions(expressions);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -2022,7 +2051,8 @@ public Visitable visit(final JmlSimpleExprClause n, final A arg) {
         SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expression == null) return null;
+        if (expression == null)
+            return null;
         n.setExpression(expression);
         n.setHeaps(heaps);
         n.setName(name);
@@ -2038,7 +2068,8 @@ public Visitable visit(final JmlSignalsClause n, final A arg) {
         SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expression == null || parameter == null) return null;
+        if (expression == null || parameter == null)
+            return null;
         n.setExpression(expression);
         n.setParameter(parameter);
         n.setName(name);
@@ -2109,15 +2140,16 @@ public Visitable visit(final JmlRefiningStmt n, final A arg) {
     }
 
     @Override
-    public Visitable visit(final JmlClauseIf n, final A arg) {
+    public Visitable visit(final JmlConditionalClause n, final A arg) {
         Expression condition = (Expression) n.getCondition().accept(this, arg);
-        Expression then = (Expression) n.getThen().accept(this, arg);
+        Expression expression = (Expression) n.getExpression().accept(this, arg);
         SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (condition == null || then == null) return null;
+        if (condition == null || expression == null)
+            return null;
         n.setCondition(condition);
-        n.setThen(then);
+        n.setExpression(expression);
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -2134,7 +2166,8 @@ public Visitable visit(final JmlClassExprDeclaration n, final A arg) {
         SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (invariant == null || kind == null) return null;
+        if (invariant == null || kind == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setInvariant(invariant);
@@ -2152,12 +2185,12 @@ public Visitable visit(final JmlClassAccessibleDeclaration n, final A arg) {
         NodeList<Modifier> modifiers = modifyList(n.getModifiers(), arg);
         NodeList<Expression> expressions = modifyList(n.getExpressions(), arg);
         NodeList<SimpleName> jmlTags = modifyList(n.getJmlTags(), arg);
-        Expression measuredBy =
-                n.getMeasuredBy().map(s -> (Expression) s.accept(this, arg)).orElse(null);
+        Expression measuredBy = n.getMeasuredBy().map(s -> (Expression) s.accept(this, arg)).orElse(null);
         Expression variable = (Expression) n.getVariable().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (variable == null) return null;
+        if (variable == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setExpressions(expressions);
@@ -2178,7 +2211,8 @@ public Visitable visit(final JmlRepresentsDeclaration n, final A arg) {
         Name name = (Name) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (expr == null || name == null) return null;
+        if (expr == null || name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setExpr(expr);
@@ -2214,7 +2248,8 @@ public Visitable visit(final JmlSetComprehensionExpr n, final A arg) {
         Expression predicate = (Expression) n.getPredicate().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (binding == null || predicate == null) return null;
+        if (binding == null || predicate == null)
+            return null;
         n.setBinding(binding);
         n.setPredicate(predicate);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -2228,7 +2263,8 @@ public Visitable visit(final JmlGhostStmt n, final A arg) {
         Statement statement = (Statement) n.getStatement().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (statement == null) return null;
+        if (statement == null)
+            return null;
         n.setJmlTags(jmlTags);
         n.setStatement(statement);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -2239,14 +2275,13 @@ public Visitable visit(final JmlGhostStmt n, final A arg) {
     @Override
     public Visitable visit(final JmlMethodDeclaration n, final A arg) {
         NodeList<AnnotationExpr> annotations = modifyList(n.getAnnotations(), arg);
-        JmlContract contract =
-                n.getContract().map(s -> (JmlContract) s.accept(this, arg)).orElse(null);
+        JmlContract contract = n.getContract().map(s -> (JmlContract) s.accept(this, arg)).orElse(null);
         NodeList<SimpleName> jmlTags = modifyList(n.getJmlTags(), arg);
-        MethodDeclaration methodDeclaration =
-                (MethodDeclaration) n.getMethodDeclaration().accept(this, arg);
+        MethodDeclaration methodDeclaration = (MethodDeclaration) n.getMethodDeclaration().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (methodDeclaration == null) return null;
+        if (methodDeclaration == null)
+            return null;
         n.setAnnotations(annotations);
         n.setContract(contract);
         n.setJmlTags(jmlTags);
@@ -2263,7 +2298,8 @@ public Visitable visit(final JmlBinaryInfixExpr n, final A arg) {
         Expression right = (Expression) n.getRight().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (left == null || operator == null || right == null) return null;
+        if (left == null || operator == null || right == null)
+            return null;
         n.setLeft(left);
         n.setOperator(operator);
         n.setRight(right);
@@ -2314,7 +2350,8 @@ public Visitable visit(final JmlDocType n, final A arg) {
         SimpleName name = (SimpleName) n.getName().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setAnnotations(annotations);
         n.setModifiers(modifiers);
         n.setJmlComments(jmlComments);
@@ -2332,7 +2369,8 @@ public Visitable visit(final JmlFieldDeclaration n, final A arg) {
         NodeList<SimpleName> jmlTags = modifyList(n.getJmlTags(), arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (decl == null) return null;
+        if (decl == null)
+            return null;
         n.setAnnotations(annotations);
         n.setDecl(decl);
         n.setJmlTags(jmlTags);
@@ -2343,12 +2381,12 @@ public Visitable visit(final JmlFieldDeclaration n, final A arg) {
 
     @Override
     public Visitable visit(final JmlOldClause n, final A arg) {
-        VariableDeclarationExpr declarations =
-                (VariableDeclarationExpr) n.getDeclarations().accept(this, arg);
+        VariableDeclarationExpr declarations = (VariableDeclarationExpr) n.getDeclarations().accept(this, arg);
         SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (declarations == null) return null;
+        if (declarations == null)
+            return null;
         n.setDeclarations(declarations);
         n.setName(name);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -2361,7 +2399,8 @@ public Visitable visit(final JmlTypeExpr n, final A arg) {
         Type type = (Type) n.getType().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (type == null) return null;
+        if (type == null)
+            return null;
         n.setType(type);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
         n.setComment(comment);
@@ -2411,7 +2450,8 @@ public Visitable visit(final JmlLabelStmt n, final A arg) {
         SimpleName label = (SimpleName) n.getLabel().accept(this, arg);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (label == null) return null;
+        if (label == null)
+            return null;
         n.setJmlTags(jmlTags);
         n.setLabel(label);
         n.setAssociatedSpecificationComments(associatedSpecificationComments);
@@ -2426,7 +2466,8 @@ public Visitable visit(final JmlMethodSignature n, final A arg) {
         Type receiver = n.getReceiver().map(s -> (Type) s.accept(this, arg)).orElse(null);
         NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
         Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
-        if (name == null) return null;
+        if (name == null)
+            return null;
         n.setArgumentTypes(argumentTypes);
         n.setName(name);
         n.setReceiver(receiver);
@@ -2434,4 +2475,34 @@ public Visitable visit(final JmlMethodSignature n, final A arg) {
         n.setComment(comment);
         return n;
     }
+
+    @Override
+    public Visitable visit(final KeYMarkerStatement n, final A arg) {
+        NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
+        Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
+        n.setAssociatedSpecificationComments(associatedSpecificationComments);
+        n.setComment(comment);
+        return n;
+    }
+
+    @Override
+    public Visitable visit(final JmlInfFlowClause n, final A arg) {
+        NodeList<Expression> by = modifyList(n.getBy(), arg);
+        NodeList<Expression> declassifies = modifyList(n.getDeclassifies(), arg);
+        NodeList<Expression> erases = modifyList(n.getErases(), arg);
+        NodeList<Expression> expressions = modifyList(n.getExpressions(), arg);
+        NodeList<Expression> newObjects = modifyList(n.getNewObjects(), arg);
+        SimpleName name = n.getName().map(s -> (SimpleName) s.accept(this, arg)).orElse(null);
+        NodeList<Comment> associatedSpecificationComments = modifyList(n.getAssociatedSpecificationComments(), arg);
+        Comment comment = n.getComment().map(s -> (Comment) s.accept(this, arg)).orElse(null);
+        n.setBy(by);
+        n.setDeclassifies(declassifies);
+        n.setErases(erases);
+        n.setExpressions(expressions);
+        n.setNewObjects(newObjects);
+        n.setName(name);
+        n.setAssociatedSpecificationComments(associatedSpecificationComments);
+        n.setComment(comment);
+        return n;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java
index de89919636..0e3b9bc3b3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentEqualsVisitor.java
@@ -30,6 +30,7 @@
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -99,30 +100,42 @@ private boolean objEquals(final Object n, final Object n2) {
     @Override
     public Boolean visit(final CompilationUnit n, final Visitable arg) {
         final CompilationUnit n2 = (CompilationUnit) arg;
-        if (!nodesEquals(n.getImports(), n2.getImports())) return false;
-        if (!nodeEquals(n.getModule(), n2.getModule())) return false;
-        if (!nodeEquals(n.getPackageDeclaration(), n2.getPackageDeclaration())) return false;
-        if (!nodesEquals(n.getTypes(), n2.getTypes())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getImports(), n2.getImports()))
+            return false;
+        if (!nodeEquals(n.getModule(), n2.getModule()))
+            return false;
+        if (!nodeEquals(n.getPackageDeclaration(), n2.getPackageDeclaration()))
+            return false;
+        if (!nodesEquals(n.getTypes(), n2.getTypes()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final PackageDeclaration n, final Visitable arg) {
         final PackageDeclaration n2 = (PackageDeclaration) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final TypeParameter n, final Visitable arg) {
         final TypeParameter n2 = (TypeParameter) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getTypeBound(), n2.getTypeBound())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getTypeBound(), n2.getTypeBound()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
@@ -139,140 +152,214 @@ public Boolean visit(final BlockComment n, final Visitable arg) {
     @Override
     public Boolean visit(final ClassOrInterfaceDeclaration n, final Visitable arg) {
         final ClassOrInterfaceDeclaration n2 = (ClassOrInterfaceDeclaration) arg;
-        if (!nodesEquals(n.getExtendedTypes(), n2.getExtendedTypes())) return false;
-        if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) return false;
-        if (!objEquals(n.isCompact(), n2.isCompact())) return false;
-        if (!objEquals(n.isInterface(), n2.isInterface())) return false;
-        if (!nodesEquals(n.getPermittedTypes(), n2.getPermittedTypes())) return false;
-        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false;
-        if (!nodesEquals(n.getMembers(), n2.getMembers())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getExtendedTypes(), n2.getExtendedTypes()))
+            return false;
+        if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes()))
+            return false;
+        if (!objEquals(n.isCompact(), n2.isCompact()))
+            return false;
+        if (!objEquals(n.isInterface(), n2.isInterface()))
+            return false;
+        if (!nodesEquals(n.getPermittedTypes(), n2.getPermittedTypes()))
+            return false;
+        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters()))
+            return false;
+        if (!nodesEquals(n.getMembers(), n2.getMembers()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final EnumDeclaration n, final Visitable arg) {
         final EnumDeclaration n2 = (EnumDeclaration) arg;
-        if (!nodesEquals(n.getEntries(), n2.getEntries())) return false;
-        if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) return false;
-        if (!nodesEquals(n.getMembers(), n2.getMembers())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getEntries(), n2.getEntries()))
+            return false;
+        if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes()))
+            return false;
+        if (!nodesEquals(n.getMembers(), n2.getMembers()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final EnumConstantDeclaration n, final Visitable arg) {
         final EnumConstantDeclaration n2 = (EnumConstantDeclaration) arg;
-        if (!nodesEquals(n.getArguments(), n2.getArguments())) return false;
-        if (!nodesEquals(n.getClassBody(), n2.getClassBody())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getArguments(), n2.getArguments()))
+            return false;
+        if (!nodesEquals(n.getClassBody(), n2.getClassBody()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final AnnotationDeclaration n, final Visitable arg) {
         final AnnotationDeclaration n2 = (AnnotationDeclaration) arg;
-        if (!nodesEquals(n.getMembers(), n2.getMembers())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getMembers(), n2.getMembers()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final AnnotationMemberDeclaration n, final Visitable arg) {
         final AnnotationMemberDeclaration n2 = (AnnotationMemberDeclaration) arg;
-        if (!nodeEquals(n.getDefaultValue(), n2.getDefaultValue())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getDefaultValue(), n2.getDefaultValue()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final FieldDeclaration n, final Visitable arg) {
         final FieldDeclaration n2 = (FieldDeclaration) arg;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodesEquals(n.getVariables(), n2.getVariables())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodesEquals(n.getVariables(), n2.getVariables()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final VariableDeclarator n, final Visitable arg) {
         final VariableDeclarator n2 = (VariableDeclarator) arg;
-        if (!nodeEquals(n.getInitializer(), n2.getInitializer())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getInitializer(), n2.getInitializer()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ConstructorDeclaration n, final Visitable arg) {
         final ConstructorDeclaration n2 = (ConstructorDeclaration) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getParameters(), n2.getParameters())) return false;
-        if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) return false;
-        if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false;
-        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getParameters(), n2.getParameters()))
+            return false;
+        if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter()))
+            return false;
+        if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions()))
+            return false;
+        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MethodDeclaration n, final Visitable arg) {
         final MethodDeclaration n2 = (MethodDeclaration) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getParameters(), n2.getParameters())) return false;
-        if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) return false;
-        if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false;
-        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getParameters(), n2.getParameters()))
+            return false;
+        if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter()))
+            return false;
+        if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions()))
+            return false;
+        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final Parameter n, final Visitable arg) {
         final Parameter n2 = (Parameter) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!objEquals(n.isVarArgs(), n2.isVarArgs())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getVarArgsAnnotations(), n2.getVarArgsAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!objEquals(n.isVarArgs(), n2.isVarArgs()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getVarArgsAnnotations(), n2.getVarArgsAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final InitializerDeclaration n, final Visitable arg) {
         final InitializerDeclaration n2 = (InitializerDeclaration) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!objEquals(n.isStatic(), n2.isStatic())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!objEquals(n.isStatic(), n2.isStatic()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
@@ -284,603 +371,810 @@ public Boolean visit(final TraditionalJavadocComment n, final Visitable arg) {
     @Override
     public Boolean visit(final ClassOrInterfaceType n, final Visitable arg) {
         final ClassOrInterfaceType n2 = (ClassOrInterfaceType) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getScope(), n2.getScope())) return false;
-        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getScope(), n2.getScope()))
+            return false;
+        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final PrimitiveType n, final Visitable arg) {
         final PrimitiveType n2 = (PrimitiveType) arg;
-        if (!objEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ArrayType n, final Visitable arg) {
         final ArrayType n2 = (ArrayType) arg;
-        if (!nodeEquals(n.getComponentType(), n2.getComponentType())) return false;
-        if (!objEquals(n.getOrigin(), n2.getOrigin())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getComponentType(), n2.getComponentType()))
+            return false;
+        if (!objEquals(n.getOrigin(), n2.getOrigin()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ArrayCreationLevel n, final Visitable arg) {
         final ArrayCreationLevel n2 = (ArrayCreationLevel) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodeEquals(n.getDimension(), n2.getDimension())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodeEquals(n.getDimension(), n2.getDimension()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final IntersectionType n, final Visitable arg) {
         final IntersectionType n2 = (IntersectionType) arg;
-        if (!nodesEquals(n.getElements(), n2.getElements())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getElements(), n2.getElements()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final UnionType n, final Visitable arg) {
         final UnionType n2 = (UnionType) arg;
-        if (!nodesEquals(n.getElements(), n2.getElements())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getElements(), n2.getElements()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final VoidType n, final Visitable arg) {
         final VoidType n2 = (VoidType) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final WildcardType n, final Visitable arg) {
         final WildcardType n2 = (WildcardType) arg;
-        if (!nodeEquals(n.getExtendedType(), n2.getExtendedType())) return false;
-        if (!nodeEquals(n.getSuperType(), n2.getSuperType())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExtendedType(), n2.getExtendedType()))
+            return false;
+        if (!nodeEquals(n.getSuperType(), n2.getSuperType()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final UnknownType n, final Visitable arg) {
         final UnknownType n2 = (UnknownType) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ArrayAccessExpr n, final Visitable arg) {
         final ArrayAccessExpr n2 = (ArrayAccessExpr) arg;
-        if (!nodeEquals(n.getIndex(), n2.getIndex())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getIndex(), n2.getIndex()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ArrayCreationExpr n, final Visitable arg) {
         final ArrayCreationExpr n2 = (ArrayCreationExpr) arg;
-        if (!nodeEquals(n.getElementType(), n2.getElementType())) return false;
-        if (!nodeEquals(n.getInitializer(), n2.getInitializer())) return false;
-        if (!nodesEquals(n.getLevels(), n2.getLevels())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getElementType(), n2.getElementType()))
+            return false;
+        if (!nodeEquals(n.getInitializer(), n2.getInitializer()))
+            return false;
+        if (!nodesEquals(n.getLevels(), n2.getLevels()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ArrayInitializerExpr n, final Visitable arg) {
         final ArrayInitializerExpr n2 = (ArrayInitializerExpr) arg;
-        if (!nodesEquals(n.getValues(), n2.getValues())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getValues(), n2.getValues()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final AssignExpr n, final Visitable arg) {
         final AssignExpr n2 = (AssignExpr) arg;
-        if (!objEquals(n.getOperator(), n2.getOperator())) return false;
-        if (!nodeEquals(n.getTarget(), n2.getTarget())) return false;
-        if (!nodeEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getOperator(), n2.getOperator()))
+            return false;
+        if (!nodeEquals(n.getTarget(), n2.getTarget()))
+            return false;
+        if (!nodeEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final BinaryExpr n, final Visitable arg) {
         final BinaryExpr n2 = (BinaryExpr) arg;
-        if (!nodeEquals(n.getLeft(), n2.getLeft())) return false;
-        if (!objEquals(n.getOperator(), n2.getOperator())) return false;
-        if (!nodeEquals(n.getRight(), n2.getRight())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getLeft(), n2.getLeft()))
+            return false;
+        if (!objEquals(n.getOperator(), n2.getOperator()))
+            return false;
+        if (!nodeEquals(n.getRight(), n2.getRight()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final CastExpr n, final Visitable arg) {
         final CastExpr n2 = (CastExpr) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ClassExpr n, final Visitable arg) {
         final ClassExpr n2 = (ClassExpr) arg;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ConditionalExpr n, final Visitable arg) {
         final ConditionalExpr n2 = (ConditionalExpr) arg;
-        if (!nodeEquals(n.getCondition(), n2.getCondition())) return false;
-        if (!nodeEquals(n.getElseExpr(), n2.getElseExpr())) return false;
-        if (!nodeEquals(n.getThenExpr(), n2.getThenExpr())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getCondition(), n2.getCondition()))
+            return false;
+        if (!nodeEquals(n.getElseExpr(), n2.getElseExpr()))
+            return false;
+        if (!nodeEquals(n.getThenExpr(), n2.getThenExpr()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final EnclosedExpr n, final Visitable arg) {
         final EnclosedExpr n2 = (EnclosedExpr) arg;
-        if (!nodeEquals(n.getInner(), n2.getInner())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getInner(), n2.getInner()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final FieldAccessExpr n, final Visitable arg) {
         final FieldAccessExpr n2 = (FieldAccessExpr) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getScope(), n2.getScope())) return false;
-        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getScope(), n2.getScope()))
+            return false;
+        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final InstanceOfExpr n, final Visitable arg) {
         final InstanceOfExpr n2 = (InstanceOfExpr) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodeEquals(n.getPattern(), n2.getPattern())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodeEquals(n.getPattern(), n2.getPattern()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final StringLiteralExpr n, final Visitable arg) {
         final StringLiteralExpr n2 = (StringLiteralExpr) arg;
-        if (!objEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final IntegerLiteralExpr n, final Visitable arg) {
         final IntegerLiteralExpr n2 = (IntegerLiteralExpr) arg;
-        if (!objEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final LongLiteralExpr n, final Visitable arg) {
         final LongLiteralExpr n2 = (LongLiteralExpr) arg;
-        if (!objEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final CharLiteralExpr n, final Visitable arg) {
         final CharLiteralExpr n2 = (CharLiteralExpr) arg;
-        if (!objEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final DoubleLiteralExpr n, final Visitable arg) {
         final DoubleLiteralExpr n2 = (DoubleLiteralExpr) arg;
-        if (!objEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final BooleanLiteralExpr n, final Visitable arg) {
         final BooleanLiteralExpr n2 = (BooleanLiteralExpr) arg;
-        if (!objEquals(n.isValue(), n2.isValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.isValue(), n2.isValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final NullLiteralExpr n, final Visitable arg) {
         final NullLiteralExpr n2 = (NullLiteralExpr) arg;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MethodCallExpr n, final Visitable arg) {
         final MethodCallExpr n2 = (MethodCallExpr) arg;
-        if (!nodesEquals(n.getArguments(), n2.getArguments())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getScope(), n2.getScope())) return false;
-        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getArguments(), n2.getArguments()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getScope(), n2.getScope()))
+            return false;
+        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final NameExpr n, final Visitable arg) {
         final NameExpr n2 = (NameExpr) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ObjectCreationExpr n, final Visitable arg) {
         final ObjectCreationExpr n2 = (ObjectCreationExpr) arg;
-        if (!nodesEquals(n.getAnonymousClassBody(), n2.getAnonymousClassBody())) return false;
-        if (!nodesEquals(n.getArguments(), n2.getArguments())) return false;
-        if (!nodeEquals(n.getScope(), n2.getScope())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAnonymousClassBody(), n2.getAnonymousClassBody()))
+            return false;
+        if (!nodesEquals(n.getArguments(), n2.getArguments()))
+            return false;
+        if (!nodeEquals(n.getScope(), n2.getScope()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final Name n, final Visitable arg) {
         final Name n2 = (Name) arg;
-        if (!objEquals(n.getIdentifier(), n2.getIdentifier())) return false;
-        if (!nodeEquals(n.getQualifier(), n2.getQualifier())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getIdentifier(), n2.getIdentifier()))
+            return false;
+        if (!nodeEquals(n.getQualifier(), n2.getQualifier()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SimpleName n, final Visitable arg) {
         final SimpleName n2 = (SimpleName) arg;
-        if (!objEquals(n.getIdentifier(), n2.getIdentifier())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getIdentifier(), n2.getIdentifier()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ThisExpr n, final Visitable arg) {
         final ThisExpr n2 = (ThisExpr) arg;
-        if (!nodeEquals(n.getTypeName(), n2.getTypeName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getTypeName(), n2.getTypeName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SuperExpr n, final Visitable arg) {
         final SuperExpr n2 = (SuperExpr) arg;
-        if (!nodeEquals(n.getTypeName(), n2.getTypeName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getTypeName(), n2.getTypeName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final UnaryExpr n, final Visitable arg) {
         final UnaryExpr n2 = (UnaryExpr) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!objEquals(n.getOperator(), n2.getOperator())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!objEquals(n.getOperator(), n2.getOperator()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final VariableDeclarationExpr n, final Visitable arg) {
         final VariableDeclarationExpr n2 = (VariableDeclarationExpr) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodesEquals(n.getVariables(), n2.getVariables())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodesEquals(n.getVariables(), n2.getVariables()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MarkerAnnotationExpr n, final Visitable arg) {
         final MarkerAnnotationExpr n2 = (MarkerAnnotationExpr) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SingleMemberAnnotationExpr n, final Visitable arg) {
         final SingleMemberAnnotationExpr n2 = (SingleMemberAnnotationExpr) arg;
-        if (!nodeEquals(n.getMemberValue(), n2.getMemberValue())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getMemberValue(), n2.getMemberValue()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final NormalAnnotationExpr n, final Visitable arg) {
         final NormalAnnotationExpr n2 = (NormalAnnotationExpr) arg;
-        if (!nodesEquals(n.getPairs(), n2.getPairs())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getPairs(), n2.getPairs()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MemberValuePair n, final Visitable arg) {
         final MemberValuePair n2 = (MemberValuePair) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ExplicitConstructorInvocationStmt n, final Visitable arg) {
         final ExplicitConstructorInvocationStmt n2 = (ExplicitConstructorInvocationStmt) arg;
-        if (!nodesEquals(n.getArguments(), n2.getArguments())) return false;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!objEquals(n.isThis(), n2.isThis())) return false;
-        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getArguments(), n2.getArguments()))
+            return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!objEquals(n.isThis(), n2.isThis()))
+            return false;
+        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final LocalClassDeclarationStmt n, final Visitable arg) {
         final LocalClassDeclarationStmt n2 = (LocalClassDeclarationStmt) arg;
-        if (!nodeEquals(n.getClassDeclaration(), n2.getClassDeclaration())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getClassDeclaration(), n2.getClassDeclaration()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final LocalRecordDeclarationStmt n, final Visitable arg) {
         final LocalRecordDeclarationStmt n2 = (LocalRecordDeclarationStmt) arg;
-        if (!nodeEquals(n.getRecordDeclaration(), n2.getRecordDeclaration())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getRecordDeclaration(), n2.getRecordDeclaration()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final AssertStmt n, final Visitable arg) {
         final AssertStmt n2 = (AssertStmt) arg;
-        if (!nodeEquals(n.getCheck(), n2.getCheck())) return false;
-        if (!nodeEquals(n.getMessage(), n2.getMessage())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getCheck(), n2.getCheck()))
+            return false;
+        if (!nodeEquals(n.getMessage(), n2.getMessage()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final BlockStmt n, final Visitable arg) {
         final BlockStmt n2 = (BlockStmt) arg;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodesEquals(n.getStatements(), n2.getStatements())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodesEquals(n.getStatements(), n2.getStatements()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final LabeledStmt n, final Visitable arg) {
         final LabeledStmt n2 = (LabeledStmt) arg;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodeEquals(n.getStatement(), n2.getStatement())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodeEquals(n.getStatement(), n2.getStatement()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final EmptyStmt n, final Visitable arg) {
         final EmptyStmt n2 = (EmptyStmt) arg;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ExpressionStmt n, final Visitable arg) {
         final ExpressionStmt n2 = (ExpressionStmt) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SwitchStmt n, final Visitable arg) {
         final SwitchStmt n2 = (SwitchStmt) arg;
-        if (!nodesEquals(n.getEntries(), n2.getEntries())) return false;
-        if (!nodeEquals(n.getSelector(), n2.getSelector())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getEntries(), n2.getEntries()))
+            return false;
+        if (!nodeEquals(n.getSelector(), n2.getSelector()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SwitchEntry n, final Visitable arg) {
         final SwitchEntry n2 = (SwitchEntry) arg;
-        if (!nodeEquals(n.getGuard(), n2.getGuard())) return false;
-        if (!objEquals(n.isDefault(), n2.isDefault())) return false;
-        if (!nodesEquals(n.getLabels(), n2.getLabels())) return false;
-        if (!nodesEquals(n.getStatements(), n2.getStatements())) return false;
-        if (!objEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getGuard(), n2.getGuard()))
+            return false;
+        if (!objEquals(n.isDefault(), n2.isDefault()))
+            return false;
+        if (!nodesEquals(n.getLabels(), n2.getLabels()))
+            return false;
+        if (!nodesEquals(n.getStatements(), n2.getStatements()))
+            return false;
+        if (!objEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final BreakStmt n, final Visitable arg) {
         final BreakStmt n2 = (BreakStmt) arg;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ReturnStmt n, final Visitable arg) {
         final ReturnStmt n2 = (ReturnStmt) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final IfStmt n, final Visitable arg) {
         final IfStmt n2 = (IfStmt) arg;
-        if (!nodeEquals(n.getCondition(), n2.getCondition())) return false;
-        if (!nodeEquals(n.getElseStmt(), n2.getElseStmt())) return false;
-        if (!nodeEquals(n.getThenStmt(), n2.getThenStmt())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getCondition(), n2.getCondition()))
+            return false;
+        if (!nodeEquals(n.getElseStmt(), n2.getElseStmt()))
+            return false;
+        if (!nodeEquals(n.getThenStmt(), n2.getThenStmt()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final WhileStmt n, final Visitable arg) {
         final WhileStmt n2 = (WhileStmt) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getCondition(), n2.getCondition())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getCondition(), n2.getCondition()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ContinueStmt n, final Visitable arg) {
         final ContinueStmt n2 = (ContinueStmt) arg;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final DoStmt n, final Visitable arg) {
         final DoStmt n2 = (DoStmt) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getCondition(), n2.getCondition())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getCondition(), n2.getCondition()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ForEachStmt n, final Visitable arg) {
         final ForEachStmt n2 = (ForEachStmt) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodeEquals(n.getIterable(), n2.getIterable())) return false;
-        if (!nodeEquals(n.getVariable(), n2.getVariable())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        return true;
-    }
-
-    @Override
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodeEquals(n.getIterable(), n2.getIterable()))
+            return false;
+        if (!nodeEquals(n.getVariable(), n2.getVariable()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        return true;
+    }
+
+    @Override
     public Boolean visit(final ForStmt n, final Visitable arg) {
         final ForStmt n2 = (ForStmt) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getCompare(), n2.getCompare())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!nodesEquals(n.getInitialization(), n2.getInitialization())) return false;
-        if (!nodesEquals(n.getUpdate(), n2.getUpdate())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getCompare(), n2.getCompare()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!nodesEquals(n.getInitialization(), n2.getInitialization()))
+            return false;
+        if (!nodesEquals(n.getUpdate(), n2.getUpdate()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ThrowStmt n, final Visitable arg) {
         final ThrowStmt n2 = (ThrowStmt) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SynchronizedStmt n, final Visitable arg) {
         final SynchronizedStmt n2 = (SynchronizedStmt) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final TryStmt n, final Visitable arg) {
         final TryStmt n2 = (TryStmt) arg;
-        if (!nodesEquals(n.getCatchClauses(), n2.getCatchClauses())) return false;
-        if (!nodeEquals(n.getFinallyBlock(), n2.getFinallyBlock())) return false;
-        if (!nodesEquals(n.getResources(), n2.getResources())) return false;
-        if (!nodeEquals(n.getTryBlock(), n2.getTryBlock())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getCatchClauses(), n2.getCatchClauses()))
+            return false;
+        if (!nodeEquals(n.getFinallyBlock(), n2.getFinallyBlock()))
+            return false;
+        if (!nodesEquals(n.getResources(), n2.getResources()))
+            return false;
+        if (!nodeEquals(n.getTryBlock(), n2.getTryBlock()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final CatchClause n, final Visitable arg) {
         final CatchClause n2 = (CatchClause) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getParameter(), n2.getParameter())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getParameter(), n2.getParameter()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final LambdaExpr n, final Visitable arg) {
         final LambdaExpr n2 = (LambdaExpr) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodesEquals(n.getContracts(), n2.getContracts())) return false;
-        if (!objEquals(n.isEnclosingParameters(), n2.isEnclosingParameters())) return false;
-        if (!nodesEquals(n.getParameters(), n2.getParameters())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodesEquals(n.getContracts(), n2.getContracts()))
+            return false;
+        if (!objEquals(n.isEnclosingParameters(), n2.isEnclosingParameters()))
+            return false;
+        if (!nodesEquals(n.getParameters(), n2.getParameters()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MethodReferenceExpr n, final Visitable arg) {
         final MethodReferenceExpr n2 = (MethodReferenceExpr) arg;
-        if (!objEquals(n.getIdentifier(), n2.getIdentifier())) return false;
-        if (!nodeEquals(n.getScope(), n2.getScope())) return false;
-        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getIdentifier(), n2.getIdentifier()))
+            return false;
+        if (!nodeEquals(n.getScope(), n2.getScope()))
+            return false;
+        if (!nodesEquals(n.getTypeArguments(), n2.getTypeArguments()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final TypeExpr n, final Visitable arg) {
         final TypeExpr n2 = (TypeExpr) arg;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ImportDeclaration n, final Visitable arg) {
         final ImportDeclaration n2 = (ImportDeclaration) arg;
-        if (!objEquals(n.isAsterisk(), n2.isAsterisk())) return false;
-        if (!objEquals(n.isJmlModel(), n2.isJmlModel())) return false;
-        if (!objEquals(n.isModule(), n2.isModule())) return false;
-        if (!objEquals(n.isStatic(), n2.isStatic())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.isAsterisk(), n2.isAsterisk()))
+            return false;
+        if (!objEquals(n.isJmlModel(), n2.isJmlModel()))
+            return false;
+        if (!objEquals(n.isModule(), n2.isModule()))
+            return false;
+        if (!objEquals(n.isStatic(), n2.isStatic()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
@@ -892,770 +1186,1068 @@ public Boolean visit(NodeList n, Visitable arg) {
     @Override
     public Boolean visit(final ModuleDeclaration n, final Visitable arg) {
         final ModuleDeclaration n2 = (ModuleDeclaration) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getDirectives(), n2.getDirectives())) return false;
-        if (!objEquals(n.isOpen(), n2.isOpen())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getDirectives(), n2.getDirectives()))
+            return false;
+        if (!objEquals(n.isOpen(), n2.isOpen()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ModuleRequiresDirective n, final Visitable arg) {
         final ModuleRequiresDirective n2 = (ModuleRequiresDirective) arg;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override()
     public Boolean visit(final ModuleExportsDirective n, final Visitable arg) {
         final ModuleExportsDirective n2 = (ModuleExportsDirective) arg;
-        if (!nodesEquals(n.getModuleNames(), n2.getModuleNames())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getModuleNames(), n2.getModuleNames()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override()
     public Boolean visit(final ModuleProvidesDirective n, final Visitable arg) {
         final ModuleProvidesDirective n2 = (ModuleProvidesDirective) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getWith(), n2.getWith())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getWith(), n2.getWith()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override()
     public Boolean visit(final ModuleUsesDirective n, final Visitable arg) {
         final ModuleUsesDirective n2 = (ModuleUsesDirective) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ModuleOpensDirective n, final Visitable arg) {
         final ModuleOpensDirective n2 = (ModuleOpensDirective) arg;
-        if (!nodesEquals(n.getModuleNames(), n2.getModuleNames())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getModuleNames(), n2.getModuleNames()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final UnparsableStmt n, final Visitable arg) {
         final UnparsableStmt n2 = (UnparsableStmt) arg;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final ReceiverParameter n, final Visitable arg) {
         final ReceiverParameter n2 = (ReceiverParameter) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final VarType n, final Visitable arg) {
         final VarType n2 = (VarType) arg;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final Modifier n, final Visitable arg) {
         final Modifier n2 = (Modifier) arg;
-        if (!objEquals(n.getKeyword(), n2.getKeyword())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getKeyword(), n2.getKeyword()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final SwitchExpr n, final Visitable arg) {
         final SwitchExpr n2 = (SwitchExpr) arg;
-        if (!nodesEquals(n.getEntries(), n2.getEntries())) return false;
-        if (!nodeEquals(n.getSelector(), n2.getSelector())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getEntries(), n2.getEntries()))
+            return false;
+        if (!nodeEquals(n.getSelector(), n2.getSelector()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final YieldStmt n, final Visitable arg) {
         final YieldStmt n2 = (YieldStmt) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final TextBlockLiteralExpr n, final Visitable arg) {
         final TextBlockLiteralExpr n2 = (TextBlockLiteralExpr) arg;
-        if (!objEquals(n.getValue(), n2.getValue())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getValue(), n2.getValue()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final TypePatternExpr n, final Visitable arg) {
         final TypePatternExpr n2 = (TypePatternExpr) arg;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final JmlClauseLabel n, final Visitable arg) {
-        final JmlClauseLabel n2 = (JmlClauseLabel) arg;
-        if (!nodeEquals(n.getExpr(), n2.getExpr())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+    public Boolean visit(final JmlLabledClause n, final Visitable arg) {
+        final JmlLabledClause n2 = (JmlLabledClause) arg;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlExpressionStmt n, final Visitable arg) {
         final JmlExpressionStmt n2 = (JmlExpressionStmt) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlQuantifiedExpr n, final Visitable arg) {
         final JmlQuantifiedExpr n2 = (JmlQuantifiedExpr) arg;
-        if (!objEquals(n.getBinder(), n2.getBinder())) return false;
-        if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false;
-        if (!nodesEquals(n.getVariables(), n2.getVariables())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getBinder(), n2.getBinder()))
+            return false;
+        if (!nodesEquals(n.getExpressions(), n2.getExpressions()))
+            return false;
+        if (!nodesEquals(n.getVariables(), n2.getVariables()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlLabelExpr n, final Visitable arg) {
         final JmlLabelExpr n2 = (JmlLabelExpr) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlLetExpr n, final Visitable arg) {
         final JmlLetExpr n2 = (JmlLetExpr) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodeEquals(n.getVariables(), n2.getVariables())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodeEquals(n.getVariables(), n2.getVariables()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlMultiCompareExpr n, final Visitable arg) {
         final JmlMultiCompareExpr n2 = (JmlMultiCompareExpr) arg;
-        if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false;
-        if (!objEquals(n.getOperators(), n2.getOperators())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getExpressions(), n2.getExpressions()))
+            return false;
+        if (!objEquals(n.getOperators(), n2.getOperators()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlSimpleExprClause n, final Visitable arg) {
         final JmlSimpleExprClause n2 = (JmlSimpleExprClause) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodesEquals(n.getHeaps(), n2.getHeaps())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodesEquals(n.getHeaps(), n2.getHeaps()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlSignalsClause n, final Visitable arg) {
         final JmlSignalsClause n2 = (JmlSignalsClause) arg;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodeEquals(n.getParameter(), n2.getParameter())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodeEquals(n.getParameter(), n2.getParameter()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlSignalsOnlyClause n, final Visitable arg) {
         final JmlSignalsOnlyClause n2 = (JmlSignalsOnlyClause) arg;
-        if (!nodesEquals(n.getTypes(), n2.getTypes())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getTypes(), n2.getTypes()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlUnreachableStmt n, final Visitable arg) {
         final JmlUnreachableStmt n2 = (JmlUnreachableStmt) arg;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlCallableClause n, final Visitable arg) {
         final JmlCallableClause n2 = (JmlCallableClause) arg;
-        if (!nodesEquals(n.getMethodSignatures(), n2.getMethodSignatures())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getMethodSignatures(), n2.getMethodSignatures()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlForallClause n, final Visitable arg) {
         final JmlForallClause n2 = (JmlForallClause) arg;
-        if (!nodesEquals(n.getBoundedVariables(), n2.getBoundedVariables())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getBoundedVariables(), n2.getBoundedVariables()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlRefiningStmt n, final Visitable arg) {
         final JmlRefiningStmt n2 = (JmlRefiningStmt) arg;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final JmlClauseIf n, final Visitable arg) {
-        final JmlClauseIf n2 = (JmlClauseIf) arg;
-        if (!nodeEquals(n.getCondition(), n2.getCondition())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodeEquals(n.getThen(), n2.getThen())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+    public Boolean visit(final JmlConditionalClause n, final Visitable arg) {
+        final JmlConditionalClause n2 = (JmlConditionalClause) arg;
+        if (!nodeEquals(n.getCondition(), n2.getCondition()))
+            return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlClassExprDeclaration n, final Visitable arg) {
         final JmlClassExprDeclaration n2 = (JmlClassExprDeclaration) arg;
-        if (!nodeEquals(n.getInvariant(), n2.getInvariant())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodeEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getInvariant(), n2.getInvariant()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodeEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlClassAccessibleDeclaration n, final Visitable arg) {
         final JmlClassAccessibleDeclaration n2 = (JmlClassAccessibleDeclaration) arg;
-        if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodeEquals(n.getMeasuredBy(), n2.getMeasuredBy())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getVariable(), n2.getVariable())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getExpressions(), n2.getExpressions()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodeEquals(n.getMeasuredBy(), n2.getMeasuredBy()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getVariable(), n2.getVariable()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlRepresentsDeclaration n, final Visitable arg) {
         final JmlRepresentsDeclaration n2 = (JmlRepresentsDeclaration) arg;
-        if (!nodeEquals(n.getExpr(), n2.getExpr())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpr(), n2.getExpr()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlContract n, final Visitable arg) {
         final JmlContract n2 = (JmlContract) arg;
-        if (!objEquals(n.getBehavior(), n2.getBehavior())) return false;
-        if (!nodesEquals(n.getClauses(), n2.getClauses())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getSubContracts(), n2.getSubContracts())) return false;
-        if (!objEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getBehavior(), n2.getBehavior()))
+            return false;
+        if (!nodesEquals(n.getClauses(), n2.getClauses()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getSubContracts(), n2.getSubContracts()))
+            return false;
+        if (!objEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlSetComprehensionExpr n, final Visitable arg) {
         final JmlSetComprehensionExpr n2 = (JmlSetComprehensionExpr) arg;
-        if (!nodeEquals(n.getBinding(), n2.getBinding())) return false;
-        if (!nodeEquals(n.getPredicate(), n2.getPredicate())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBinding(), n2.getBinding()))
+            return false;
+        if (!nodeEquals(n.getPredicate(), n2.getPredicate()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlGhostStmt n, final Visitable arg) {
         final JmlGhostStmt n2 = (JmlGhostStmt) arg;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodeEquals(n.getStatement(), n2.getStatement())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodeEquals(n.getStatement(), n2.getStatement()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final RecordDeclaration n, final Visitable arg) {
         final RecordDeclaration n2 = (RecordDeclaration) arg;
-        if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes())) return false;
-        if (!nodesEquals(n.getParameters(), n2.getParameters())) return false;
-        if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter())) return false;
-        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false;
-        if (!nodesEquals(n.getMembers(), n2.getMembers())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getImplementedTypes(), n2.getImplementedTypes()))
+            return false;
+        if (!nodesEquals(n.getParameters(), n2.getParameters()))
+            return false;
+        if (!nodeEquals(n.getReceiverParameter(), n2.getReceiverParameter()))
+            return false;
+        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters()))
+            return false;
+        if (!nodesEquals(n.getMembers(), n2.getMembers()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final CompactConstructorDeclaration n, final Visitable arg) {
         final CompactConstructorDeclaration n2 = (CompactConstructorDeclaration) arg;
-        if (!nodeEquals(n.getBody(), n2.getBody())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions())) return false;
-        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBody(), n2.getBody()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getThrownExceptions(), n2.getThrownExceptions()))
+            return false;
+        if (!nodesEquals(n.getTypeParameters(), n2.getTypeParameters()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final RecordPatternExpr n, final Visitable arg) {
         final RecordPatternExpr n2 = (RecordPatternExpr) arg;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodesEquals(n.getPatternList(), n2.getPatternList())) return false;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodesEquals(n.getPatternList(), n2.getPatternList()))
+            return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyCcatchBreak n, final Visitable arg) {
         final KeyCcatchBreak n2 = (KeyCcatchBreak) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyCcatchContinue n, final Visitable arg) {
         final KeyCcatchContinue n2 = (KeyCcatchContinue) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyCcatchParameter n, final Visitable arg) {
         final KeyCcatchParameter n2 = (KeyCcatchParameter) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getParameter(), n2.getParameter())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getParameter(), n2.getParameter()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyCcatchReturn n, final Visitable arg) {
         final KeyCcatchReturn n2 = (KeyCcatchReturn) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getParameter(), n2.getParameter())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getParameter(), n2.getParameter()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final KeyCatchAllStatement n, final Visitable arg) {
-        final KeyCatchAllStatement n2 = (KeyCatchAllStatement) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+    public Boolean visit(final KeyCatchAllStmt n, final Visitable arg) {
+        final KeyCatchAllStmt n2 = (KeyCatchAllStmt) arg;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyEscapeExpression n, final Visitable arg) {
         final KeyEscapeExpression n2 = (KeyEscapeExpression) arg;
-        if (!nodesEquals(n.getArguments(), n2.getArguments())) return false;
-        if (!nodeEquals(n.getCallee(), n2.getCallee())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getArguments(), n2.getArguments()))
+            return false;
+        if (!nodeEquals(n.getCallee(), n2.getCallee()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final KeyExecStatement n, final Visitable arg) {
-        final KeyExecStatement n2 = (KeyExecStatement) arg;
-        if (!nodesEquals(n.getBranches(), n2.getBranches())) return false;
-        if (!nodeEquals(n.getExecBlock(), n2.getExecBlock())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+    public Boolean visit(final KeyExecStmt n, final Visitable arg) {
+        final KeyExecStmt n2 = (KeyExecStmt) arg;
+        if (!nodesEquals(n.getBranches(), n2.getBranches()))
+            return false;
+        if (!nodeEquals(n.getExecBlock(), n2.getExecBlock()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyExecutionContext n, final Visitable arg) {
         final KeyExecutionContext n2 = (KeyExecutionContext) arg;
-        if (!nodeEquals(n.getContext(), n2.getContext())) return false;
-        if (!nodeEquals(n.getInstance(), n2.getInstance())) return false;
-        if (!nodeEquals(n.getSignature(), n2.getSignature())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getContext(), n2.getContext()))
+            return false;
+        if (!nodeEquals(n.getInstance(), n2.getInstance()))
+            return false;
+        if (!nodeEquals(n.getSignature(), n2.getSignature()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final KeyLoopScopeBlock n, final Visitable arg) {
-        final KeyLoopScopeBlock n2 = (KeyLoopScopeBlock) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getIndexPV(), n2.getIndexPV())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+    public Boolean visit(final KeyLoopScopeBlockStmt n, final Visitable arg) {
+        final KeyLoopScopeBlockStmt n2 = (KeyLoopScopeBlockStmt) arg;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getIndexPV(), n2.getIndexPV()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final KeyMergePointStatement n, final Visitable arg) {
-        final KeyMergePointStatement n2 = (KeyMergePointStatement) arg;
-        if (!nodeEquals(n.getExpr(), n2.getExpr())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+    public Boolean visit(final KeyMergePointStmt n, final Visitable arg) {
+        final KeyMergePointStmt n2 = (KeyMergePointStmt) arg;
+        if (!nodeEquals(n.getExpr(), n2.getExpr()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyMethodBodyStatement n, final Visitable arg) {
         final KeyMethodBodyStatement n2 = (KeyMethodBodyStatement) arg;
-        if (!nodeEquals(n.getExpr(), n2.getExpr())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getSource(), n2.getSource())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpr(), n2.getExpr()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getSource(), n2.getSource()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final KeyMethodCallStatement n, final Visitable arg) {
-        final KeyMethodCallStatement n2 = (KeyMethodCallStatement) arg;
-        if (!nodeEquals(n.getBlock(), n2.getBlock())) return false;
-        if (!nodeEquals(n.getContext(), n2.getContext())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+    public Boolean visit(final KeyMethodCallStmt n, final Visitable arg) {
+        final KeyMethodCallStmt n2 = (KeyMethodCallStmt) arg;
+        if (!nodeEquals(n.getBlock(), n2.getBlock()))
+            return false;
+        if (!nodeEquals(n.getContext(), n2.getContext()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyMethodSignature n, final Visitable arg) {
         final KeyMethodSignature n2 = (KeyMethodSignature) arg;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getParamTypes(), n2.getParamTypes())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final KeyRangeExpression n, final Visitable arg) {
-        final KeyRangeExpression n2 = (KeyRangeExpression) arg;
-        if (!nodeEquals(n.getLower(), n2.getLower())) return false;
-        if (!nodeEquals(n.getUpper(), n2.getUpper())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getParamTypes(), n2.getParamTypes()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
-    public Boolean visit(final KeyTransactionStatement n, final Visitable arg) {
-        final KeyTransactionStatement n2 = (KeyTransactionStatement) arg;
-        if (!objEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+    public Boolean visit(final KeyTransactionStmt n, final Visitable arg) {
+        final KeyTransactionStmt n2 = (KeyTransactionStmt) arg;
+        if (!objEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyContextStatementBlock n, final Visitable arg) {
         final KeyContextStatementBlock n2 = (KeyContextStatementBlock) arg;
-        if (!nodeEquals(n.getContext(), n2.getContext())) return false;
-        if (!nodeEquals(n.getExpression(), n2.getExpression())) return false;
-        if (!nodeEquals(n.getSignature(), n2.getSignature())) return false;
-        if (!nodesEquals(n.getStatements(), n2.getStatements())) return false;
-        if (!nodeEquals(n.getTr(), n2.getTr())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getContext(), n2.getContext()))
+            return false;
+        if (!nodeEquals(n.getExpression(), n2.getExpression()))
+            return false;
+        if (!nodeEquals(n.getSignature(), n2.getSignature()))
+            return false;
+        if (!nodesEquals(n.getStatements(), n2.getStatements()))
+            return false;
+        if (!nodeEquals(n.getTr(), n2.getTr()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyExecCtxtSV n, final Visitable arg) {
         final KeyExecCtxtSV n2 = (KeyExecCtxtSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyExpressionSV n, final Visitable arg) {
         final KeyExpressionSV n2 = (KeyExpressionSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyJumpLabelSV n, final Visitable arg) {
         final KeyJumpLabelSV n2 = (KeyJumpLabelSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyMetaConstructExpression n, final Visitable arg) {
         final KeyMetaConstructExpression n2 = (KeyMetaConstructExpression) arg;
-        if (!nodeEquals(n.getChild(), n2.getChild())) return false;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getChild(), n2.getChild()))
+            return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyMetaConstruct n, final Visitable arg) {
         final KeyMetaConstruct n2 = (KeyMetaConstruct) arg;
-        if (!nodeEquals(n.getChild(), n2.getChild())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodesEquals(n.getSchemas(), n2.getSchemas())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getChild(), n2.getChild()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodesEquals(n.getSchemas(), n2.getSchemas()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyMetaConstructType n, final Visitable arg) {
         final KeyMetaConstructType n2 = (KeyMetaConstructType) arg;
-        if (!nodeEquals(n.getExpr(), n2.getExpr())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpr(), n2.getExpr()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyMethodSignatureSV n, final Visitable arg) {
         final KeyMethodSignatureSV n2 = (KeyMethodSignatureSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyPassiveExpression n, final Visitable arg) {
         final KeyPassiveExpression n2 = (KeyPassiveExpression) arg;
-        if (!nodeEquals(n.getExpr(), n2.getExpr())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getExpr(), n2.getExpr()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyProgramVariableSV n, final Visitable arg) {
         final KeyProgramVariableSV n2 = (KeyProgramVariableSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyStatementSV n, final Visitable arg) {
         final KeyStatementSV n2 = (KeyStatementSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyTypeSV n, final Visitable arg) {
         final KeyTypeSV n2 = (KeyTypeSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyCcatchSV n, final Visitable arg) {
         final KeyCcatchSV n2 = (KeyCcatchSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final KeyExecutionContextSV n, final Visitable arg) {
         final KeyExecutionContextSV n2 = (KeyExecutionContextSV) arg;
-        if (!objEquals(n.getText(), n2.getText())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getText(), n2.getText()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MatchAllPatternExpr n, final Visitable arg) {
         final MatchAllPatternExpr n2 = (MatchAllPatternExpr) arg;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final MarkdownComment n, final Visitable arg) {
         final MarkdownComment n2 = (MarkdownComment) arg;
-        if (!objEquals(n.getContent(), n2.getContent())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!objEquals(n.getContent(), n2.getContent()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlMethodDeclaration n, final Visitable arg) {
         final JmlMethodDeclaration n2 = (JmlMethodDeclaration) arg;
-        if (!nodeEquals(n.getContract(), n2.getContract())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodeEquals(n.getMethodDeclaration(), n2.getMethodDeclaration())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getContract(), n2.getContract()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodeEquals(n.getMethodDeclaration(), n2.getMethodDeclaration()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlBinaryInfixExpr n, final Visitable arg) {
         final JmlBinaryInfixExpr n2 = (JmlBinaryInfixExpr) arg;
-        if (!nodeEquals(n.getLeft(), n2.getLeft())) return false;
-        if (!nodeEquals(n.getOperator(), n2.getOperator())) return false;
-        if (!nodeEquals(n.getRight(), n2.getRight())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getLeft(), n2.getLeft()))
+            return false;
+        if (!nodeEquals(n.getOperator(), n2.getOperator()))
+            return false;
+        if (!nodeEquals(n.getRight(), n2.getRight()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlDocDeclaration n, final Visitable arg) {
         final JmlDocDeclaration n2 = (JmlDocDeclaration) arg;
-        if (!nodesEquals(n.getJmlComments(), n2.getJmlComments())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getJmlComments(), n2.getJmlComments()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlDocStmt n, final Visitable arg) {
         final JmlDocStmt n2 = (JmlDocStmt) arg;
-        if (!nodesEquals(n.getJmlComments(), n2.getJmlComments())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final JmlDoc n, final Visitable arg) {
-        final JmlDoc n2 = (JmlDoc) arg;
-        if (!objEquals(n.getContent(), n2.getContent())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getJmlComments(), n2.getJmlComments()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlDocType n, final Visitable arg) {
         final JmlDocType n2 = (JmlDocType) arg;
-        if (!nodesEquals(n.getJmlComments(), n2.getJmlComments())) return false;
-        if (!nodesEquals(n.getMembers(), n2.getMembers())) return false;
-        if (!nodesEquals(n.getModifiers(), n2.getModifiers())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getJmlComments(), n2.getJmlComments()))
+            return false;
+        if (!nodesEquals(n.getMembers(), n2.getMembers()))
+            return false;
+        if (!nodesEquals(n.getModifiers(), n2.getModifiers()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlFieldDeclaration n, final Visitable arg) {
         final JmlFieldDeclaration n2 = (JmlFieldDeclaration) arg;
-        if (!nodeEquals(n.getDecl(), n2.getDecl())) return false;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getDecl(), n2.getDecl()))
+            return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getAnnotations(), n2.getAnnotations()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlOldClause n, final Visitable arg) {
         final JmlOldClause n2 = (JmlOldClause) arg;
-        if (!nodeEquals(n.getDeclarations(), n2.getDeclarations())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getDeclarations(), n2.getDeclarations()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlTypeExpr n, final Visitable arg) {
         final JmlTypeExpr n2 = (JmlTypeExpr) arg;
-        if (!nodeEquals(n.getType(), n2.getType())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodeEquals(n.getType(), n2.getType()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlMultiExprClause n, final Visitable arg) {
         final JmlMultiExprClause n2 = (JmlMultiExprClause) arg;
-        if (!nodesEquals(n.getExpressions(), n2.getExpressions())) return false;
-        if (!nodesEquals(n.getHeaps(), n2.getHeaps())) return false;
-        if (!objEquals(n.getKind(), n2.getKind())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getExpressions(), n2.getExpressions()))
+            return false;
+        if (!nodesEquals(n.getHeaps(), n2.getHeaps()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlBeginStmt n, final Visitable arg) {
         final JmlBeginStmt n2 = (JmlBeginStmt) arg;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlEndStmt n, final Visitable arg) {
         final JmlEndStmt n2 = (JmlEndStmt) arg;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlLabelStmt n, final Visitable arg) {
         final JmlLabelStmt n2 = (JmlLabelStmt) arg;
-        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags())) return false;
-        if (!nodeEquals(n.getLabel(), n2.getLabel())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getJmlTags(), n2.getJmlTags()))
+            return false;
+        if (!nodeEquals(n.getLabel(), n2.getLabel()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 
     @Override
     public Boolean visit(final JmlMethodSignature n, final Visitable arg) {
         final JmlMethodSignature n2 = (JmlMethodSignature) arg;
-        if (!nodesEquals(n.getArgumentTypes(), n2.getArgumentTypes())) return false;
-        if (!nodeEquals(n.getName(), n2.getName())) return false;
-        if (!nodeEquals(n.getReceiver(), n2.getReceiver())) return false;
-        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments())) return false;
+        if (!nodesEquals(n.getArgumentTypes(), n2.getArgumentTypes()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodeEquals(n.getReceiver(), n2.getReceiver()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        return true;
+    }
+
+    @Override
+    public Boolean visit(final JmlDoc n, final Visitable arg) {
+        final JmlDoc n2 = (JmlDoc) arg;
+        if (!objEquals(n.getContent(), n2.getContent()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        return true;
+    }
+
+    @Override
+    public Boolean visit(final KeYMarkerStatement n, final Visitable arg) {
+        final KeYMarkerStatement n2 = (KeYMarkerStatement) arg;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
+        return true;
+    }
+
+    @Override
+    public Boolean visit(final JmlInfFlowClause n, final Visitable arg) {
+        final JmlInfFlowClause n2 = (JmlInfFlowClause) arg;
+        if (!nodesEquals(n.getBy(), n2.getBy()))
+            return false;
+        if (!nodesEquals(n.getDeclassifies(), n2.getDeclassifies()))
+            return false;
+        if (!nodesEquals(n.getErases(), n2.getErases()))
+            return false;
+        if (!nodesEquals(n.getExpressions(), n2.getExpressions()))
+            return false;
+        if (!objEquals(n.getKind(), n2.getKind()))
+            return false;
+        if (!nodesEquals(n.getNewObjects(), n2.getNewObjects()))
+            return false;
+        if (!nodeEquals(n.getName(), n2.getName()))
+            return false;
+        if (!nodesEquals(n.getAssociatedSpecificationComments(), n2.getAssociatedSpecificationComments()))
+            return false;
         return true;
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java
index 4e5dd58d7f..5da70e7cac 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NoCommentHashCodeVisitor.java
@@ -30,6 +30,7 @@
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -47,91 +48,43 @@ public static int hashCode(final Node node) {
     }
 
     public Integer visit(final AnnotationDeclaration n, final Void arg) {
-        return (n.getMembers().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final AnnotationMemberDeclaration n, final Void arg) {
-        return (n.getDefaultValue().isPresent() ? n.getDefaultValue().get().accept(this, arg) : 0) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getDefaultValue().isPresent() ? n.getDefaultValue().get().accept(this, arg) : 0) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ArrayAccessExpr n, final Void arg) {
-        return (n.getIndex().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getIndex().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ArrayCreationExpr n, final Void arg) {
-        return (n.getElementType().accept(this, arg)) * 31
-                + (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31
-                + (n.getLevels().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getElementType().accept(this, arg)) * 31 + (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31 + (n.getLevels().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ArrayCreationLevel n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getDimension().isPresent() ? n.getDimension().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getDimension().isPresent() ? n.getDimension().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ArrayInitializerExpr n, final Void arg) {
-        return (n.getValues().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getValues().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ArrayType n, final Void arg) {
-        return (n.getComponentType().accept(this, arg)) * 31
-                + (n.getOrigin().hashCode()) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getComponentType().accept(this, arg)) * 31 + (n.getOrigin().hashCode()) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final AssertStmt n, final Void arg) {
-        return (n.getCheck().accept(this, arg)) * 31
-                + (n.getMessage().isPresent() ? n.getMessage().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getCheck().accept(this, arg)) * 31 + (n.getMessage().isPresent() ? n.getMessage().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final AssignExpr n, final Void arg) {
-        return (n.getOperator().hashCode()) * 31
-                + (n.getTarget().accept(this, arg)) * 31
-                + (n.getValue().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getOperator().hashCode()) * 31 + (n.getTarget().accept(this, arg)) * 31 + (n.getValue().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final BinaryExpr n, final Void arg) {
-        return (n.getLeft().accept(this, arg)) * 31
-                + (n.getOperator().hashCode()) * 31
-                + (n.getRight().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getLeft().accept(this, arg)) * 31 + (n.getOperator().hashCode()) * 31 + (n.getRight().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final BlockComment n, final Void arg) {
@@ -139,288 +92,127 @@ public Integer visit(final BlockComment n, final Void arg) {
     }
 
     public Integer visit(final BlockStmt n, final Void arg) {
-        return (n.getContracts().accept(this, arg)) * 31
-                + (n.getStatements().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getContracts().accept(this, arg)) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final BooleanLiteralExpr n, final Void arg) {
-        return (n.isValue() ? 1 : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.isValue() ? 1 : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final BreakStmt n, final Void arg) {
-        return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final CastExpr n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final CatchClause n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getParameter().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getParameter().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final CharLiteralExpr n, final Void arg) {
-        return (n.getValue().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getValue().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ClassExpr n, final Void arg) {
-        return (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ClassOrInterfaceDeclaration n, final Void arg) {
-        return (n.getExtendedTypes().accept(this, arg)) * 31
-                + (n.getImplementedTypes().accept(this, arg)) * 31
-                + (n.isCompact() ? 1 : 0) * 31
-                + (n.isInterface() ? 1 : 0) * 31
-                + (n.getPermittedTypes().accept(this, arg)) * 31
-                + (n.getTypeParameters().accept(this, arg)) * 31
-                + (n.getMembers().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExtendedTypes().accept(this, arg)) * 31 + (n.getImplementedTypes().accept(this, arg)) * 31 + (n.isCompact() ? 1 : 0) * 31 + (n.isInterface() ? 1 : 0) * 31 + (n.getPermittedTypes().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ClassOrInterfaceType n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31
-                + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final CompilationUnit n, final Void arg) {
-        return (n.getImports().accept(this, arg)) * 31
-                + (n.getModule().isPresent() ? n.getModule().get().accept(this, arg) : 0) * 31
-                + (n.getPackageDeclaration().isPresent()
-                                ? n.getPackageDeclaration().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getTypes().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getImports().accept(this, arg)) * 31 + (n.getModule().isPresent() ? n.getModule().get().accept(this, arg) : 0) * 31 + (n.getPackageDeclaration().isPresent() ? n.getPackageDeclaration().get().accept(this, arg) : 0) * 31 + (n.getTypes().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ConditionalExpr n, final Void arg) {
-        return (n.getCondition().accept(this, arg)) * 31
-                + (n.getElseExpr().accept(this, arg)) * 31
-                + (n.getThenExpr().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getCondition().accept(this, arg)) * 31 + (n.getElseExpr().accept(this, arg)) * 31 + (n.getThenExpr().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ConstructorDeclaration n, final Void arg) {
-        return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getParameters().accept(this, arg)) * 31
-                + (n.getReceiverParameter().isPresent()
-                                ? n.getReceiverParameter().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getThrownExceptions().accept(this, arg)) * 31
-                + (n.getTypeParameters().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ContinueStmt n, final Void arg) {
-        return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final DoStmt n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getCondition().accept(this, arg)) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getCondition().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final DoubleLiteralExpr n, final Void arg) {
-        return (n.getValue().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getValue().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final EmptyStmt n, final Void arg) {
-        return (n.getAssociatedSpecificationComments().isPresent()
-                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                : 0);
+        return (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final EnclosedExpr n, final Void arg) {
-        return (n.getInner().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getInner().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final EnumConstantDeclaration n, final Void arg) {
-        return (n.getArguments().accept(this, arg)) * 31
-                + (n.getClassBody().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getArguments().accept(this, arg)) * 31 + (n.getClassBody().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final EnumDeclaration n, final Void arg) {
-        return (n.getEntries().accept(this, arg)) * 31
-                + (n.getImplementedTypes().accept(this, arg)) * 31
-                + (n.getMembers().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getEntries().accept(this, arg)) * 31 + (n.getImplementedTypes().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ExplicitConstructorInvocationStmt n, final Void arg) {
-        return (n.getArguments().accept(this, arg)) * 31
-                + (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31
-                + (n.isThis() ? 1 : 0) * 31
-                + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getArguments().accept(this, arg)) * 31 + (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31 + (n.isThis() ? 1 : 0) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ExpressionStmt n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final FieldAccessExpr n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getScope().accept(this, arg)) * 31
-                + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getScope().accept(this, arg)) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final FieldDeclaration n, final Void arg) {
-        return (n.getModifiers().accept(this, arg)) * 31
-                + (n.getVariables().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getModifiers().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ForStmt n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getCompare().isPresent() ? n.getCompare().get().accept(this, arg) : 0) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.getInitialization().accept(this, arg)) * 31
-                + (n.getUpdate().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getCompare().isPresent() ? n.getCompare().get().accept(this, arg) : 0) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getInitialization().accept(this, arg)) * 31 + (n.getUpdate().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ForEachStmt n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.getIterable().accept(this, arg)) * 31
-                + (n.getVariable().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getIterable().accept(this, arg)) * 31 + (n.getVariable().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final IfStmt n, final Void arg) {
-        return (n.getCondition().accept(this, arg)) * 31
-                + (n.getElseStmt().isPresent() ? n.getElseStmt().get().accept(this, arg) : 0) * 31
-                + (n.getThenStmt().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getCondition().accept(this, arg)) * 31 + (n.getElseStmt().isPresent() ? n.getElseStmt().get().accept(this, arg) : 0) * 31 + (n.getThenStmt().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ImportDeclaration n, final Void arg) {
-        return (n.isAsterisk() ? 1 : 0) * 31
-                + (n.isJmlModel() ? 1 : 0) * 31
-                + (n.isModule() ? 1 : 0) * 31
-                + (n.isStatic() ? 1 : 0) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.isAsterisk() ? 1 : 0) * 31 + (n.isJmlModel() ? 1 : 0) * 31 + (n.isModule() ? 1 : 0) * 31 + (n.isStatic() ? 1 : 0) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final InitializerDeclaration n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.isStatic() ? 1 : 0) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.isStatic() ? 1 : 0) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final InstanceOfExpr n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getPattern().isPresent() ? n.getPattern().get().accept(this, arg) : 0) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getPattern().isPresent() ? n.getPattern().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final IntegerLiteralExpr n, final Void arg) {
-        return (n.getValue().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getValue().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final IntersectionType n, final Void arg) {
-        return (n.getElements().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getElements().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final TraditionalJavadocComment n, final Void arg) {
@@ -428,21 +220,11 @@ public Integer visit(final TraditionalJavadocComment n, final Void arg) {
     }
 
     public Integer visit(final LabeledStmt n, final Void arg) {
-        return (n.getLabel().accept(this, arg)) * 31
-                + (n.getStatement().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getLabel().accept(this, arg)) * 31 + (n.getStatement().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final LambdaExpr n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.isEnclosingParameters() ? 1 : 0) * 31
-                + (n.getParameters().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.isEnclosingParameters() ? 1 : 0) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final LineComment n, final Void arg) {
@@ -450,96 +232,47 @@ public Integer visit(final LineComment n, final Void arg) {
     }
 
     public Integer visit(final LocalClassDeclarationStmt n, final Void arg) {
-        return (n.getClassDeclaration().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getClassDeclaration().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final LocalRecordDeclarationStmt n, final Void arg) {
-        return (n.getRecordDeclaration().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getRecordDeclaration().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final LongLiteralExpr n, final Void arg) {
-        return (n.getValue().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getValue().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final MarkerAnnotationExpr n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final MemberValuePair n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getValue().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getValue().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final MethodCallExpr n, final Void arg) {
-        return (n.getArguments().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31
-                + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getArguments().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final MethodDeclaration n, final Void arg) {
-        return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getParameters().accept(this, arg)) * 31
-                + (n.getReceiverParameter().isPresent()
-                                ? n.getReceiverParameter().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getThrownExceptions().accept(this, arg)) * 31
-                + (n.getTypeParameters().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBody().isPresent() ? n.getBody().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final MethodReferenceExpr n, final Void arg) {
-        return (n.getIdentifier().hashCode()) * 31
-                + (n.getScope().accept(this, arg)) * 31
-                + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getIdentifier().hashCode()) * 31 + (n.getScope().accept(this, arg)) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final NameExpr n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final Name n, final Void arg) {
-        return (n.getIdentifier().hashCode()) * 31
-                + (n.getQualifier().isPresent() ? n.getQualifier().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getIdentifier().hashCode()) * 31 + (n.getQualifier().isPresent() ? n.getQualifier().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
-    public Integer visit(NodeList n, Void arg) {
+    public Integer visit(NodeList<?> n, Void arg) {
         int result = 0;
         for (Object node : n) {
             result += 31 * ((Visitable) node).accept(this, arg);
@@ -548,997 +281,522 @@ public Integer visit(NodeList n, Void arg) {
     }
 
     public Integer visit(final NormalAnnotationExpr n, final Void arg) {
-        return (n.getPairs().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getPairs().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final NullLiteralExpr n, final Void arg) {
-        return (n.getAssociatedSpecificationComments().isPresent()
-                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                : 0);
+        return (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ObjectCreationExpr n, final Void arg) {
-        return (n.getAnonymousClassBody().isPresent()
-                                ? n.getAnonymousClassBody().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getArguments().accept(this, arg)) * 31
-                + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getAnonymousClassBody().isPresent() ? n.getAnonymousClassBody().get().accept(this, arg) : 0) * 31 + (n.getArguments().accept(this, arg)) * 31 + (n.getScope().isPresent() ? n.getScope().get().accept(this, arg) : 0) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getTypeArguments().isPresent() ? n.getTypeArguments().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final PackageDeclaration n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final Parameter n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.isVarArgs() ? 1 : 0) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getVarArgsAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.isVarArgs() ? 1 : 0) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getVarArgsAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final PrimitiveType n, final Void arg) {
-        return (n.getType().hashCode()) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getType().hashCode()) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ReturnStmt n, final Void arg) {
-        return (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SimpleName n, final Void arg) {
-        return (n.getIdentifier().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getIdentifier().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SingleMemberAnnotationExpr n, final Void arg) {
-        return (n.getMemberValue().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getMemberValue().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final StringLiteralExpr n, final Void arg) {
-        return (n.getValue().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getValue().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SuperExpr n, final Void arg) {
-        return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SwitchEntry n, final Void arg) {
-        return (n.getGuard().isPresent() ? n.getGuard().get().accept(this, arg) : 0) * 31
-                + (n.isDefault() ? 1 : 0) * 31
-                + (n.getLabels().accept(this, arg)) * 31
-                + (n.getStatements().accept(this, arg)) * 31
-                + (n.getType().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getGuard().isPresent() ? n.getGuard().get().accept(this, arg) : 0) * 31 + (n.isDefault() ? 1 : 0) * 31 + (n.getLabels().accept(this, arg)) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getType().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SwitchStmt n, final Void arg) {
-        return (n.getEntries().accept(this, arg)) * 31
-                + (n.getSelector().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getEntries().accept(this, arg)) * 31 + (n.getSelector().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final SynchronizedStmt n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getExpression().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getExpression().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ThisExpr n, final Void arg) {
-        return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getTypeName().isPresent() ? n.getTypeName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ThrowStmt n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final TryStmt n, final Void arg) {
-        return (n.getCatchClauses().accept(this, arg)) * 31
-                + (n.getFinallyBlock().isPresent() ? n.getFinallyBlock().get().accept(this, arg) : 0) * 31
-                + (n.getResources().accept(this, arg)) * 31
-                + (n.getTryBlock().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getCatchClauses().accept(this, arg)) * 31 + (n.getFinallyBlock().isPresent() ? n.getFinallyBlock().get().accept(this, arg) : 0) * 31 + (n.getResources().accept(this, arg)) * 31 + (n.getTryBlock().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final TypeExpr n, final Void arg) {
-        return (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final TypeParameter n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getTypeBound().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getTypeBound().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final UnaryExpr n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getOperator().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getOperator().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final UnionType n, final Void arg) {
-        return (n.getElements().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getElements().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final UnknownType n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final VariableDeclarationExpr n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getVariables().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final VariableDeclarator n, final Void arg) {
-        return (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getInitializer().isPresent() ? n.getInitializer().get().accept(this, arg) : 0) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final VoidType n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final WhileStmt n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getCondition().accept(this, arg)) * 31
-                + (n.getContracts().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getCondition().accept(this, arg)) * 31 + (n.getContracts().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final WildcardType n, final Void arg) {
-        return (n.getExtendedType().isPresent() ? n.getExtendedType().get().accept(this, arg) : 0) * 31
-                + (n.getSuperType().isPresent() ? n.getSuperType().get().accept(this, arg) : 0) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExtendedType().isPresent() ? n.getExtendedType().get().accept(this, arg) : 0) * 31 + (n.getSuperType().isPresent() ? n.getSuperType().get().accept(this, arg) : 0) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ModuleDeclaration n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getDirectives().accept(this, arg)) * 31
-                + (n.isOpen() ? 1 : 0) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getDirectives().accept(this, arg)) * 31 + (n.isOpen() ? 1 : 0) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final ModuleRequiresDirective n, final Void arg) {
-        return (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override()
     public Integer visit(final ModuleExportsDirective n, final Void arg) {
-        return (n.getModuleNames().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getModuleNames().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override()
     public Integer visit(final ModuleProvidesDirective n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getWith().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getWith().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override()
     public Integer visit(final ModuleUsesDirective n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final ModuleOpensDirective n, final Void arg) {
-        return (n.getModuleNames().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getModuleNames().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final UnparsableStmt n, final Void arg) {
-        return (n.getAssociatedSpecificationComments().isPresent()
-                ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                : 0);
+        return (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final ReceiverParameter n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final VarType n, final Void arg) {
-        return (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final Modifier n, final Void arg) {
-        return (n.getKeyword().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getKeyword().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final SwitchExpr n, final Void arg) {
-        return (n.getEntries().accept(this, arg)) * 31
-                + (n.getSelector().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getEntries().accept(this, arg)) * 31 + (n.getSelector().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final YieldStmt n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final TextBlockLiteralExpr n, final Void arg) {
-        return (n.getValue().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getValue().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final TypePatternExpr n, final Void arg) {
-        return (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlQuantifiedExpr n, final Void arg) {
-        return (n.getBinder().hashCode()) * 31
-                + (n.getExpressions().accept(this, arg)) * 31
-                + (n.getVariables().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBinder().hashCode()) * 31 + (n.getExpressions().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final JmlClauseLabel n, final Void arg) {
-        return (n.getExpr().accept(this, arg)) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+    public Integer visit(final JmlLabledClause n, final Void arg) {
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlExpressionStmt n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlLabelExpr n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getLabel().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getLabel().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlLetExpr n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getVariables().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getVariables().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlMultiCompareExpr n, final Void arg) {
-        return (n.getExpressions().accept(this, arg)) * 31
-                + (n.getOperators().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpressions().accept(this, arg)) * 31 + (n.getOperators().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlSimpleExprClause n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getHeaps().isPresent() ? n.getHeaps().get().accept(this, arg) : 0) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getHeaps().isPresent() ? n.getHeaps().get().accept(this, arg) : 0) * 31 + (n.getKind().hashCode()) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlSignalsClause n, final Void arg) {
-        return (n.getExpression().accept(this, arg)) * 31
-                + (n.getParameter().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpression().accept(this, arg)) * 31 + (n.getParameter().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlSignalsOnlyClause n, final Void arg) {
-        return (n.getTypes().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getTypes().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlUnreachableStmt n, final Void arg) {
-        return (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getJmlTags().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlCallableClause n, final Void arg) {
-        return (n.getMethodSignatures().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getMethodSignatures().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlForallClause n, final Void arg) {
-        return (n.getBoundedVariables().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBoundedVariables().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlRefiningStmt n, final Void arg) {
-        return (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getJmlTags().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final JmlClauseIf n, final Void arg) {
-        return (n.getCondition().accept(this, arg)) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getThen().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+    public Integer visit(final JmlConditionalClause n, final Void arg) {
+        return (n.getCondition().accept(this, arg)) * 31 + (n.getExpression().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlClassExprDeclaration n, final Void arg) {
-        return (n.getInvariant().accept(this, arg)) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getKind().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getInvariant().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getKind().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlClassAccessibleDeclaration n, final Void arg) {
-        return (n.getExpressions().accept(this, arg)) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getMeasuredBy().isPresent() ? n.getMeasuredBy().get().accept(this, arg) : 0) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getVariable().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpressions().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getMeasuredBy().isPresent() ? n.getMeasuredBy().get().accept(this, arg) : 0) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getVariable().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlRepresentsDeclaration n, final Void arg) {
-        return (n.getExpr().accept(this, arg)) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpr().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlContract n, final Void arg) {
-        return (n.getBehavior().hashCode()) * 31
-                + (n.getClauses().accept(this, arg)) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getSubContracts().accept(this, arg)) * 31
-                + (n.getType().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBehavior().hashCode()) * 31 + (n.getClauses().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getSubContracts().accept(this, arg)) * 31 + (n.getType().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlSetComprehensionExpr n, final Void arg) {
-        return (n.getBinding().accept(this, arg)) * 31
-                + (n.getPredicate().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBinding().accept(this, arg)) * 31 + (n.getPredicate().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlGhostStmt n, final Void arg) {
-        return (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getStatement().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getJmlTags().accept(this, arg)) * 31 + (n.getStatement().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final RecordDeclaration n, final Void arg) {
-        return (n.getImplementedTypes().accept(this, arg)) * 31
-                + (n.getParameters().accept(this, arg)) * 31
-                + (n.getReceiverParameter().isPresent()
-                                ? n.getReceiverParameter().get().accept(this, arg)
-                                : 0)
-                        * 31
-                + (n.getTypeParameters().accept(this, arg)) * 31
-                + (n.getMembers().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getImplementedTypes().accept(this, arg)) * 31 + (n.getParameters().accept(this, arg)) * 31 + (n.getReceiverParameter().isPresent() ? n.getReceiverParameter().get().accept(this, arg) : 0) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     public Integer visit(final CompactConstructorDeclaration n, final Void arg) {
-        return (n.getBody().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getThrownExceptions().accept(this, arg)) * 31
-                + (n.getTypeParameters().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBody().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getThrownExceptions().accept(this, arg)) * 31 + (n.getTypeParameters().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyCcatchBreak n, final Void arg) {
-        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31
-                + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31 + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyCcatchContinue n, final Void arg) {
-        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31
-                + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31 + (n.getLabel().isPresent() ? n.getLabel().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyCcatchParameter n, final Void arg) {
-        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31
-                + (n.getParameter().isPresent() ? n.getParameter().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31 + (n.getParameter().isPresent() ? n.getParameter().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyCcatchReturn n, final Void arg) {
-        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31
-                + (n.getParameter().isPresent() ? n.getParameter().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getBlock().isPresent() ? n.getBlock().get().accept(this, arg) : 0) * 31 + (n.getParameter().isPresent() ? n.getParameter().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final KeyCatchAllStatement n, final Void arg) {
-        return (n.getBlock().accept(this, arg)) * 31
-                + (n.getLabel().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+    public Integer visit(final KeyCatchAllStmt n, final Void arg) {
+        return (n.getBlock().accept(this, arg)) * 31 + (n.getLabel().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyEscapeExpression n, final Void arg) {
-        return (n.getArguments().isPresent() ? n.getArguments().get().accept(this, arg) : 0) * 31
-                + (n.getCallee().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getArguments().isPresent() ? n.getArguments().get().accept(this, arg) : 0) * 31 + (n.getCallee().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final KeyExecStatement n, final Void arg) {
-        return (n.getBranches().accept(this, arg)) * 31
-                + (n.getExecBlock().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+    public Integer visit(final KeyExecStmt n, final Void arg) {
+        return (n.getBranches().accept(this, arg)) * 31 + (n.getExecBlock().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyExecutionContext n, final Void arg) {
-        return (n.getContext().accept(this, arg)) * 31
-                + (n.getInstance().isPresent() ? n.getInstance().get().accept(this, arg) : 0) * 31
-                + (n.getSignature().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getContext().accept(this, arg)) * 31 + (n.getInstance().isPresent() ? n.getInstance().get().accept(this, arg) : 0) * 31 + (n.getSignature().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final KeyLoopScopeBlock n, final Void arg) {
-        return (n.getBlock().accept(this, arg)) * 31
-                + (n.getIndexPV().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+    public Integer visit(final KeyLoopScopeBlockStmt n, final Void arg) {
+        return (n.getBlock().accept(this, arg)) * 31 + (n.getIndexPV().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final KeyMergePointStatement n, final Void arg) {
-        return (n.getExpr().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+    public Integer visit(final KeyMergePointStmt n, final Void arg) {
+        return (n.getExpr().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyMethodBodyStatement n, final Void arg) {
-        return (n.getExpr().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getSource().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpr().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getSource().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final KeyMethodCallStatement n, final Void arg) {
-        return (n.getBlock().accept(this, arg)) * 31
-                + (n.getContext().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+    public Integer visit(final KeyMethodCallStmt n, final Void arg) {
+        return (n.getBlock().accept(this, arg)) * 31 + (n.getContext().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyMethodSignature n, final Void arg) {
-        return (n.getName().accept(this, arg)) * 31
-                + (n.getParamTypes().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getName().accept(this, arg)) * 31 + (n.getParamTypes().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
-    public Integer visit(final KeyRangeExpression n, final Void arg) {
-        return (n.getLower().accept(this, arg)) * 31
-                + (n.getUpper().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
-    }
-
-    @Override
-    public Integer visit(final KeyTransactionStatement n, final Void arg) {
-        return (n.getType().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+    public Integer visit(final KeyTransactionStmt n, final Void arg) {
+        return (n.getType().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyContextStatementBlock n, final Void arg) {
-        return (n.getContext().isPresent() ? n.getContext().get().accept(this, arg) : 0) * 31
-                + (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31
-                + (n.getSignature().isPresent() ? n.getSignature().get().accept(this, arg) : 0) * 31
-                + (n.getStatements().accept(this, arg)) * 31
-                + (n.getTr().isPresent() ? n.getTr().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getContext().isPresent() ? n.getContext().get().accept(this, arg) : 0) * 31 + (n.getExpression().isPresent() ? n.getExpression().get().accept(this, arg) : 0) * 31 + (n.getSignature().isPresent() ? n.getSignature().get().accept(this, arg) : 0) * 31 + (n.getStatements().accept(this, arg)) * 31 + (n.getTr().isPresent() ? n.getTr().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyExecCtxtSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyExpressionSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyJumpLabelSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyMetaConstructExpression n, final Void arg) {
-        return (n.getChild().accept(this, arg)) * 31
-                + (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getChild().accept(this, arg)) * 31 + (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyMetaConstruct n, final Void arg) {
-        return (n.getChild().accept(this, arg)) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getSchemas().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getChild().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getSchemas().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyMetaConstructType n, final Void arg) {
-        return (n.getExpr().accept(this, arg)) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpr().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyMethodSignatureSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyPassiveExpression n, final Void arg) {
-        return (n.getExpr().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpr().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyProgramVariableSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyStatementSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyTypeSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyCcatchSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final KeyExecutionContextSV n, final Void arg) {
-        return (n.getText().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getText().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final RecordPatternExpr n, final Void arg) {
-        return (n.getModifiers().accept(this, arg)) * 31
-                + (n.getPatternList().accept(this, arg)) * 31
-                + (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getModifiers().accept(this, arg)) * 31 + (n.getPatternList().accept(this, arg)) * 31 + (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final MatchAllPatternExpr n, final Void arg) {
-        return (n.getModifiers().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getModifiers().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final MarkdownComment n, final Void arg) {
-        return (n.getContent().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getContent().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlMethodDeclaration n, final Void arg) {
-        return (n.getContract().isPresent() ? n.getContract().get().accept(this, arg) : 0) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getMethodDeclaration().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getContract().isPresent() ? n.getContract().get().accept(this, arg) : 0) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getMethodDeclaration().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlBinaryInfixExpr n, final Void arg) {
-        return (n.getLeft().accept(this, arg)) * 31
-                + (n.getOperator().accept(this, arg)) * 31
-                + (n.getRight().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getLeft().accept(this, arg)) * 31 + (n.getOperator().accept(this, arg)) * 31 + (n.getRight().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlDocDeclaration n, final Void arg) {
-        return (n.getJmlComments().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getJmlComments().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlDocStmt n, final Void arg) {
-        return (n.getJmlComments().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
-    }
-
-    @Override
-    public Integer visit(final JmlDoc n, final Void arg) {
-        return (n.getContent().hashCode()) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getJmlComments().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlDocType n, final Void arg) {
-        return (n.getJmlComments().accept(this, arg)) * 31
-                + (n.getMembers().accept(this, arg)) * 31
-                + (n.getModifiers().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getJmlComments().accept(this, arg)) * 31 + (n.getMembers().accept(this, arg)) * 31 + (n.getModifiers().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlFieldDeclaration n, final Void arg) {
-        return (n.getDecl().accept(this, arg)) * 31
-                + (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getAnnotations().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getDecl().accept(this, arg)) * 31 + (n.getJmlTags().accept(this, arg)) * 31 + (n.getAnnotations().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlOldClause n, final Void arg) {
-        return (n.getDeclarations().accept(this, arg)) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getDeclarations().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlTypeExpr n, final Void arg) {
-        return (n.getType().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getType().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlMultiExprClause n, final Void arg) {
-        return (n.getExpressions().accept(this, arg)) * 31
-                + (n.getHeaps().isPresent() ? n.getHeaps().get().accept(this, arg) : 0) * 31
-                + (n.getKind().hashCode()) * 31
-                + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getExpressions().accept(this, arg)) * 31 + (n.getHeaps().isPresent() ? n.getHeaps().get().accept(this, arg) : 0) * 31 + (n.getKind().hashCode()) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlBeginStmt n, final Void arg) {
-        return (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getJmlTags().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlEndStmt n, final Void arg) {
-        return (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getJmlTags().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlLabelStmt n, final Void arg) {
-        return (n.getJmlTags().accept(this, arg)) * 31
-                + (n.getLabel().accept(this, arg)) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getJmlTags().accept(this, arg)) * 31 + (n.getLabel().accept(this, arg)) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 
     @Override
     public Integer visit(final JmlMethodSignature n, final Void arg) {
-        return (n.getArgumentTypes().accept(this, arg)) * 31
-                + (n.getName().accept(this, arg)) * 31
-                + (n.getReceiver().isPresent() ? n.getReceiver().get().accept(this, arg) : 0) * 31
-                + (n.getAssociatedSpecificationComments().isPresent()
-                        ? n.getAssociatedSpecificationComments().get().accept(this, arg)
-                        : 0);
+        return (n.getArgumentTypes().accept(this, arg)) * 31 + (n.getName().accept(this, arg)) * 31 + (n.getReceiver().isPresent() ? n.getReceiver().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
+    }
+
+    @Override
+    public Integer visit(final JmlDoc n, final Void arg) {
+        return (n.getContent().hashCode()) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
+    }
+
+    @Override
+    public Integer visit(final KeYMarkerStatement n, final Void arg) {
+        return n.getKind() * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
+    }
+
+    @Override
+    public Integer visit(final JmlInfFlowClause n, final Void arg) {
+        return (n.getBy().accept(this, arg)) * 31 + (n.getDeclassifies().accept(this, arg)) * 31 + (n.getErases().accept(this, arg)) * 31 + (n.getExpressions().accept(this, arg)) * 31 + (n.getKind().hashCode()) * 31 + (n.getNewObjects().accept(this, arg)) * 31 + (n.getName().isPresent() ? n.getName().get().accept(this, arg) : 0) * 31 + (n.getAssociatedSpecificationComments().isPresent() ? n.getAssociatedSpecificationComments().get().accept(this, arg) : 0);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NodeFinderVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NodeFinderVisitor.java
index 8acd75e8b1..9ca3ed0b4f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NodeFinderVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/NodeFinderVisitor.java
@@ -166,23 +166,28 @@ public Node getSelectedNode() {
     public void visit(final AnnotationDeclaration n, final Range arg) {
         {
             n.getMembers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -194,27 +199,33 @@ public void visit(final AnnotationDeclaration n, final Range arg) {
     public void visit(final AnnotationMemberDeclaration n, final Range arg) {
         if (n.getDefaultValue().isPresent()) {
             n.getDefaultValue().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -226,15 +237,18 @@ public void visit(final AnnotationMemberDeclaration n, final Range arg) {
     public void visit(final ArrayAccessExpr n, final Range arg) {
         {
             n.getIndex().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -246,19 +260,23 @@ public void visit(final ArrayAccessExpr n, final Range arg) {
     public void visit(final ArrayCreationExpr n, final Range arg) {
         {
             n.getElementType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getInitializer().isPresent()) {
             n.getInitializer().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getLevels().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -270,11 +288,13 @@ public void visit(final ArrayCreationExpr n, final Range arg) {
     public void visit(final ArrayInitializerExpr n, final Range arg) {
         {
             n.getValues().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -286,15 +306,18 @@ public void visit(final ArrayInitializerExpr n, final Range arg) {
     public void visit(final AssertStmt n, final Range arg) {
         {
             n.getCheck().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getMessage().isPresent()) {
             n.getMessage().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -306,15 +329,18 @@ public void visit(final AssertStmt n, final Range arg) {
     public void visit(final AssignExpr n, final Range arg) {
         {
             n.getTarget().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getValue().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -326,15 +352,18 @@ public void visit(final AssignExpr n, final Range arg) {
     public void visit(final BinaryExpr n, final Range arg) {
         {
             n.getLeft().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getRight().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -346,11 +375,13 @@ public void visit(final BinaryExpr n, final Range arg) {
     public void visit(final BlockStmt n, final Range arg) {
         {
             n.getStatements().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -362,7 +393,8 @@ public void visit(final BlockStmt n, final Range arg) {
     public void visit(final BooleanLiteralExpr n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -374,11 +406,13 @@ public void visit(final BooleanLiteralExpr n, final Range arg) {
     public void visit(final BreakStmt n, final Range arg) {
         if (n.getLabel().isPresent()) {
             n.getLabel().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -390,15 +424,18 @@ public void visit(final BreakStmt n, final Range arg) {
     public void visit(final CastExpr n, final Range arg) {
         {
             n.getExpression().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -410,15 +447,18 @@ public void visit(final CastExpr n, final Range arg) {
     public void visit(final CatchClause n, final Range arg) {
         {
             n.getBody().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getParameter().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -430,7 +470,8 @@ public void visit(final CatchClause n, final Range arg) {
     public void visit(final CharLiteralExpr n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         return;
     }
@@ -439,11 +480,13 @@ public void visit(final CharLiteralExpr n, final Range arg) {
     public void visit(final ClassExpr n, final Range arg) {
         {
             n.getType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -455,39 +498,48 @@ public void visit(final ClassExpr n, final Range arg) {
     public void visit(final ClassOrInterfaceDeclaration n, final Range arg) {
         {
             n.getExtendedTypes().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getImplementedTypes().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getPermittedTypes().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getTypeParameters().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getMembers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -499,23 +551,28 @@ public void visit(final ClassOrInterfaceDeclaration n, final Range arg) {
     public void visit(final ClassOrInterfaceType n, final Range arg) {
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getScope().isPresent()) {
             n.getScope().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getTypeArguments().isPresent()) {
             n.getTypeArguments().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -527,23 +584,28 @@ public void visit(final ClassOrInterfaceType n, final Range arg) {
     public void visit(final CompilationUnit n, final Range arg) {
         {
             n.getImports().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getModule().isPresent()) {
             n.getModule().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getPackageDeclaration().isPresent()) {
             n.getPackageDeclaration().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getTypes().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -555,19 +617,23 @@ public void visit(final CompilationUnit n, final Range arg) {
     public void visit(final ConditionalExpr n, final Range arg) {
         {
             n.getCondition().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getElseExpr().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getThenExpr().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -581,40 +647,49 @@ public void visit(final ConstructorDeclaration n, final Range arg) {
             var b = n.getBody();
             if (b.isPresent()) {
                 b.get().accept(this, arg);
-                if (selectedNode != null) return;
+                if (selectedNode != null)
+                    return;
             }
         }
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getParameters().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getReceiverParameter().isPresent()) {
             n.getReceiverParameter().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getThrownExceptions().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getTypeParameters().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -626,11 +701,13 @@ public void visit(final ConstructorDeclaration n, final Range arg) {
     public void visit(final ContinueStmt n, final Range arg) {
         if (n.getLabel().isPresent()) {
             n.getLabel().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -642,15 +719,18 @@ public void visit(final ContinueStmt n, final Range arg) {
     public void visit(final DoStmt n, final Range arg) {
         {
             n.getBody().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getCondition().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -662,7 +742,8 @@ public void visit(final DoStmt n, final Range arg) {
     public void visit(final DoubleLiteralExpr n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -674,7 +755,8 @@ public void visit(final DoubleLiteralExpr n, final Range arg) {
     public void visit(final EmptyStmt n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -686,11 +768,13 @@ public void visit(final EmptyStmt n, final Range arg) {
     public void visit(final EnclosedExpr n, final Range arg) {
         {
             n.getInner().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -702,23 +786,28 @@ public void visit(final EnclosedExpr n, final Range arg) {
     public void visit(final EnumConstantDeclaration n, final Range arg) {
         {
             n.getArguments().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getClassBody().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -730,31 +819,38 @@ public void visit(final EnumConstantDeclaration n, final Range arg) {
     public void visit(final EnumDeclaration n, final Range arg) {
         {
             n.getEntries().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getImplementedTypes().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getMembers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -766,19 +862,23 @@ public void visit(final EnumDeclaration n, final Range arg) {
     public void visit(final ExplicitConstructorInvocationStmt n, final Range arg) {
         {
             n.getArguments().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getExpression().isPresent()) {
             n.getExpression().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getTypeArguments().isPresent()) {
             n.getTypeArguments().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -790,11 +890,13 @@ public void visit(final ExplicitConstructorInvocationStmt n, final Range arg) {
     public void visit(final ExpressionStmt n, final Range arg) {
         {
             n.getExpression().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -806,19 +908,23 @@ public void visit(final ExpressionStmt n, final Range arg) {
     public void visit(final FieldAccessExpr n, final Range arg) {
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getScope().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getTypeArguments().isPresent()) {
             n.getTypeArguments().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -830,19 +936,23 @@ public void visit(final FieldAccessExpr n, final Range arg) {
     public void visit(final FieldDeclaration n, final Range arg) {
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getVariables().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -854,19 +964,23 @@ public void visit(final FieldDeclaration n, final Range arg) {
     public void visit(final ForEachStmt n, final Range arg) {
         {
             n.getBody().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getIterable().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getVariable().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -878,23 +992,28 @@ public void visit(final ForEachStmt n, final Range arg) {
     public void visit(final ForStmt n, final Range arg) {
         {
             n.getBody().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getCompare().isPresent()) {
             n.getCompare().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getInitialization().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getUpdate().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -906,19 +1025,23 @@ public void visit(final ForStmt n, final Range arg) {
     public void visit(final IfStmt n, final Range arg) {
         {
             n.getCondition().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getElseStmt().isPresent()) {
             n.getElseStmt().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getThenStmt().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -930,15 +1053,18 @@ public void visit(final IfStmt n, final Range arg) {
     public void visit(final InitializerDeclaration n, final Range arg) {
         {
             n.getBody().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -950,19 +1076,23 @@ public void visit(final InitializerDeclaration n, final Range arg) {
     public void visit(final InstanceOfExpr n, final Range arg) {
         {
             n.getExpression().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getPattern().isPresent()) {
             n.getPattern().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -974,7 +1104,8 @@ public void visit(final InstanceOfExpr n, final Range arg) {
     public void visit(final IntegerLiteralExpr n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         return;
     }
@@ -983,7 +1114,8 @@ public void visit(final IntegerLiteralExpr n, final Range arg) {
     public void visit(final TraditionalJavadocComment n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -995,15 +1127,18 @@ public void visit(final TraditionalJavadocComment n, final Range arg) {
     public void visit(final LabeledStmt n, final Range arg) {
         {
             n.getLabel().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getStatement().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1015,7 +1150,8 @@ public void visit(final LabeledStmt n, final Range arg) {
     public void visit(final LongLiteralExpr n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1027,11 +1163,13 @@ public void visit(final LongLiteralExpr n, final Range arg) {
     public void visit(final MarkerAnnotationExpr n, final Range arg) {
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1043,15 +1181,18 @@ public void visit(final MarkerAnnotationExpr n, final Range arg) {
     public void visit(final MemberValuePair n, final Range arg) {
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getValue().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1063,23 +1204,28 @@ public void visit(final MemberValuePair n, final Range arg) {
     public void visit(final MethodCallExpr n, final Range arg) {
         {
             n.getArguments().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getScope().isPresent()) {
             n.getScope().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getTypeArguments().isPresent()) {
             n.getTypeArguments().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1091,43 +1237,53 @@ public void visit(final MethodCallExpr n, final Range arg) {
     public void visit(final MethodDeclaration n, final Range arg) {
         if (n.getBody().isPresent()) {
             n.getBody().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getParameters().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getReceiverParameter().isPresent()) {
             n.getReceiverParameter().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getThrownExceptions().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getTypeParameters().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1139,11 +1295,13 @@ public void visit(final MethodDeclaration n, final Range arg) {
     public void visit(final NameExpr n, final Range arg) {
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1155,15 +1313,18 @@ public void visit(final NameExpr n, final Range arg) {
     public void visit(final NormalAnnotationExpr n, final Range arg) {
         {
             n.getPairs().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1175,7 +1336,8 @@ public void visit(final NormalAnnotationExpr n, final Range arg) {
     public void visit(final NullLiteralExpr n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1187,27 +1349,33 @@ public void visit(final NullLiteralExpr n, final Range arg) {
     public void visit(final ObjectCreationExpr n, final Range arg) {
         if (n.getAnonymousClassBody().isPresent()) {
             n.getAnonymousClassBody().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getArguments().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getScope().isPresent()) {
             n.getScope().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getTypeArguments().isPresent()) {
             n.getTypeArguments().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1219,15 +1387,18 @@ public void visit(final ObjectCreationExpr n, final Range arg) {
     public void visit(final PackageDeclaration n, final Range arg) {
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1239,27 +1410,33 @@ public void visit(final PackageDeclaration n, final Range arg) {
     public void visit(final Parameter n, final Range arg) {
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getVarArgsAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1271,11 +1448,13 @@ public void visit(final Parameter n, final Range arg) {
     public void visit(final PrimitiveType n, final Range arg) {
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1287,11 +1466,13 @@ public void visit(final PrimitiveType n, final Range arg) {
     public void visit(final Name n, final Range arg) {
         if (n.getQualifier().isPresent()) {
             n.getQualifier().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1303,7 +1484,8 @@ public void visit(final Name n, final Range arg) {
     public void visit(final SimpleName n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1315,15 +1497,18 @@ public void visit(final SimpleName n, final Range arg) {
     public void visit(final ArrayType n, final Range arg) {
         {
             n.getComponentType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1335,15 +1520,18 @@ public void visit(final ArrayType n, final Range arg) {
     public void visit(final ArrayCreationLevel n, final Range arg) {
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getDimension().isPresent()) {
             n.getDimension().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1355,15 +1543,18 @@ public void visit(final ArrayCreationLevel n, final Range arg) {
     public void visit(final IntersectionType n, final Range arg) {
         {
             n.getElements().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1375,15 +1566,18 @@ public void visit(final IntersectionType n, final Range arg) {
     public void visit(final UnionType n, final Range arg) {
         {
             n.getElements().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1395,11 +1589,13 @@ public void visit(final UnionType n, final Range arg) {
     public void visit(final ReturnStmt n, final Range arg) {
         if (n.getExpression().isPresent()) {
             n.getExpression().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1411,15 +1607,18 @@ public void visit(final ReturnStmt n, final Range arg) {
     public void visit(final SingleMemberAnnotationExpr n, final Range arg) {
         {
             n.getMemberValue().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1431,7 +1630,8 @@ public void visit(final SingleMemberAnnotationExpr n, final Range arg) {
     public void visit(final StringLiteralExpr n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1443,11 +1643,13 @@ public void visit(final StringLiteralExpr n, final Range arg) {
     public void visit(final SuperExpr n, final Range arg) {
         if (n.getTypeName().isPresent()) {
             n.getTypeName().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1459,19 +1661,23 @@ public void visit(final SuperExpr n, final Range arg) {
     public void visit(final SwitchEntry n, final Range arg) {
         {
             n.getLabels().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getStatements().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getGuard().isPresent()) {
             n.getGuard().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1483,15 +1689,18 @@ public void visit(final SwitchEntry n, final Range arg) {
     public void visit(final SwitchStmt n, final Range arg) {
         {
             n.getEntries().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getSelector().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1503,15 +1712,18 @@ public void visit(final SwitchStmt n, final Range arg) {
     public void visit(final SynchronizedStmt n, final Range arg) {
         {
             n.getBody().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getExpression().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1523,11 +1735,13 @@ public void visit(final SynchronizedStmt n, final Range arg) {
     public void visit(final ThisExpr n, final Range arg) {
         if (n.getTypeName().isPresent()) {
             n.getTypeName().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1539,11 +1753,13 @@ public void visit(final ThisExpr n, final Range arg) {
     public void visit(final ThrowStmt n, final Range arg) {
         {
             n.getExpression().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1555,23 +1771,28 @@ public void visit(final ThrowStmt n, final Range arg) {
     public void visit(final TryStmt n, final Range arg) {
         {
             n.getCatchClauses().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getFinallyBlock().isPresent()) {
             n.getFinallyBlock().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getResources().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getTryBlock().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1583,11 +1804,13 @@ public void visit(final TryStmt n, final Range arg) {
     public void visit(final LocalClassDeclarationStmt n, final Range arg) {
         {
             n.getClassDeclaration().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1599,11 +1822,13 @@ public void visit(final LocalClassDeclarationStmt n, final Range arg) {
     public void visit(final LocalRecordDeclarationStmt n, final Range arg) {
         {
             n.getRecordDeclaration().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1615,19 +1840,23 @@ public void visit(final LocalRecordDeclarationStmt n, final Range arg) {
     public void visit(final TypeParameter n, final Range arg) {
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getTypeBound().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1639,11 +1868,13 @@ public void visit(final TypeParameter n, final Range arg) {
     public void visit(final UnaryExpr n, final Range arg) {
         {
             n.getExpression().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1655,11 +1886,13 @@ public void visit(final UnaryExpr n, final Range arg) {
     public void visit(final UnknownType n, final Range arg) {
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1671,19 +1904,23 @@ public void visit(final UnknownType n, final Range arg) {
     public void visit(final VariableDeclarationExpr n, final Range arg) {
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getVariables().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1695,19 +1932,23 @@ public void visit(final VariableDeclarationExpr n, final Range arg) {
     public void visit(final VariableDeclarator n, final Range arg) {
         if (n.getInitializer().isPresent()) {
             n.getInitializer().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1719,11 +1960,13 @@ public void visit(final VariableDeclarator n, final Range arg) {
     public void visit(final VoidType n, final Range arg) {
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1735,15 +1978,18 @@ public void visit(final VoidType n, final Range arg) {
     public void visit(final WhileStmt n, final Range arg) {
         {
             n.getBody().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getCondition().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1755,19 +2001,23 @@ public void visit(final WhileStmt n, final Range arg) {
     public void visit(final WildcardType n, final Range arg) {
         if (n.getExtendedType().isPresent()) {
             n.getExtendedType().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getSuperType().isPresent()) {
             n.getSuperType().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1779,15 +2029,18 @@ public void visit(final WildcardType n, final Range arg) {
     public void visit(final LambdaExpr n, final Range arg) {
         {
             n.getBody().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getParameters().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1799,15 +2052,18 @@ public void visit(final LambdaExpr n, final Range arg) {
     public void visit(final MethodReferenceExpr n, final Range arg) {
         {
             n.getScope().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getTypeArguments().isPresent()) {
             n.getTypeArguments().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1819,11 +2075,13 @@ public void visit(final MethodReferenceExpr n, final Range arg) {
     public void visit(final TypeExpr n, final Range arg) {
         {
             n.getType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1835,11 +2093,13 @@ public void visit(final TypeExpr n, final Range arg) {
     public void visit(final ImportDeclaration n, final Range arg) {
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1851,7 +2111,8 @@ public void visit(final ImportDeclaration n, final Range arg) {
     public void visit(final BlockComment n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1863,7 +2124,8 @@ public void visit(final BlockComment n, final Range arg) {
     public void visit(final LineComment n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1883,19 +2145,23 @@ public void visit(NodeList n, final Range arg) {
     public void visit(final ModuleDeclaration n, final Range arg) {
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getDirectives().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1907,15 +2173,18 @@ public void visit(final ModuleDeclaration n, final Range arg) {
     public void visit(final ModuleRequiresDirective n, final Range arg) {
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1927,15 +2196,18 @@ public void visit(final ModuleRequiresDirective n, final Range arg) {
     public void visit(final ModuleExportsDirective n, final Range arg) {
         {
             n.getModuleNames().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1947,15 +2219,18 @@ public void visit(final ModuleExportsDirective n, final Range arg) {
     public void visit(final ModuleProvidesDirective n, final Range arg) {
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getWith().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1967,11 +2242,13 @@ public void visit(final ModuleProvidesDirective n, final Range arg) {
     public void visit(final ModuleUsesDirective n, final Range arg) {
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -1983,15 +2260,18 @@ public void visit(final ModuleUsesDirective n, final Range arg) {
     public void visit(final ModuleOpensDirective n, final Range arg) {
         {
             n.getModuleNames().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -2003,7 +2283,8 @@ public void visit(final ModuleOpensDirective n, final Range arg) {
     public void visit(final UnparsableStmt n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -2015,19 +2296,23 @@ public void visit(final UnparsableStmt n, final Range arg) {
     public void visit(final ReceiverParameter n, final Range arg) {
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -2039,11 +2324,13 @@ public void visit(final ReceiverParameter n, final Range arg) {
     public void visit(final VarType n, final Range arg) {
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -2055,7 +2342,8 @@ public void visit(final VarType n, final Range arg) {
     public void visit(final Modifier n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -2067,15 +2355,18 @@ public void visit(final Modifier n, final Range arg) {
     public void visit(final SwitchExpr n, final Range arg) {
         {
             n.getEntries().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getSelector().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -2087,11 +2378,13 @@ public void visit(final SwitchExpr n, final Range arg) {
     public void visit(final YieldStmt n, final Range arg) {
         {
             n.getExpression().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -2103,7 +2396,8 @@ public void visit(final YieldStmt n, final Range arg) {
     public void visit(final TextBlockLiteralExpr n, final Range arg) {
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -2115,19 +2409,23 @@ public void visit(final TextBlockLiteralExpr n, final Range arg) {
     public void visit(final TypePatternExpr n, final Range arg) {
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getType().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -2139,39 +2437,48 @@ public void visit(final TypePatternExpr n, final Range arg) {
     public void visit(final RecordDeclaration n, final Range arg) {
         {
             n.getImplementedTypes().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getParameters().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getReceiverParameter().isPresent()) {
             n.getReceiverParameter().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getTypeParameters().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getMembers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
@@ -2183,31 +2490,38 @@ public void visit(final RecordDeclaration n, final Range arg) {
     public void visit(final CompactConstructorDeclaration n, final Range arg) {
         {
             n.getBody().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getModifiers().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getName().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getThrownExceptions().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getTypeParameters().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         {
             n.getAnnotations().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (n.getComment().isPresent()) {
             n.getComment().get().accept(this, arg);
-            if (selectedNode != null) return;
+            if (selectedNode != null)
+                return;
         }
         if (fn.apply(n, arg)) {
             selectedNode = n;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityEqualsVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityEqualsVisitor.java
index 1d7831b9b1..b271c1c18e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityEqualsVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityEqualsVisitor.java
@@ -30,6 +30,7 @@
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -467,7 +468,7 @@ public Boolean visit(final ImportDeclaration n, final Visitable arg) {
     }
 
     @Override
-    public Boolean visit(NodeList n, Visitable arg) {
+    public Boolean visit(NodeList<?> n, Visitable arg) {
         return n == arg;
     }
 
@@ -547,7 +548,7 @@ public Boolean visit(final JmlQuantifiedExpr n, final Visitable arg) {
     }
 
     @Override
-    public Boolean visit(final JmlClauseLabel n, final Visitable arg) {
+    public Boolean visit(final JmlLabledClause n, final Visitable arg) {
         return n == arg;
     }
 
@@ -607,7 +608,7 @@ public Boolean visit(final JmlRefiningStmt n, final Visitable arg) {
     }
 
     @Override
-    public Boolean visit(final JmlClauseIf n, final Visitable arg) {
+    public Boolean visit(final JmlConditionalClause n, final Visitable arg) {
         return n == arg;
     }
 
@@ -687,7 +688,7 @@ public Boolean visit(final KeyCcatchReturn n, final Visitable arg) {
     }
 
     @Override
-    public Boolean visit(final KeyCatchAllStatement n, final Visitable arg) {
+    public Boolean visit(final KeyCatchAllStmt n, final Visitable arg) {
         return n == arg;
     }
 
@@ -697,7 +698,7 @@ public Boolean visit(final KeyEscapeExpression n, final Visitable arg) {
     }
 
     @Override
-    public Boolean visit(final KeyExecStatement n, final Visitable arg) {
+    public Boolean visit(final KeyExecStmt n, final Visitable arg) {
         return n == arg;
     }
 
@@ -707,12 +708,12 @@ public Boolean visit(final KeyExecutionContext n, final Visitable arg) {
     }
 
     @Override
-    public Boolean visit(final KeyLoopScopeBlock n, final Visitable arg) {
+    public Boolean visit(final KeyLoopScopeBlockStmt n, final Visitable arg) {
         return n == arg;
     }
 
     @Override
-    public Boolean visit(final KeyMergePointStatement n, final Visitable arg) {
+    public Boolean visit(final KeyMergePointStmt n, final Visitable arg) {
         return n == arg;
     }
 
@@ -722,7 +723,7 @@ public Boolean visit(final KeyMethodBodyStatement n, final Visitable arg) {
     }
 
     @Override
-    public Boolean visit(final KeyMethodCallStatement n, final Visitable arg) {
+    public Boolean visit(final KeyMethodCallStmt n, final Visitable arg) {
         return n == arg;
     }
 
@@ -732,12 +733,7 @@ public Boolean visit(final KeyMethodSignature n, final Visitable arg) {
     }
 
     @Override
-    public Boolean visit(final KeyRangeExpression n, final Visitable arg) {
-        return n == arg;
-    }
-
-    @Override
-    public Boolean visit(final KeyTransactionStatement n, final Visitable arg) {
+    public Boolean visit(final KeyTransactionStmt n, final Visitable arg) {
         return n == arg;
     }
 
@@ -880,4 +876,14 @@ public Boolean visit(final JmlLabelStmt n, final Visitable arg) {
     public Boolean visit(final JmlMethodSignature n, final Visitable arg) {
         return n == arg;
     }
+
+    @Override
+    public Boolean visit(final KeYMarkerStatement n, final Visitable arg) {
+        return n == arg;
+    }
+
+    @Override
+    public Boolean visit(final JmlInfFlowClause n, final Visitable arg) {
+        return n == arg;
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityHashCodeVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityHashCodeVisitor.java
index 9cf78254f7..9e7e3d34ec 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityHashCodeVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/ObjectIdentityHashCodeVisitor.java
@@ -29,6 +29,7 @@
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -274,7 +275,7 @@ public Integer visit(final Name n, final Void arg) {
         return n.hashCode();
     }
 
-    public Integer visit(NodeList n, Void arg) {
+    public Integer visit(NodeList<?> n, Void arg) {
         return n.hashCode();
     }
 
@@ -460,7 +461,7 @@ public Integer visit(final JmlQuantifiedExpr n, final Void arg) {
     }
 
     @Override
-    public Integer visit(final JmlClauseLabel n, final Void arg) {
+    public Integer visit(final JmlLabledClause n, final Void arg) {
         return n.hashCode();
     }
 
@@ -520,7 +521,7 @@ public Integer visit(final JmlRefiningStmt n, final Void arg) {
     }
 
     @Override
-    public Integer visit(final JmlClauseIf n, final Void arg) {
+    public Integer visit(final JmlConditionalClause n, final Void arg) {
         return n.hashCode();
     }
 
@@ -599,7 +600,7 @@ public Integer visit(final KeyCcatchReturn n, final Void arg) {
     }
 
     @Override
-    public Integer visit(final KeyCatchAllStatement n, final Void arg) {
+    public Integer visit(final KeyCatchAllStmt n, final Void arg) {
         return n.hashCode();
     }
 
@@ -609,7 +610,7 @@ public Integer visit(final KeyEscapeExpression n, final Void arg) {
     }
 
     @Override
-    public Integer visit(final KeyExecStatement n, final Void arg) {
+    public Integer visit(final KeyExecStmt n, final Void arg) {
         return n.hashCode();
     }
 
@@ -619,12 +620,12 @@ public Integer visit(final KeyExecutionContext n, final Void arg) {
     }
 
     @Override
-    public Integer visit(final KeyLoopScopeBlock n, final Void arg) {
+    public Integer visit(final KeyLoopScopeBlockStmt n, final Void arg) {
         return n.hashCode();
     }
 
     @Override
-    public Integer visit(final KeyMergePointStatement n, final Void arg) {
+    public Integer visit(final KeyMergePointStmt n, final Void arg) {
         return n.hashCode();
     }
 
@@ -634,7 +635,7 @@ public Integer visit(final KeyMethodBodyStatement n, final Void arg) {
     }
 
     @Override
-    public Integer visit(final KeyMethodCallStatement n, final Void arg) {
+    public Integer visit(final KeyMethodCallStmt n, final Void arg) {
         return n.hashCode();
     }
 
@@ -644,12 +645,7 @@ public Integer visit(final KeyMethodSignature n, final Void arg) {
     }
 
     @Override
-    public Integer visit(final KeyRangeExpression n, final Void arg) {
-        return n.hashCode();
-    }
-
-    @Override
-    public Integer visit(final KeyTransactionStatement n, final Void arg) {
+    public Integer visit(final KeyTransactionStmt n, final Void arg) {
         return n.hashCode();
     }
 
@@ -792,4 +788,14 @@ public Integer visit(final JmlLabelStmt n, final Void arg) {
     public Integer visit(final JmlMethodSignature n, final Void arg) {
         return n.hashCode();
     }
+
+    @Override
+    public Integer visit(final KeYMarkerStatement n, final Void arg) {
+        return n.hashCode();
+    }
+
+    @Override
+    public Integer visit(final JmlInfFlowClause n, final Void arg) {
+        return n.hashCode();
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java
index cd4de4a6b5..97967f48a6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitor.java
@@ -22,14 +22,15 @@
 
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
-import com.github.javaparser.ast.comments.*;
+import com.github.javaparser.ast.comments.BlockComment;
+import com.github.javaparser.ast.comments.LineComment;
+import com.github.javaparser.ast.comments.MarkdownComment;
+import com.github.javaparser.ast.comments.TraditionalJavadocComment;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
+import com.github.javaparser.ast.jml.doc.*;
 import com.github.javaparser.ast.jml.doc.JmlDoc;
-import com.github.javaparser.ast.jml.doc.JmlDocDeclaration;
-import com.github.javaparser.ast.jml.doc.JmlDocStmt;
-import com.github.javaparser.ast.jml.doc.JmlDocType;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -45,7 +46,7 @@
  */
 public interface VoidVisitor<A> {
 
-    void visit(NodeList n, A arg);
+    void visit(NodeList<?> n, A arg);
 
     void visit(AnnotationDeclaration n, A arg);
 
@@ -259,27 +260,25 @@ public interface VoidVisitor<A> {
 
     void visit(KeyCcatchReturn n, A arg);
 
-    void visit(KeyCatchAllStatement n, A arg);
+    void visit(KeyCatchAllStmt n, A arg);
 
     void visit(KeyEscapeExpression n, A arg);
 
-    void visit(KeyExecStatement n, A arg);
+    void visit(KeyExecStmt n, A arg);
 
     void visit(KeyExecutionContext n, A arg);
 
-    void visit(KeyLoopScopeBlock n, A arg);
+    void visit(KeyLoopScopeBlockStmt n, A arg);
 
-    void visit(KeyMergePointStatement n, A arg);
+    void visit(KeyMergePointStmt n, A arg);
 
     void visit(KeyMethodBodyStatement n, A arg);
 
-    void visit(KeyMethodCallStatement n, A arg);
+    void visit(KeyMethodCallStmt n, A arg);
 
     void visit(KeyMethodSignature n, A arg);
 
-    void visit(KeyRangeExpression n, A arg);
-
-    void visit(KeyTransactionStatement n, A arg);
+    void visit(KeyTransactionStmt n, A arg);
 
     void visit(KeyContextStatementBlock n, A arg);
 
@@ -311,7 +310,7 @@ public interface VoidVisitor<A> {
 
     void visit(JmlQuantifiedExpr jmlQuantifiedExpr, A arg);
 
-    void visit(JmlClauseLabel n, A arg);
+    void visit(JmlLabledClause n, A arg);
 
     void visit(JmlExpressionStmt n, A arg);
 
@@ -335,7 +334,7 @@ public interface VoidVisitor<A> {
 
     void visit(JmlRefiningStmt n, A arg);
 
-    void visit(JmlClauseIf n, A arg);
+    void visit(JmlConditionalClause n, A arg);
 
     void visit(JmlClassExprDeclaration n, A arg);
 
@@ -376,4 +375,8 @@ public interface VoidVisitor<A> {
     void visit(JmlLabelStmt n, A arg);
 
     void visit(JmlMethodSignature n, A arg);
+
+    void visit(KeYMarkerStatement n, A arg);
+
+    void visit(JmlInfFlowClause n, A arg);
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
index 6329fd91f6..2bbfea9bc6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
@@ -30,6 +30,7 @@
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -725,7 +726,7 @@ public void visit(final TypeExpr n, final A arg) {
     }
 
     @Override
-    public void visit(NodeList n, A arg) {
+    public void visit(NodeList<?> n, A arg) {
         for (Object node : n) {
             ((Node) node).accept(this, arg);
         }
@@ -843,8 +844,8 @@ public void visit(final TypePatternExpr n, final A arg) {
     }
 
     @Override
-    public void visit(final JmlClauseLabel n, final A arg) {
-        n.getExpr().accept(this, arg);
+    public void visit(final JmlLabledClause n, final A arg) {
+        n.getExpression().accept(this, arg);
         n.getLabel().ifPresent(l -> l.accept(this, arg));
         n.getName().ifPresent(l -> l.accept(this, arg));
         n.getAssociatedSpecificationComments().ifPresent(l -> l.forEach(v -> v.accept(this, arg)));
@@ -947,9 +948,9 @@ public void visit(final JmlRefiningStmt n, final A arg) {
     }
 
     @Override
-    public void visit(final JmlClauseIf n, final A arg) {
+    public void visit(final JmlConditionalClause n, final A arg) {
         n.getCondition().accept(this, arg);
-        n.getThen().accept(this, arg);
+        n.getExpression().accept(this, arg);
         n.getName().ifPresent(l -> l.accept(this, arg));
         n.getAssociatedSpecificationComments().ifPresent(l -> l.forEach(v -> v.accept(this, arg)));
         n.getComment().ifPresent(l -> l.accept(this, arg));
@@ -1076,7 +1077,7 @@ public void visit(final KeyCcatchReturn n, final A arg) {
     }
 
     @Override
-    public void visit(final KeyCatchAllStatement n, final A arg) {
+    public void visit(final KeyCatchAllStmt n, final A arg) {
         n.getBlock().accept(this, arg);
         n.getLabel().accept(this, arg);
         n.getAssociatedSpecificationComments().ifPresent(l -> l.forEach(v -> v.accept(this, arg)));
@@ -1092,7 +1093,7 @@ public void visit(final KeyEscapeExpression n, final A arg) {
     }
 
     @Override
-    public void visit(final KeyExecStatement n, final A arg) {
+    public void visit(final KeyExecStmt n, final A arg) {
         n.getBranches().forEach(p -> p.accept(this, arg));
         n.getExecBlock().accept(this, arg);
         n.getAssociatedSpecificationComments().ifPresent(l -> l.forEach(v -> v.accept(this, arg)));
@@ -1109,7 +1110,7 @@ public void visit(final KeyExecutionContext n, final A arg) {
     }
 
     @Override
-    public void visit(final KeyLoopScopeBlock n, final A arg) {
+    public void visit(final KeyLoopScopeBlockStmt n, final A arg) {
         n.getBlock().accept(this, arg);
         n.getIndexPV().accept(this, arg);
         n.getAssociatedSpecificationComments().ifPresent(l -> l.forEach(v -> v.accept(this, arg)));
@@ -1117,7 +1118,7 @@ public void visit(final KeyLoopScopeBlock n, final A arg) {
     }
 
     @Override
-    public void visit(final KeyMergePointStatement n, final A arg) {
+    public void visit(final KeyMergePointStmt n, final A arg) {
         n.getExpr().accept(this, arg);
         n.getAssociatedSpecificationComments().ifPresent(l -> l.forEach(v -> v.accept(this, arg)));
         n.getComment().ifPresent(l -> l.accept(this, arg));
@@ -1133,7 +1134,7 @@ public void visit(final KeyMethodBodyStatement n, final A arg) {
     }
 
     @Override
-    public void visit(final KeyMethodCallStatement n, final A arg) {
+    public void visit(final KeyMethodCallStmt n, final A arg) {
         n.getBlock().accept(this, arg);
         n.getContext().accept(this, arg);
         n.getName().ifPresent(l -> l.accept(this, arg));
@@ -1150,15 +1151,7 @@ public void visit(final KeyMethodSignature n, final A arg) {
     }
 
     @Override
-    public void visit(final KeyRangeExpression n, final A arg) {
-        n.getLower().accept(this, arg);
-        n.getUpper().accept(this, arg);
-        n.getAssociatedSpecificationComments().ifPresent(l -> l.forEach(v -> v.accept(this, arg)));
-        n.getComment().ifPresent(l -> l.accept(this, arg));
-    }
-
-    @Override
-    public void visit(final KeyTransactionStatement n, final A arg) {
+    public void visit(final KeyTransactionStmt n, final A arg) {
         n.getAssociatedSpecificationComments().ifPresent(l -> l.forEach(v -> v.accept(this, arg)));
         n.getComment().ifPresent(l -> l.accept(this, arg));
     }
@@ -1395,4 +1388,22 @@ public void visit(final JmlMethodSignature n, final A arg) {
         n.getAssociatedSpecificationComments().ifPresent(l -> l.forEach(v -> v.accept(this, arg)));
         n.getComment().ifPresent(l -> l.accept(this, arg));
     }
+
+    @Override
+    public void visit(final KeYMarkerStatement n, final A arg) {
+        n.getAssociatedSpecificationComments().ifPresent(l -> l.forEach(v -> v.accept(this, arg)));
+        n.getComment().ifPresent(l -> l.accept(this, arg));
+    }
+
+    @Override
+    public void visit(final JmlInfFlowClause n, final A arg) {
+        n.getBy().forEach(p -> p.accept(this, arg));
+        n.getDeclassifies().forEach(p -> p.accept(this, arg));
+        n.getErases().forEach(p -> p.accept(this, arg));
+        n.getExpressions().forEach(p -> p.accept(this, arg));
+        n.getNewObjects().forEach(p -> p.accept(this, arg));
+        n.getName().ifPresent(l -> l.accept(this, arg));
+        n.getAssociatedSpecificationComments().ifPresent(l -> l.forEach(v -> v.accept(this, arg)));
+        n.getComment().ifPresent(l -> l.accept(this, arg));
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorWithDefaults.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorWithDefaults.java
index b0ad1ce508..d4623db8ad 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorWithDefaults.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/VoidVisitorWithDefaults.java
@@ -27,6 +27,7 @@
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -44,12 +45,14 @@ public abstract class VoidVisitorWithDefaults<A> implements VoidVisitor<A> {
     /**
      * This will be called by every node visit method that is not overridden.
      */
-    public void defaultAction(Node n, A arg) {}
+    public void defaultAction(Node n, A arg) {
+    }
 
     /**
      * This will be called by the NodeList visit method when it is not overridden.
      */
-    public void defaultAction(NodeList n, A arg) {}
+    public void defaultAction(NodeList n, A arg) {
+    }
 
     @Override
     public void visit(final LocalRecordDeclarationStmt n, final A arg) {
@@ -462,7 +465,7 @@ public void visit(final TypeExpr n, final A arg) {
     }
 
     @Override
-    public void visit(NodeList n, A arg) {
+    public void visit(NodeList<?> n, A arg) {
         defaultAction(n, arg);
     }
 
@@ -545,7 +548,7 @@ public void visit(final JmlQuantifiedExpr n, final A arg) {
     }
 
     @Override
-    public void visit(final JmlClauseLabel n, final A arg) {
+    public void visit(final JmlLabledClause n, final A arg) {
         defaultAction(n, arg);
     }
 
@@ -605,7 +608,7 @@ public void visit(final JmlRefiningStmt n, final A arg) {
     }
 
     @Override
-    public void visit(final JmlClauseIf n, final A arg) {
+    public void visit(final JmlConditionalClause n, final A arg) {
         defaultAction(n, arg);
     }
 
@@ -685,7 +688,7 @@ public void visit(final KeyCcatchReturn n, final A arg) {
     }
 
     @Override
-    public void visit(final KeyCatchAllStatement n, final A arg) {
+    public void visit(final KeyCatchAllStmt n, final A arg) {
         defaultAction(n, arg);
     }
 
@@ -695,7 +698,7 @@ public void visit(final KeyEscapeExpression n, final A arg) {
     }
 
     @Override
-    public void visit(final KeyExecStatement n, final A arg) {
+    public void visit(final KeyExecStmt n, final A arg) {
         defaultAction(n, arg);
     }
 
@@ -705,12 +708,12 @@ public void visit(final KeyExecutionContext n, final A arg) {
     }
 
     @Override
-    public void visit(final KeyLoopScopeBlock n, final A arg) {
+    public void visit(final KeyLoopScopeBlockStmt n, final A arg) {
         defaultAction(n, arg);
     }
 
     @Override
-    public void visit(final KeyMergePointStatement n, final A arg) {
+    public void visit(final KeyMergePointStmt n, final A arg) {
         defaultAction(n, arg);
     }
 
@@ -720,7 +723,7 @@ public void visit(final KeyMethodBodyStatement n, final A arg) {
     }
 
     @Override
-    public void visit(final KeyMethodCallStatement n, final A arg) {
+    public void visit(final KeyMethodCallStmt n, final A arg) {
         defaultAction(n, arg);
     }
 
@@ -730,12 +733,7 @@ public void visit(final KeyMethodSignature n, final A arg) {
     }
 
     @Override
-    public void visit(final KeyRangeExpression n, final A arg) {
-        defaultAction(n, arg);
-    }
-
-    @Override
-    public void visit(final KeyTransactionStatement n, final A arg) {
+    public void visit(final KeyTransactionStmt n, final A arg) {
         defaultAction(n, arg);
     }
 
@@ -829,11 +827,6 @@ public void visit(final JmlDocStmt n, final A arg) {
         defaultAction(n, arg);
     }
 
-    @Override
-    public void visit(final JmlDoc n, final A arg) {
-        defaultAction(n, arg);
-    }
-
     @Override
     public void visit(final JmlDocType n, final A arg) {
         defaultAction(n, arg);
@@ -878,4 +871,19 @@ public void visit(final JmlLabelStmt n, final A arg) {
     public void visit(final JmlMethodSignature n, final A arg) {
         defaultAction(n, arg);
     }
+
+    @Override
+    public void visit(final JmlDoc n, final A arg) {
+        defaultAction(n, arg);
+    }
+
+    @Override
+    public void visit(final KeYMarkerStatement n, final A arg) {
+        defaultAction(n, arg);
+    }
+
+    @Override
+    public void visit(final JmlInfFlowClause n, final A arg) {
+        defaultAction(n, arg);
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/Javadoc.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/Javadoc.java
index c6b71e501f..5975f51fff 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/Javadoc.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/Javadoc.java
@@ -115,8 +115,7 @@ public JavadocComment toComment() {
     public JavadocComment toComment(String indentation) {
         for (char c : indentation.toCharArray()) {
             if (!Character.isWhitespace(c)) {
-                throw new IllegalArgumentException(
-                        "The indentation string should be composed only by whitespace characters");
+                throw new IllegalArgumentException("The indentation string should be composed only by whitespace characters");
             }
         }
         StringBuilder sb = new StringBuilder();
@@ -153,8 +152,10 @@ public List<JavadocBlockTag> getBlockTags() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         Javadoc document = (Javadoc) o;
         return description.equals(document.description) && blockTags.equals(document.blockTags);
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/JavadocBlockTag.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/JavadocBlockTag.java
index acaf15f4c7..1f1f97541c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/JavadocBlockTag.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/JavadocBlockTag.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.nextWord;
 import static com.github.javaparser.utils.Utils.screamingToCamelCase;
-
 import com.github.javaparser.javadoc.description.JavadocDescription;
 import java.util.Optional;
 
@@ -43,6 +42,7 @@ public class JavadocBlockTag {
      * an unknown tag.
      */
     public enum Type {
+
         AUTHOR,
         DEPRECATED,
         EXCEPTION,
@@ -134,11 +134,15 @@ public String toText() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         JavadocBlockTag that = (JavadocBlockTag) o;
-        if (type != that.type) return false;
-        if (!content.equals(that.content)) return false;
+        if (type != that.type)
+            return false;
+        if (!content.equals(that.content))
+            return false;
         return name.equals(that.name);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java
index cc3fbc5817..012fb90860 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocDescription.java
@@ -92,8 +92,10 @@ public boolean isEmpty() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         JavadocDescription that = (JavadocDescription) o;
         return elements.equals(that.elements);
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocInlineTag.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocInlineTag.java
index 1d72e4d551..1d7e3040b2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocInlineTag.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocInlineTag.java
@@ -49,6 +49,7 @@ public static JavadocDescriptionElement fromText(String text) {
      * an unknown tag.
      */
     public enum Type {
+
         CODE,
         DOC_ROOT,
         INHERIT_DOC,
@@ -106,11 +107,15 @@ public String toText() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         JavadocInlineTag that = (JavadocInlineTag) o;
-        if (tagName != null ? !tagName.equals(that.tagName) : that.tagName != null) return false;
-        if (type != that.type) return false;
+        if (tagName != null ? !tagName.equals(that.tagName) : that.tagName != null)
+            return false;
+        if (type != that.type)
+            return false;
         return content != null ? content.equals(that.content) : that.content == null;
     }
 
@@ -124,7 +129,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "JavadocInlineTag{" + "tagName='" + tagName + '\'' + ", type=" + type + ", content='" + content + '\''
-                + '}';
+        return "JavadocInlineTag{" + "tagName='" + tagName + '\'' + ", type=" + type + ", content='" + content + '\'' + '}';
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocSnippet.java b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocSnippet.java
index ca2d498295..1d10a1a698 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocSnippet.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/javadoc/description/JavadocSnippet.java
@@ -44,8 +44,10 @@ public String toText() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         JavadocSnippet that = (JavadocSnippet) o;
         return text.equals(that.text);
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/Example.java b/javaparser-core/src/main/java/com/github/javaparser/jml/Example.java
index 9ee55e75e7..2a71a69903 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/jml/Example.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/jml/Example.java
@@ -39,8 +39,7 @@ public static void main(String[] args) throws FileNotFoundException {
         IntStream timings = IntStream.rangeClosed(0, 0).map(i -> {
             long start = System.currentTimeMillis();
             try {
-                ParseResult<CompilationUnit> result =
-                        jpb.parse(new File("/home/weigl/work/javaparser/JmlExample.java"));
+                ParseResult<CompilationUnit> result = jpb.parse(new File("/home/weigl/work/javaparser/JmlExample.java"));
             } catch (FileNotFoundException e) {
                 e.printStackTrace();
             }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlDocSanitizer.java b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlDocSanitizer.java
index 6dce907689..c44c2202ed 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlDocSanitizer.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlDocSanitizer.java
@@ -22,7 +22,8 @@ public String asString(NodeList<JmlDoc> jmlDocs) {
     }
 
     public String asStringJT(Collection<JavaToken> jmlDocs, boolean emulateGlobalPosition) {
-        if (jmlDocs.isEmpty()) return "";
+        if (jmlDocs.isEmpty())
+            return "";
         StringConstructor s = new StringConstructor();
         for (JavaToken tok : jmlDocs) {
             if (emulateGlobalPosition) {
@@ -40,7 +41,8 @@ public String asStringJT(Collection<JavaToken> jmlDocs, boolean emulateGlobalPos
     }
 
     public String asString(Collection<Token> jmlDocs, boolean emulateGlobalPosition) {
-        if (jmlDocs.isEmpty()) return "";
+        if (jmlDocs.isEmpty())
+            return "";
         StringConstructor s = new StringConstructor();
         for (Token tok : jmlDocs) {
             if (emulateGlobalPosition) {
@@ -54,7 +56,7 @@ public String asString(Collection<Token> jmlDocs, boolean emulateGlobalPosition)
     }
 
     public String asString(NodeList<JmlDoc> jmlDocs, boolean emulateGlobalPosition) {
-        return asStringJT(jmlDocs.stream().map(JmlDoc::getContent).toList(), emulateGlobalPosition);
+        return asStringJT(jmlDocs.stream().map(JmlDoc::constructToken).toList(), emulateGlobalPosition);
     }
 
     public String toSanitizedString(StringBuilder s) {
@@ -69,7 +71,8 @@ private static void cleanAtSigns(StringBuilder s) {
             if (cur == '\n') {
                 ++pos;
                 for (; pos < s.length(); pos++) {
-                    if (!Character.isWhitespace(s.charAt(pos))) break;
+                    if (!Character.isWhitespace(s.charAt(pos)))
+                        break;
                 }
                 for (; pos < s.length(); pos++) {
                     if ('@' == s.charAt(pos)) {
@@ -132,7 +135,8 @@ private int activateJmlComment(StringBuilder s, int pos) {
 
     private boolean isJmlComment(StringBuilder s, int pos) {
         int posAt = s.indexOf("@", pos + 2);
-        if (posAt < 0) return false;
+        if (posAt < 0)
+            return false;
         for (int i = pos + 2; i < posAt; i++) {
             int point = s.charAt(i);
             if (!(Character.isJavaIdentifierPart(point) || point == '-' || point == '+')) {
@@ -140,7 +144,8 @@ private boolean isJmlComment(StringBuilder s, int pos) {
             }
         }
         // unconditional JML comment
-        if (pos + 2 == posAt) return true;
+        if (pos + 2 == posAt)
+            return true;
         String[] keys = splitTags(s.substring(pos + 2, posAt));
         return isActiveJmlSpec(keys);
     }
@@ -167,7 +172,8 @@ public static boolean isActiveJmlSpec(Collection<String> activeKeys, String[] ke
         // a JML annotation with an enabled negative-key is ignored (even if there are enabled positive-keys).
         boolean enabledNegativeKeyFound = false;
         for (String marker : keys) {
-            if (marker.isEmpty()) continue;
+            if (marker.isEmpty())
+                continue;
             plusKeyFound = plusKeyFound || isPositive(marker);
             enabledPlusKeyFound = enabledPlusKeyFound || isPositive(marker) && isEnabled(activeKeys, marker);
             enabledNegativeKeyFound = enabledNegativeKeyFound || isNegative(marker) && isEnabled(activeKeys, marker);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlProcessor.java b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlProcessor.java
index 1910c3630d..bc1a52c720 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlProcessor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlProcessor.java
@@ -52,8 +52,7 @@ public void postProcess(ParseResult<? extends Node> result, ParserConfiguration
             ArrayList<Node> processedJmlDoc = new ArrayList<>(4096 * 10);
             if (r.isPresent() && comments.isPresent()) {
                 for (List<String> activeKeys : configuration.getJmlKeys()) {
-                    final JmlReplaceVisitor v =
-                            new JmlReplaceVisitor(configuration, new TreeSet<>(activeKeys), result.getProblems());
+                    final JmlReplaceVisitor v = new JmlReplaceVisitor(configuration, new TreeSet<>(activeKeys), result.getProblems());
                     r.get().accept(v, null);
                     // System.out.format("cap: %d, size: %d, add: %d", 0, processedJmlDoc.size(),
                     // v.processedJmlDoc.size());
@@ -111,8 +110,7 @@ private void setJmlTags(ArbitraryNodeContainer result) {
             if (result != null) {
                 for (Node child : result.getChildren()) {
                     if (child instanceof NodeWithJmlTags) {
-                        ((NodeWithJmlTags) child)
-                                .setJmlTags((NodeList<SimpleName>) enabledKeys.accept(new CloneVisitor(), null));
+                        ((NodeWithJmlTags) child).setJmlTags((NodeList<SimpleName>) enabledKeys.accept(new CloneVisitor(), null));
                     }
                 }
             }
@@ -145,13 +143,9 @@ public JmlDocDeclaration visit(JmlDocDeclaration n, Void arg) {
             ArbitraryNodeContainer t = parseJmlClasslevel(n.getJmlComments());
             if (t != null) {
                 setJmlTags(t);
-                TypeDeclaration<?> parent =
-                        (TypeDeclaration<?>) n.getParentNode().get();
+                TypeDeclaration<?> parent = (TypeDeclaration<?>) n.getParentNode().get();
                 NodeList<BodyDeclaration<?>> members = parent.getMembers();
-                int pos = IntStream.range(0, members.size())
-                        .filter(i -> members.get(i) == n)
-                        .findFirst()
-                        .orElse(-1);
+                int pos = IntStream.range(0, members.size()).filter(i -> members.get(i) == n).findFirst().orElse(-1);
                 assert pos >= 0;
                 if (pos + 1 >= members.size()) {
                     // JML Documentation is last element, therefore it can only refer to upper element.
@@ -163,10 +157,7 @@ public JmlDocDeclaration visit(JmlDocDeclaration n, Void arg) {
                         } else if (child instanceof JmlContract) {
                             reporter.report(child, "JML contract without a method found.");
                         } else {
-                            reporter.report(
-                                    child,
-                                    "JML construct " + child.getClass().getSimpleName()
-                                            + " not supported at this position.");
+                            reporter.report(child, "JML construct " + child.getClass().getSimpleName() + " not supported at this position.");
                         }
                     }
                 } else {
@@ -179,10 +170,7 @@ public JmlDocDeclaration visit(JmlDocDeclaration n, Void arg) {
                         } else if (child instanceof JmlContract) {
                             ((NodeWithContracts<?>) next).addContracts((JmlContract) child);
                         } else {
-                            reporter.report(
-                                    child,
-                                    "JML construct " + child.getClass().getSimpleName()
-                                            + " not supported at this position.");
+                            reporter.report(child, "JML construct " + child.getClass().getSimpleName() + " not supported at this position.");
                         }
                     }
                 }
@@ -241,11 +229,11 @@ private int handleJmlStatementLevel(BlockStmt p, JmlDocStmt n, int pos) {
             setJmlTags(t);
             pos = pos + 1;
             // possible the next statement after the given comment
-            @Nullable Statement nextStatement = pos < p.getStatements().size() ? p.getStatement(pos) : null;
+            @Nullable
+            Statement nextStatement = pos < p.getStatements().size() ? p.getStatement(pos) : null;
             // ignore LabeledStatements
             if (nextStatement != null) {
-                while (nextStatement.isLabeledStmt())
-                    nextStatement = nextStatement.asLabeledStmt().getStatement();
+                while (nextStatement.isLabeledStmt()) nextStatement = nextStatement.asLabeledStmt().getStatement();
             }
             // Positon to insert new statements
             int insertPosition = pos;
@@ -254,34 +242,22 @@ private int handleJmlStatementLevel(BlockStmt p, JmlDocStmt n, int pos) {
                     p.getStatements().add(insertPosition++, (JmlStatement) child);
                 } else if (child instanceof Modifier) {
                     if (nextStatement == null) {
-                        reporter.report(
-                                child, "You passed a modifier but there is following " + "statement to carry it.");
+                        reporter.report(child, "You passed a modifier but there is following " + "statement to carry it.");
                     } else {
                         try {
-                            ((NodeWithModifiers<?>) nextStatement)
-                                    .getModifiers()
-                                    .add((Modifier) child);
+                            ((NodeWithModifiers<?>) nextStatement).getModifiers().add((Modifier) child);
                         } catch (ClassCastException e) {
-                            reporter.report(
-                                    nextStatement,
-                                    "You passed a JML modifier but the following "
-                                            + "statement is not able to carry modifiers. "
-                                            + nextStatement.getMetaModel().getTypeName());
+                            reporter.report(nextStatement, "You passed a JML modifier but the following " + "statement is not able to carry modifiers. " + nextStatement.getMetaModel().getTypeName());
                         }
                     }
                 } else if (child instanceof JmlContract) {
                     if (nextStatement == null) {
-                        reporter.report(
-                                child, "You passed a contract but there is following " + "statement to carry it.");
+                        reporter.report(child, "You passed a contract but there is following " + "statement to carry it.");
                     } else {
                         try {
                             ((NodeWithContracts<?>) nextStatement).addContracts((JmlContract) child);
                         } catch (ClassCastException e) {
-                            reporter.report(
-                                    nextStatement,
-                                    "You passed a JML contract but the following "
-                                            + "statement is not able to carry contract. "
-                                            + nextStatement.getMetaModel().getTypeName());
+                            reporter.report(nextStatement, "You passed a JML contract but the following " + "statement is not able to carry contract. " + nextStatement.getMetaModel().getTypeName());
                         }
                     }
                 } else {
@@ -305,10 +281,10 @@ private void handleModifier(Modifier n) {
             JmlDocModifier doc = (JmlDocModifier) n.getKeyword();
             if (n.getParentNode().isPresent()) {
                 processedJmlDoc.add(n);
-                NodeWithModifiers<?> parent =
-                        (NodeWithModifiers<?>) n.getParentNode().get();
+                NodeWithModifiers<?> parent = (NodeWithModifiers<?>) n.getParentNode().get();
                 ArbitraryNodeContainer t = parseJmlModifierLevel(doc.getJmlComments());
-                if (t == null) return;
+                if (t == null)
+                    return;
                 setJmlTags(t);
                 for (Node child : t.getChildren()) {
                     if (child instanceof Modifier) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlUtility.java b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlUtility.java
index 686d091c22..77b70e9dc5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlUtility.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlUtility.java
@@ -24,9 +24,7 @@ public static void fixRangeContracts(@NotNull NodeWithContracts<? extends Node>
         Optional<JmlContract> first;
         var m = ((Node) n);
         var r = m.getRange();
-        if (r.isPresent()
-                && (first = n.getContracts().getOFirst()).isPresent()
-                && first.get().getRange().isPresent()) {
+        if (r.isPresent() && (first = n.getContracts().getOFirst()).isPresent() && first.get().getRange().isPresent()) {
             m.setRange(r.get().withBegin(first.get().getRange().get().begin));
         }
     }
@@ -106,7 +104,8 @@ public Node next() {
         if (toSupply.isEmpty()) {
             explore();
         }
-        if (!toSupply.isEmpty()) return toSupply.poll();
+        if (!toSupply.isEmpty())
+            return toSupply.poll();
         throw new IllegalStateException("no more elements");
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlWarnRemaingJmlDoc.java b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlWarnRemaingJmlDoc.java
index 246e566e8d..c4d3441d5d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/jml/JmlWarnRemaingJmlDoc.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/jml/JmlWarnRemaingJmlDoc.java
@@ -32,8 +32,7 @@ public void postProcess(ParseResult<? extends Node> result, ParserConfiguration
 
     public static class JmlWarnRemainingJmlDocVisitor extends GenericVisitorAdapter<Void, Void> {
 
-        private static final String FOUND_JML_DOCUMENTATION_COMMENT =
-                "JML annotation comment was not removed properly ";
+        private static final String FOUND_JML_DOCUMENTATION_COMMENT = "JML annotation comment was not removed properly ";
 
         private final ProblemReporter problems;
 
@@ -43,38 +42,33 @@ public JmlWarnRemainingJmlDocVisitor(List<Problem> problems) {
 
         @Override
         public Void visit(JmlDocDeclaration n, Void arg) {
-            problems.report(
-                    n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName());
+            problems.report(n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName());
             return null;
         }
 
         @Override
         public Void visit(JmlDocStmt n, Void arg) {
-            problems.report(
-                    n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName());
+            problems.report(n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName());
             return null;
         }
 
         @Override
         public Void visit(JmlDoc n, Void arg) {
-            problems.report(
-                    n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName());
+            problems.report(n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName());
             return null;
         }
 
         @Override
         public Void visit(Modifier n, Void arg) {
             if (n.getKeyword() instanceof JmlDocModifier) {
-                problems.report(
-                        n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName());
+                problems.report(n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName());
             }
             return null;
         }
 
         @Override
         public Void visit(JmlDocType n, Void arg) {
-            problems.report(
-                    n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName());
+            problems.report(n, FOUND_JML_DOCUMENTATION_COMMENT + n.getMetaModel().getTypeName());
             return null;
         }
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/jml/impl/JmlAnnotationSupport.java b/javaparser-core/src/main/java/com/github/javaparser/jml/impl/JmlAnnotationSupport.java
index 38fcbed446..94222fc2e4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/jml/impl/JmlAnnotationSupport.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/jml/impl/JmlAnnotationSupport.java
@@ -30,8 +30,7 @@ public JmlAnnotationSupport(JmlAnnotationConfiguration configuration) {
     @Override
     public void postProcess(ParseResult<? extends Node> result, ParserConfiguration configuration) {
         if (result.isSuccessful()) {
-            Map<String, Modifier.DefaultKeyword> a2m =
-                    JmlAnnotationSupport.this.configuration.getAnnotationToModifier();
+            Map<String, Modifier.DefaultKeyword> a2m = JmlAnnotationSupport.this.configuration.getAnnotationToModifier();
             TreeVisitor visitor = new JmlAnnotationTranslator(a2m, result.getProblems());
             result.getResult().ifPresent(visitor::visitPreOrder);
         }
@@ -61,12 +60,7 @@ public void process(Node node) {
                         NodeWithModifiers<?> m = (NodeWithModifiers<?>) node;
                         m.addModifier(a2m.get(fqn));
                     } catch (ClassCastException e) {
-                        problemReport.report(
-                                annotation,
-                                "Could not translate annotation %s into a modifier. "
-                                        + "Target node '%s' does support modifiers.",
-                                annotation.getName(),
-                                node.getMetaModel().getTypeName());
+                        problemReport.report(annotation, "Could not translate annotation %s into a modifier. " + "Target node '%s' does support modifiers.", annotation.getName(), node.getMetaModel().getTypeName());
                     }
                 }
             }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationDeclarationMetaModel.java
index c0916a5682..3fa96e54fe 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.AnnotationDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.body.AnnotationDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class AnnotationDeclarationMetaModel extends TypeDeclarationMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     AnnotationDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                AnnotationDeclaration.class,
-                "AnnotationDeclaration",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, AnnotationDeclaration.class, "AnnotationDeclaration", "com.github.javaparser.ast.body", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationExprMetaModel.java
index c3bc512536..32f407e51a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationExprMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.expr.AnnotationExpr;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.expr.AnnotationExpr;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class AnnotationExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     AnnotationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                AnnotationExpr.class,
-                "AnnotationExpr",
-                "com.github.javaparser.ast.expr",
-                true,
-                false);
+        super(superBaseNodeMetaModel, AnnotationExpr.class, "AnnotationExpr", "com.github.javaparser.ast.expr", true, false);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected AnnotationExprMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected AnnotationExprMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationMemberDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationMemberDeclarationMetaModel.java
index c603478fe7..6dfe02e684 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationMemberDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AnnotationMemberDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.AnnotationMemberDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.body.AnnotationMemberDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class AnnotationMemberDeclarationMetaModel extends BodyDeclarationMetaMod
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     AnnotationMemberDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                AnnotationMemberDeclaration.class,
-                "AnnotationMemberDeclaration",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, AnnotationMemberDeclaration.class, "AnnotationMemberDeclaration", "com.github.javaparser.ast.body", false, false);
     }
 
     public PropertyMetaModel defaultValuePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayAccessExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayAccessExprMetaModel.java
index 7ce2a3aa9a..ac466e9ee2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayAccessExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayAccessExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.ArrayAccessExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.ArrayAccessExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ArrayAccessExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ArrayAccessExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ArrayAccessExpr.class,
-                "ArrayAccessExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ArrayAccessExpr.class, "ArrayAccessExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel indexPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationExprMetaModel.java
index e60fc3be8f..44f0eb14b2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.ArrayCreationExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.ArrayCreationExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ArrayCreationExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ArrayCreationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ArrayCreationExpr.class,
-                "ArrayCreationExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ArrayCreationExpr.class, "ArrayCreationExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel elementTypePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationLevelMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationLevelMetaModel.java
index 92eda1ae8c..b42a8a5817 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationLevelMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayCreationLevelMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
 import com.github.javaparser.ast.ArrayCreationLevel;
 import com.github.javaparser.ast.Generated;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ArrayCreationLevelMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ArrayCreationLevelMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ArrayCreationLevel.class,
-                "ArrayCreationLevel",
-                "com.github.javaparser.ast",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ArrayCreationLevel.class, "ArrayCreationLevel", "com.github.javaparser.ast", false, false);
     }
 
     public PropertyMetaModel annotationsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayInitializerExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayInitializerExprMetaModel.java
index 3cc4196b7f..bf62e4d067 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayInitializerExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayInitializerExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.ArrayInitializerExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.ArrayInitializerExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ArrayInitializerExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ArrayInitializerExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ArrayInitializerExpr.class,
-                "ArrayInitializerExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ArrayInitializerExpr.class, "ArrayInitializerExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel valuesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayTypeMetaModel.java
index da951e3fb7..95ee2670d7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayTypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ArrayTypeMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.type.ArrayType;
 import java.util.Optional;
+import com.github.javaparser.ast.type.ArrayType;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssertStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssertStmtMetaModel.java
index 6c3047816d..22e643b9c8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssertStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssertStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.AssertStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.AssertStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssignExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssignExprMetaModel.java
index 00310dccc5..d37c7e31cf 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssignExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/AssignExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.AssignExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.AssignExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BaseNodeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BaseNodeMetaModel.java
index 34cf34fc58..5af1b9f6d5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BaseNodeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BaseNodeMetaModel.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.metamodel;
 
 import static com.github.javaparser.utils.Utils.decapitalize;
-
 import com.github.javaparser.ast.AllFieldsConstructor;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
@@ -55,13 +54,7 @@ public abstract class BaseNodeMetaModel {
 
     private final boolean hasWildcard;
 
-    public BaseNodeMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    public BaseNodeMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         this.superNodeMetaModel = superNodeMetaModel;
         this.type = type;
         this.name = name;
@@ -173,10 +166,13 @@ public boolean isRootNode() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         BaseNodeMetaModel classMetaModel = (BaseNodeMetaModel) o;
-        if (!type.equals(classMetaModel.type)) return false;
+        if (!type.equals(classMetaModel.type))
+            return false;
         return true;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BinaryExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BinaryExprMetaModel.java
index bb17fd1713..443744f832 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BinaryExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BinaryExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.BinaryExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.BinaryExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockCommentMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockCommentMetaModel.java
index fd94dcb4f1..154006338b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockCommentMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockCommentMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.comments.BlockComment;
 import java.util.Optional;
+import com.github.javaparser.ast.comments.BlockComment;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class BlockCommentMetaModel extends CommentMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     BlockCommentMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                BlockComment.class,
-                "BlockComment",
-                "com.github.javaparser.ast.comments",
-                false,
-                false);
+        super(superBaseNodeMetaModel, BlockComment.class, "BlockComment", "com.github.javaparser.ast.comments", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockStmtMetaModel.java
index f20f8776be..5b0886f0ae 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BlockStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.BlockStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.BlockStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BodyDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BodyDeclarationMetaModel.java
index 0d727566ab..ec0f5a4dcd 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BodyDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BodyDeclarationMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.body.BodyDeclaration;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.body.BodyDeclaration;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class BodyDeclarationMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     BodyDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                BodyDeclaration.class,
-                "BodyDeclaration",
-                "com.github.javaparser.ast.body",
-                true,
-                true);
+        super(superBaseNodeMetaModel, BodyDeclaration.class, "BodyDeclaration", "com.github.javaparser.ast.body", true, true);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected BodyDeclarationMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected BodyDeclarationMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BooleanLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BooleanLiteralExprMetaModel.java
index b6eb1679f3..53b03b57d1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BooleanLiteralExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BooleanLiteralExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.BooleanLiteralExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.BooleanLiteralExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class BooleanLiteralExprMetaModel extends LiteralExprMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     BooleanLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                BooleanLiteralExpr.class,
-                "BooleanLiteralExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, BooleanLiteralExpr.class, "BooleanLiteralExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel valuePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreakStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreakStmtMetaModel.java
index 81973b3fa4..1ce94f158b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreakStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreakStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.BreakStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.BreakStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreaksClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreaksClauseMetaModel.java
index bab3a4b4f2..a40c878b5b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreaksClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/BreaksClauseMetaModel.java
@@ -21,7 +21,7 @@
 package com.github.javaparser.metamodel;
 
 import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlClauseLabel;
+import com.github.javaparser.ast.jml.clauses.JmlLabledClause;
 import java.util.Optional;
 
 /**
@@ -38,13 +38,7 @@ public class BreaksClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     BreaksClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlClauseLabel.class,
-                "BreaksClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlLabledClause.class, "BreaksClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel exprPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableClauseMetaModel.java
index ea310582f4..58cb67abb5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableClauseMetaModel.java
@@ -38,12 +38,6 @@ public class CallableClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     CallableClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlCallableClause.class,
-                "CallableClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlCallableClause.class, "CallableClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableDeclarationMetaModel.java
index e79de3fbc1..9bd72dc904 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableDeclarationMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.body.CallableDeclaration;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.body.CallableDeclaration;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class CallableDeclarationMetaModel extends BodyDeclarationMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     CallableDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                CallableDeclaration.class,
-                "CallableDeclaration",
-                "com.github.javaparser.ast.body",
-                true,
-                true);
+        super(superBaseNodeMetaModel, CallableDeclaration.class, "CallableDeclaration", "com.github.javaparser.ast.body", true, true);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected CallableDeclarationMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected CallableDeclarationMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableMetaModel.java
index 682680375a..b113ffee4c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CallableMetaModel.java
@@ -38,12 +38,6 @@ public class CallableMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     CallableMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlCallableClause.class,
-                "Callable",
-                "com.github.javaparser.ast.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlCallableClause.class, "Callable", "com.github.javaparser.ast.clauses", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CastExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CastExprMetaModel.java
index a226f0a9dd..8966f4598f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CastExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CastExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.CastExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.CastExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CatchClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CatchClauseMetaModel.java
index 19d3331302..6d469c0eac 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CatchClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CatchClauseMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.CatchClause;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.CatchClause;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CharLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CharLiteralExprMetaModel.java
index 0acda94722..03c38da9b0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CharLiteralExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CharLiteralExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.CharLiteralExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.CharLiteralExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class CharLiteralExprMetaModel extends LiteralStringValueExprMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     CharLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                CharLiteralExpr.class,
-                "CharLiteralExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, CharLiteralExpr.class, "CharLiteralExpr", "com.github.javaparser.ast.expr", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassExprMetaModel.java
index 098eb54fc8..698eb3d53c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.ClassExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.ClassExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceDeclarationMetaModel.java
index 7e60f99ae8..c92a8c38a5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ClassOrInterfaceDeclarationMetaModel extends TypeDeclarationMetaMod
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ClassOrInterfaceDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ClassOrInterfaceDeclaration.class,
-                "ClassOrInterfaceDeclaration",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ClassOrInterfaceDeclaration.class, "ClassOrInterfaceDeclaration", "com.github.javaparser.ast.body", false, false);
     }
 
     public PropertyMetaModel extendedTypesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceTypeMetaModel.java
index 2f153f02ce..75e200564c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceTypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassOrInterfaceTypeMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import java.util.Optional;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ClassOrInterfaceTypeMetaModel extends ReferenceTypeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ClassOrInterfaceTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ClassOrInterfaceType.class,
-                "ClassOrInterfaceType",
-                "com.github.javaparser.ast.type",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ClassOrInterfaceType.class, "ClassOrInterfaceType", "com.github.javaparser.ast.type", false, false);
     }
 
     public PropertyMetaModel namePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CommentMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CommentMetaModel.java
index fb54122872..db8227dc91 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CommentMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CommentMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.comments.Comment;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -43,13 +43,7 @@ public class CommentMetaModel extends NodeMetaModel {
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected CommentMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected CommentMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompactConstructorDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompactConstructorDeclarationMetaModel.java
index 13e48082f4..eaa8252794 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompactConstructorDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompactConstructorDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.CompactConstructorDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.body.CompactConstructorDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class CompactConstructorDeclarationMetaModel extends BodyDeclarationMetaM
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     CompactConstructorDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                CompactConstructorDeclaration.class,
-                "CompactConstructorDeclaration",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, CompactConstructorDeclaration.class, "CompactConstructorDeclaration", "com.github.javaparser.ast.body", false, false);
     }
 
     public PropertyMetaModel bodyPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompilationUnitMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompilationUnitMetaModel.java
index 65c73ea06d..2c5740114b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompilationUnitMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/CompilationUnitMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Generated;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class CompilationUnitMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     CompilationUnitMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                CompilationUnit.class,
-                "CompilationUnit",
-                "com.github.javaparser.ast",
-                false,
-                false);
+        super(superBaseNodeMetaModel, CompilationUnit.class, "CompilationUnit", "com.github.javaparser.ast", false, false);
     }
 
     public PropertyMetaModel importsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ComponentPatternExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ComponentPatternExprMetaModel.java
index 8c1d40dbda..b532b52113 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ComponentPatternExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ComponentPatternExprMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.expr.ComponentPatternExpr;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.expr.ComponentPatternExpr;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class ComponentPatternExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ComponentPatternExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ComponentPatternExpr.class,
-                "ComponentPatternExpr",
-                "com.github.javaparser.ast.expr",
-                true,
-                false);
+        super(superBaseNodeMetaModel, ComponentPatternExpr.class, "ComponentPatternExpr", "com.github.javaparser.ast.expr", true, false);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected ComponentPatternExprMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected ComponentPatternExprMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConditionalExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConditionalExprMetaModel.java
index 3e2dd7e15f..39538f37a7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConditionalExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConditionalExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.ConditionalExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.ConditionalExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ConditionalExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ConditionalExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ConditionalExpr.class,
-                "ConditionalExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ConditionalExpr.class, "ConditionalExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel conditionPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConstructorDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConstructorDeclarationMetaModel.java
index 73b67f3890..157dccf48f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConstructorDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ConstructorDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.ConstructorDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.body.ConstructorDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ConstructorDeclarationMetaModel extends CallableDeclarationMetaMode
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ConstructorDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ConstructorDeclaration.class,
-                "ConstructorDeclaration",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ConstructorDeclaration.class, "ConstructorDeclaration", "com.github.javaparser.ast.body", false, false);
     }
 
     public PropertyMetaModel bodyPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ContinueStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ContinueStmtMetaModel.java
index 43b89c7498..585d7c571a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ContinueStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ContinueStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.ContinueStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.ContinueStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ContinueStmtMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ContinueStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ContinueStmt.class,
-                "ContinueStmt",
-                "com.github.javaparser.ast.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ContinueStmt.class, "ContinueStmt", "com.github.javaparser.ast.stmt", false, false);
     }
 
     public PropertyMetaModel labelPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/DerivedProperty.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/DerivedProperty.java
index 3f83db7141..5e3effb9a7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/DerivedProperty.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/DerivedProperty.java
@@ -22,7 +22,6 @@
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -34,4 +33,5 @@
  */
 @Retention(RUNTIME)
 @Target(METHOD)
-public @interface DerivedProperty {}
+public @interface DerivedProperty {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoStmtMetaModel.java
index 0cf5895182..abd408fcaf 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.DoStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.DoStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoubleLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoubleLiteralExprMetaModel.java
index 2024499caa..e6a51f516a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoubleLiteralExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/DoubleLiteralExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.DoubleLiteralExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.DoubleLiteralExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class DoubleLiteralExprMetaModel extends LiteralStringValueExprMetaModel
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     DoubleLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                DoubleLiteralExpr.class,
-                "DoubleLiteralExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, DoubleLiteralExpr.class, "DoubleLiteralExpr", "com.github.javaparser.ast.expr", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EmptyStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EmptyStmtMetaModel.java
index c3ec0f5b4f..d0376c4ef1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EmptyStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EmptyStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.EmptyStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.EmptyStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnclosedExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnclosedExprMetaModel.java
index 06a8fb0b89..56f63a8c69 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnclosedExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnclosedExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.EnclosedExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.EnclosedExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class EnclosedExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     EnclosedExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                EnclosedExpr.class,
-                "EnclosedExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, EnclosedExpr.class, "EnclosedExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel innerPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumConstantDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumConstantDeclarationMetaModel.java
index baf238ebe0..955f4a88b0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumConstantDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumConstantDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.EnumConstantDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.body.EnumConstantDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class EnumConstantDeclarationMetaModel extends BodyDeclarationMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     EnumConstantDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                EnumConstantDeclaration.class,
-                "EnumConstantDeclaration",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, EnumConstantDeclaration.class, "EnumConstantDeclaration", "com.github.javaparser.ast.body", false, false);
     }
 
     public PropertyMetaModel argumentsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumDeclarationMetaModel.java
index 9bad4e6d08..58fb98e7f2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/EnumDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.EnumDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.body.EnumDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class EnumDeclarationMetaModel extends TypeDeclarationMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     EnumDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                EnumDeclaration.class,
-                "EnumDeclaration",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, EnumDeclaration.class, "EnumDeclaration", "com.github.javaparser.ast.body", false, false);
     }
 
     public PropertyMetaModel entriesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExplicitConstructorInvocationStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExplicitConstructorInvocationStmtMetaModel.java
index 9ba9c4348f..5dc734232b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExplicitConstructorInvocationStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExplicitConstructorInvocationStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ExplicitConstructorInvocationStmtMetaModel extends StatementMetaMod
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ExplicitConstructorInvocationStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ExplicitConstructorInvocationStmt.class,
-                "ExplicitConstructorInvocationStmt",
-                "com.github.javaparser.ast.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ExplicitConstructorInvocationStmt.class, "ExplicitConstructorInvocationStmt", "com.github.javaparser.ast.stmt", false, false);
     }
 
     public PropertyMetaModel argumentsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionMetaModel.java
index 2301de75f9..0480e393a4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.expr.Expression;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -43,13 +43,7 @@ public class ExpressionMetaModel extends NodeMetaModel {
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected ExpressionMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected ExpressionMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionStmtMetaModel.java
index 48e7b8a9c9..e96f5fa609 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ExpressionStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.ExpressionStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.ExpressionStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ExpressionStmtMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ExpressionStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ExpressionStmt.class,
-                "ExpressionStmt",
-                "com.github.javaparser.ast.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ExpressionStmt.class, "ExpressionStmt", "com.github.javaparser.ast.stmt", false, false);
     }
 
     public PropertyMetaModel expressionPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldAccessExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldAccessExprMetaModel.java
index a187b928e5..a6d80a3e05 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldAccessExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldAccessExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.FieldAccessExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.FieldAccessExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class FieldAccessExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     FieldAccessExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                FieldAccessExpr.class,
-                "FieldAccessExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, FieldAccessExpr.class, "FieldAccessExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel namePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldDeclarationMetaModel.java
index 180839d3de..c2008b88c8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/FieldDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.FieldDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.body.FieldDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class FieldDeclarationMetaModel extends BodyDeclarationMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     FieldDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                FieldDeclaration.class,
-                "FieldDeclaration",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, FieldDeclaration.class, "FieldDeclaration", "com.github.javaparser.ast.body", false, false);
     }
 
     public PropertyMetaModel modifiersPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForEachStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForEachStmtMetaModel.java
index ec81035426..f8efe987b8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForEachStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForEachStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.ForEachStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.ForEachStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForStmtMetaModel.java
index d311f72f10..5e3697e53a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.ForStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.ForStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForallClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForallClauseMetaModel.java
index f54d5b5b1d..bd0d47e4a0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForallClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ForallClauseMetaModel.java
@@ -38,13 +38,7 @@ public class ForallClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ForallClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlForallClause.class,
-                "ForallClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlForallClause.class, "ForallClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel variablesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/IfStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/IfStmtMetaModel.java
index 1a055b6f61..5386197e18 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/IfStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/IfStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.IfStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.IfStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ImportDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ImportDeclarationMetaModel.java
index 33b582ca97..8771ac8205 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ImportDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ImportDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.ImportDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.ImportDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ImportDeclarationMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ImportDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ImportDeclaration.class,
-                "ImportDeclaration",
-                "com.github.javaparser.ast",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ImportDeclaration.class, "ImportDeclaration", "com.github.javaparser.ast", false, false);
     }
 
     public PropertyMetaModel isAsteriskPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/InitializerDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/InitializerDeclarationMetaModel.java
index 259e73a5af..7055226817 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/InitializerDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/InitializerDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.InitializerDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.body.InitializerDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class InitializerDeclarationMetaModel extends BodyDeclarationMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     InitializerDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                InitializerDeclaration.class,
-                "InitializerDeclaration",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, InitializerDeclaration.class, "InitializerDeclaration", "com.github.javaparser.ast.body", false, false);
     }
 
     public PropertyMetaModel bodyPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/InstanceOfExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/InstanceOfExprMetaModel.java
index 1780cd6c06..72eebbaf8f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/InstanceOfExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/InstanceOfExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.InstanceOfExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.InstanceOfExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class InstanceOfExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     InstanceOfExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                InstanceOfExpr.class,
-                "InstanceOfExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, InstanceOfExpr.class, "InstanceOfExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel expressionPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntegerLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntegerLiteralExprMetaModel.java
index a8123a1beb..181f45e641 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntegerLiteralExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntegerLiteralExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.IntegerLiteralExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.IntegerLiteralExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class IntegerLiteralExprMetaModel extends LiteralStringValueExprMetaModel
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     IntegerLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                IntegerLiteralExpr.class,
-                "IntegerLiteralExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, IntegerLiteralExpr.class, "IntegerLiteralExpr", "com.github.javaparser.ast.expr", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/InternalProperty.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/InternalProperty.java
index f9c02ff05a..d5252b6181 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/InternalProperty.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/InternalProperty.java
@@ -22,7 +22,6 @@
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -33,4 +32,5 @@
  */
 @Retention(RUNTIME)
 @Target(FIELD)
-public @interface InternalProperty {}
+public @interface InternalProperty {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntersectionTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntersectionTypeMetaModel.java
index f525be908a..d6566f9379 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntersectionTypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/IntersectionTypeMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.type.IntersectionType;
 import java.util.Optional;
+import com.github.javaparser.ast.type.IntersectionType;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class IntersectionTypeMetaModel extends TypeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     IntersectionTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                IntersectionType.class,
-                "IntersectionType",
-                "com.github.javaparser.ast.type",
-                false,
-                false);
+        super(superBaseNodeMetaModel, IntersectionType.class, "IntersectionType", "com.github.javaparser.ast.type", false, false);
     }
 
     public PropertyMetaModel elementsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java
index 55bc7e1471..5bed7c254a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavaParserMetaModel.java
@@ -30,35 +30,22 @@
  */
 public final class JavaParserMetaModel {
 
-    private JavaParserMetaModel() {}
+    private JavaParserMetaModel() {
+    }
 
     private static final List<BaseNodeMetaModel> nodeMetaModels = new ArrayList<>();
 
     @Generated("com.github.javaparser.generator.metamodel.MetaModelGenerator")
     private static void initializeConstructorParameters() {
         bodyDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
-        callableDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.modifiersPropertyMetaModel);
-        callableDeclarationMetaModel
-                .getConstructorParameters()
-                .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
-        callableDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.typeParametersPropertyMetaModel);
+        callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.modifiersPropertyMetaModel);
+        callableDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
+        callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.typeParametersPropertyMetaModel);
         callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.namePropertyMetaModel);
-        callableDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.parametersPropertyMetaModel);
-        callableDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel);
-        callableDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel);
-        callableDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.contractsPropertyMetaModel);
+        callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.parametersPropertyMetaModel);
+        callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel);
+        callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel);
+        callableDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.contractsPropertyMetaModel);
         typeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
         annotationExprMetaModel.getConstructorParameters().add(annotationExprMetaModel.namePropertyMetaModel);
         referenceTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
@@ -66,230 +53,104 @@ private static void initializeConstructorParameters() {
         typeDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
         typeDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel);
         typeDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel);
-        literalStringValueExprMetaModel
-                .getConstructorParameters()
-                .add(literalStringValueExprMetaModel.valuePropertyMetaModel);
-        stringLiteralExprMetaModel
-                .getConstructorParameters()
-                .add(literalStringValueExprMetaModel.valuePropertyMetaModel);
-        moduleDeclarationMetaModel
-                .getConstructorParameters()
-                .add(moduleDeclarationMetaModel.annotationsPropertyMetaModel);
+        literalStringValueExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel);
+        stringLiteralExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel);
+        moduleDeclarationMetaModel.getConstructorParameters().add(moduleDeclarationMetaModel.annotationsPropertyMetaModel);
         moduleDeclarationMetaModel.getConstructorParameters().add(moduleDeclarationMetaModel.namePropertyMetaModel);
         moduleDeclarationMetaModel.getConstructorParameters().add(moduleDeclarationMetaModel.isOpenPropertyMetaModel);
-        moduleDeclarationMetaModel
-                .getConstructorParameters()
-                .add(moduleDeclarationMetaModel.directivesPropertyMetaModel);
-        arrayCreationLevelMetaModel
-                .getConstructorParameters()
-                .add(arrayCreationLevelMetaModel.dimensionPropertyMetaModel);
-        arrayCreationLevelMetaModel
-                .getConstructorParameters()
-                .add(arrayCreationLevelMetaModel.annotationsPropertyMetaModel);
-        compilationUnitMetaModel
-                .getConstructorParameters()
-                .add(compilationUnitMetaModel.packageDeclarationPropertyMetaModel);
+        moduleDeclarationMetaModel.getConstructorParameters().add(moduleDeclarationMetaModel.directivesPropertyMetaModel);
+        arrayCreationLevelMetaModel.getConstructorParameters().add(arrayCreationLevelMetaModel.dimensionPropertyMetaModel);
+        arrayCreationLevelMetaModel.getConstructorParameters().add(arrayCreationLevelMetaModel.annotationsPropertyMetaModel);
+        compilationUnitMetaModel.getConstructorParameters().add(compilationUnitMetaModel.packageDeclarationPropertyMetaModel);
         compilationUnitMetaModel.getConstructorParameters().add(compilationUnitMetaModel.importsPropertyMetaModel);
         compilationUnitMetaModel.getConstructorParameters().add(compilationUnitMetaModel.typesPropertyMetaModel);
         compilationUnitMetaModel.getConstructorParameters().add(compilationUnitMetaModel.modulePropertyMetaModel);
         importDeclarationMetaModel.getConstructorParameters().add(importDeclarationMetaModel.namePropertyMetaModel);
         importDeclarationMetaModel.getConstructorParameters().add(importDeclarationMetaModel.isStaticPropertyMetaModel);
-        importDeclarationMetaModel
-                .getConstructorParameters()
-                .add(importDeclarationMetaModel.isAsteriskPropertyMetaModel);
+        importDeclarationMetaModel.getConstructorParameters().add(importDeclarationMetaModel.isAsteriskPropertyMetaModel);
         importDeclarationMetaModel.getConstructorParameters().add(importDeclarationMetaModel.isModulePropertyMetaModel);
-        importDeclarationMetaModel
-                .getConstructorParameters()
-                .add(importDeclarationMetaModel.isJmlModelPropertyMetaModel);
+        importDeclarationMetaModel.getConstructorParameters().add(importDeclarationMetaModel.isJmlModelPropertyMetaModel);
         modifierMetaModel.getConstructorParameters().add(modifierMetaModel.keywordPropertyMetaModel);
-        packageDeclarationMetaModel
-                .getConstructorParameters()
-                .add(packageDeclarationMetaModel.annotationsPropertyMetaModel);
+        packageDeclarationMetaModel.getConstructorParameters().add(packageDeclarationMetaModel.annotationsPropertyMetaModel);
         packageDeclarationMetaModel.getConstructorParameters().add(packageDeclarationMetaModel.namePropertyMetaModel);
-        annotationDeclarationMetaModel
-                .getConstructorParameters()
-                .add(typeDeclarationMetaModel.modifiersPropertyMetaModel);
-        annotationDeclarationMetaModel
-                .getConstructorParameters()
-                .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
+        annotationDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.modifiersPropertyMetaModel);
+        annotationDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
         annotationDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel);
-        annotationDeclarationMetaModel
-                .getConstructorParameters()
-                .add(typeDeclarationMetaModel.membersPropertyMetaModel);
-        annotationMemberDeclarationMetaModel
-                .getConstructorParameters()
-                .add(annotationMemberDeclarationMetaModel.modifiersPropertyMetaModel);
-        annotationMemberDeclarationMetaModel
-                .getConstructorParameters()
-                .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
-        annotationMemberDeclarationMetaModel
-                .getConstructorParameters()
-                .add(annotationMemberDeclarationMetaModel.typePropertyMetaModel);
-        annotationMemberDeclarationMetaModel
-                .getConstructorParameters()
-                .add(annotationMemberDeclarationMetaModel.namePropertyMetaModel);
-        annotationMemberDeclarationMetaModel
-                .getConstructorParameters()
-                .add(annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel
-                .getConstructorParameters()
-                .add(typeDeclarationMetaModel.modifiersPropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel
-                .getConstructorParameters()
-                .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel
-                .getConstructorParameters()
-                .add(classOrInterfaceDeclarationMetaModel.isInterfacePropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel
-                .getConstructorParameters()
-                .add(typeDeclarationMetaModel.namePropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel
-                .getConstructorParameters()
-                .add(classOrInterfaceDeclarationMetaModel.typeParametersPropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel
-                .getConstructorParameters()
-                .add(classOrInterfaceDeclarationMetaModel.extendedTypesPropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel
-                .getConstructorParameters()
-                .add(classOrInterfaceDeclarationMetaModel.implementedTypesPropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel
-                .getConstructorParameters()
-                .add(classOrInterfaceDeclarationMetaModel.permittedTypesPropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel
-                .getConstructorParameters()
-                .add(typeDeclarationMetaModel.membersPropertyMetaModel);
-        constructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.modifiersPropertyMetaModel);
-        constructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
-        constructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.typeParametersPropertyMetaModel);
-        constructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.namePropertyMetaModel);
-        constructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.parametersPropertyMetaModel);
-        constructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel);
-        constructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(constructorDeclarationMetaModel.bodyPropertyMetaModel);
-        constructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel);
-        constructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.contractsPropertyMetaModel);
-        enumConstantDeclarationMetaModel
-                .getConstructorParameters()
-                .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
-        enumConstantDeclarationMetaModel
-                .getConstructorParameters()
-                .add(enumConstantDeclarationMetaModel.namePropertyMetaModel);
-        enumConstantDeclarationMetaModel
-                .getConstructorParameters()
-                .add(enumConstantDeclarationMetaModel.argumentsPropertyMetaModel);
-        enumConstantDeclarationMetaModel
-                .getConstructorParameters()
-                .add(enumConstantDeclarationMetaModel.classBodyPropertyMetaModel);
+        annotationDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel);
+        annotationMemberDeclarationMetaModel.getConstructorParameters().add(annotationMemberDeclarationMetaModel.modifiersPropertyMetaModel);
+        annotationMemberDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
+        annotationMemberDeclarationMetaModel.getConstructorParameters().add(annotationMemberDeclarationMetaModel.typePropertyMetaModel);
+        annotationMemberDeclarationMetaModel.getConstructorParameters().add(annotationMemberDeclarationMetaModel.namePropertyMetaModel);
+        annotationMemberDeclarationMetaModel.getConstructorParameters().add(annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.modifiersPropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(classOrInterfaceDeclarationMetaModel.isInterfacePropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(classOrInterfaceDeclarationMetaModel.typeParametersPropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(classOrInterfaceDeclarationMetaModel.extendedTypesPropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(classOrInterfaceDeclarationMetaModel.implementedTypesPropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(classOrInterfaceDeclarationMetaModel.permittedTypesPropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel);
+        constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.modifiersPropertyMetaModel);
+        constructorDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
+        constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.typeParametersPropertyMetaModel);
+        constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.namePropertyMetaModel);
+        constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.parametersPropertyMetaModel);
+        constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel);
+        constructorDeclarationMetaModel.getConstructorParameters().add(constructorDeclarationMetaModel.bodyPropertyMetaModel);
+        constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel);
+        constructorDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.contractsPropertyMetaModel);
+        enumConstantDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
+        enumConstantDeclarationMetaModel.getConstructorParameters().add(enumConstantDeclarationMetaModel.namePropertyMetaModel);
+        enumConstantDeclarationMetaModel.getConstructorParameters().add(enumConstantDeclarationMetaModel.argumentsPropertyMetaModel);
+        enumConstantDeclarationMetaModel.getConstructorParameters().add(enumConstantDeclarationMetaModel.classBodyPropertyMetaModel);
         enumDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.modifiersPropertyMetaModel);
         enumDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
         enumDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel);
-        enumDeclarationMetaModel
-                .getConstructorParameters()
-                .add(enumDeclarationMetaModel.implementedTypesPropertyMetaModel);
+        enumDeclarationMetaModel.getConstructorParameters().add(enumDeclarationMetaModel.implementedTypesPropertyMetaModel);
         enumDeclarationMetaModel.getConstructorParameters().add(enumDeclarationMetaModel.entriesPropertyMetaModel);
         enumDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel);
         fieldDeclarationMetaModel.getConstructorParameters().add(fieldDeclarationMetaModel.modifiersPropertyMetaModel);
         fieldDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
         fieldDeclarationMetaModel.getConstructorParameters().add(fieldDeclarationMetaModel.variablesPropertyMetaModel);
-        initializerDeclarationMetaModel
-                .getConstructorParameters()
-                .add(initializerDeclarationMetaModel.isStaticPropertyMetaModel);
-        initializerDeclarationMetaModel
-                .getConstructorParameters()
-                .add(initializerDeclarationMetaModel.bodyPropertyMetaModel);
-        methodDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.modifiersPropertyMetaModel);
-        methodDeclarationMetaModel
-                .getConstructorParameters()
-                .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
-        methodDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.typeParametersPropertyMetaModel);
+        initializerDeclarationMetaModel.getConstructorParameters().add(initializerDeclarationMetaModel.isStaticPropertyMetaModel);
+        initializerDeclarationMetaModel.getConstructorParameters().add(initializerDeclarationMetaModel.bodyPropertyMetaModel);
+        methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.modifiersPropertyMetaModel);
+        methodDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
+        methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.typeParametersPropertyMetaModel);
         methodDeclarationMetaModel.getConstructorParameters().add(methodDeclarationMetaModel.typePropertyMetaModel);
         methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.namePropertyMetaModel);
-        methodDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.parametersPropertyMetaModel);
-        methodDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel);
+        methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.parametersPropertyMetaModel);
+        methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel);
         methodDeclarationMetaModel.getConstructorParameters().add(methodDeclarationMetaModel.bodyPropertyMetaModel);
-        methodDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel);
-        methodDeclarationMetaModel
-                .getConstructorParameters()
-                .add(callableDeclarationMetaModel.contractsPropertyMetaModel);
+        methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel);
+        methodDeclarationMetaModel.getConstructorParameters().add(callableDeclarationMetaModel.contractsPropertyMetaModel);
         parameterMetaModel.getConstructorParameters().add(parameterMetaModel.modifiersPropertyMetaModel);
         parameterMetaModel.getConstructorParameters().add(parameterMetaModel.annotationsPropertyMetaModel);
         parameterMetaModel.getConstructorParameters().add(parameterMetaModel.typePropertyMetaModel);
         parameterMetaModel.getConstructorParameters().add(parameterMetaModel.isVarArgsPropertyMetaModel);
         parameterMetaModel.getConstructorParameters().add(parameterMetaModel.varArgsAnnotationsPropertyMetaModel);
         parameterMetaModel.getConstructorParameters().add(parameterMetaModel.namePropertyMetaModel);
-        receiverParameterMetaModel
-                .getConstructorParameters()
-                .add(receiverParameterMetaModel.annotationsPropertyMetaModel);
+        receiverParameterMetaModel.getConstructorParameters().add(receiverParameterMetaModel.annotationsPropertyMetaModel);
         receiverParameterMetaModel.getConstructorParameters().add(receiverParameterMetaModel.typePropertyMetaModel);
         receiverParameterMetaModel.getConstructorParameters().add(receiverParameterMetaModel.namePropertyMetaModel);
         recordDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.modifiersPropertyMetaModel);
-        recordDeclarationMetaModel
-                .getConstructorParameters()
-                .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
+        recordDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
         recordDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel);
-        recordDeclarationMetaModel
-                .getConstructorParameters()
-                .add(recordDeclarationMetaModel.parametersPropertyMetaModel);
-        recordDeclarationMetaModel
-                .getConstructorParameters()
-                .add(recordDeclarationMetaModel.typeParametersPropertyMetaModel);
-        recordDeclarationMetaModel
-                .getConstructorParameters()
-                .add(recordDeclarationMetaModel.implementedTypesPropertyMetaModel);
+        recordDeclarationMetaModel.getConstructorParameters().add(recordDeclarationMetaModel.parametersPropertyMetaModel);
+        recordDeclarationMetaModel.getConstructorParameters().add(recordDeclarationMetaModel.typeParametersPropertyMetaModel);
+        recordDeclarationMetaModel.getConstructorParameters().add(recordDeclarationMetaModel.implementedTypesPropertyMetaModel);
         recordDeclarationMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel);
-        recordDeclarationMetaModel
-                .getConstructorParameters()
-                .add(recordDeclarationMetaModel.receiverParameterPropertyMetaModel);
-        compactConstructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(compactConstructorDeclarationMetaModel.modifiersPropertyMetaModel);
-        compactConstructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
-        compactConstructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(compactConstructorDeclarationMetaModel.typeParametersPropertyMetaModel);
-        compactConstructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(compactConstructorDeclarationMetaModel.namePropertyMetaModel);
-        compactConstructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(compactConstructorDeclarationMetaModel.thrownExceptionsPropertyMetaModel);
-        compactConstructorDeclarationMetaModel
-                .getConstructorParameters()
-                .add(compactConstructorDeclarationMetaModel.bodyPropertyMetaModel);
+        recordDeclarationMetaModel.getConstructorParameters().add(recordDeclarationMetaModel.receiverParameterPropertyMetaModel);
+        compactConstructorDeclarationMetaModel.getConstructorParameters().add(compactConstructorDeclarationMetaModel.modifiersPropertyMetaModel);
+        compactConstructorDeclarationMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
+        compactConstructorDeclarationMetaModel.getConstructorParameters().add(compactConstructorDeclarationMetaModel.typeParametersPropertyMetaModel);
+        compactConstructorDeclarationMetaModel.getConstructorParameters().add(compactConstructorDeclarationMetaModel.namePropertyMetaModel);
+        compactConstructorDeclarationMetaModel.getConstructorParameters().add(compactConstructorDeclarationMetaModel.thrownExceptionsPropertyMetaModel);
+        compactConstructorDeclarationMetaModel.getConstructorParameters().add(compactConstructorDeclarationMetaModel.bodyPropertyMetaModel);
         variableDeclaratorMetaModel.getConstructorParameters().add(variableDeclaratorMetaModel.typePropertyMetaModel);
         variableDeclaratorMetaModel.getConstructorParameters().add(variableDeclaratorMetaModel.namePropertyMetaModel);
-        variableDeclaratorMetaModel
-                .getConstructorParameters()
-                .add(variableDeclaratorMetaModel.initializerPropertyMetaModel);
+        variableDeclaratorMetaModel.getConstructorParameters().add(variableDeclaratorMetaModel.initializerPropertyMetaModel);
         commentMetaModel.getConstructorParameters().add(commentMetaModel.contentPropertyMetaModel);
         javadocCommentMetaModel.getConstructorParameters().add(commentMetaModel.contentPropertyMetaModel);
         blockCommentMetaModel.getConstructorParameters().add(commentMetaModel.contentPropertyMetaModel);
@@ -298,16 +159,10 @@ private static void initializeConstructorParameters() {
         markdownCommentMetaModel.getConstructorParameters().add(commentMetaModel.contentPropertyMetaModel);
         arrayAccessExprMetaModel.getConstructorParameters().add(arrayAccessExprMetaModel.namePropertyMetaModel);
         arrayAccessExprMetaModel.getConstructorParameters().add(arrayAccessExprMetaModel.indexPropertyMetaModel);
-        arrayCreationExprMetaModel
-                .getConstructorParameters()
-                .add(arrayCreationExprMetaModel.elementTypePropertyMetaModel);
+        arrayCreationExprMetaModel.getConstructorParameters().add(arrayCreationExprMetaModel.elementTypePropertyMetaModel);
         arrayCreationExprMetaModel.getConstructorParameters().add(arrayCreationExprMetaModel.levelsPropertyMetaModel);
-        arrayCreationExprMetaModel
-                .getConstructorParameters()
-                .add(arrayCreationExprMetaModel.initializerPropertyMetaModel);
-        arrayInitializerExprMetaModel
-                .getConstructorParameters()
-                .add(arrayInitializerExprMetaModel.valuesPropertyMetaModel);
+        arrayCreationExprMetaModel.getConstructorParameters().add(arrayCreationExprMetaModel.initializerPropertyMetaModel);
+        arrayInitializerExprMetaModel.getConstructorParameters().add(arrayInitializerExprMetaModel.valuesPropertyMetaModel);
         assignExprMetaModel.getConstructorParameters().add(assignExprMetaModel.targetPropertyMetaModel);
         assignExprMetaModel.getConstructorParameters().add(assignExprMetaModel.valuePropertyMetaModel);
         assignExprMetaModel.getConstructorParameters().add(assignExprMetaModel.operatorPropertyMetaModel);
@@ -322,21 +177,15 @@ private static void initializeConstructorParameters() {
         conditionalExprMetaModel.getConstructorParameters().add(conditionalExprMetaModel.conditionPropertyMetaModel);
         conditionalExprMetaModel.getConstructorParameters().add(conditionalExprMetaModel.thenExprPropertyMetaModel);
         conditionalExprMetaModel.getConstructorParameters().add(conditionalExprMetaModel.elseExprPropertyMetaModel);
-        doubleLiteralExprMetaModel
-                .getConstructorParameters()
-                .add(literalStringValueExprMetaModel.valuePropertyMetaModel);
+        doubleLiteralExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel);
         enclosedExprMetaModel.getConstructorParameters().add(enclosedExprMetaModel.innerPropertyMetaModel);
         fieldAccessExprMetaModel.getConstructorParameters().add(fieldAccessExprMetaModel.scopePropertyMetaModel);
-        fieldAccessExprMetaModel
-                .getConstructorParameters()
-                .add(fieldAccessExprMetaModel.typeArgumentsPropertyMetaModel);
+        fieldAccessExprMetaModel.getConstructorParameters().add(fieldAccessExprMetaModel.typeArgumentsPropertyMetaModel);
         fieldAccessExprMetaModel.getConstructorParameters().add(fieldAccessExprMetaModel.namePropertyMetaModel);
         instanceOfExprMetaModel.getConstructorParameters().add(instanceOfExprMetaModel.expressionPropertyMetaModel);
         instanceOfExprMetaModel.getConstructorParameters().add(instanceOfExprMetaModel.typePropertyMetaModel);
         instanceOfExprMetaModel.getConstructorParameters().add(instanceOfExprMetaModel.patternPropertyMetaModel);
-        integerLiteralExprMetaModel
-                .getConstructorParameters()
-                .add(literalStringValueExprMetaModel.valuePropertyMetaModel);
+        integerLiteralExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel);
         lambdaExprMetaModel.getConstructorParameters().add(lambdaExprMetaModel.parametersPropertyMetaModel);
         lambdaExprMetaModel.getConstructorParameters().add(lambdaExprMetaModel.bodyPropertyMetaModel);
         lambdaExprMetaModel.getConstructorParameters().add(lambdaExprMetaModel.isEnclosingParametersPropertyMetaModel);
@@ -348,54 +197,30 @@ private static void initializeConstructorParameters() {
         methodCallExprMetaModel.getConstructorParameters().add(methodCallExprMetaModel.typeArgumentsPropertyMetaModel);
         methodCallExprMetaModel.getConstructorParameters().add(methodCallExprMetaModel.namePropertyMetaModel);
         methodCallExprMetaModel.getConstructorParameters().add(methodCallExprMetaModel.argumentsPropertyMetaModel);
-        methodReferenceExprMetaModel
-                .getConstructorParameters()
-                .add(methodReferenceExprMetaModel.scopePropertyMetaModel);
-        methodReferenceExprMetaModel
-                .getConstructorParameters()
-                .add(methodReferenceExprMetaModel.typeArgumentsPropertyMetaModel);
-        methodReferenceExprMetaModel
-                .getConstructorParameters()
-                .add(methodReferenceExprMetaModel.identifierPropertyMetaModel);
+        methodReferenceExprMetaModel.getConstructorParameters().add(methodReferenceExprMetaModel.scopePropertyMetaModel);
+        methodReferenceExprMetaModel.getConstructorParameters().add(methodReferenceExprMetaModel.typeArgumentsPropertyMetaModel);
+        methodReferenceExprMetaModel.getConstructorParameters().add(methodReferenceExprMetaModel.identifierPropertyMetaModel);
         nameExprMetaModel.getConstructorParameters().add(nameExprMetaModel.namePropertyMetaModel);
         nameMetaModel.getConstructorParameters().add(nameMetaModel.qualifierPropertyMetaModel);
         nameMetaModel.getConstructorParameters().add(nameMetaModel.identifierPropertyMetaModel);
         normalAnnotationExprMetaModel.getConstructorParameters().add(annotationExprMetaModel.namePropertyMetaModel);
-        normalAnnotationExprMetaModel
-                .getConstructorParameters()
-                .add(normalAnnotationExprMetaModel.pairsPropertyMetaModel);
+        normalAnnotationExprMetaModel.getConstructorParameters().add(normalAnnotationExprMetaModel.pairsPropertyMetaModel);
         objectCreationExprMetaModel.getConstructorParameters().add(objectCreationExprMetaModel.scopePropertyMetaModel);
         objectCreationExprMetaModel.getConstructorParameters().add(objectCreationExprMetaModel.typePropertyMetaModel);
-        objectCreationExprMetaModel
-                .getConstructorParameters()
-                .add(objectCreationExprMetaModel.typeArgumentsPropertyMetaModel);
-        objectCreationExprMetaModel
-                .getConstructorParameters()
-                .add(objectCreationExprMetaModel.argumentsPropertyMetaModel);
-        objectCreationExprMetaModel
-                .getConstructorParameters()
-                .add(objectCreationExprMetaModel.anonymousClassBodyPropertyMetaModel);
+        objectCreationExprMetaModel.getConstructorParameters().add(objectCreationExprMetaModel.typeArgumentsPropertyMetaModel);
+        objectCreationExprMetaModel.getConstructorParameters().add(objectCreationExprMetaModel.argumentsPropertyMetaModel);
+        objectCreationExprMetaModel.getConstructorParameters().add(objectCreationExprMetaModel.anonymousClassBodyPropertyMetaModel);
         patternExprMetaModel.getConstructorParameters().add(patternExprMetaModel.typePropertyMetaModel);
-        recordPatternExprMetaModel
-                .getConstructorParameters()
-                .add(recordPatternExprMetaModel.modifiersPropertyMetaModel);
+        recordPatternExprMetaModel.getConstructorParameters().add(recordPatternExprMetaModel.modifiersPropertyMetaModel);
         recordPatternExprMetaModel.getConstructorParameters().add(patternExprMetaModel.typePropertyMetaModel);
-        recordPatternExprMetaModel
-                .getConstructorParameters()
-                .add(recordPatternExprMetaModel.patternListPropertyMetaModel);
-        singleMemberAnnotationExprMetaModel
-                .getConstructorParameters()
-                .add(annotationExprMetaModel.namePropertyMetaModel);
-        singleMemberAnnotationExprMetaModel
-                .getConstructorParameters()
-                .add(singleMemberAnnotationExprMetaModel.memberValuePropertyMetaModel);
+        recordPatternExprMetaModel.getConstructorParameters().add(recordPatternExprMetaModel.patternListPropertyMetaModel);
+        singleMemberAnnotationExprMetaModel.getConstructorParameters().add(annotationExprMetaModel.namePropertyMetaModel);
+        singleMemberAnnotationExprMetaModel.getConstructorParameters().add(singleMemberAnnotationExprMetaModel.memberValuePropertyMetaModel);
         simpleNameMetaModel.getConstructorParameters().add(simpleNameMetaModel.identifierPropertyMetaModel);
         superExprMetaModel.getConstructorParameters().add(superExprMetaModel.typeNamePropertyMetaModel);
         switchExprMetaModel.getConstructorParameters().add(switchExprMetaModel.selectorPropertyMetaModel);
         switchExprMetaModel.getConstructorParameters().add(switchExprMetaModel.entriesPropertyMetaModel);
-        textBlockLiteralExprMetaModel
-                .getConstructorParameters()
-                .add(literalStringValueExprMetaModel.valuePropertyMetaModel);
+        textBlockLiteralExprMetaModel.getConstructorParameters().add(literalStringValueExprMetaModel.valuePropertyMetaModel);
         thisExprMetaModel.getConstructorParameters().add(thisExprMetaModel.typeNamePropertyMetaModel);
         typeExprMetaModel.getConstructorParameters().add(typeExprMetaModel.typePropertyMetaModel);
         typePatternExprMetaModel.getConstructorParameters().add(typePatternExprMetaModel.modifiersPropertyMetaModel);
@@ -403,58 +228,10 @@ private static void initializeConstructorParameters() {
         typePatternExprMetaModel.getConstructorParameters().add(typePatternExprMetaModel.namePropertyMetaModel);
         unaryExprMetaModel.getConstructorParameters().add(unaryExprMetaModel.expressionPropertyMetaModel);
         unaryExprMetaModel.getConstructorParameters().add(unaryExprMetaModel.operatorPropertyMetaModel);
-        matchAllPatternExprMetaModel
-                .getConstructorParameters()
-                .add(matchAllPatternExprMetaModel.modifiersPropertyMetaModel);
-        variableDeclarationExprMetaModel
-                .getConstructorParameters()
-                .add(variableDeclarationExprMetaModel.modifiersPropertyMetaModel);
-        variableDeclarationExprMetaModel
-                .getConstructorParameters()
-                .add(variableDeclarationExprMetaModel.annotationsPropertyMetaModel);
-        variableDeclarationExprMetaModel
-                .getConstructorParameters()
-                .add(variableDeclarationExprMetaModel.variablesPropertyMetaModel);
-        jmlDocMetaModel.getConstructorParameters().add(jmlDocMetaModel.contentPropertyMetaModel);
-        jmlDocDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlDocDeclarationMetaModel.jmlCommentsPropertyMetaModel);
-        jmlDocStmtMetaModel.getConstructorParameters().add(jmlDocStmtMetaModel.jmlCommentsPropertyMetaModel);
-        jmlDocTypeMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.modifiersPropertyMetaModel);
-        jmlDocTypeMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
-        jmlDocTypeMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel);
-        jmlDocTypeMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel);
-        jmlDocTypeMetaModel.getConstructorParameters().add(jmlDocTypeMetaModel.jmlCommentsPropertyMetaModel);
-        jmlQuantifiedExprMetaModel.getConstructorParameters().add(jmlQuantifiedExprMetaModel.binderPropertyMetaModel);
-        jmlQuantifiedExprMetaModel
-                .getConstructorParameters()
-                .add(jmlQuantifiedExprMetaModel.variablesPropertyMetaModel);
-        jmlQuantifiedExprMetaModel
-                .getConstructorParameters()
-                .add(jmlQuantifiedExprMetaModel.expressionsPropertyMetaModel);
-        jmlTypeExprMetaModel.getConstructorParameters().add(jmlTypeExprMetaModel.typePropertyMetaModel);
-        jmlBinaryInfixExprMetaModel.getConstructorParameters().add(jmlBinaryInfixExprMetaModel.leftPropertyMetaModel);
-        jmlBinaryInfixExprMetaModel.getConstructorParameters().add(jmlBinaryInfixExprMetaModel.rightPropertyMetaModel);
-        jmlBinaryInfixExprMetaModel
-                .getConstructorParameters()
-                .add(jmlBinaryInfixExprMetaModel.operatorPropertyMetaModel);
-        jmlLetExprMetaModel.getConstructorParameters().add(jmlLetExprMetaModel.variablesPropertyMetaModel);
-        jmlLetExprMetaModel.getConstructorParameters().add(jmlLetExprMetaModel.bodyPropertyMetaModel);
-        jmlMultiCompareExprMetaModel
-                .getConstructorParameters()
-                .add(jmlMultiCompareExprMetaModel.expressionsPropertyMetaModel);
-        jmlMultiCompareExprMetaModel
-                .getConstructorParameters()
-                .add(jmlMultiCompareExprMetaModel.operatorsPropertyMetaModel);
-        jmlLabelExprMetaModel.getConstructorParameters().add(jmlLabelExprMetaModel.kindPropertyMetaModel);
-        jmlLabelExprMetaModel.getConstructorParameters().add(jmlLabelExprMetaModel.labelPropertyMetaModel);
-        jmlLabelExprMetaModel.getConstructorParameters().add(jmlLabelExprMetaModel.expressionPropertyMetaModel);
-        jmlSetComprehensionExprMetaModel
-                .getConstructorParameters()
-                .add(jmlSetComprehensionExprMetaModel.bindingPropertyMetaModel);
-        jmlSetComprehensionExprMetaModel
-                .getConstructorParameters()
-                .add(jmlSetComprehensionExprMetaModel.predicatePropertyMetaModel);
+        matchAllPatternExprMetaModel.getConstructorParameters().add(matchAllPatternExprMetaModel.modifiersPropertyMetaModel);
+        variableDeclarationExprMetaModel.getConstructorParameters().add(variableDeclarationExprMetaModel.modifiersPropertyMetaModel);
+        variableDeclarationExprMetaModel.getConstructorParameters().add(variableDeclarationExprMetaModel.annotationsPropertyMetaModel);
+        variableDeclarationExprMetaModel.getConstructorParameters().add(variableDeclarationExprMetaModel.variablesPropertyMetaModel);
         assertStmtMetaModel.getConstructorParameters().add(assertStmtMetaModel.checkPropertyMetaModel);
         assertStmtMetaModel.getConstructorParameters().add(assertStmtMetaModel.messagePropertyMetaModel);
         blockStmtMetaModel.getConstructorParameters().add(blockStmtMetaModel.statementsPropertyMetaModel);
@@ -466,18 +243,10 @@ private static void initializeConstructorParameters() {
         doStmtMetaModel.getConstructorParameters().add(doStmtMetaModel.bodyPropertyMetaModel);
         doStmtMetaModel.getConstructorParameters().add(doStmtMetaModel.conditionPropertyMetaModel);
         doStmtMetaModel.getConstructorParameters().add(doStmtMetaModel.contractsPropertyMetaModel);
-        explicitConstructorInvocationStmtMetaModel
-                .getConstructorParameters()
-                .add(explicitConstructorInvocationStmtMetaModel.typeArgumentsPropertyMetaModel);
-        explicitConstructorInvocationStmtMetaModel
-                .getConstructorParameters()
-                .add(explicitConstructorInvocationStmtMetaModel.isThisPropertyMetaModel);
-        explicitConstructorInvocationStmtMetaModel
-                .getConstructorParameters()
-                .add(explicitConstructorInvocationStmtMetaModel.expressionPropertyMetaModel);
-        explicitConstructorInvocationStmtMetaModel
-                .getConstructorParameters()
-                .add(explicitConstructorInvocationStmtMetaModel.argumentsPropertyMetaModel);
+        explicitConstructorInvocationStmtMetaModel.getConstructorParameters().add(explicitConstructorInvocationStmtMetaModel.typeArgumentsPropertyMetaModel);
+        explicitConstructorInvocationStmtMetaModel.getConstructorParameters().add(explicitConstructorInvocationStmtMetaModel.isThisPropertyMetaModel);
+        explicitConstructorInvocationStmtMetaModel.getConstructorParameters().add(explicitConstructorInvocationStmtMetaModel.expressionPropertyMetaModel);
+        explicitConstructorInvocationStmtMetaModel.getConstructorParameters().add(explicitConstructorInvocationStmtMetaModel.argumentsPropertyMetaModel);
         expressionStmtMetaModel.getConstructorParameters().add(expressionStmtMetaModel.expressionPropertyMetaModel);
         forEachStmtMetaModel.getConstructorParameters().add(forEachStmtMetaModel.variablePropertyMetaModel);
         forEachStmtMetaModel.getConstructorParameters().add(forEachStmtMetaModel.iterablePropertyMetaModel);
@@ -493,12 +262,8 @@ private static void initializeConstructorParameters() {
         ifStmtMetaModel.getConstructorParameters().add(ifStmtMetaModel.elseStmtPropertyMetaModel);
         labeledStmtMetaModel.getConstructorParameters().add(labeledStmtMetaModel.labelPropertyMetaModel);
         labeledStmtMetaModel.getConstructorParameters().add(labeledStmtMetaModel.statementPropertyMetaModel);
-        localClassDeclarationStmtMetaModel
-                .getConstructorParameters()
-                .add(localClassDeclarationStmtMetaModel.classDeclarationPropertyMetaModel);
-        localRecordDeclarationStmtMetaModel
-                .getConstructorParameters()
-                .add(localRecordDeclarationStmtMetaModel.recordDeclarationPropertyMetaModel);
+        localClassDeclarationStmtMetaModel.getConstructorParameters().add(localClassDeclarationStmtMetaModel.classDeclarationPropertyMetaModel);
+        localRecordDeclarationStmtMetaModel.getConstructorParameters().add(localRecordDeclarationStmtMetaModel.recordDeclarationPropertyMetaModel);
         returnStmtMetaModel.getConstructorParameters().add(returnStmtMetaModel.expressionPropertyMetaModel);
         switchEntryMetaModel.getConstructorParameters().add(switchEntryMetaModel.labelsPropertyMetaModel);
         switchEntryMetaModel.getConstructorParameters().add(switchEntryMetaModel.typePropertyMetaModel);
@@ -518,77 +283,106 @@ private static void initializeConstructorParameters() {
         whileStmtMetaModel.getConstructorParameters().add(whileStmtMetaModel.bodyPropertyMetaModel);
         whileStmtMetaModel.getConstructorParameters().add(whileStmtMetaModel.contractsPropertyMetaModel);
         yieldStmtMetaModel.getConstructorParameters().add(yieldStmtMetaModel.expressionPropertyMetaModel);
+        arrayTypeMetaModel.getConstructorParameters().add(arrayTypeMetaModel.componentTypePropertyMetaModel);
+        arrayTypeMetaModel.getConstructorParameters().add(arrayTypeMetaModel.originPropertyMetaModel);
+        arrayTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
+        classOrInterfaceTypeMetaModel.getConstructorParameters().add(classOrInterfaceTypeMetaModel.scopePropertyMetaModel);
+        classOrInterfaceTypeMetaModel.getConstructorParameters().add(classOrInterfaceTypeMetaModel.namePropertyMetaModel);
+        classOrInterfaceTypeMetaModel.getConstructorParameters().add(classOrInterfaceTypeMetaModel.typeArgumentsPropertyMetaModel);
+        classOrInterfaceTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
+        intersectionTypeMetaModel.getConstructorParameters().add(intersectionTypeMetaModel.elementsPropertyMetaModel);
+        primitiveTypeMetaModel.getConstructorParameters().add(primitiveTypeMetaModel.typePropertyMetaModel);
+        primitiveTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
+        typeParameterMetaModel.getConstructorParameters().add(typeParameterMetaModel.namePropertyMetaModel);
+        typeParameterMetaModel.getConstructorParameters().add(typeParameterMetaModel.typeBoundPropertyMetaModel);
+        typeParameterMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
+        unionTypeMetaModel.getConstructorParameters().add(unionTypeMetaModel.elementsPropertyMetaModel);
+        wildcardTypeMetaModel.getConstructorParameters().add(wildcardTypeMetaModel.extendedTypePropertyMetaModel);
+        wildcardTypeMetaModel.getConstructorParameters().add(wildcardTypeMetaModel.superTypePropertyMetaModel);
+        wildcardTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
+        moduleExportsDirectiveMetaModel.getConstructorParameters().add(moduleExportsDirectiveMetaModel.namePropertyMetaModel);
+        moduleExportsDirectiveMetaModel.getConstructorParameters().add(moduleExportsDirectiveMetaModel.moduleNamesPropertyMetaModel);
+        moduleOpensDirectiveMetaModel.getConstructorParameters().add(moduleOpensDirectiveMetaModel.namePropertyMetaModel);
+        moduleOpensDirectiveMetaModel.getConstructorParameters().add(moduleOpensDirectiveMetaModel.moduleNamesPropertyMetaModel);
+        moduleProvidesDirectiveMetaModel.getConstructorParameters().add(moduleProvidesDirectiveMetaModel.namePropertyMetaModel);
+        moduleProvidesDirectiveMetaModel.getConstructorParameters().add(moduleProvidesDirectiveMetaModel.withPropertyMetaModel);
+        moduleRequiresDirectiveMetaModel.getConstructorParameters().add(moduleRequiresDirectiveMetaModel.modifiersPropertyMetaModel);
+        moduleRequiresDirectiveMetaModel.getConstructorParameters().add(moduleRequiresDirectiveMetaModel.namePropertyMetaModel);
+        moduleUsesDirectiveMetaModel.getConstructorParameters().add(moduleUsesDirectiveMetaModel.namePropertyMetaModel);
+        jmlDocMetaModel.getConstructorParameters().add(jmlDocMetaModel.contentPropertyMetaModel);
+        jmlDocDeclarationMetaModel.getConstructorParameters().add(jmlDocDeclarationMetaModel.jmlCommentsPropertyMetaModel);
+        jmlDocStmtMetaModel.getConstructorParameters().add(jmlDocStmtMetaModel.jmlCommentsPropertyMetaModel);
+        jmlDocTypeMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.modifiersPropertyMetaModel);
+        jmlDocTypeMetaModel.getConstructorParameters().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
+        jmlDocTypeMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.namePropertyMetaModel);
+        jmlDocTypeMetaModel.getConstructorParameters().add(typeDeclarationMetaModel.membersPropertyMetaModel);
+        jmlDocTypeMetaModel.getConstructorParameters().add(jmlDocTypeMetaModel.jmlCommentsPropertyMetaModel);
+        jmlQuantifiedExprMetaModel.getConstructorParameters().add(jmlQuantifiedExprMetaModel.binderPropertyMetaModel);
+        jmlQuantifiedExprMetaModel.getConstructorParameters().add(jmlQuantifiedExprMetaModel.variablesPropertyMetaModel);
+        jmlQuantifiedExprMetaModel.getConstructorParameters().add(jmlQuantifiedExprMetaModel.expressionsPropertyMetaModel);
+        jmlTypeExprMetaModel.getConstructorParameters().add(jmlTypeExprMetaModel.typePropertyMetaModel);
+        jmlBinaryInfixExprMetaModel.getConstructorParameters().add(jmlBinaryInfixExprMetaModel.leftPropertyMetaModel);
+        jmlBinaryInfixExprMetaModel.getConstructorParameters().add(jmlBinaryInfixExprMetaModel.rightPropertyMetaModel);
+        jmlBinaryInfixExprMetaModel.getConstructorParameters().add(jmlBinaryInfixExprMetaModel.operatorPropertyMetaModel);
+        jmlLetExprMetaModel.getConstructorParameters().add(jmlLetExprMetaModel.variablesPropertyMetaModel);
+        jmlLetExprMetaModel.getConstructorParameters().add(jmlLetExprMetaModel.bodyPropertyMetaModel);
+        jmlMultiCompareExprMetaModel.getConstructorParameters().add(jmlMultiCompareExprMetaModel.expressionsPropertyMetaModel);
+        jmlMultiCompareExprMetaModel.getConstructorParameters().add(jmlMultiCompareExprMetaModel.operatorsPropertyMetaModel);
+        jmlLabelExprMetaModel.getConstructorParameters().add(jmlLabelExprMetaModel.kindPropertyMetaModel);
+        jmlLabelExprMetaModel.getConstructorParameters().add(jmlLabelExprMetaModel.labelPropertyMetaModel);
+        jmlLabelExprMetaModel.getConstructorParameters().add(jmlLabelExprMetaModel.expressionPropertyMetaModel);
+        jmlSetComprehensionExprMetaModel.getConstructorParameters().add(jmlSetComprehensionExprMetaModel.bindingPropertyMetaModel);
+        jmlSetComprehensionExprMetaModel.getConstructorParameters().add(jmlSetComprehensionExprMetaModel.predicatePropertyMetaModel);
         jmlGhostStmtMetaModel.getConstructorParameters().add(jmlGhostStmtMetaModel.jmlTagsPropertyMetaModel);
         jmlGhostStmtMetaModel.getConstructorParameters().add(jmlGhostStmtMetaModel.statementPropertyMetaModel);
         jmlExpressionStmtMetaModel.getConstructorParameters().add(jmlExpressionStmtMetaModel.jmlTagsPropertyMetaModel);
         jmlExpressionStmtMetaModel.getConstructorParameters().add(jmlExpressionStmtMetaModel.kindPropertyMetaModel);
-        jmlExpressionStmtMetaModel
-                .getConstructorParameters()
-                .add(jmlExpressionStmtMetaModel.expressionPropertyMetaModel);
+        jmlExpressionStmtMetaModel.getConstructorParameters().add(jmlExpressionStmtMetaModel.expressionPropertyMetaModel);
         jmlRefiningStmtMetaModel.getConstructorParameters().add(jmlRefiningStmtMetaModel.jmlTagsPropertyMetaModel);
-        jmlUnreachableStmtMetaModel
-                .getConstructorParameters()
-                .add(jmlUnreachableStmtMetaModel.jmlTagsPropertyMetaModel);
+        jmlUnreachableStmtMetaModel.getConstructorParameters().add(jmlUnreachableStmtMetaModel.jmlTagsPropertyMetaModel);
         jmlLabelStmtMetaModel.getConstructorParameters().add(jmlLabelStmtMetaModel.jmlTagsPropertyMetaModel);
         jmlLabelStmtMetaModel.getConstructorParameters().add(jmlLabelStmtMetaModel.labelPropertyMetaModel);
         jmlBeginStmtMetaModel.getConstructorParameters().add(jmlBeginStmtMetaModel.jmlTagsPropertyMetaModel);
         jmlEndStmtMetaModel.getConstructorParameters().add(jmlEndStmtMetaModel.jmlTagsPropertyMetaModel);
-        jmlMethodDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlMethodDeclarationMetaModel.jmlTagsPropertyMetaModel);
-        jmlMethodDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlMethodDeclarationMetaModel.methodDeclarationPropertyMetaModel);
-        jmlMethodDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlMethodDeclarationMetaModel.contractPropertyMetaModel);
-        jmlFieldDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlFieldDeclarationMetaModel.jmlTagsPropertyMetaModel);
+        jmlMethodDeclarationMetaModel.getConstructorParameters().add(jmlMethodDeclarationMetaModel.jmlTagsPropertyMetaModel);
+        jmlMethodDeclarationMetaModel.getConstructorParameters().add(jmlMethodDeclarationMetaModel.methodDeclarationPropertyMetaModel);
+        jmlMethodDeclarationMetaModel.getConstructorParameters().add(jmlMethodDeclarationMetaModel.contractPropertyMetaModel);
+        jmlFieldDeclarationMetaModel.getConstructorParameters().add(jmlFieldDeclarationMetaModel.jmlTagsPropertyMetaModel);
         jmlFieldDeclarationMetaModel.getConstructorParameters().add(jmlFieldDeclarationMetaModel.declPropertyMetaModel);
         jmlClauseMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel);
         jmlSimpleExprClauseMetaModel.getConstructorParameters().add(jmlSimpleExprClauseMetaModel.kindPropertyMetaModel);
         jmlSimpleExprClauseMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel);
-        jmlSimpleExprClauseMetaModel
-                .getConstructorParameters()
-                .add(jmlSimpleExprClauseMetaModel.heapsPropertyMetaModel);
-        jmlSimpleExprClauseMetaModel
-                .getConstructorParameters()
-                .add(jmlSimpleExprClauseMetaModel.expressionPropertyMetaModel);
+        jmlSimpleExprClauseMetaModel.getConstructorParameters().add(jmlSimpleExprClauseMetaModel.heapsPropertyMetaModel);
+        jmlSimpleExprClauseMetaModel.getConstructorParameters().add(jmlSimpleExprClauseMetaModel.expressionPropertyMetaModel);
         jmlMultiExprClauseMetaModel.getConstructorParameters().add(jmlMultiExprClauseMetaModel.kindPropertyMetaModel);
         jmlMultiExprClauseMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel);
         jmlMultiExprClauseMetaModel.getConstructorParameters().add(jmlMultiExprClauseMetaModel.heapsPropertyMetaModel);
-        jmlMultiExprClauseMetaModel
-                .getConstructorParameters()
-                .add(jmlMultiExprClauseMetaModel.expressionsPropertyMetaModel);
+        jmlMultiExprClauseMetaModel.getConstructorParameters().add(jmlMultiExprClauseMetaModel.expressionsPropertyMetaModel);
         jmlSignalsClauseMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel);
         jmlSignalsClauseMetaModel.getConstructorParameters().add(jmlSignalsClauseMetaModel.parameterPropertyMetaModel);
         jmlSignalsClauseMetaModel.getConstructorParameters().add(jmlSignalsClauseMetaModel.expressionPropertyMetaModel);
-        jmlSignalsOnlyClauseMetaModel
-                .getConstructorParameters()
-                .add(jmlSignalsOnlyClauseMetaModel.typesPropertyMetaModel);
-        jmlClauseLabelMetaModel.getConstructorParameters().add(jmlClauseLabelMetaModel.kindPropertyMetaModel);
-        jmlClauseLabelMetaModel.getConstructorParameters().add(jmlClauseLabelMetaModel.labelPropertyMetaModel);
-        jmlClauseLabelMetaModel.getConstructorParameters().add(jmlClauseLabelMetaModel.exprPropertyMetaModel);
-        jmlForallClauseMetaModel
-                .getConstructorParameters()
-                .add(jmlForallClauseMetaModel.boundedVariablesPropertyMetaModel);
+        jmlSignalsOnlyClauseMetaModel.getConstructorParameters().add(jmlSignalsOnlyClauseMetaModel.typesPropertyMetaModel);
+        jmlLabledClauseMetaModel.getConstructorParameters().add(jmlLabledClauseMetaModel.kindPropertyMetaModel);
+        jmlLabledClauseMetaModel.getConstructorParameters().add(jmlLabledClauseMetaModel.labelPropertyMetaModel);
+        jmlLabledClauseMetaModel.getConstructorParameters().add(jmlLabledClauseMetaModel.expressionPropertyMetaModel);
+        jmlForallClauseMetaModel.getConstructorParameters().add(jmlForallClauseMetaModel.boundedVariablesPropertyMetaModel);
         jmlOldClauseMetaModel.getConstructorParameters().add(jmlOldClauseMetaModel.declarationsPropertyMetaModel);
         jmlCallableClauseMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel);
-        jmlCallableClauseMetaModel
-                .getConstructorParameters()
-                .add(jmlCallableClauseMetaModel.methodSignaturesPropertyMetaModel);
-        jmlClauseIfMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel);
-        jmlClauseIfMetaModel.getConstructorParameters().add(jmlClauseIfMetaModel.conditionPropertyMetaModel);
-        jmlClauseIfMetaModel.getConstructorParameters().add(jmlClauseIfMetaModel.kindPropertyMetaModel);
-        jmlClauseIfMetaModel.getConstructorParameters().add(jmlClauseIfMetaModel.thenPropertyMetaModel);
-        jmlMethodSignatureMetaModel
-                .getConstructorParameters()
-                .add(jmlMethodSignatureMetaModel.receiverPropertyMetaModel);
+        jmlCallableClauseMetaModel.getConstructorParameters().add(jmlCallableClauseMetaModel.methodSignaturesPropertyMetaModel);
+        jmlConditionalClauseMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel);
+        jmlConditionalClauseMetaModel.getConstructorParameters().add(jmlConditionalClauseMetaModel.conditionPropertyMetaModel);
+        jmlConditionalClauseMetaModel.getConstructorParameters().add(jmlConditionalClauseMetaModel.kindPropertyMetaModel);
+        jmlConditionalClauseMetaModel.getConstructorParameters().add(jmlConditionalClauseMetaModel.expressionPropertyMetaModel);
+        jmlMethodSignatureMetaModel.getConstructorParameters().add(jmlMethodSignatureMetaModel.receiverPropertyMetaModel);
         jmlMethodSignatureMetaModel.getConstructorParameters().add(jmlMethodSignatureMetaModel.namePropertyMetaModel);
-        jmlMethodSignatureMetaModel
-                .getConstructorParameters()
-                .add(jmlMethodSignatureMetaModel.argumentTypesPropertyMetaModel);
+        jmlMethodSignatureMetaModel.getConstructorParameters().add(jmlMethodSignatureMetaModel.argumentTypesPropertyMetaModel);
+        jmlInfFlowClauseMetaModel.getConstructorParameters().add(jmlInfFlowClauseMetaModel.kindPropertyMetaModel);
+        jmlInfFlowClauseMetaModel.getConstructorParameters().add(jmlClauseMetaModel.namePropertyMetaModel);
+        jmlInfFlowClauseMetaModel.getConstructorParameters().add(jmlInfFlowClauseMetaModel.byPropertyMetaModel);
+        jmlInfFlowClauseMetaModel.getConstructorParameters().add(jmlInfFlowClauseMetaModel.declassifiesPropertyMetaModel);
+        jmlInfFlowClauseMetaModel.getConstructorParameters().add(jmlInfFlowClauseMetaModel.erasesPropertyMetaModel);
+        jmlInfFlowClauseMetaModel.getConstructorParameters().add(jmlInfFlowClauseMetaModel.expressionsPropertyMetaModel);
+        jmlInfFlowClauseMetaModel.getConstructorParameters().add(jmlInfFlowClauseMetaModel.newObjectsPropertyMetaModel);
         jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.jmlTagsPropertyMetaModel);
         jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.typePropertyMetaModel);
         jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.behaviorPropertyMetaModel);
@@ -596,210 +390,73 @@ private static void initializeConstructorParameters() {
         jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.modifiersPropertyMetaModel);
         jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.clausesPropertyMetaModel);
         jmlContractMetaModel.getConstructorParameters().add(jmlContractMetaModel.subContractsPropertyMetaModel);
-        jmlClassExprDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlClassExprDeclarationMetaModel.jmlTagsPropertyMetaModel);
-        jmlClassExprDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlClassExprDeclarationMetaModel.modifiersPropertyMetaModel);
-        jmlClassExprDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlClassExprDeclarationMetaModel.kindPropertyMetaModel);
-        jmlClassExprDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlClassExprDeclarationMetaModel.namePropertyMetaModel);
-        jmlClassExprDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlClassExprDeclarationMetaModel.invariantPropertyMetaModel);
-        jmlRepresentsDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlRepresentsDeclarationMetaModel.jmlTagsPropertyMetaModel);
-        jmlRepresentsDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlRepresentsDeclarationMetaModel.modifiersPropertyMetaModel);
-        jmlRepresentsDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlRepresentsDeclarationMetaModel.namePropertyMetaModel);
-        jmlRepresentsDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlRepresentsDeclarationMetaModel.exprPropertyMetaModel);
-        jmlClassAccessibleDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlClassAccessibleDeclarationMetaModel.jmlTagsPropertyMetaModel);
-        jmlClassAccessibleDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlClassAccessibleDeclarationMetaModel.modifiersPropertyMetaModel);
-        jmlClassAccessibleDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlClassAccessibleDeclarationMetaModel.variablePropertyMetaModel);
-        jmlClassAccessibleDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlClassAccessibleDeclarationMetaModel.expressionsPropertyMetaModel);
-        jmlClassAccessibleDeclarationMetaModel
-                .getConstructorParameters()
-                .add(jmlClassAccessibleDeclarationMetaModel.measuredByPropertyMetaModel);
-        arrayTypeMetaModel.getConstructorParameters().add(arrayTypeMetaModel.componentTypePropertyMetaModel);
-        arrayTypeMetaModel.getConstructorParameters().add(arrayTypeMetaModel.originPropertyMetaModel);
-        arrayTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
-        classOrInterfaceTypeMetaModel
-                .getConstructorParameters()
-                .add(classOrInterfaceTypeMetaModel.scopePropertyMetaModel);
-        classOrInterfaceTypeMetaModel
-                .getConstructorParameters()
-                .add(classOrInterfaceTypeMetaModel.namePropertyMetaModel);
-        classOrInterfaceTypeMetaModel
-                .getConstructorParameters()
-                .add(classOrInterfaceTypeMetaModel.typeArgumentsPropertyMetaModel);
-        classOrInterfaceTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
-        intersectionTypeMetaModel.getConstructorParameters().add(intersectionTypeMetaModel.elementsPropertyMetaModel);
-        primitiveTypeMetaModel.getConstructorParameters().add(primitiveTypeMetaModel.typePropertyMetaModel);
-        primitiveTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
-        typeParameterMetaModel.getConstructorParameters().add(typeParameterMetaModel.namePropertyMetaModel);
-        typeParameterMetaModel.getConstructorParameters().add(typeParameterMetaModel.typeBoundPropertyMetaModel);
-        typeParameterMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
-        unionTypeMetaModel.getConstructorParameters().add(unionTypeMetaModel.elementsPropertyMetaModel);
-        wildcardTypeMetaModel.getConstructorParameters().add(wildcardTypeMetaModel.extendedTypePropertyMetaModel);
-        wildcardTypeMetaModel.getConstructorParameters().add(wildcardTypeMetaModel.superTypePropertyMetaModel);
-        wildcardTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
-        moduleExportsDirectiveMetaModel
-                .getConstructorParameters()
-                .add(moduleExportsDirectiveMetaModel.namePropertyMetaModel);
-        moduleExportsDirectiveMetaModel
-                .getConstructorParameters()
-                .add(moduleExportsDirectiveMetaModel.moduleNamesPropertyMetaModel);
-        moduleOpensDirectiveMetaModel
-                .getConstructorParameters()
-                .add(moduleOpensDirectiveMetaModel.namePropertyMetaModel);
-        moduleOpensDirectiveMetaModel
-                .getConstructorParameters()
-                .add(moduleOpensDirectiveMetaModel.moduleNamesPropertyMetaModel);
-        moduleProvidesDirectiveMetaModel
-                .getConstructorParameters()
-                .add(moduleProvidesDirectiveMetaModel.namePropertyMetaModel);
-        moduleProvidesDirectiveMetaModel
-                .getConstructorParameters()
-                .add(moduleProvidesDirectiveMetaModel.withPropertyMetaModel);
-        moduleRequiresDirectiveMetaModel
-                .getConstructorParameters()
-                .add(moduleRequiresDirectiveMetaModel.modifiersPropertyMetaModel);
-        moduleRequiresDirectiveMetaModel
-                .getConstructorParameters()
-                .add(moduleRequiresDirectiveMetaModel.namePropertyMetaModel);
-        moduleUsesDirectiveMetaModel.getConstructorParameters().add(moduleUsesDirectiveMetaModel.namePropertyMetaModel);
-        keyCatchAllStatementMetaModel
-                .getConstructorParameters()
-                .add(keyCatchAllStatementMetaModel.labelPropertyMetaModel);
-        keyCatchAllStatementMetaModel
-                .getConstructorParameters()
-                .add(keyCatchAllStatementMetaModel.blockPropertyMetaModel);
+        jmlClassExprDeclarationMetaModel.getConstructorParameters().add(jmlClassExprDeclarationMetaModel.jmlTagsPropertyMetaModel);
+        jmlClassExprDeclarationMetaModel.getConstructorParameters().add(jmlClassExprDeclarationMetaModel.modifiersPropertyMetaModel);
+        jmlClassExprDeclarationMetaModel.getConstructorParameters().add(jmlClassExprDeclarationMetaModel.kindPropertyMetaModel);
+        jmlClassExprDeclarationMetaModel.getConstructorParameters().add(jmlClassExprDeclarationMetaModel.namePropertyMetaModel);
+        jmlClassExprDeclarationMetaModel.getConstructorParameters().add(jmlClassExprDeclarationMetaModel.invariantPropertyMetaModel);
+        jmlRepresentsDeclarationMetaModel.getConstructorParameters().add(jmlRepresentsDeclarationMetaModel.jmlTagsPropertyMetaModel);
+        jmlRepresentsDeclarationMetaModel.getConstructorParameters().add(jmlRepresentsDeclarationMetaModel.modifiersPropertyMetaModel);
+        jmlRepresentsDeclarationMetaModel.getConstructorParameters().add(jmlRepresentsDeclarationMetaModel.namePropertyMetaModel);
+        jmlRepresentsDeclarationMetaModel.getConstructorParameters().add(jmlRepresentsDeclarationMetaModel.exprPropertyMetaModel);
+        jmlClassAccessibleDeclarationMetaModel.getConstructorParameters().add(jmlClassAccessibleDeclarationMetaModel.jmlTagsPropertyMetaModel);
+        jmlClassAccessibleDeclarationMetaModel.getConstructorParameters().add(jmlClassAccessibleDeclarationMetaModel.modifiersPropertyMetaModel);
+        jmlClassAccessibleDeclarationMetaModel.getConstructorParameters().add(jmlClassAccessibleDeclarationMetaModel.variablePropertyMetaModel);
+        jmlClassAccessibleDeclarationMetaModel.getConstructorParameters().add(jmlClassAccessibleDeclarationMetaModel.expressionsPropertyMetaModel);
+        jmlClassAccessibleDeclarationMetaModel.getConstructorParameters().add(jmlClassAccessibleDeclarationMetaModel.measuredByPropertyMetaModel);
+        keyCatchAllStmtMetaModel.getConstructorParameters().add(keyCatchAllStmtMetaModel.labelPropertyMetaModel);
+        keyCatchAllStmtMetaModel.getConstructorParameters().add(keyCatchAllStmtMetaModel.blockPropertyMetaModel);
         keyCcatchBreakMetaModel.getConstructorParameters().add(keyCcatchBreakMetaModel.labelPropertyMetaModel);
         keyCcatchBreakMetaModel.getConstructorParameters().add(keyCcatchBreakMetaModel.blockPropertyMetaModel);
         keyCcatchContinueMetaModel.getConstructorParameters().add(keyCcatchContinueMetaModel.labelPropertyMetaModel);
         keyCcatchContinueMetaModel.getConstructorParameters().add(keyCcatchContinueMetaModel.blockPropertyMetaModel);
-        keyCcatchParameterMetaModel
-                .getConstructorParameters()
-                .add(keyCcatchParameterMetaModel.parameterPropertyMetaModel);
+        keyCcatchParameterMetaModel.getConstructorParameters().add(keyCcatchParameterMetaModel.parameterPropertyMetaModel);
         keyCcatchParameterMetaModel.getConstructorParameters().add(keyCcatchParameterMetaModel.blockPropertyMetaModel);
         keyCcatchReturnMetaModel.getConstructorParameters().add(keyCcatchReturnMetaModel.parameterPropertyMetaModel);
         keyCcatchReturnMetaModel.getConstructorParameters().add(keyCcatchReturnMetaModel.blockPropertyMetaModel);
-        keyEscapeExpressionMetaModel
-                .getConstructorParameters()
-                .add(keyEscapeExpressionMetaModel.calleePropertyMetaModel);
-        keyEscapeExpressionMetaModel
-                .getConstructorParameters()
-                .add(keyEscapeExpressionMetaModel.argumentsPropertyMetaModel);
-        keyExecStatementMetaModel.getConstructorParameters().add(keyExecStatementMetaModel.execBlockPropertyMetaModel);
-        keyExecStatementMetaModel.getConstructorParameters().add(keyExecStatementMetaModel.branchesPropertyMetaModel);
-        keyExecutionContextMetaModel
-                .getConstructorParameters()
-                .add(keyExecutionContextMetaModel.contextPropertyMetaModel);
-        keyExecutionContextMetaModel
-                .getConstructorParameters()
-                .add(keyExecutionContextMetaModel.signaturePropertyMetaModel);
-        keyExecutionContextMetaModel
-                .getConstructorParameters()
-                .add(keyExecutionContextMetaModel.instancePropertyMetaModel);
-        keyLoopScopeBlockMetaModel.getConstructorParameters().add(keyLoopScopeBlockMetaModel.indexPVPropertyMetaModel);
-        keyLoopScopeBlockMetaModel.getConstructorParameters().add(keyLoopScopeBlockMetaModel.blockPropertyMetaModel);
-        keyMergePointStatementMetaModel
-                .getConstructorParameters()
-                .add(keyMergePointStatementMetaModel.exprPropertyMetaModel);
-        keyMethodBodyStatementMetaModel
-                .getConstructorParameters()
-                .add(keyMethodBodyStatementMetaModel.namePropertyMetaModel);
-        keyMethodBodyStatementMetaModel
-                .getConstructorParameters()
-                .add(keyMethodBodyStatementMetaModel.exprPropertyMetaModel);
-        keyMethodBodyStatementMetaModel
-                .getConstructorParameters()
-                .add(keyMethodBodyStatementMetaModel.sourcePropertyMetaModel);
-        keyMethodCallStatementMetaModel
-                .getConstructorParameters()
-                .add(keyMethodCallStatementMetaModel.namePropertyMetaModel);
-        keyMethodCallStatementMetaModel
-                .getConstructorParameters()
-                .add(keyMethodCallStatementMetaModel.contextPropertyMetaModel);
-        keyMethodCallStatementMetaModel
-                .getConstructorParameters()
-                .add(keyMethodCallStatementMetaModel.blockPropertyMetaModel);
+        keyEscapeExpressionMetaModel.getConstructorParameters().add(keyEscapeExpressionMetaModel.calleePropertyMetaModel);
+        keyEscapeExpressionMetaModel.getConstructorParameters().add(keyEscapeExpressionMetaModel.argumentsPropertyMetaModel);
+        keyExecStmtMetaModel.getConstructorParameters().add(keyExecStmtMetaModel.execBlockPropertyMetaModel);
+        keyExecStmtMetaModel.getConstructorParameters().add(keyExecStmtMetaModel.branchesPropertyMetaModel);
+        keyExecutionContextMetaModel.getConstructorParameters().add(keyExecutionContextMetaModel.contextPropertyMetaModel);
+        keyExecutionContextMetaModel.getConstructorParameters().add(keyExecutionContextMetaModel.signaturePropertyMetaModel);
+        keyExecutionContextMetaModel.getConstructorParameters().add(keyExecutionContextMetaModel.instancePropertyMetaModel);
+        keyLoopScopeBlockStmtMetaModel.getConstructorParameters().add(keyLoopScopeBlockStmtMetaModel.indexPVPropertyMetaModel);
+        keyLoopScopeBlockStmtMetaModel.getConstructorParameters().add(keyLoopScopeBlockStmtMetaModel.blockPropertyMetaModel);
+        keyMergePointStmtMetaModel.getConstructorParameters().add(keyMergePointStmtMetaModel.exprPropertyMetaModel);
+        keyMethodBodyStatementMetaModel.getConstructorParameters().add(keyMethodBodyStatementMetaModel.namePropertyMetaModel);
+        keyMethodBodyStatementMetaModel.getConstructorParameters().add(keyMethodBodyStatementMetaModel.exprPropertyMetaModel);
+        keyMethodBodyStatementMetaModel.getConstructorParameters().add(keyMethodBodyStatementMetaModel.sourcePropertyMetaModel);
+        keyMethodCallStmtMetaModel.getConstructorParameters().add(keyMethodCallStmtMetaModel.namePropertyMetaModel);
+        keyMethodCallStmtMetaModel.getConstructorParameters().add(keyMethodCallStmtMetaModel.contextPropertyMetaModel);
+        keyMethodCallStmtMetaModel.getConstructorParameters().add(keyMethodCallStmtMetaModel.blockPropertyMetaModel);
         keyMethodSignatureMetaModel.getConstructorParameters().add(keyMethodSignatureMetaModel.namePropertyMetaModel);
-        keyMethodSignatureMetaModel
-                .getConstructorParameters()
-                .add(keyMethodSignatureMetaModel.paramTypesPropertyMetaModel);
-        keyRangeExpressionMetaModel.getConstructorParameters().add(keyRangeExpressionMetaModel.lowerPropertyMetaModel);
-        keyRangeExpressionMetaModel.getConstructorParameters().add(keyRangeExpressionMetaModel.upperPropertyMetaModel);
-        keyTransactionStatementMetaModel
-                .getConstructorParameters()
-                .add(keyTransactionStatementMetaModel.typePropertyMetaModel);
-        keyContextStatementBlockMetaModel
-                .getConstructorParameters()
-                .add(keyContextStatementBlockMetaModel.statementsPropertyMetaModel);
-        keyContextStatementBlockMetaModel
-                .getConstructorParameters()
-                .add(keyContextStatementBlockMetaModel.contextPropertyMetaModel);
-        keyContextStatementBlockMetaModel
-                .getConstructorParameters()
-                .add(keyContextStatementBlockMetaModel.trPropertyMetaModel);
-        keyContextStatementBlockMetaModel
-                .getConstructorParameters()
-                .add(keyContextStatementBlockMetaModel.signaturePropertyMetaModel);
-        keyContextStatementBlockMetaModel
-                .getConstructorParameters()
-                .add(keyContextStatementBlockMetaModel.expressionPropertyMetaModel);
+        keyMethodSignatureMetaModel.getConstructorParameters().add(keyMethodSignatureMetaModel.paramTypesPropertyMetaModel);
+        keyTransactionStmtMetaModel.getConstructorParameters().add(keyTransactionStmtMetaModel.typePropertyMetaModel);
+        keYMarkerStatementMetaModel.getConstructorParameters().add(keYMarkerStatementMetaModel.kindPropertyMetaModel);
+        keyContextStatementBlockMetaModel.getConstructorParameters().add(keyContextStatementBlockMetaModel.statementsPropertyMetaModel);
+        keyContextStatementBlockMetaModel.getConstructorParameters().add(keyContextStatementBlockMetaModel.contextPropertyMetaModel);
+        keyContextStatementBlockMetaModel.getConstructorParameters().add(keyContextStatementBlockMetaModel.trPropertyMetaModel);
+        keyContextStatementBlockMetaModel.getConstructorParameters().add(keyContextStatementBlockMetaModel.signaturePropertyMetaModel);
+        keyContextStatementBlockMetaModel.getConstructorParameters().add(keyContextStatementBlockMetaModel.expressionPropertyMetaModel);
         keyExecCtxtSVMetaModel.getConstructorParameters().add(keyExecCtxtSVMetaModel.textPropertyMetaModel);
         keyExpressionSVMetaModel.getConstructorParameters().add(keyExpressionSVMetaModel.textPropertyMetaModel);
         keyJumpLabelSVMetaModel.getConstructorParameters().add(keyJumpLabelSVMetaModel.textPropertyMetaModel);
         keyMetaConstructMetaModel.getConstructorParameters().add(keyMetaConstructMetaModel.kindPropertyMetaModel);
         keyMetaConstructMetaModel.getConstructorParameters().add(keyMetaConstructMetaModel.childPropertyMetaModel);
         keyMetaConstructMetaModel.getConstructorParameters().add(keyMetaConstructMetaModel.schemasPropertyMetaModel);
-        keyMetaConstructExpressionMetaModel
-                .getConstructorParameters()
-                .add(keyMetaConstructExpressionMetaModel.textPropertyMetaModel);
-        keyMetaConstructExpressionMetaModel
-                .getConstructorParameters()
-                .add(keyMetaConstructExpressionMetaModel.childPropertyMetaModel);
+        keyMetaConstructExpressionMetaModel.getConstructorParameters().add(keyMetaConstructExpressionMetaModel.textPropertyMetaModel);
+        keyMetaConstructExpressionMetaModel.getConstructorParameters().add(keyMetaConstructExpressionMetaModel.childPropertyMetaModel);
         keyMetaConstructTypeMetaModel.getConstructorParameters().add(typeMetaModel.annotationsPropertyMetaModel);
-        keyMetaConstructTypeMetaModel
-                .getConstructorParameters()
-                .add(keyMetaConstructTypeMetaModel.kindPropertyMetaModel);
-        keyMetaConstructTypeMetaModel
-                .getConstructorParameters()
-                .add(keyMetaConstructTypeMetaModel.exprPropertyMetaModel);
-        keyMethodSignatureSVMetaModel
-                .getConstructorParameters()
-                .add(keyMethodSignatureSVMetaModel.textPropertyMetaModel);
-        keyPassiveExpressionMetaModel
-                .getConstructorParameters()
-                .add(keyPassiveExpressionMetaModel.exprPropertyMetaModel);
-        keyProgramVariableSVMetaModel
-                .getConstructorParameters()
-                .add(keyProgramVariableSVMetaModel.textPropertyMetaModel);
+        keyMetaConstructTypeMetaModel.getConstructorParameters().add(keyMetaConstructTypeMetaModel.kindPropertyMetaModel);
+        keyMetaConstructTypeMetaModel.getConstructorParameters().add(keyMetaConstructTypeMetaModel.exprPropertyMetaModel);
+        keyMethodSignatureSVMetaModel.getConstructorParameters().add(keyMethodSignatureSVMetaModel.textPropertyMetaModel);
+        keyPassiveExpressionMetaModel.getConstructorParameters().add(keyPassiveExpressionMetaModel.exprPropertyMetaModel);
+        keyProgramVariableSVMetaModel.getConstructorParameters().add(keyProgramVariableSVMetaModel.textPropertyMetaModel);
         keyStatementSVMetaModel.getConstructorParameters().add(keyStatementSVMetaModel.textPropertyMetaModel);
         keyTypeSVMetaModel.getConstructorParameters().add(keyTypeSVMetaModel.textPropertyMetaModel);
         keyCcatchSVMetaModel.getConstructorParameters().add(keyCcatchSVMetaModel.textPropertyMetaModel);
-        keyExecutionContextSVMetaModel
-                .getConstructorParameters()
-                .add(keyExecutionContextSVMetaModel.textPropertyMetaModel);
+        keyExecutionContextSVMetaModel.getConstructorParameters().add(keyExecutionContextSVMetaModel.textPropertyMetaModel);
     }
 
     public static List<BaseNodeMetaModel> getNodeMetaModels() {
@@ -864,9 +521,8 @@ private static void initializeNodeMetaModels() {
         nodeMetaModels.add(jmlClassAccessibleDeclarationMetaModel);
         nodeMetaModels.add(jmlClassExprDeclarationMetaModel);
         nodeMetaModels.add(jmlClassLevelDeclarationMetaModel);
-        nodeMetaModels.add(jmlClauseIfMetaModel);
-        nodeMetaModels.add(jmlClauseLabelMetaModel);
         nodeMetaModels.add(jmlClauseMetaModel);
+        nodeMetaModels.add(jmlConditionalClauseMetaModel);
         nodeMetaModels.add(jmlContractMetaModel);
         nodeMetaModels.add(jmlDocDeclarationMetaModel);
         nodeMetaModels.add(jmlDocMetaModel);
@@ -877,8 +533,10 @@ private static void initializeNodeMetaModels() {
         nodeMetaModels.add(jmlFieldDeclarationMetaModel);
         nodeMetaModels.add(jmlForallClauseMetaModel);
         nodeMetaModels.add(jmlGhostStmtMetaModel);
+        nodeMetaModels.add(jmlInfFlowClauseMetaModel);
         nodeMetaModels.add(jmlLabelExprMetaModel);
         nodeMetaModels.add(jmlLabelStmtMetaModel);
+        nodeMetaModels.add(jmlLabledClauseMetaModel);
         nodeMetaModels.add(jmlLetExprMetaModel);
         nodeMetaModels.add(jmlMethodDeclarationMetaModel);
         nodeMetaModels.add(jmlMethodSignatureMetaModel);
@@ -895,8 +553,9 @@ private static void initializeNodeMetaModels() {
         nodeMetaModels.add(jmlStatementMetaModel);
         nodeMetaModels.add(jmlTypeExprMetaModel);
         nodeMetaModels.add(jmlUnreachableStmtMetaModel);
+        nodeMetaModels.add(keYMarkerStatementMetaModel);
         nodeMetaModels.add(keyAbstractExecutionContextMetaModel);
-        nodeMetaModels.add(keyCatchAllStatementMetaModel);
+        nodeMetaModels.add(keyCatchAllStmtMetaModel);
         nodeMetaModels.add(keyCcatchBranchMetaModel);
         nodeMetaModels.add(keyCcatchBreakMetaModel);
         nodeMetaModels.add(keyCcatchContinueMetaModel);
@@ -906,25 +565,24 @@ private static void initializeNodeMetaModels() {
         nodeMetaModels.add(keyContextStatementBlockMetaModel);
         nodeMetaModels.add(keyEscapeExpressionMetaModel);
         nodeMetaModels.add(keyExecCtxtSVMetaModel);
-        nodeMetaModels.add(keyExecStatementMetaModel);
+        nodeMetaModels.add(keyExecStmtMetaModel);
         nodeMetaModels.add(keyExecutionContextMetaModel);
         nodeMetaModels.add(keyExecutionContextSVMetaModel);
         nodeMetaModels.add(keyExpressionSVMetaModel);
         nodeMetaModels.add(keyJumpLabelSVMetaModel);
-        nodeMetaModels.add(keyLoopScopeBlockMetaModel);
-        nodeMetaModels.add(keyMergePointStatementMetaModel);
+        nodeMetaModels.add(keyLoopScopeBlockStmtMetaModel);
+        nodeMetaModels.add(keyMergePointStmtMetaModel);
         nodeMetaModels.add(keyMetaConstructExpressionMetaModel);
         nodeMetaModels.add(keyMetaConstructMetaModel);
         nodeMetaModels.add(keyMetaConstructTypeMetaModel);
         nodeMetaModels.add(keyMethodBodyStatementMetaModel);
-        nodeMetaModels.add(keyMethodCallStatementMetaModel);
+        nodeMetaModels.add(keyMethodCallStmtMetaModel);
         nodeMetaModels.add(keyMethodSignatureMetaModel);
         nodeMetaModels.add(keyMethodSignatureSVMetaModel);
         nodeMetaModels.add(keyPassiveExpressionMetaModel);
         nodeMetaModels.add(keyProgramVariableSVMetaModel);
-        nodeMetaModels.add(keyRangeExpressionMetaModel);
         nodeMetaModels.add(keyStatementSVMetaModel);
-        nodeMetaModels.add(keyTransactionStatementMetaModel);
+        nodeMetaModels.add(keyTransactionStmtMetaModel);
         nodeMetaModels.add(keyTypeSVMetaModel);
         nodeMetaModels.add(labeledStmtMetaModel);
         nodeMetaModels.add(lambdaExprMetaModel);
@@ -998,3905 +656,744 @@ private static void initializeNodeMetaModels() {
 
     @Generated("com.github.javaparser.generator.metamodel.MetaModelGenerator")
     private static void initializePropertyMetaModels() {
-        nodeMetaModel.associatedSpecificationCommentsPropertyMetaModel = new PropertyMetaModel(
-                nodeMetaModel,
-                "associatedSpecificationComments",
-                com.github.javaparser.ast.comments.Comment.class,
-                Optional.of(commentMetaModel),
-                true,
-                false,
-                true,
-                false);
-        nodeMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(nodeMetaModel.associatedSpecificationCommentsPropertyMetaModel);
-        nodeMetaModel.commentPropertyMetaModel = new PropertyMetaModel(
-                nodeMetaModel,
-                "comment",
-                com.github.javaparser.ast.comments.Comment.class,
-                Optional.of(commentMetaModel),
-                true,
-                false,
-                false,
-                false);
+        nodeMetaModel.associatedSpecificationCommentsPropertyMetaModel = new PropertyMetaModel(nodeMetaModel, "associatedSpecificationComments", com.github.javaparser.ast.comments.Comment.class, Optional.of(commentMetaModel), true, false, true, false);
+        nodeMetaModel.getDeclaredPropertyMetaModels().add(nodeMetaModel.associatedSpecificationCommentsPropertyMetaModel);
+        nodeMetaModel.commentPropertyMetaModel = new PropertyMetaModel(nodeMetaModel, "comment", com.github.javaparser.ast.comments.Comment.class, Optional.of(commentMetaModel), true, false, false, false);
         nodeMetaModel.getDeclaredPropertyMetaModels().add(nodeMetaModel.commentPropertyMetaModel);
-        bodyDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(
-                bodyDeclarationMetaModel,
-                "annotations",
-                com.github.javaparser.ast.expr.AnnotationExpr.class,
-                Optional.of(annotationExprMetaModel),
-                false,
-                false,
-                true,
-                false);
-        bodyDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
-        callableDeclarationMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(
-                callableDeclarationMetaModel,
-                "contracts",
-                com.github.javaparser.ast.jml.clauses.JmlContract.class,
-                Optional.of(jmlContractMetaModel),
-                false,
-                false,
-                true,
-                false);
-        callableDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(callableDeclarationMetaModel.contractsPropertyMetaModel);
-        callableDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                callableDeclarationMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        callableDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(callableDeclarationMetaModel.modifiersPropertyMetaModel);
-        callableDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                callableDeclarationMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        callableDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(callableDeclarationMetaModel.namePropertyMetaModel);
-        callableDeclarationMetaModel.parametersPropertyMetaModel = new PropertyMetaModel(
-                callableDeclarationMetaModel,
-                "parameters",
-                com.github.javaparser.ast.body.Parameter.class,
-                Optional.of(parameterMetaModel),
-                false,
-                false,
-                true,
-                false);
-        callableDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(callableDeclarationMetaModel.parametersPropertyMetaModel);
-        callableDeclarationMetaModel.receiverParameterPropertyMetaModel = new PropertyMetaModel(
-                callableDeclarationMetaModel,
-                "receiverParameter",
-                com.github.javaparser.ast.body.ReceiverParameter.class,
-                Optional.of(receiverParameterMetaModel),
-                true,
-                false,
-                false,
-                false);
-        callableDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel);
-        callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel = new PropertyMetaModel(
-                callableDeclarationMetaModel,
-                "thrownExceptions",
-                com.github.javaparser.ast.type.ReferenceType.class,
-                Optional.of(referenceTypeMetaModel),
-                false,
-                false,
-                true,
-                false);
-        callableDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel);
-        callableDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(
-                callableDeclarationMetaModel,
-                "typeParameters",
-                com.github.javaparser.ast.type.TypeParameter.class,
-                Optional.of(typeParameterMetaModel),
-                false,
-                false,
-                true,
-                false);
-        callableDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(callableDeclarationMetaModel.typeParametersPropertyMetaModel);
-        typeMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(
-                typeMetaModel,
-                "annotations",
-                com.github.javaparser.ast.expr.AnnotationExpr.class,
-                Optional.of(annotationExprMetaModel),
-                false,
-                false,
-                true,
-                false);
+        bodyDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(bodyDeclarationMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false);
+        bodyDeclarationMetaModel.getDeclaredPropertyMetaModels().add(bodyDeclarationMetaModel.annotationsPropertyMetaModel);
+        callableDeclarationMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false);
+        callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.contractsPropertyMetaModel);
+        callableDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.modifiersPropertyMetaModel);
+        callableDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
+        callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.namePropertyMetaModel);
+        callableDeclarationMetaModel.parametersPropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "parameters", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, false, true, false);
+        callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.parametersPropertyMetaModel);
+        callableDeclarationMetaModel.receiverParameterPropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "receiverParameter", com.github.javaparser.ast.body.ReceiverParameter.class, Optional.of(receiverParameterMetaModel), true, false, false, false);
+        callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.receiverParameterPropertyMetaModel);
+        callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "thrownExceptions", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), false, false, true, false);
+        callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.thrownExceptionsPropertyMetaModel);
+        callableDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(callableDeclarationMetaModel, "typeParameters", com.github.javaparser.ast.type.TypeParameter.class, Optional.of(typeParameterMetaModel), false, false, true, false);
+        callableDeclarationMetaModel.getDeclaredPropertyMetaModels().add(callableDeclarationMetaModel.typeParametersPropertyMetaModel);
+        typeMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(typeMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false);
         typeMetaModel.getDeclaredPropertyMetaModels().add(typeMetaModel.annotationsPropertyMetaModel);
-        annotationExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                annotationExprMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
+        annotationExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(annotationExprMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
         annotationExprMetaModel.getDeclaredPropertyMetaModels().add(annotationExprMetaModel.namePropertyMetaModel);
-        typeDeclarationMetaModel.membersPropertyMetaModel = new PropertyMetaModel(
-                typeDeclarationMetaModel,
-                "members",
-                com.github.javaparser.ast.body.BodyDeclaration.class,
-                Optional.of(bodyDeclarationMetaModel),
-                false,
-                false,
-                true,
-                true);
+        typeDeclarationMetaModel.membersPropertyMetaModel = new PropertyMetaModel(typeDeclarationMetaModel, "members", com.github.javaparser.ast.body.BodyDeclaration.class, Optional.of(bodyDeclarationMetaModel), false, false, true, true);
         typeDeclarationMetaModel.getDeclaredPropertyMetaModels().add(typeDeclarationMetaModel.membersPropertyMetaModel);
-        typeDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                typeDeclarationMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        typeDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(typeDeclarationMetaModel.modifiersPropertyMetaModel);
-        typeDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                typeDeclarationMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
+        typeDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(typeDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        typeDeclarationMetaModel.getDeclaredPropertyMetaModels().add(typeDeclarationMetaModel.modifiersPropertyMetaModel);
+        typeDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(typeDeclarationMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
         typeDeclarationMetaModel.getDeclaredPropertyMetaModels().add(typeDeclarationMetaModel.namePropertyMetaModel);
-        literalStringValueExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel(
-                literalStringValueExprMetaModel,
-                "value",
-                java.lang.String.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        literalStringValueExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(literalStringValueExprMetaModel.valuePropertyMetaModel);
-        moduleDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(
-                moduleDeclarationMetaModel,
-                "annotations",
-                com.github.javaparser.ast.expr.AnnotationExpr.class,
-                Optional.of(annotationExprMetaModel),
-                false,
-                false,
-                true,
-                false);
-        moduleDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleDeclarationMetaModel.annotationsPropertyMetaModel);
-        moduleDeclarationMetaModel.directivesPropertyMetaModel = new PropertyMetaModel(
-                moduleDeclarationMetaModel,
-                "directives",
-                com.github.javaparser.ast.modules.ModuleDirective.class,
-                Optional.of(moduleDirectiveMetaModel),
-                false,
-                false,
-                true,
-                false);
-        moduleDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleDeclarationMetaModel.directivesPropertyMetaModel);
-        moduleDeclarationMetaModel.isOpenPropertyMetaModel = new PropertyMetaModel(
-                moduleDeclarationMetaModel, "isOpen", boolean.class, Optional.empty(), false, false, false, false);
-        moduleDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleDeclarationMetaModel.isOpenPropertyMetaModel);
-        moduleDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                moduleDeclarationMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        moduleDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleDeclarationMetaModel.namePropertyMetaModel);
-        arrayCreationLevelMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(
-                arrayCreationLevelMetaModel,
-                "annotations",
-                com.github.javaparser.ast.expr.AnnotationExpr.class,
-                Optional.of(annotationExprMetaModel),
-                false,
-                false,
-                true,
-                false);
-        arrayCreationLevelMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(arrayCreationLevelMetaModel.annotationsPropertyMetaModel);
-        arrayCreationLevelMetaModel.dimensionPropertyMetaModel = new PropertyMetaModel(
-                arrayCreationLevelMetaModel,
-                "dimension",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                false,
-                false);
-        arrayCreationLevelMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(arrayCreationLevelMetaModel.dimensionPropertyMetaModel);
-        compilationUnitMetaModel.importsPropertyMetaModel = new PropertyMetaModel(
-                compilationUnitMetaModel,
-                "imports",
-                com.github.javaparser.ast.ImportDeclaration.class,
-                Optional.of(importDeclarationMetaModel),
-                false,
-                false,
-                true,
-                false);
+        literalStringValueExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel(literalStringValueExprMetaModel, "value", java.lang.String.class, Optional.empty(), false, false, false, false);
+        literalStringValueExprMetaModel.getDeclaredPropertyMetaModels().add(literalStringValueExprMetaModel.valuePropertyMetaModel);
+        moduleDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(moduleDeclarationMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false);
+        moduleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(moduleDeclarationMetaModel.annotationsPropertyMetaModel);
+        moduleDeclarationMetaModel.directivesPropertyMetaModel = new PropertyMetaModel(moduleDeclarationMetaModel, "directives", com.github.javaparser.ast.modules.ModuleDirective.class, Optional.of(moduleDirectiveMetaModel), false, false, true, false);
+        moduleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(moduleDeclarationMetaModel.directivesPropertyMetaModel);
+        moduleDeclarationMetaModel.isOpenPropertyMetaModel = new PropertyMetaModel(moduleDeclarationMetaModel, "isOpen", boolean.class, Optional.empty(), false, false, false, false);
+        moduleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(moduleDeclarationMetaModel.isOpenPropertyMetaModel);
+        moduleDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(moduleDeclarationMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        moduleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(moduleDeclarationMetaModel.namePropertyMetaModel);
+        arrayCreationLevelMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(arrayCreationLevelMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false);
+        arrayCreationLevelMetaModel.getDeclaredPropertyMetaModels().add(arrayCreationLevelMetaModel.annotationsPropertyMetaModel);
+        arrayCreationLevelMetaModel.dimensionPropertyMetaModel = new PropertyMetaModel(arrayCreationLevelMetaModel, "dimension", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
+        arrayCreationLevelMetaModel.getDeclaredPropertyMetaModels().add(arrayCreationLevelMetaModel.dimensionPropertyMetaModel);
+        compilationUnitMetaModel.importsPropertyMetaModel = new PropertyMetaModel(compilationUnitMetaModel, "imports", com.github.javaparser.ast.ImportDeclaration.class, Optional.of(importDeclarationMetaModel), false, false, true, false);
         compilationUnitMetaModel.getDeclaredPropertyMetaModels().add(compilationUnitMetaModel.importsPropertyMetaModel);
-        compilationUnitMetaModel.modulePropertyMetaModel = new PropertyMetaModel(
-                compilationUnitMetaModel,
-                "module",
-                com.github.javaparser.ast.modules.ModuleDeclaration.class,
-                Optional.of(moduleDeclarationMetaModel),
-                true,
-                false,
-                false,
-                false);
+        compilationUnitMetaModel.modulePropertyMetaModel = new PropertyMetaModel(compilationUnitMetaModel, "module", com.github.javaparser.ast.modules.ModuleDeclaration.class, Optional.of(moduleDeclarationMetaModel), true, false, false, false);
         compilationUnitMetaModel.getDeclaredPropertyMetaModels().add(compilationUnitMetaModel.modulePropertyMetaModel);
-        compilationUnitMetaModel.packageDeclarationPropertyMetaModel = new PropertyMetaModel(
-                compilationUnitMetaModel,
-                "packageDeclaration",
-                com.github.javaparser.ast.PackageDeclaration.class,
-                Optional.of(packageDeclarationMetaModel),
-                true,
-                false,
-                false,
-                false);
-        compilationUnitMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(compilationUnitMetaModel.packageDeclarationPropertyMetaModel);
-        compilationUnitMetaModel.typesPropertyMetaModel = new PropertyMetaModel(
-                compilationUnitMetaModel,
-                "types",
-                com.github.javaparser.ast.body.TypeDeclaration.class,
-                Optional.of(typeDeclarationMetaModel),
-                false,
-                false,
-                true,
-                true);
+        compilationUnitMetaModel.packageDeclarationPropertyMetaModel = new PropertyMetaModel(compilationUnitMetaModel, "packageDeclaration", com.github.javaparser.ast.PackageDeclaration.class, Optional.of(packageDeclarationMetaModel), true, false, false, false);
+        compilationUnitMetaModel.getDeclaredPropertyMetaModels().add(compilationUnitMetaModel.packageDeclarationPropertyMetaModel);
+        compilationUnitMetaModel.typesPropertyMetaModel = new PropertyMetaModel(compilationUnitMetaModel, "types", com.github.javaparser.ast.body.TypeDeclaration.class, Optional.of(typeDeclarationMetaModel), false, false, true, true);
         compilationUnitMetaModel.getDeclaredPropertyMetaModels().add(compilationUnitMetaModel.typesPropertyMetaModel);
-        importDeclarationMetaModel.isAsteriskPropertyMetaModel = new PropertyMetaModel(
-                importDeclarationMetaModel, "isAsterisk", boolean.class, Optional.empty(), false, false, false, false);
-        importDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(importDeclarationMetaModel.isAsteriskPropertyMetaModel);
-        importDeclarationMetaModel.isJmlModelPropertyMetaModel = new PropertyMetaModel(
-                importDeclarationMetaModel, "isJmlModel", boolean.class, Optional.empty(), false, false, false, false);
-        importDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(importDeclarationMetaModel.isJmlModelPropertyMetaModel);
-        importDeclarationMetaModel.isModulePropertyMetaModel = new PropertyMetaModel(
-                importDeclarationMetaModel, "isModule", boolean.class, Optional.empty(), false, false, false, false);
-        importDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(importDeclarationMetaModel.isModulePropertyMetaModel);
-        importDeclarationMetaModel.isStaticPropertyMetaModel = new PropertyMetaModel(
-                importDeclarationMetaModel, "isStatic", boolean.class, Optional.empty(), false, false, false, false);
-        importDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(importDeclarationMetaModel.isStaticPropertyMetaModel);
-        importDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                importDeclarationMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        importDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(importDeclarationMetaModel.namePropertyMetaModel);
-        modifierMetaModel.keywordPropertyMetaModel = new PropertyMetaModel(
-                modifierMetaModel,
-                "keyword",
-                com.github.javaparser.ast.Modifier.Keyword.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
+        importDeclarationMetaModel.isAsteriskPropertyMetaModel = new PropertyMetaModel(importDeclarationMetaModel, "isAsterisk", boolean.class, Optional.empty(), false, false, false, false);
+        importDeclarationMetaModel.getDeclaredPropertyMetaModels().add(importDeclarationMetaModel.isAsteriskPropertyMetaModel);
+        importDeclarationMetaModel.isJmlModelPropertyMetaModel = new PropertyMetaModel(importDeclarationMetaModel, "isJmlModel", boolean.class, Optional.empty(), false, false, false, false);
+        importDeclarationMetaModel.getDeclaredPropertyMetaModels().add(importDeclarationMetaModel.isJmlModelPropertyMetaModel);
+        importDeclarationMetaModel.isModulePropertyMetaModel = new PropertyMetaModel(importDeclarationMetaModel, "isModule", boolean.class, Optional.empty(), false, false, false, false);
+        importDeclarationMetaModel.getDeclaredPropertyMetaModels().add(importDeclarationMetaModel.isModulePropertyMetaModel);
+        importDeclarationMetaModel.isStaticPropertyMetaModel = new PropertyMetaModel(importDeclarationMetaModel, "isStatic", boolean.class, Optional.empty(), false, false, false, false);
+        importDeclarationMetaModel.getDeclaredPropertyMetaModels().add(importDeclarationMetaModel.isStaticPropertyMetaModel);
+        importDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(importDeclarationMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        importDeclarationMetaModel.getDeclaredPropertyMetaModels().add(importDeclarationMetaModel.namePropertyMetaModel);
+        modifierMetaModel.keywordPropertyMetaModel = new PropertyMetaModel(modifierMetaModel, "keyword", com.github.javaparser.ast.Modifier.Keyword.class, Optional.empty(), false, false, false, false);
         modifierMetaModel.getDeclaredPropertyMetaModels().add(modifierMetaModel.keywordPropertyMetaModel);
-        packageDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(
-                packageDeclarationMetaModel,
-                "annotations",
-                com.github.javaparser.ast.expr.AnnotationExpr.class,
-                Optional.of(annotationExprMetaModel),
-                false,
-                false,
-                true,
-                false);
-        packageDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(packageDeclarationMetaModel.annotationsPropertyMetaModel);
-        packageDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                packageDeclarationMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        packageDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(packageDeclarationMetaModel.namePropertyMetaModel);
-        annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel = new PropertyMetaModel(
-                annotationMemberDeclarationMetaModel,
-                "defaultValue",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                false,
-                false);
-        annotationMemberDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel);
-        annotationMemberDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                annotationMemberDeclarationMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        annotationMemberDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(annotationMemberDeclarationMetaModel.modifiersPropertyMetaModel);
-        annotationMemberDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                annotationMemberDeclarationMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        annotationMemberDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(annotationMemberDeclarationMetaModel.namePropertyMetaModel);
-        annotationMemberDeclarationMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                annotationMemberDeclarationMetaModel,
-                "type",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
-        annotationMemberDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(annotationMemberDeclarationMetaModel.typePropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel.extendedTypesPropertyMetaModel = new PropertyMetaModel(
-                classOrInterfaceDeclarationMetaModel,
-                "extendedTypes",
-                com.github.javaparser.ast.type.ClassOrInterfaceType.class,
-                Optional.of(classOrInterfaceTypeMetaModel),
-                false,
-                false,
-                true,
-                false);
-        classOrInterfaceDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(classOrInterfaceDeclarationMetaModel.extendedTypesPropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel.implementedTypesPropertyMetaModel = new PropertyMetaModel(
-                classOrInterfaceDeclarationMetaModel,
-                "implementedTypes",
-                com.github.javaparser.ast.type.ClassOrInterfaceType.class,
-                Optional.of(classOrInterfaceTypeMetaModel),
-                false,
-                false,
-                true,
-                false);
-        classOrInterfaceDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(classOrInterfaceDeclarationMetaModel.implementedTypesPropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel.isCompactPropertyMetaModel = new PropertyMetaModel(
-                classOrInterfaceDeclarationMetaModel,
-                "isCompact",
-                boolean.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        classOrInterfaceDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(classOrInterfaceDeclarationMetaModel.isCompactPropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel.isInterfacePropertyMetaModel = new PropertyMetaModel(
-                classOrInterfaceDeclarationMetaModel,
-                "isInterface",
-                boolean.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        classOrInterfaceDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(classOrInterfaceDeclarationMetaModel.isInterfacePropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel.permittedTypesPropertyMetaModel = new PropertyMetaModel(
-                classOrInterfaceDeclarationMetaModel,
-                "permittedTypes",
-                com.github.javaparser.ast.type.ClassOrInterfaceType.class,
-                Optional.of(classOrInterfaceTypeMetaModel),
-                false,
-                false,
-                true,
-                false);
-        classOrInterfaceDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(classOrInterfaceDeclarationMetaModel.permittedTypesPropertyMetaModel);
-        classOrInterfaceDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(
-                classOrInterfaceDeclarationMetaModel,
-                "typeParameters",
-                com.github.javaparser.ast.type.TypeParameter.class,
-                Optional.of(typeParameterMetaModel),
-                false,
-                false,
-                true,
-                false);
-        classOrInterfaceDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(classOrInterfaceDeclarationMetaModel.typeParametersPropertyMetaModel);
-        constructorDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(
-                constructorDeclarationMetaModel,
-                "body",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                true,
-                false,
-                false,
-                false);
-        constructorDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(constructorDeclarationMetaModel.bodyPropertyMetaModel);
-        enumConstantDeclarationMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(
-                enumConstantDeclarationMetaModel,
-                "arguments",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                true,
-                false);
-        enumConstantDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(enumConstantDeclarationMetaModel.argumentsPropertyMetaModel);
-        enumConstantDeclarationMetaModel.classBodyPropertyMetaModel = new PropertyMetaModel(
-                enumConstantDeclarationMetaModel,
-                "classBody",
-                com.github.javaparser.ast.body.BodyDeclaration.class,
-                Optional.of(bodyDeclarationMetaModel),
-                false,
-                false,
-                true,
-                true);
-        enumConstantDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(enumConstantDeclarationMetaModel.classBodyPropertyMetaModel);
-        enumConstantDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                enumConstantDeclarationMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        enumConstantDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(enumConstantDeclarationMetaModel.namePropertyMetaModel);
-        enumDeclarationMetaModel.entriesPropertyMetaModel = new PropertyMetaModel(
-                enumDeclarationMetaModel,
-                "entries",
-                com.github.javaparser.ast.body.EnumConstantDeclaration.class,
-                Optional.of(enumConstantDeclarationMetaModel),
-                false,
-                false,
-                true,
-                false);
+        packageDeclarationMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(packageDeclarationMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false);
+        packageDeclarationMetaModel.getDeclaredPropertyMetaModels().add(packageDeclarationMetaModel.annotationsPropertyMetaModel);
+        packageDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(packageDeclarationMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        packageDeclarationMetaModel.getDeclaredPropertyMetaModels().add(packageDeclarationMetaModel.namePropertyMetaModel);
+        annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel = new PropertyMetaModel(annotationMemberDeclarationMetaModel, "defaultValue", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
+        annotationMemberDeclarationMetaModel.getDeclaredPropertyMetaModels().add(annotationMemberDeclarationMetaModel.defaultValuePropertyMetaModel);
+        annotationMemberDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(annotationMemberDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        annotationMemberDeclarationMetaModel.getDeclaredPropertyMetaModels().add(annotationMemberDeclarationMetaModel.modifiersPropertyMetaModel);
+        annotationMemberDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(annotationMemberDeclarationMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
+        annotationMemberDeclarationMetaModel.getDeclaredPropertyMetaModels().add(annotationMemberDeclarationMetaModel.namePropertyMetaModel);
+        annotationMemberDeclarationMetaModel.typePropertyMetaModel = new PropertyMetaModel(annotationMemberDeclarationMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
+        annotationMemberDeclarationMetaModel.getDeclaredPropertyMetaModels().add(annotationMemberDeclarationMetaModel.typePropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.extendedTypesPropertyMetaModel = new PropertyMetaModel(classOrInterfaceDeclarationMetaModel, "extendedTypes", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, true, false);
+        classOrInterfaceDeclarationMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceDeclarationMetaModel.extendedTypesPropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.implementedTypesPropertyMetaModel = new PropertyMetaModel(classOrInterfaceDeclarationMetaModel, "implementedTypes", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, true, false);
+        classOrInterfaceDeclarationMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceDeclarationMetaModel.implementedTypesPropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.isCompactPropertyMetaModel = new PropertyMetaModel(classOrInterfaceDeclarationMetaModel, "isCompact", boolean.class, Optional.empty(), false, false, false, false);
+        classOrInterfaceDeclarationMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceDeclarationMetaModel.isCompactPropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.isInterfacePropertyMetaModel = new PropertyMetaModel(classOrInterfaceDeclarationMetaModel, "isInterface", boolean.class, Optional.empty(), false, false, false, false);
+        classOrInterfaceDeclarationMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceDeclarationMetaModel.isInterfacePropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.permittedTypesPropertyMetaModel = new PropertyMetaModel(classOrInterfaceDeclarationMetaModel, "permittedTypes", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, true, false);
+        classOrInterfaceDeclarationMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceDeclarationMetaModel.permittedTypesPropertyMetaModel);
+        classOrInterfaceDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(classOrInterfaceDeclarationMetaModel, "typeParameters", com.github.javaparser.ast.type.TypeParameter.class, Optional.of(typeParameterMetaModel), false, false, true, false);
+        classOrInterfaceDeclarationMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceDeclarationMetaModel.typeParametersPropertyMetaModel);
+        constructorDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(constructorDeclarationMetaModel, "body", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), true, false, false, false);
+        constructorDeclarationMetaModel.getDeclaredPropertyMetaModels().add(constructorDeclarationMetaModel.bodyPropertyMetaModel);
+        enumConstantDeclarationMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(enumConstantDeclarationMetaModel, "arguments", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
+        enumConstantDeclarationMetaModel.getDeclaredPropertyMetaModels().add(enumConstantDeclarationMetaModel.argumentsPropertyMetaModel);
+        enumConstantDeclarationMetaModel.classBodyPropertyMetaModel = new PropertyMetaModel(enumConstantDeclarationMetaModel, "classBody", com.github.javaparser.ast.body.BodyDeclaration.class, Optional.of(bodyDeclarationMetaModel), false, false, true, true);
+        enumConstantDeclarationMetaModel.getDeclaredPropertyMetaModels().add(enumConstantDeclarationMetaModel.classBodyPropertyMetaModel);
+        enumConstantDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(enumConstantDeclarationMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
+        enumConstantDeclarationMetaModel.getDeclaredPropertyMetaModels().add(enumConstantDeclarationMetaModel.namePropertyMetaModel);
+        enumDeclarationMetaModel.entriesPropertyMetaModel = new PropertyMetaModel(enumDeclarationMetaModel, "entries", com.github.javaparser.ast.body.EnumConstantDeclaration.class, Optional.of(enumConstantDeclarationMetaModel), false, false, true, false);
         enumDeclarationMetaModel.getDeclaredPropertyMetaModels().add(enumDeclarationMetaModel.entriesPropertyMetaModel);
-        enumDeclarationMetaModel.implementedTypesPropertyMetaModel = new PropertyMetaModel(
-                enumDeclarationMetaModel,
-                "implementedTypes",
-                com.github.javaparser.ast.type.ClassOrInterfaceType.class,
-                Optional.of(classOrInterfaceTypeMetaModel),
-                false,
-                false,
-                true,
-                false);
-        enumDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(enumDeclarationMetaModel.implementedTypesPropertyMetaModel);
-        fieldDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                fieldDeclarationMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        fieldDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(fieldDeclarationMetaModel.modifiersPropertyMetaModel);
-        fieldDeclarationMetaModel.variablesPropertyMetaModel = new PropertyMetaModel(
-                fieldDeclarationMetaModel,
-                "variables",
-                com.github.javaparser.ast.body.VariableDeclarator.class,
-                Optional.of(variableDeclaratorMetaModel),
-                false,
-                true,
-                true,
-                false);
-        fieldDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(fieldDeclarationMetaModel.variablesPropertyMetaModel);
-        fieldDeclarationMetaModel.maximumCommonTypePropertyMetaModel = new PropertyMetaModel(
-                fieldDeclarationMetaModel,
-                "maximumCommonType",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                true,
-                false,
-                false,
-                false);
-        fieldDeclarationMetaModel
-                .getDerivedPropertyMetaModels()
-                .add(fieldDeclarationMetaModel.maximumCommonTypePropertyMetaModel);
-        initializerDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(
-                initializerDeclarationMetaModel,
-                "body",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                false,
-                false,
-                false,
-                false);
-        initializerDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(initializerDeclarationMetaModel.bodyPropertyMetaModel);
-        initializerDeclarationMetaModel.isStaticPropertyMetaModel = new PropertyMetaModel(
-                initializerDeclarationMetaModel,
-                "isStatic",
-                boolean.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        initializerDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(initializerDeclarationMetaModel.isStaticPropertyMetaModel);
-        methodDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(
-                methodDeclarationMetaModel,
-                "body",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                true,
-                false,
-                false,
-                false);
-        methodDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(methodDeclarationMetaModel.bodyPropertyMetaModel);
-        methodDeclarationMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                methodDeclarationMetaModel,
-                "type",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
-        methodDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(methodDeclarationMetaModel.typePropertyMetaModel);
-        parameterMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(
-                parameterMetaModel,
-                "annotations",
-                com.github.javaparser.ast.expr.AnnotationExpr.class,
-                Optional.of(annotationExprMetaModel),
-                false,
-                false,
-                true,
-                false);
+        enumDeclarationMetaModel.implementedTypesPropertyMetaModel = new PropertyMetaModel(enumDeclarationMetaModel, "implementedTypes", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, true, false);
+        enumDeclarationMetaModel.getDeclaredPropertyMetaModels().add(enumDeclarationMetaModel.implementedTypesPropertyMetaModel);
+        fieldDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(fieldDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        fieldDeclarationMetaModel.getDeclaredPropertyMetaModels().add(fieldDeclarationMetaModel.modifiersPropertyMetaModel);
+        fieldDeclarationMetaModel.variablesPropertyMetaModel = new PropertyMetaModel(fieldDeclarationMetaModel, "variables", com.github.javaparser.ast.body.VariableDeclarator.class, Optional.of(variableDeclaratorMetaModel), false, true, true, false);
+        fieldDeclarationMetaModel.getDeclaredPropertyMetaModels().add(fieldDeclarationMetaModel.variablesPropertyMetaModel);
+        fieldDeclarationMetaModel.maximumCommonTypePropertyMetaModel = new PropertyMetaModel(fieldDeclarationMetaModel, "maximumCommonType", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, false, false);
+        fieldDeclarationMetaModel.getDerivedPropertyMetaModels().add(fieldDeclarationMetaModel.maximumCommonTypePropertyMetaModel);
+        initializerDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(initializerDeclarationMetaModel, "body", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false);
+        initializerDeclarationMetaModel.getDeclaredPropertyMetaModels().add(initializerDeclarationMetaModel.bodyPropertyMetaModel);
+        initializerDeclarationMetaModel.isStaticPropertyMetaModel = new PropertyMetaModel(initializerDeclarationMetaModel, "isStatic", boolean.class, Optional.empty(), false, false, false, false);
+        initializerDeclarationMetaModel.getDeclaredPropertyMetaModels().add(initializerDeclarationMetaModel.isStaticPropertyMetaModel);
+        methodDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(methodDeclarationMetaModel, "body", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), true, false, false, false);
+        methodDeclarationMetaModel.getDeclaredPropertyMetaModels().add(methodDeclarationMetaModel.bodyPropertyMetaModel);
+        methodDeclarationMetaModel.typePropertyMetaModel = new PropertyMetaModel(methodDeclarationMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
+        methodDeclarationMetaModel.getDeclaredPropertyMetaModels().add(methodDeclarationMetaModel.typePropertyMetaModel);
+        parameterMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false);
         parameterMetaModel.getDeclaredPropertyMetaModels().add(parameterMetaModel.annotationsPropertyMetaModel);
-        parameterMetaModel.isVarArgsPropertyMetaModel = new PropertyMetaModel(
-                parameterMetaModel, "isVarArgs", boolean.class, Optional.empty(), false, false, false, false);
+        parameterMetaModel.isVarArgsPropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "isVarArgs", boolean.class, Optional.empty(), false, false, false, false);
         parameterMetaModel.getDeclaredPropertyMetaModels().add(parameterMetaModel.isVarArgsPropertyMetaModel);
-        parameterMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                parameterMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
+        parameterMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
         parameterMetaModel.getDeclaredPropertyMetaModels().add(parameterMetaModel.modifiersPropertyMetaModel);
-        parameterMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                parameterMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
+        parameterMetaModel.namePropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
         parameterMetaModel.getDeclaredPropertyMetaModels().add(parameterMetaModel.namePropertyMetaModel);
-        parameterMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                parameterMetaModel,
-                "type",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
+        parameterMetaModel.typePropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
         parameterMetaModel.getDeclaredPropertyMetaModels().add(parameterMetaModel.typePropertyMetaModel);
-        parameterMetaModel.varArgsAnnotationsPropertyMetaModel = new PropertyMetaModel(
-                parameterMetaModel,
-                "varArgsAnnotations",
-                com.github.javaparser.ast.expr.AnnotationExpr.class,
-                Optional.of(annotationExprMetaModel),
-                false,
-                false,
-                true,
-                false);
+        parameterMetaModel.varArgsAnnotationsPropertyMetaModel = new PropertyMetaModel(parameterMetaModel, "varArgsAnnotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false);
         parameterMetaModel.getDeclaredPropertyMetaModels().add(parameterMetaModel.varArgsAnnotationsPropertyMetaModel);
-        receiverParameterMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(
-                receiverParameterMetaModel,
-                "annotations",
-                com.github.javaparser.ast.expr.AnnotationExpr.class,
-                Optional.of(annotationExprMetaModel),
-                false,
-                false,
-                true,
-                false);
-        receiverParameterMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(receiverParameterMetaModel.annotationsPropertyMetaModel);
-        receiverParameterMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                receiverParameterMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        receiverParameterMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(receiverParameterMetaModel.namePropertyMetaModel);
-        receiverParameterMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                receiverParameterMetaModel,
-                "type",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
-        receiverParameterMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(receiverParameterMetaModel.typePropertyMetaModel);
-        recordDeclarationMetaModel.implementedTypesPropertyMetaModel = new PropertyMetaModel(
-                recordDeclarationMetaModel,
-                "implementedTypes",
-                com.github.javaparser.ast.type.ClassOrInterfaceType.class,
-                Optional.of(classOrInterfaceTypeMetaModel),
-                false,
-                false,
-                true,
-                false);
-        recordDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(recordDeclarationMetaModel.implementedTypesPropertyMetaModel);
-        recordDeclarationMetaModel.parametersPropertyMetaModel = new PropertyMetaModel(
-                recordDeclarationMetaModel,
-                "parameters",
-                com.github.javaparser.ast.body.Parameter.class,
-                Optional.of(parameterMetaModel),
-                false,
-                false,
-                true,
-                false);
-        recordDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(recordDeclarationMetaModel.parametersPropertyMetaModel);
-        recordDeclarationMetaModel.receiverParameterPropertyMetaModel = new PropertyMetaModel(
-                recordDeclarationMetaModel,
-                "receiverParameter",
-                com.github.javaparser.ast.body.ReceiverParameter.class,
-                Optional.of(receiverParameterMetaModel),
-                true,
-                false,
-                false,
-                false);
-        recordDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(recordDeclarationMetaModel.receiverParameterPropertyMetaModel);
-        recordDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(
-                recordDeclarationMetaModel,
-                "typeParameters",
-                com.github.javaparser.ast.type.TypeParameter.class,
-                Optional.of(typeParameterMetaModel),
-                false,
-                false,
-                true,
-                false);
-        recordDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(recordDeclarationMetaModel.typeParametersPropertyMetaModel);
-        compactConstructorDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(
-                compactConstructorDeclarationMetaModel,
-                "body",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                false,
-                false,
-                false,
-                false);
-        compactConstructorDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(compactConstructorDeclarationMetaModel.bodyPropertyMetaModel);
-        compactConstructorDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                compactConstructorDeclarationMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        compactConstructorDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(compactConstructorDeclarationMetaModel.modifiersPropertyMetaModel);
-        compactConstructorDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                compactConstructorDeclarationMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        compactConstructorDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(compactConstructorDeclarationMetaModel.namePropertyMetaModel);
-        compactConstructorDeclarationMetaModel.thrownExceptionsPropertyMetaModel = new PropertyMetaModel(
-                compactConstructorDeclarationMetaModel,
-                "thrownExceptions",
-                com.github.javaparser.ast.type.ReferenceType.class,
-                Optional.of(referenceTypeMetaModel),
-                false,
-                false,
-                true,
-                false);
-        compactConstructorDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(compactConstructorDeclarationMetaModel.thrownExceptionsPropertyMetaModel);
-        compactConstructorDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(
-                compactConstructorDeclarationMetaModel,
-                "typeParameters",
-                com.github.javaparser.ast.type.TypeParameter.class,
-                Optional.of(typeParameterMetaModel),
-                false,
-                false,
-                true,
-                false);
-        compactConstructorDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(compactConstructorDeclarationMetaModel.typeParametersPropertyMetaModel);
-        variableDeclaratorMetaModel.initializerPropertyMetaModel = new PropertyMetaModel(
-                variableDeclaratorMetaModel,
-                "initializer",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                true,
-                false,
-                false);
-        variableDeclaratorMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(variableDeclaratorMetaModel.initializerPropertyMetaModel);
-        variableDeclaratorMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                variableDeclaratorMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        variableDeclaratorMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(variableDeclaratorMetaModel.namePropertyMetaModel);
-        variableDeclaratorMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                variableDeclaratorMetaModel,
-                "type",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
-        variableDeclaratorMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(variableDeclaratorMetaModel.typePropertyMetaModel);
-        commentMetaModel.contentPropertyMetaModel = new PropertyMetaModel(
-                commentMetaModel, "content", java.lang.String.class, Optional.empty(), false, false, false, false);
+        receiverParameterMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(receiverParameterMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false);
+        receiverParameterMetaModel.getDeclaredPropertyMetaModels().add(receiverParameterMetaModel.annotationsPropertyMetaModel);
+        receiverParameterMetaModel.namePropertyMetaModel = new PropertyMetaModel(receiverParameterMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        receiverParameterMetaModel.getDeclaredPropertyMetaModels().add(receiverParameterMetaModel.namePropertyMetaModel);
+        receiverParameterMetaModel.typePropertyMetaModel = new PropertyMetaModel(receiverParameterMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
+        receiverParameterMetaModel.getDeclaredPropertyMetaModels().add(receiverParameterMetaModel.typePropertyMetaModel);
+        recordDeclarationMetaModel.implementedTypesPropertyMetaModel = new PropertyMetaModel(recordDeclarationMetaModel, "implementedTypes", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, true, false);
+        recordDeclarationMetaModel.getDeclaredPropertyMetaModels().add(recordDeclarationMetaModel.implementedTypesPropertyMetaModel);
+        recordDeclarationMetaModel.parametersPropertyMetaModel = new PropertyMetaModel(recordDeclarationMetaModel, "parameters", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, false, true, false);
+        recordDeclarationMetaModel.getDeclaredPropertyMetaModels().add(recordDeclarationMetaModel.parametersPropertyMetaModel);
+        recordDeclarationMetaModel.receiverParameterPropertyMetaModel = new PropertyMetaModel(recordDeclarationMetaModel, "receiverParameter", com.github.javaparser.ast.body.ReceiverParameter.class, Optional.of(receiverParameterMetaModel), true, false, false, false);
+        recordDeclarationMetaModel.getDeclaredPropertyMetaModels().add(recordDeclarationMetaModel.receiverParameterPropertyMetaModel);
+        recordDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(recordDeclarationMetaModel, "typeParameters", com.github.javaparser.ast.type.TypeParameter.class, Optional.of(typeParameterMetaModel), false, false, true, false);
+        recordDeclarationMetaModel.getDeclaredPropertyMetaModels().add(recordDeclarationMetaModel.typeParametersPropertyMetaModel);
+        compactConstructorDeclarationMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(compactConstructorDeclarationMetaModel, "body", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false);
+        compactConstructorDeclarationMetaModel.getDeclaredPropertyMetaModels().add(compactConstructorDeclarationMetaModel.bodyPropertyMetaModel);
+        compactConstructorDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(compactConstructorDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        compactConstructorDeclarationMetaModel.getDeclaredPropertyMetaModels().add(compactConstructorDeclarationMetaModel.modifiersPropertyMetaModel);
+        compactConstructorDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(compactConstructorDeclarationMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
+        compactConstructorDeclarationMetaModel.getDeclaredPropertyMetaModels().add(compactConstructorDeclarationMetaModel.namePropertyMetaModel);
+        compactConstructorDeclarationMetaModel.thrownExceptionsPropertyMetaModel = new PropertyMetaModel(compactConstructorDeclarationMetaModel, "thrownExceptions", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), false, false, true, false);
+        compactConstructorDeclarationMetaModel.getDeclaredPropertyMetaModels().add(compactConstructorDeclarationMetaModel.thrownExceptionsPropertyMetaModel);
+        compactConstructorDeclarationMetaModel.typeParametersPropertyMetaModel = new PropertyMetaModel(compactConstructorDeclarationMetaModel, "typeParameters", com.github.javaparser.ast.type.TypeParameter.class, Optional.of(typeParameterMetaModel), false, false, true, false);
+        compactConstructorDeclarationMetaModel.getDeclaredPropertyMetaModels().add(compactConstructorDeclarationMetaModel.typeParametersPropertyMetaModel);
+        variableDeclaratorMetaModel.initializerPropertyMetaModel = new PropertyMetaModel(variableDeclaratorMetaModel, "initializer", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, true, false, false);
+        variableDeclaratorMetaModel.getDeclaredPropertyMetaModels().add(variableDeclaratorMetaModel.initializerPropertyMetaModel);
+        variableDeclaratorMetaModel.namePropertyMetaModel = new PropertyMetaModel(variableDeclaratorMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
+        variableDeclaratorMetaModel.getDeclaredPropertyMetaModels().add(variableDeclaratorMetaModel.namePropertyMetaModel);
+        variableDeclaratorMetaModel.typePropertyMetaModel = new PropertyMetaModel(variableDeclaratorMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
+        variableDeclaratorMetaModel.getDeclaredPropertyMetaModels().add(variableDeclaratorMetaModel.typePropertyMetaModel);
+        commentMetaModel.contentPropertyMetaModel = new PropertyMetaModel(commentMetaModel, "content", java.lang.String.class, Optional.empty(), false, false, false, false);
         commentMetaModel.getDeclaredPropertyMetaModels().add(commentMetaModel.contentPropertyMetaModel);
-        arrayAccessExprMetaModel.indexPropertyMetaModel = new PropertyMetaModel(
-                arrayAccessExprMetaModel,
-                "index",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        arrayAccessExprMetaModel.indexPropertyMetaModel = new PropertyMetaModel(arrayAccessExprMetaModel, "index", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         arrayAccessExprMetaModel.getDeclaredPropertyMetaModels().add(arrayAccessExprMetaModel.indexPropertyMetaModel);
-        arrayAccessExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                arrayAccessExprMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        arrayAccessExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(arrayAccessExprMetaModel, "name", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         arrayAccessExprMetaModel.getDeclaredPropertyMetaModels().add(arrayAccessExprMetaModel.namePropertyMetaModel);
-        arrayCreationExprMetaModel.elementTypePropertyMetaModel = new PropertyMetaModel(
-                arrayCreationExprMetaModel,
-                "elementType",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
-        arrayCreationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(arrayCreationExprMetaModel.elementTypePropertyMetaModel);
-        arrayCreationExprMetaModel.initializerPropertyMetaModel = new PropertyMetaModel(
-                arrayCreationExprMetaModel,
-                "initializer",
-                com.github.javaparser.ast.expr.ArrayInitializerExpr.class,
-                Optional.of(arrayInitializerExprMetaModel),
-                true,
-                false,
-                false,
-                false);
-        arrayCreationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(arrayCreationExprMetaModel.initializerPropertyMetaModel);
-        arrayCreationExprMetaModel.levelsPropertyMetaModel = new PropertyMetaModel(
-                arrayCreationExprMetaModel,
-                "levels",
-                com.github.javaparser.ast.ArrayCreationLevel.class,
-                Optional.of(arrayCreationLevelMetaModel),
-                false,
-                true,
-                true,
-                false);
-        arrayCreationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(arrayCreationExprMetaModel.levelsPropertyMetaModel);
-        arrayInitializerExprMetaModel.valuesPropertyMetaModel = new PropertyMetaModel(
-                arrayInitializerExprMetaModel,
-                "values",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                true,
-                false);
-        arrayInitializerExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(arrayInitializerExprMetaModel.valuesPropertyMetaModel);
-        assignExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(
-                assignExprMetaModel,
-                "operator",
-                com.github.javaparser.ast.expr.AssignExpr.Operator.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
+        arrayCreationExprMetaModel.elementTypePropertyMetaModel = new PropertyMetaModel(arrayCreationExprMetaModel, "elementType", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
+        arrayCreationExprMetaModel.getDeclaredPropertyMetaModels().add(arrayCreationExprMetaModel.elementTypePropertyMetaModel);
+        arrayCreationExprMetaModel.initializerPropertyMetaModel = new PropertyMetaModel(arrayCreationExprMetaModel, "initializer", com.github.javaparser.ast.expr.ArrayInitializerExpr.class, Optional.of(arrayInitializerExprMetaModel), true, false, false, false);
+        arrayCreationExprMetaModel.getDeclaredPropertyMetaModels().add(arrayCreationExprMetaModel.initializerPropertyMetaModel);
+        arrayCreationExprMetaModel.levelsPropertyMetaModel = new PropertyMetaModel(arrayCreationExprMetaModel, "levels", com.github.javaparser.ast.ArrayCreationLevel.class, Optional.of(arrayCreationLevelMetaModel), false, true, true, false);
+        arrayCreationExprMetaModel.getDeclaredPropertyMetaModels().add(arrayCreationExprMetaModel.levelsPropertyMetaModel);
+        arrayInitializerExprMetaModel.valuesPropertyMetaModel = new PropertyMetaModel(arrayInitializerExprMetaModel, "values", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
+        arrayInitializerExprMetaModel.getDeclaredPropertyMetaModels().add(arrayInitializerExprMetaModel.valuesPropertyMetaModel);
+        assignExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(assignExprMetaModel, "operator", com.github.javaparser.ast.expr.AssignExpr.Operator.class, Optional.empty(), false, false, false, false);
         assignExprMetaModel.getDeclaredPropertyMetaModels().add(assignExprMetaModel.operatorPropertyMetaModel);
-        assignExprMetaModel.targetPropertyMetaModel = new PropertyMetaModel(
-                assignExprMetaModel,
-                "target",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        assignExprMetaModel.targetPropertyMetaModel = new PropertyMetaModel(assignExprMetaModel, "target", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         assignExprMetaModel.getDeclaredPropertyMetaModels().add(assignExprMetaModel.targetPropertyMetaModel);
-        assignExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel(
-                assignExprMetaModel,
-                "value",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        assignExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel(assignExprMetaModel, "value", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         assignExprMetaModel.getDeclaredPropertyMetaModels().add(assignExprMetaModel.valuePropertyMetaModel);
-        binaryExprMetaModel.leftPropertyMetaModel = new PropertyMetaModel(
-                binaryExprMetaModel,
-                "left",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        binaryExprMetaModel.leftPropertyMetaModel = new PropertyMetaModel(binaryExprMetaModel, "left", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         binaryExprMetaModel.getDeclaredPropertyMetaModels().add(binaryExprMetaModel.leftPropertyMetaModel);
-        binaryExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(
-                binaryExprMetaModel,
-                "operator",
-                com.github.javaparser.ast.expr.BinaryExpr.Operator.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
+        binaryExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(binaryExprMetaModel, "operator", com.github.javaparser.ast.expr.BinaryExpr.Operator.class, Optional.empty(), false, false, false, false);
         binaryExprMetaModel.getDeclaredPropertyMetaModels().add(binaryExprMetaModel.operatorPropertyMetaModel);
-        binaryExprMetaModel.rightPropertyMetaModel = new PropertyMetaModel(
-                binaryExprMetaModel,
-                "right",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        binaryExprMetaModel.rightPropertyMetaModel = new PropertyMetaModel(binaryExprMetaModel, "right", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         binaryExprMetaModel.getDeclaredPropertyMetaModels().add(binaryExprMetaModel.rightPropertyMetaModel);
-        booleanLiteralExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel(
-                booleanLiteralExprMetaModel, "value", boolean.class, Optional.empty(), false, false, false, false);
-        booleanLiteralExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(booleanLiteralExprMetaModel.valuePropertyMetaModel);
-        castExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                castExprMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        booleanLiteralExprMetaModel.valuePropertyMetaModel = new PropertyMetaModel(booleanLiteralExprMetaModel, "value", boolean.class, Optional.empty(), false, false, false, false);
+        booleanLiteralExprMetaModel.getDeclaredPropertyMetaModels().add(booleanLiteralExprMetaModel.valuePropertyMetaModel);
+        castExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(castExprMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         castExprMetaModel.getDeclaredPropertyMetaModels().add(castExprMetaModel.expressionPropertyMetaModel);
-        castExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                castExprMetaModel,
-                "type",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
+        castExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(castExprMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
         castExprMetaModel.getDeclaredPropertyMetaModels().add(castExprMetaModel.typePropertyMetaModel);
-        classExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                classExprMetaModel,
-                "type",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
+        classExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(classExprMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
         classExprMetaModel.getDeclaredPropertyMetaModels().add(classExprMetaModel.typePropertyMetaModel);
-        conditionalExprMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(
-                conditionalExprMetaModel,
-                "condition",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        conditionalExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(conditionalExprMetaModel.conditionPropertyMetaModel);
-        conditionalExprMetaModel.elseExprPropertyMetaModel = new PropertyMetaModel(
-                conditionalExprMetaModel,
-                "elseExpr",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        conditionalExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(conditionalExprMetaModel.elseExprPropertyMetaModel);
-        conditionalExprMetaModel.thenExprPropertyMetaModel = new PropertyMetaModel(
-                conditionalExprMetaModel,
-                "thenExpr",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        conditionalExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(conditionalExprMetaModel.thenExprPropertyMetaModel);
-        enclosedExprMetaModel.innerPropertyMetaModel = new PropertyMetaModel(
-                enclosedExprMetaModel,
-                "inner",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        conditionalExprMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(conditionalExprMetaModel, "condition", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        conditionalExprMetaModel.getDeclaredPropertyMetaModels().add(conditionalExprMetaModel.conditionPropertyMetaModel);
+        conditionalExprMetaModel.elseExprPropertyMetaModel = new PropertyMetaModel(conditionalExprMetaModel, "elseExpr", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        conditionalExprMetaModel.getDeclaredPropertyMetaModels().add(conditionalExprMetaModel.elseExprPropertyMetaModel);
+        conditionalExprMetaModel.thenExprPropertyMetaModel = new PropertyMetaModel(conditionalExprMetaModel, "thenExpr", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        conditionalExprMetaModel.getDeclaredPropertyMetaModels().add(conditionalExprMetaModel.thenExprPropertyMetaModel);
+        enclosedExprMetaModel.innerPropertyMetaModel = new PropertyMetaModel(enclosedExprMetaModel, "inner", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         enclosedExprMetaModel.getDeclaredPropertyMetaModels().add(enclosedExprMetaModel.innerPropertyMetaModel);
-        fieldAccessExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                fieldAccessExprMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
+        fieldAccessExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(fieldAccessExprMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
         fieldAccessExprMetaModel.getDeclaredPropertyMetaModels().add(fieldAccessExprMetaModel.namePropertyMetaModel);
-        fieldAccessExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel(
-                fieldAccessExprMetaModel,
-                "scope",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        fieldAccessExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel(fieldAccessExprMetaModel, "scope", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         fieldAccessExprMetaModel.getDeclaredPropertyMetaModels().add(fieldAccessExprMetaModel.scopePropertyMetaModel);
-        fieldAccessExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(
-                fieldAccessExprMetaModel,
-                "typeArguments",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                true,
-                false,
-                true,
-                false);
-        fieldAccessExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(fieldAccessExprMetaModel.typeArgumentsPropertyMetaModel);
-        fieldAccessExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(
-                fieldAccessExprMetaModel,
-                "usingDiamondOperator",
-                boolean.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        fieldAccessExprMetaModel
-                .getDerivedPropertyMetaModels()
-                .add(fieldAccessExprMetaModel.usingDiamondOperatorPropertyMetaModel);
-        instanceOfExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                instanceOfExprMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        instanceOfExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(instanceOfExprMetaModel.expressionPropertyMetaModel);
-        instanceOfExprMetaModel.patternPropertyMetaModel = new PropertyMetaModel(
-                instanceOfExprMetaModel,
-                "pattern",
-                com.github.javaparser.ast.expr.PatternExpr.class,
-                Optional.of(patternExprMetaModel),
-                true,
-                false,
-                false,
-                false);
+        fieldAccessExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(fieldAccessExprMetaModel, "typeArguments", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, true, false);
+        fieldAccessExprMetaModel.getDeclaredPropertyMetaModels().add(fieldAccessExprMetaModel.typeArgumentsPropertyMetaModel);
+        fieldAccessExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(fieldAccessExprMetaModel, "usingDiamondOperator", boolean.class, Optional.empty(), false, false, false, false);
+        fieldAccessExprMetaModel.getDerivedPropertyMetaModels().add(fieldAccessExprMetaModel.usingDiamondOperatorPropertyMetaModel);
+        instanceOfExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(instanceOfExprMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        instanceOfExprMetaModel.getDeclaredPropertyMetaModels().add(instanceOfExprMetaModel.expressionPropertyMetaModel);
+        instanceOfExprMetaModel.patternPropertyMetaModel = new PropertyMetaModel(instanceOfExprMetaModel, "pattern", com.github.javaparser.ast.expr.PatternExpr.class, Optional.of(patternExprMetaModel), true, false, false, false);
         instanceOfExprMetaModel.getDeclaredPropertyMetaModels().add(instanceOfExprMetaModel.patternPropertyMetaModel);
-        instanceOfExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                instanceOfExprMetaModel,
-                "type",
-                com.github.javaparser.ast.type.ReferenceType.class,
-                Optional.of(referenceTypeMetaModel),
-                false,
-                false,
-                false,
-                false);
+        instanceOfExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(instanceOfExprMetaModel, "type", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), false, false, false, false);
         instanceOfExprMetaModel.getDeclaredPropertyMetaModels().add(instanceOfExprMetaModel.typePropertyMetaModel);
-        lambdaExprMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(
-                lambdaExprMetaModel,
-                "body",
-                com.github.javaparser.ast.stmt.Statement.class,
-                Optional.of(statementMetaModel),
-                false,
-                false,
-                false,
-                false);
+        lambdaExprMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(lambdaExprMetaModel, "body", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false);
         lambdaExprMetaModel.getDeclaredPropertyMetaModels().add(lambdaExprMetaModel.bodyPropertyMetaModel);
-        lambdaExprMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(
-                lambdaExprMetaModel,
-                "contracts",
-                com.github.javaparser.ast.jml.clauses.JmlContract.class,
-                Optional.of(jmlContractMetaModel),
-                false,
-                false,
-                true,
-                false);
+        lambdaExprMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(lambdaExprMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false);
         lambdaExprMetaModel.getDeclaredPropertyMetaModels().add(lambdaExprMetaModel.contractsPropertyMetaModel);
-        lambdaExprMetaModel.isEnclosingParametersPropertyMetaModel = new PropertyMetaModel(
-                lambdaExprMetaModel,
-                "isEnclosingParameters",
-                boolean.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        lambdaExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(lambdaExprMetaModel.isEnclosingParametersPropertyMetaModel);
-        lambdaExprMetaModel.parametersPropertyMetaModel = new PropertyMetaModel(
-                lambdaExprMetaModel,
-                "parameters",
-                com.github.javaparser.ast.body.Parameter.class,
-                Optional.of(parameterMetaModel),
-                false,
-                false,
-                true,
-                false);
+        lambdaExprMetaModel.isEnclosingParametersPropertyMetaModel = new PropertyMetaModel(lambdaExprMetaModel, "isEnclosingParameters", boolean.class, Optional.empty(), false, false, false, false);
+        lambdaExprMetaModel.getDeclaredPropertyMetaModels().add(lambdaExprMetaModel.isEnclosingParametersPropertyMetaModel);
+        lambdaExprMetaModel.parametersPropertyMetaModel = new PropertyMetaModel(lambdaExprMetaModel, "parameters", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, false, true, false);
         lambdaExprMetaModel.getDeclaredPropertyMetaModels().add(lambdaExprMetaModel.parametersPropertyMetaModel);
-        lambdaExprMetaModel.expressionBodyPropertyMetaModel = new PropertyMetaModel(
-                lambdaExprMetaModel,
-                "expressionBody",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                false,
-                false);
+        lambdaExprMetaModel.expressionBodyPropertyMetaModel = new PropertyMetaModel(lambdaExprMetaModel, "expressionBody", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
         lambdaExprMetaModel.getDerivedPropertyMetaModels().add(lambdaExprMetaModel.expressionBodyPropertyMetaModel);
-        memberValuePairMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                memberValuePairMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
+        memberValuePairMetaModel.namePropertyMetaModel = new PropertyMetaModel(memberValuePairMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
         memberValuePairMetaModel.getDeclaredPropertyMetaModels().add(memberValuePairMetaModel.namePropertyMetaModel);
-        memberValuePairMetaModel.valuePropertyMetaModel = new PropertyMetaModel(
-                memberValuePairMetaModel,
-                "value",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        memberValuePairMetaModel.valuePropertyMetaModel = new PropertyMetaModel(memberValuePairMetaModel, "value", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         memberValuePairMetaModel.getDeclaredPropertyMetaModels().add(memberValuePairMetaModel.valuePropertyMetaModel);
-        methodCallExprMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(
-                methodCallExprMetaModel,
-                "arguments",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                true,
-                false);
+        methodCallExprMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(methodCallExprMetaModel, "arguments", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
         methodCallExprMetaModel.getDeclaredPropertyMetaModels().add(methodCallExprMetaModel.argumentsPropertyMetaModel);
-        methodCallExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                methodCallExprMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
+        methodCallExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(methodCallExprMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
         methodCallExprMetaModel.getDeclaredPropertyMetaModels().add(methodCallExprMetaModel.namePropertyMetaModel);
-        methodCallExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel(
-                methodCallExprMetaModel,
-                "scope",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                false,
-                false);
+        methodCallExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel(methodCallExprMetaModel, "scope", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
         methodCallExprMetaModel.getDeclaredPropertyMetaModels().add(methodCallExprMetaModel.scopePropertyMetaModel);
-        methodCallExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(
-                methodCallExprMetaModel,
-                "typeArguments",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                true,
-                false,
-                true,
-                false);
-        methodCallExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(methodCallExprMetaModel.typeArgumentsPropertyMetaModel);
-        methodCallExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(
-                methodCallExprMetaModel,
-                "usingDiamondOperator",
-                boolean.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        methodCallExprMetaModel
-                .getDerivedPropertyMetaModels()
-                .add(methodCallExprMetaModel.usingDiamondOperatorPropertyMetaModel);
-        methodReferenceExprMetaModel.identifierPropertyMetaModel = new PropertyMetaModel(
-                methodReferenceExprMetaModel,
-                "identifier",
-                java.lang.String.class,
-                Optional.empty(),
-                false,
-                true,
-                false,
-                false);
-        methodReferenceExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(methodReferenceExprMetaModel.identifierPropertyMetaModel);
-        methodReferenceExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel(
-                methodReferenceExprMetaModel,
-                "scope",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        methodReferenceExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(methodReferenceExprMetaModel.scopePropertyMetaModel);
-        methodReferenceExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(
-                methodReferenceExprMetaModel,
-                "typeArguments",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                true,
-                false,
-                true,
-                false);
-        methodReferenceExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(methodReferenceExprMetaModel.typeArgumentsPropertyMetaModel);
-        methodReferenceExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(
-                methodReferenceExprMetaModel,
-                "usingDiamondOperator",
-                boolean.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        methodReferenceExprMetaModel
-                .getDerivedPropertyMetaModels()
-                .add(methodReferenceExprMetaModel.usingDiamondOperatorPropertyMetaModel);
-        nameExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                nameExprMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
+        methodCallExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(methodCallExprMetaModel, "typeArguments", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, true, false);
+        methodCallExprMetaModel.getDeclaredPropertyMetaModels().add(methodCallExprMetaModel.typeArgumentsPropertyMetaModel);
+        methodCallExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(methodCallExprMetaModel, "usingDiamondOperator", boolean.class, Optional.empty(), false, false, false, false);
+        methodCallExprMetaModel.getDerivedPropertyMetaModels().add(methodCallExprMetaModel.usingDiamondOperatorPropertyMetaModel);
+        methodReferenceExprMetaModel.identifierPropertyMetaModel = new PropertyMetaModel(methodReferenceExprMetaModel, "identifier", java.lang.String.class, Optional.empty(), false, true, false, false);
+        methodReferenceExprMetaModel.getDeclaredPropertyMetaModels().add(methodReferenceExprMetaModel.identifierPropertyMetaModel);
+        methodReferenceExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel(methodReferenceExprMetaModel, "scope", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        methodReferenceExprMetaModel.getDeclaredPropertyMetaModels().add(methodReferenceExprMetaModel.scopePropertyMetaModel);
+        methodReferenceExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(methodReferenceExprMetaModel, "typeArguments", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, true, false);
+        methodReferenceExprMetaModel.getDeclaredPropertyMetaModels().add(methodReferenceExprMetaModel.typeArgumentsPropertyMetaModel);
+        methodReferenceExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(methodReferenceExprMetaModel, "usingDiamondOperator", boolean.class, Optional.empty(), false, false, false, false);
+        methodReferenceExprMetaModel.getDerivedPropertyMetaModels().add(methodReferenceExprMetaModel.usingDiamondOperatorPropertyMetaModel);
+        nameExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(nameExprMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
         nameExprMetaModel.getDeclaredPropertyMetaModels().add(nameExprMetaModel.namePropertyMetaModel);
-        nameMetaModel.identifierPropertyMetaModel = new PropertyMetaModel(
-                nameMetaModel, "identifier", java.lang.String.class, Optional.empty(), false, true, false, false);
+        nameMetaModel.identifierPropertyMetaModel = new PropertyMetaModel(nameMetaModel, "identifier", java.lang.String.class, Optional.empty(), false, true, false, false);
         nameMetaModel.getDeclaredPropertyMetaModels().add(nameMetaModel.identifierPropertyMetaModel);
-        nameMetaModel.qualifierPropertyMetaModel = new PropertyMetaModel(
-                nameMetaModel,
-                "qualifier",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                true,
-                false,
-                false,
-                false);
+        nameMetaModel.qualifierPropertyMetaModel = new PropertyMetaModel(nameMetaModel, "qualifier", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false);
         nameMetaModel.getDeclaredPropertyMetaModels().add(nameMetaModel.qualifierPropertyMetaModel);
-        normalAnnotationExprMetaModel.pairsPropertyMetaModel = new PropertyMetaModel(
-                normalAnnotationExprMetaModel,
-                "pairs",
-                com.github.javaparser.ast.expr.MemberValuePair.class,
-                Optional.of(memberValuePairMetaModel),
-                false,
-                false,
-                true,
-                false);
-        normalAnnotationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(normalAnnotationExprMetaModel.pairsPropertyMetaModel);
-        objectCreationExprMetaModel.anonymousClassBodyPropertyMetaModel = new PropertyMetaModel(
-                objectCreationExprMetaModel,
-                "anonymousClassBody",
-                com.github.javaparser.ast.body.BodyDeclaration.class,
-                Optional.of(bodyDeclarationMetaModel),
-                true,
-                false,
-                true,
-                true);
-        objectCreationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(objectCreationExprMetaModel.anonymousClassBodyPropertyMetaModel);
-        objectCreationExprMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(
-                objectCreationExprMetaModel,
-                "arguments",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                true,
-                false);
-        objectCreationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(objectCreationExprMetaModel.argumentsPropertyMetaModel);
-        objectCreationExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel(
-                objectCreationExprMetaModel,
-                "scope",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                false,
-                false);
-        objectCreationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(objectCreationExprMetaModel.scopePropertyMetaModel);
-        objectCreationExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                objectCreationExprMetaModel,
-                "type",
-                com.github.javaparser.ast.type.ClassOrInterfaceType.class,
-                Optional.of(classOrInterfaceTypeMetaModel),
-                false,
-                false,
-                false,
-                false);
-        objectCreationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(objectCreationExprMetaModel.typePropertyMetaModel);
-        objectCreationExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(
-                objectCreationExprMetaModel,
-                "typeArguments",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                true,
-                false,
-                true,
-                false);
-        objectCreationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(objectCreationExprMetaModel.typeArgumentsPropertyMetaModel);
-        objectCreationExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(
-                objectCreationExprMetaModel,
-                "usingDiamondOperator",
-                boolean.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        objectCreationExprMetaModel
-                .getDerivedPropertyMetaModels()
-                .add(objectCreationExprMetaModel.usingDiamondOperatorPropertyMetaModel);
-        patternExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                patternExprMetaModel,
-                "type",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
+        normalAnnotationExprMetaModel.pairsPropertyMetaModel = new PropertyMetaModel(normalAnnotationExprMetaModel, "pairs", com.github.javaparser.ast.expr.MemberValuePair.class, Optional.of(memberValuePairMetaModel), false, false, true, false);
+        normalAnnotationExprMetaModel.getDeclaredPropertyMetaModels().add(normalAnnotationExprMetaModel.pairsPropertyMetaModel);
+        objectCreationExprMetaModel.anonymousClassBodyPropertyMetaModel = new PropertyMetaModel(objectCreationExprMetaModel, "anonymousClassBody", com.github.javaparser.ast.body.BodyDeclaration.class, Optional.of(bodyDeclarationMetaModel), true, false, true, true);
+        objectCreationExprMetaModel.getDeclaredPropertyMetaModels().add(objectCreationExprMetaModel.anonymousClassBodyPropertyMetaModel);
+        objectCreationExprMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(objectCreationExprMetaModel, "arguments", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
+        objectCreationExprMetaModel.getDeclaredPropertyMetaModels().add(objectCreationExprMetaModel.argumentsPropertyMetaModel);
+        objectCreationExprMetaModel.scopePropertyMetaModel = new PropertyMetaModel(objectCreationExprMetaModel, "scope", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
+        objectCreationExprMetaModel.getDeclaredPropertyMetaModels().add(objectCreationExprMetaModel.scopePropertyMetaModel);
+        objectCreationExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(objectCreationExprMetaModel, "type", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, false, false);
+        objectCreationExprMetaModel.getDeclaredPropertyMetaModels().add(objectCreationExprMetaModel.typePropertyMetaModel);
+        objectCreationExprMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(objectCreationExprMetaModel, "typeArguments", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, true, false);
+        objectCreationExprMetaModel.getDeclaredPropertyMetaModels().add(objectCreationExprMetaModel.typeArgumentsPropertyMetaModel);
+        objectCreationExprMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(objectCreationExprMetaModel, "usingDiamondOperator", boolean.class, Optional.empty(), false, false, false, false);
+        objectCreationExprMetaModel.getDerivedPropertyMetaModels().add(objectCreationExprMetaModel.usingDiamondOperatorPropertyMetaModel);
+        patternExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(patternExprMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
         patternExprMetaModel.getDeclaredPropertyMetaModels().add(patternExprMetaModel.typePropertyMetaModel);
-        recordPatternExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                recordPatternExprMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        recordPatternExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(recordPatternExprMetaModel.modifiersPropertyMetaModel);
-        recordPatternExprMetaModel.patternListPropertyMetaModel = new PropertyMetaModel(
-                recordPatternExprMetaModel,
-                "patternList",
-                com.github.javaparser.ast.expr.ComponentPatternExpr.class,
-                Optional.of(componentPatternExprMetaModel),
-                false,
-                false,
-                true,
-                false);
-        recordPatternExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(recordPatternExprMetaModel.patternListPropertyMetaModel);
-        singleMemberAnnotationExprMetaModel.memberValuePropertyMetaModel = new PropertyMetaModel(
-                singleMemberAnnotationExprMetaModel,
-                "memberValue",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        singleMemberAnnotationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(singleMemberAnnotationExprMetaModel.memberValuePropertyMetaModel);
-        simpleNameMetaModel.identifierPropertyMetaModel = new PropertyMetaModel(
-                simpleNameMetaModel, "identifier", java.lang.String.class, Optional.empty(), false, true, false, false);
+        recordPatternExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(recordPatternExprMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        recordPatternExprMetaModel.getDeclaredPropertyMetaModels().add(recordPatternExprMetaModel.modifiersPropertyMetaModel);
+        recordPatternExprMetaModel.patternListPropertyMetaModel = new PropertyMetaModel(recordPatternExprMetaModel, "patternList", com.github.javaparser.ast.expr.ComponentPatternExpr.class, Optional.of(componentPatternExprMetaModel), false, false, true, false);
+        recordPatternExprMetaModel.getDeclaredPropertyMetaModels().add(recordPatternExprMetaModel.patternListPropertyMetaModel);
+        singleMemberAnnotationExprMetaModel.memberValuePropertyMetaModel = new PropertyMetaModel(singleMemberAnnotationExprMetaModel, "memberValue", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        singleMemberAnnotationExprMetaModel.getDeclaredPropertyMetaModels().add(singleMemberAnnotationExprMetaModel.memberValuePropertyMetaModel);
+        simpleNameMetaModel.identifierPropertyMetaModel = new PropertyMetaModel(simpleNameMetaModel, "identifier", java.lang.String.class, Optional.empty(), false, true, false, false);
         simpleNameMetaModel.getDeclaredPropertyMetaModels().add(simpleNameMetaModel.identifierPropertyMetaModel);
-        superExprMetaModel.typeNamePropertyMetaModel = new PropertyMetaModel(
-                superExprMetaModel,
-                "typeName",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                true,
-                false,
-                false,
-                false);
+        superExprMetaModel.typeNamePropertyMetaModel = new PropertyMetaModel(superExprMetaModel, "typeName", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false);
         superExprMetaModel.getDeclaredPropertyMetaModels().add(superExprMetaModel.typeNamePropertyMetaModel);
-        switchExprMetaModel.entriesPropertyMetaModel = new PropertyMetaModel(
-                switchExprMetaModel,
-                "entries",
-                com.github.javaparser.ast.stmt.SwitchEntry.class,
-                Optional.of(switchEntryMetaModel),
-                false,
-                false,
-                true,
-                false);
+        switchExprMetaModel.entriesPropertyMetaModel = new PropertyMetaModel(switchExprMetaModel, "entries", com.github.javaparser.ast.stmt.SwitchEntry.class, Optional.of(switchEntryMetaModel), false, false, true, false);
         switchExprMetaModel.getDeclaredPropertyMetaModels().add(switchExprMetaModel.entriesPropertyMetaModel);
-        switchExprMetaModel.selectorPropertyMetaModel = new PropertyMetaModel(
-                switchExprMetaModel,
-                "selector",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        switchExprMetaModel.selectorPropertyMetaModel = new PropertyMetaModel(switchExprMetaModel, "selector", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         switchExprMetaModel.getDeclaredPropertyMetaModels().add(switchExprMetaModel.selectorPropertyMetaModel);
-        thisExprMetaModel.typeNamePropertyMetaModel = new PropertyMetaModel(
-                thisExprMetaModel,
-                "typeName",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                true,
-                false,
-                false,
-                false);
+        thisExprMetaModel.typeNamePropertyMetaModel = new PropertyMetaModel(thisExprMetaModel, "typeName", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false);
         thisExprMetaModel.getDeclaredPropertyMetaModels().add(thisExprMetaModel.typeNamePropertyMetaModel);
-        typeExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                typeExprMetaModel,
-                "type",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
+        typeExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(typeExprMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
         typeExprMetaModel.getDeclaredPropertyMetaModels().add(typeExprMetaModel.typePropertyMetaModel);
-        typePatternExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                typePatternExprMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        typePatternExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(typePatternExprMetaModel.modifiersPropertyMetaModel);
-        typePatternExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                typePatternExprMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
+        typePatternExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(typePatternExprMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        typePatternExprMetaModel.getDeclaredPropertyMetaModels().add(typePatternExprMetaModel.modifiersPropertyMetaModel);
+        typePatternExprMetaModel.namePropertyMetaModel = new PropertyMetaModel(typePatternExprMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
         typePatternExprMetaModel.getDeclaredPropertyMetaModels().add(typePatternExprMetaModel.namePropertyMetaModel);
-        unaryExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                unaryExprMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        unaryExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(unaryExprMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         unaryExprMetaModel.getDeclaredPropertyMetaModels().add(unaryExprMetaModel.expressionPropertyMetaModel);
-        unaryExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(
-                unaryExprMetaModel,
-                "operator",
-                com.github.javaparser.ast.expr.UnaryExpr.Operator.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
+        unaryExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(unaryExprMetaModel, "operator", com.github.javaparser.ast.expr.UnaryExpr.Operator.class, Optional.empty(), false, false, false, false);
         unaryExprMetaModel.getDeclaredPropertyMetaModels().add(unaryExprMetaModel.operatorPropertyMetaModel);
-        unaryExprMetaModel.postfixPropertyMetaModel = new PropertyMetaModel(
-                unaryExprMetaModel, "postfix", boolean.class, Optional.empty(), false, false, false, false);
+        unaryExprMetaModel.postfixPropertyMetaModel = new PropertyMetaModel(unaryExprMetaModel, "postfix", boolean.class, Optional.empty(), false, false, false, false);
         unaryExprMetaModel.getDerivedPropertyMetaModels().add(unaryExprMetaModel.postfixPropertyMetaModel);
-        unaryExprMetaModel.prefixPropertyMetaModel = new PropertyMetaModel(
-                unaryExprMetaModel, "prefix", boolean.class, Optional.empty(), false, false, false, false);
+        unaryExprMetaModel.prefixPropertyMetaModel = new PropertyMetaModel(unaryExprMetaModel, "prefix", boolean.class, Optional.empty(), false, false, false, false);
         unaryExprMetaModel.getDerivedPropertyMetaModels().add(unaryExprMetaModel.prefixPropertyMetaModel);
-        matchAllPatternExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                matchAllPatternExprMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        matchAllPatternExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(matchAllPatternExprMetaModel.modifiersPropertyMetaModel);
-        variableDeclarationExprMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(
-                variableDeclarationExprMetaModel,
-                "annotations",
-                com.github.javaparser.ast.expr.AnnotationExpr.class,
-                Optional.of(annotationExprMetaModel),
-                false,
-                false,
-                true,
-                false);
-        variableDeclarationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(variableDeclarationExprMetaModel.annotationsPropertyMetaModel);
-        variableDeclarationExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                variableDeclarationExprMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        variableDeclarationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(variableDeclarationExprMetaModel.modifiersPropertyMetaModel);
-        variableDeclarationExprMetaModel.variablesPropertyMetaModel = new PropertyMetaModel(
-                variableDeclarationExprMetaModel,
-                "variables",
-                com.github.javaparser.ast.body.VariableDeclarator.class,
-                Optional.of(variableDeclaratorMetaModel),
-                false,
-                true,
-                true,
-                false);
-        variableDeclarationExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(variableDeclarationExprMetaModel.variablesPropertyMetaModel);
-        variableDeclarationExprMetaModel.maximumCommonTypePropertyMetaModel = new PropertyMetaModel(
-                variableDeclarationExprMetaModel,
-                "maximumCommonType",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                true,
-                false,
-                false,
-                false);
-        variableDeclarationExprMetaModel
-                .getDerivedPropertyMetaModels()
-                .add(variableDeclarationExprMetaModel.maximumCommonTypePropertyMetaModel);
-        jmlDocMetaModel.contentPropertyMetaModel = new PropertyMetaModel(
-                jmlDocMetaModel,
-                "content",
-                com.github.javaparser.JavaToken.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        jmlDocMetaModel.getDeclaredPropertyMetaModels().add(jmlDocMetaModel.contentPropertyMetaModel);
-        jmlDocDeclarationMetaModel.jmlCommentsPropertyMetaModel = new PropertyMetaModel(
-                jmlDocDeclarationMetaModel,
-                "jmlComments",
-                com.github.javaparser.ast.jml.doc.JmlDoc.class,
-                Optional.of(jmlDocMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlDocDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlDocDeclarationMetaModel.jmlCommentsPropertyMetaModel);
-        jmlDocStmtMetaModel.jmlCommentsPropertyMetaModel = new PropertyMetaModel(
-                jmlDocStmtMetaModel,
-                "jmlComments",
-                com.github.javaparser.ast.jml.doc.JmlDoc.class,
-                Optional.of(jmlDocMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlDocStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlDocStmtMetaModel.jmlCommentsPropertyMetaModel);
-        jmlDocTypeMetaModel.jmlCommentsPropertyMetaModel = new PropertyMetaModel(
-                jmlDocTypeMetaModel,
-                "jmlComments",
-                com.github.javaparser.ast.jml.doc.JmlDoc.class,
-                Optional.of(jmlDocMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlDocTypeMetaModel.getDeclaredPropertyMetaModels().add(jmlDocTypeMetaModel.jmlCommentsPropertyMetaModel);
-        jmlQuantifiedExprMetaModel.binderPropertyMetaModel = new PropertyMetaModel(
-                jmlQuantifiedExprMetaModel,
-                "binder",
-                com.github.javaparser.ast.jml.expr.JmlQuantifiedExpr.JmlBinder.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        jmlQuantifiedExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlQuantifiedExprMetaModel.binderPropertyMetaModel);
-        jmlQuantifiedExprMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(
-                jmlQuantifiedExprMetaModel,
-                "expressions",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                true,
-                true,
-                false);
-        jmlQuantifiedExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlQuantifiedExprMetaModel.expressionsPropertyMetaModel);
-        jmlQuantifiedExprMetaModel.variablesPropertyMetaModel = new PropertyMetaModel(
-                jmlQuantifiedExprMetaModel,
-                "variables",
-                com.github.javaparser.ast.body.Parameter.class,
-                Optional.of(parameterMetaModel),
-                false,
-                true,
-                true,
-                false);
-        jmlQuantifiedExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlQuantifiedExprMetaModel.variablesPropertyMetaModel);
-        jmlTypeExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                jmlTypeExprMetaModel,
-                "type",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlTypeExprMetaModel.getDeclaredPropertyMetaModels().add(jmlTypeExprMetaModel.typePropertyMetaModel);
-        jmlBinaryInfixExprMetaModel.leftPropertyMetaModel = new PropertyMetaModel(
-                jmlBinaryInfixExprMetaModel,
-                "left",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlBinaryInfixExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlBinaryInfixExprMetaModel.leftPropertyMetaModel);
-        jmlBinaryInfixExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(
-                jmlBinaryInfixExprMetaModel,
-                "operator",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlBinaryInfixExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlBinaryInfixExprMetaModel.operatorPropertyMetaModel);
-        jmlBinaryInfixExprMetaModel.rightPropertyMetaModel = new PropertyMetaModel(
-                jmlBinaryInfixExprMetaModel,
-                "right",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlBinaryInfixExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlBinaryInfixExprMetaModel.rightPropertyMetaModel);
-        jmlLetExprMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(
-                jmlLetExprMetaModel,
-                "body",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlLetExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLetExprMetaModel.bodyPropertyMetaModel);
-        jmlLetExprMetaModel.variablesPropertyMetaModel = new PropertyMetaModel(
-                jmlLetExprMetaModel,
-                "variables",
-                com.github.javaparser.ast.expr.VariableDeclarationExpr.class,
-                Optional.of(variableDeclarationExprMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlLetExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLetExprMetaModel.variablesPropertyMetaModel);
-        jmlMultiCompareExprMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(
-                jmlMultiCompareExprMetaModel,
-                "expressions",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                true,
-                true,
-                false);
-        jmlMultiCompareExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlMultiCompareExprMetaModel.expressionsPropertyMetaModel);
-        jmlMultiCompareExprMetaModel.operatorsPropertyMetaModel = new PropertyMetaModel(
-                jmlMultiCompareExprMetaModel,
-                "operators",
-                com.github.javaparser.ast.jml.expr.JmlMultiCompareExpr.Operators.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        jmlMultiCompareExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlMultiCompareExprMetaModel.operatorsPropertyMetaModel);
-        jmlLabelExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                jmlLabelExprMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlLabelExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelExprMetaModel.expressionPropertyMetaModel);
-        jmlLabelExprMetaModel.kindPropertyMetaModel = new PropertyMetaModel(
-                jmlLabelExprMetaModel,
-                "kind",
-                com.github.javaparser.ast.jml.expr.JmlLabelExpr.Kind.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        jmlLabelExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelExprMetaModel.kindPropertyMetaModel);
-        jmlLabelExprMetaModel.labelPropertyMetaModel = new PropertyMetaModel(
-                jmlLabelExprMetaModel,
-                "label",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlLabelExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelExprMetaModel.labelPropertyMetaModel);
-        jmlSetComprehensionExprMetaModel.bindingPropertyMetaModel = new PropertyMetaModel(
-                jmlSetComprehensionExprMetaModel,
-                "binding",
-                com.github.javaparser.ast.body.VariableDeclarator.class,
-                Optional.of(variableDeclaratorMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlSetComprehensionExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlSetComprehensionExprMetaModel.bindingPropertyMetaModel);
-        jmlSetComprehensionExprMetaModel.predicatePropertyMetaModel = new PropertyMetaModel(
-                jmlSetComprehensionExprMetaModel,
-                "predicate",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlSetComprehensionExprMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlSetComprehensionExprMetaModel.predicatePropertyMetaModel);
-        assertStmtMetaModel.checkPropertyMetaModel = new PropertyMetaModel(
-                assertStmtMetaModel,
-                "check",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        matchAllPatternExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(matchAllPatternExprMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        matchAllPatternExprMetaModel.getDeclaredPropertyMetaModels().add(matchAllPatternExprMetaModel.modifiersPropertyMetaModel);
+        variableDeclarationExprMetaModel.annotationsPropertyMetaModel = new PropertyMetaModel(variableDeclarationExprMetaModel, "annotations", com.github.javaparser.ast.expr.AnnotationExpr.class, Optional.of(annotationExprMetaModel), false, false, true, false);
+        variableDeclarationExprMetaModel.getDeclaredPropertyMetaModels().add(variableDeclarationExprMetaModel.annotationsPropertyMetaModel);
+        variableDeclarationExprMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(variableDeclarationExprMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        variableDeclarationExprMetaModel.getDeclaredPropertyMetaModels().add(variableDeclarationExprMetaModel.modifiersPropertyMetaModel);
+        variableDeclarationExprMetaModel.variablesPropertyMetaModel = new PropertyMetaModel(variableDeclarationExprMetaModel, "variables", com.github.javaparser.ast.body.VariableDeclarator.class, Optional.of(variableDeclaratorMetaModel), false, true, true, false);
+        variableDeclarationExprMetaModel.getDeclaredPropertyMetaModels().add(variableDeclarationExprMetaModel.variablesPropertyMetaModel);
+        variableDeclarationExprMetaModel.maximumCommonTypePropertyMetaModel = new PropertyMetaModel(variableDeclarationExprMetaModel, "maximumCommonType", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, false, false);
+        variableDeclarationExprMetaModel.getDerivedPropertyMetaModels().add(variableDeclarationExprMetaModel.maximumCommonTypePropertyMetaModel);
+        assertStmtMetaModel.checkPropertyMetaModel = new PropertyMetaModel(assertStmtMetaModel, "check", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         assertStmtMetaModel.getDeclaredPropertyMetaModels().add(assertStmtMetaModel.checkPropertyMetaModel);
-        assertStmtMetaModel.messagePropertyMetaModel = new PropertyMetaModel(
-                assertStmtMetaModel,
-                "message",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                false,
-                false);
+        assertStmtMetaModel.messagePropertyMetaModel = new PropertyMetaModel(assertStmtMetaModel, "message", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
         assertStmtMetaModel.getDeclaredPropertyMetaModels().add(assertStmtMetaModel.messagePropertyMetaModel);
-        blockStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(
-                blockStmtMetaModel,
-                "contracts",
-                com.github.javaparser.ast.jml.clauses.JmlContract.class,
-                Optional.of(jmlContractMetaModel),
-                false,
-                false,
-                true,
-                false);
+        blockStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(blockStmtMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false);
         blockStmtMetaModel.getDeclaredPropertyMetaModels().add(blockStmtMetaModel.contractsPropertyMetaModel);
-        blockStmtMetaModel.statementsPropertyMetaModel = new PropertyMetaModel(
-                blockStmtMetaModel,
-                "statements",
-                com.github.javaparser.ast.stmt.Statement.class,
-                Optional.of(statementMetaModel),
-                false,
-                false,
-                true,
-                false);
+        blockStmtMetaModel.statementsPropertyMetaModel = new PropertyMetaModel(blockStmtMetaModel, "statements", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, true, false);
         blockStmtMetaModel.getDeclaredPropertyMetaModels().add(blockStmtMetaModel.statementsPropertyMetaModel);
-        breakStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(
-                breakStmtMetaModel,
-                "label",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                true,
-                false,
-                false,
-                false);
+        breakStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(breakStmtMetaModel, "label", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, false, false);
         breakStmtMetaModel.getDeclaredPropertyMetaModels().add(breakStmtMetaModel.labelPropertyMetaModel);
-        catchClauseMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(
-                catchClauseMetaModel,
-                "body",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                false,
-                false,
-                false,
-                false);
+        catchClauseMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(catchClauseMetaModel, "body", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false);
         catchClauseMetaModel.getDeclaredPropertyMetaModels().add(catchClauseMetaModel.bodyPropertyMetaModel);
-        catchClauseMetaModel.parameterPropertyMetaModel = new PropertyMetaModel(
-                catchClauseMetaModel,
-                "parameter",
-                com.github.javaparser.ast.body.Parameter.class,
-                Optional.of(parameterMetaModel),
-                false,
-                false,
-                false,
-                false);
+        catchClauseMetaModel.parameterPropertyMetaModel = new PropertyMetaModel(catchClauseMetaModel, "parameter", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, false, false, false);
         catchClauseMetaModel.getDeclaredPropertyMetaModels().add(catchClauseMetaModel.parameterPropertyMetaModel);
-        continueStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(
-                continueStmtMetaModel,
-                "label",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                true,
-                false,
-                false,
-                false);
+        continueStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(continueStmtMetaModel, "label", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, false, false);
         continueStmtMetaModel.getDeclaredPropertyMetaModels().add(continueStmtMetaModel.labelPropertyMetaModel);
-        doStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(
-                doStmtMetaModel,
-                "body",
-                com.github.javaparser.ast.stmt.Statement.class,
-                Optional.of(statementMetaModel),
-                false,
-                false,
-                false,
-                false);
+        doStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(doStmtMetaModel, "body", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false);
         doStmtMetaModel.getDeclaredPropertyMetaModels().add(doStmtMetaModel.bodyPropertyMetaModel);
-        doStmtMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(
-                doStmtMetaModel,
-                "condition",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        doStmtMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(doStmtMetaModel, "condition", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         doStmtMetaModel.getDeclaredPropertyMetaModels().add(doStmtMetaModel.conditionPropertyMetaModel);
-        doStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(
-                doStmtMetaModel,
-                "contracts",
-                com.github.javaparser.ast.jml.clauses.JmlContract.class,
-                Optional.of(jmlContractMetaModel),
-                false,
-                false,
-                true,
-                false);
+        doStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(doStmtMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false);
         doStmtMetaModel.getDeclaredPropertyMetaModels().add(doStmtMetaModel.contractsPropertyMetaModel);
-        explicitConstructorInvocationStmtMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(
-                explicitConstructorInvocationStmtMetaModel,
-                "arguments",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                true,
-                false);
-        explicitConstructorInvocationStmtMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(explicitConstructorInvocationStmtMetaModel.argumentsPropertyMetaModel);
-        explicitConstructorInvocationStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                explicitConstructorInvocationStmtMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                false,
-                false);
-        explicitConstructorInvocationStmtMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(explicitConstructorInvocationStmtMetaModel.expressionPropertyMetaModel);
-        explicitConstructorInvocationStmtMetaModel.isThisPropertyMetaModel = new PropertyMetaModel(
-                explicitConstructorInvocationStmtMetaModel,
-                "isThis",
-                boolean.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        explicitConstructorInvocationStmtMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(explicitConstructorInvocationStmtMetaModel.isThisPropertyMetaModel);
-        explicitConstructorInvocationStmtMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(
-                explicitConstructorInvocationStmtMetaModel,
-                "typeArguments",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                true,
-                false,
-                true,
-                false);
-        explicitConstructorInvocationStmtMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(explicitConstructorInvocationStmtMetaModel.typeArgumentsPropertyMetaModel);
-        explicitConstructorInvocationStmtMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(
-                explicitConstructorInvocationStmtMetaModel,
-                "usingDiamondOperator",
-                boolean.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        explicitConstructorInvocationStmtMetaModel
-                .getDerivedPropertyMetaModels()
-                .add(explicitConstructorInvocationStmtMetaModel.usingDiamondOperatorPropertyMetaModel);
-        expressionStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                expressionStmtMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        expressionStmtMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(expressionStmtMetaModel.expressionPropertyMetaModel);
-        forEachStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(
-                forEachStmtMetaModel,
-                "body",
-                com.github.javaparser.ast.stmt.Statement.class,
-                Optional.of(statementMetaModel),
-                false,
-                false,
-                false,
-                false);
+        explicitConstructorInvocationStmtMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(explicitConstructorInvocationStmtMetaModel, "arguments", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
+        explicitConstructorInvocationStmtMetaModel.getDeclaredPropertyMetaModels().add(explicitConstructorInvocationStmtMetaModel.argumentsPropertyMetaModel);
+        explicitConstructorInvocationStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(explicitConstructorInvocationStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
+        explicitConstructorInvocationStmtMetaModel.getDeclaredPropertyMetaModels().add(explicitConstructorInvocationStmtMetaModel.expressionPropertyMetaModel);
+        explicitConstructorInvocationStmtMetaModel.isThisPropertyMetaModel = new PropertyMetaModel(explicitConstructorInvocationStmtMetaModel, "isThis", boolean.class, Optional.empty(), false, false, false, false);
+        explicitConstructorInvocationStmtMetaModel.getDeclaredPropertyMetaModels().add(explicitConstructorInvocationStmtMetaModel.isThisPropertyMetaModel);
+        explicitConstructorInvocationStmtMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(explicitConstructorInvocationStmtMetaModel, "typeArguments", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, true, false);
+        explicitConstructorInvocationStmtMetaModel.getDeclaredPropertyMetaModels().add(explicitConstructorInvocationStmtMetaModel.typeArgumentsPropertyMetaModel);
+        explicitConstructorInvocationStmtMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(explicitConstructorInvocationStmtMetaModel, "usingDiamondOperator", boolean.class, Optional.empty(), false, false, false, false);
+        explicitConstructorInvocationStmtMetaModel.getDerivedPropertyMetaModels().add(explicitConstructorInvocationStmtMetaModel.usingDiamondOperatorPropertyMetaModel);
+        expressionStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(expressionStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        expressionStmtMetaModel.getDeclaredPropertyMetaModels().add(expressionStmtMetaModel.expressionPropertyMetaModel);
+        forEachStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(forEachStmtMetaModel, "body", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false);
         forEachStmtMetaModel.getDeclaredPropertyMetaModels().add(forEachStmtMetaModel.bodyPropertyMetaModel);
-        forEachStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(
-                forEachStmtMetaModel,
-                "contracts",
-                com.github.javaparser.ast.jml.clauses.JmlContract.class,
-                Optional.of(jmlContractMetaModel),
-                false,
-                false,
-                true,
-                false);
+        forEachStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(forEachStmtMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false);
         forEachStmtMetaModel.getDeclaredPropertyMetaModels().add(forEachStmtMetaModel.contractsPropertyMetaModel);
-        forEachStmtMetaModel.iterablePropertyMetaModel = new PropertyMetaModel(
-                forEachStmtMetaModel,
-                "iterable",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        forEachStmtMetaModel.iterablePropertyMetaModel = new PropertyMetaModel(forEachStmtMetaModel, "iterable", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         forEachStmtMetaModel.getDeclaredPropertyMetaModels().add(forEachStmtMetaModel.iterablePropertyMetaModel);
-        forEachStmtMetaModel.variablePropertyMetaModel = new PropertyMetaModel(
-                forEachStmtMetaModel,
-                "variable",
-                com.github.javaparser.ast.expr.VariableDeclarationExpr.class,
-                Optional.of(variableDeclarationExprMetaModel),
-                false,
-                false,
-                false,
-                false);
+        forEachStmtMetaModel.variablePropertyMetaModel = new PropertyMetaModel(forEachStmtMetaModel, "variable", com.github.javaparser.ast.expr.VariableDeclarationExpr.class, Optional.of(variableDeclarationExprMetaModel), false, false, false, false);
         forEachStmtMetaModel.getDeclaredPropertyMetaModels().add(forEachStmtMetaModel.variablePropertyMetaModel);
-        forStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(
-                forStmtMetaModel,
-                "body",
-                com.github.javaparser.ast.stmt.Statement.class,
-                Optional.of(statementMetaModel),
-                false,
-                false,
-                false,
-                false);
+        forStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(forStmtMetaModel, "body", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false);
         forStmtMetaModel.getDeclaredPropertyMetaModels().add(forStmtMetaModel.bodyPropertyMetaModel);
-        forStmtMetaModel.comparePropertyMetaModel = new PropertyMetaModel(
-                forStmtMetaModel,
-                "compare",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                false,
-                false);
+        forStmtMetaModel.comparePropertyMetaModel = new PropertyMetaModel(forStmtMetaModel, "compare", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
         forStmtMetaModel.getDeclaredPropertyMetaModels().add(forStmtMetaModel.comparePropertyMetaModel);
-        forStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(
-                forStmtMetaModel,
-                "contracts",
-                com.github.javaparser.ast.jml.clauses.JmlContract.class,
-                Optional.of(jmlContractMetaModel),
-                false,
-                false,
-                true,
-                false);
+        forStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(forStmtMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false);
         forStmtMetaModel.getDeclaredPropertyMetaModels().add(forStmtMetaModel.contractsPropertyMetaModel);
-        forStmtMetaModel.initializationPropertyMetaModel = new PropertyMetaModel(
-                forStmtMetaModel,
-                "initialization",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                true,
-                false);
+        forStmtMetaModel.initializationPropertyMetaModel = new PropertyMetaModel(forStmtMetaModel, "initialization", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
         forStmtMetaModel.getDeclaredPropertyMetaModels().add(forStmtMetaModel.initializationPropertyMetaModel);
-        forStmtMetaModel.updatePropertyMetaModel = new PropertyMetaModel(
-                forStmtMetaModel,
-                "update",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                true,
-                false);
+        forStmtMetaModel.updatePropertyMetaModel = new PropertyMetaModel(forStmtMetaModel, "update", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
         forStmtMetaModel.getDeclaredPropertyMetaModels().add(forStmtMetaModel.updatePropertyMetaModel);
-        ifStmtMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(
-                ifStmtMetaModel,
-                "condition",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        ifStmtMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "condition", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         ifStmtMetaModel.getDeclaredPropertyMetaModels().add(ifStmtMetaModel.conditionPropertyMetaModel);
-        ifStmtMetaModel.elseStmtPropertyMetaModel = new PropertyMetaModel(
-                ifStmtMetaModel,
-                "elseStmt",
-                com.github.javaparser.ast.stmt.Statement.class,
-                Optional.of(statementMetaModel),
-                true,
-                false,
-                false,
-                false);
+        ifStmtMetaModel.elseStmtPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "elseStmt", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), true, false, false, false);
         ifStmtMetaModel.getDeclaredPropertyMetaModels().add(ifStmtMetaModel.elseStmtPropertyMetaModel);
-        ifStmtMetaModel.thenStmtPropertyMetaModel = new PropertyMetaModel(
-                ifStmtMetaModel,
-                "thenStmt",
-                com.github.javaparser.ast.stmt.Statement.class,
-                Optional.of(statementMetaModel),
-                false,
-                false,
-                false,
-                false);
+        ifStmtMetaModel.thenStmtPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "thenStmt", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false);
         ifStmtMetaModel.getDeclaredPropertyMetaModels().add(ifStmtMetaModel.thenStmtPropertyMetaModel);
-        ifStmtMetaModel.cascadingIfStmtPropertyMetaModel = new PropertyMetaModel(
-                ifStmtMetaModel, "cascadingIfStmt", boolean.class, Optional.empty(), false, false, false, false);
+        ifStmtMetaModel.cascadingIfStmtPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "cascadingIfStmt", boolean.class, Optional.empty(), false, false, false, false);
         ifStmtMetaModel.getDerivedPropertyMetaModels().add(ifStmtMetaModel.cascadingIfStmtPropertyMetaModel);
-        ifStmtMetaModel.elseBlockPropertyMetaModel = new PropertyMetaModel(
-                ifStmtMetaModel, "elseBlock", boolean.class, Optional.empty(), false, false, false, false);
+        ifStmtMetaModel.elseBlockPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "elseBlock", boolean.class, Optional.empty(), false, false, false, false);
         ifStmtMetaModel.getDerivedPropertyMetaModels().add(ifStmtMetaModel.elseBlockPropertyMetaModel);
-        ifStmtMetaModel.elseBranchPropertyMetaModel = new PropertyMetaModel(
-                ifStmtMetaModel, "elseBranch", boolean.class, Optional.empty(), false, false, false, false);
+        ifStmtMetaModel.elseBranchPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "elseBranch", boolean.class, Optional.empty(), false, false, false, false);
         ifStmtMetaModel.getDerivedPropertyMetaModels().add(ifStmtMetaModel.elseBranchPropertyMetaModel);
-        ifStmtMetaModel.thenBlockPropertyMetaModel = new PropertyMetaModel(
-                ifStmtMetaModel, "thenBlock", boolean.class, Optional.empty(), false, false, false, false);
+        ifStmtMetaModel.thenBlockPropertyMetaModel = new PropertyMetaModel(ifStmtMetaModel, "thenBlock", boolean.class, Optional.empty(), false, false, false, false);
         ifStmtMetaModel.getDerivedPropertyMetaModels().add(ifStmtMetaModel.thenBlockPropertyMetaModel);
-        labeledStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(
-                labeledStmtMetaModel,
-                "label",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
+        labeledStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(labeledStmtMetaModel, "label", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
         labeledStmtMetaModel.getDeclaredPropertyMetaModels().add(labeledStmtMetaModel.labelPropertyMetaModel);
-        labeledStmtMetaModel.statementPropertyMetaModel = new PropertyMetaModel(
-                labeledStmtMetaModel,
-                "statement",
-                com.github.javaparser.ast.stmt.Statement.class,
-                Optional.of(statementMetaModel),
-                false,
-                false,
-                false,
-                false);
+        labeledStmtMetaModel.statementPropertyMetaModel = new PropertyMetaModel(labeledStmtMetaModel, "statement", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false);
         labeledStmtMetaModel.getDeclaredPropertyMetaModels().add(labeledStmtMetaModel.statementPropertyMetaModel);
-        localClassDeclarationStmtMetaModel.classDeclarationPropertyMetaModel = new PropertyMetaModel(
-                localClassDeclarationStmtMetaModel,
-                "classDeclaration",
-                com.github.javaparser.ast.body.ClassOrInterfaceDeclaration.class,
-                Optional.of(classOrInterfaceDeclarationMetaModel),
-                false,
-                false,
-                false,
-                false);
-        localClassDeclarationStmtMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(localClassDeclarationStmtMetaModel.classDeclarationPropertyMetaModel);
-        localRecordDeclarationStmtMetaModel.recordDeclarationPropertyMetaModel = new PropertyMetaModel(
-                localRecordDeclarationStmtMetaModel,
-                "recordDeclaration",
-                com.github.javaparser.ast.body.RecordDeclaration.class,
-                Optional.of(recordDeclarationMetaModel),
-                false,
-                false,
-                false,
-                false);
-        localRecordDeclarationStmtMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(localRecordDeclarationStmtMetaModel.recordDeclarationPropertyMetaModel);
-        returnStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                returnStmtMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                false,
-                false);
+        localClassDeclarationStmtMetaModel.classDeclarationPropertyMetaModel = new PropertyMetaModel(localClassDeclarationStmtMetaModel, "classDeclaration", com.github.javaparser.ast.body.ClassOrInterfaceDeclaration.class, Optional.of(classOrInterfaceDeclarationMetaModel), false, false, false, false);
+        localClassDeclarationStmtMetaModel.getDeclaredPropertyMetaModels().add(localClassDeclarationStmtMetaModel.classDeclarationPropertyMetaModel);
+        localRecordDeclarationStmtMetaModel.recordDeclarationPropertyMetaModel = new PropertyMetaModel(localRecordDeclarationStmtMetaModel, "recordDeclaration", com.github.javaparser.ast.body.RecordDeclaration.class, Optional.of(recordDeclarationMetaModel), false, false, false, false);
+        localRecordDeclarationStmtMetaModel.getDeclaredPropertyMetaModels().add(localRecordDeclarationStmtMetaModel.recordDeclarationPropertyMetaModel);
+        returnStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(returnStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
         returnStmtMetaModel.getDeclaredPropertyMetaModels().add(returnStmtMetaModel.expressionPropertyMetaModel);
-        switchEntryMetaModel.guardPropertyMetaModel = new PropertyMetaModel(
-                switchEntryMetaModel,
-                "guard",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                false,
-                false);
+        switchEntryMetaModel.guardPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "guard", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
         switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.guardPropertyMetaModel);
-        switchEntryMetaModel.isDefaultPropertyMetaModel = new PropertyMetaModel(
-                switchEntryMetaModel, "isDefault", boolean.class, Optional.empty(), false, false, false, false);
+        switchEntryMetaModel.isDefaultPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "isDefault", boolean.class, Optional.empty(), false, false, false, false);
         switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.isDefaultPropertyMetaModel);
-        switchEntryMetaModel.labelsPropertyMetaModel = new PropertyMetaModel(
-                switchEntryMetaModel,
-                "labels",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                true,
-                false);
+        switchEntryMetaModel.labelsPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "labels", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
         switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.labelsPropertyMetaModel);
-        switchEntryMetaModel.statementsPropertyMetaModel = new PropertyMetaModel(
-                switchEntryMetaModel,
-                "statements",
-                com.github.javaparser.ast.stmt.Statement.class,
-                Optional.of(statementMetaModel),
-                false,
-                false,
-                true,
-                false);
+        switchEntryMetaModel.statementsPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "statements", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, true, false);
         switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.statementsPropertyMetaModel);
-        switchEntryMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                switchEntryMetaModel,
-                "type",
-                com.github.javaparser.ast.stmt.SwitchEntry.Type.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
+        switchEntryMetaModel.typePropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "type", com.github.javaparser.ast.stmt.SwitchEntry.Type.class, Optional.empty(), false, false, false, false);
         switchEntryMetaModel.getDeclaredPropertyMetaModels().add(switchEntryMetaModel.typePropertyMetaModel);
-        switchEntryMetaModel.switchStatementEntryPropertyMetaModel = new PropertyMetaModel(
-                switchEntryMetaModel,
-                "switchStatementEntry",
-                boolean.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        switchEntryMetaModel
-                .getDerivedPropertyMetaModels()
-                .add(switchEntryMetaModel.switchStatementEntryPropertyMetaModel);
-        switchStmtMetaModel.entriesPropertyMetaModel = new PropertyMetaModel(
-                switchStmtMetaModel,
-                "entries",
-                com.github.javaparser.ast.stmt.SwitchEntry.class,
-                Optional.of(switchEntryMetaModel),
-                false,
-                false,
-                true,
-                false);
+        switchEntryMetaModel.switchStatementEntryPropertyMetaModel = new PropertyMetaModel(switchEntryMetaModel, "switchStatementEntry", boolean.class, Optional.empty(), false, false, false, false);
+        switchEntryMetaModel.getDerivedPropertyMetaModels().add(switchEntryMetaModel.switchStatementEntryPropertyMetaModel);
+        switchStmtMetaModel.entriesPropertyMetaModel = new PropertyMetaModel(switchStmtMetaModel, "entries", com.github.javaparser.ast.stmt.SwitchEntry.class, Optional.of(switchEntryMetaModel), false, false, true, false);
         switchStmtMetaModel.getDeclaredPropertyMetaModels().add(switchStmtMetaModel.entriesPropertyMetaModel);
-        switchStmtMetaModel.selectorPropertyMetaModel = new PropertyMetaModel(
-                switchStmtMetaModel,
-                "selector",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        switchStmtMetaModel.selectorPropertyMetaModel = new PropertyMetaModel(switchStmtMetaModel, "selector", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         switchStmtMetaModel.getDeclaredPropertyMetaModels().add(switchStmtMetaModel.selectorPropertyMetaModel);
-        synchronizedStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(
-                synchronizedStmtMetaModel,
-                "body",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                false,
-                false,
-                false,
-                false);
+        synchronizedStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(synchronizedStmtMetaModel, "body", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false);
         synchronizedStmtMetaModel.getDeclaredPropertyMetaModels().add(synchronizedStmtMetaModel.bodyPropertyMetaModel);
-        synchronizedStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                synchronizedStmtMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        synchronizedStmtMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(synchronizedStmtMetaModel.expressionPropertyMetaModel);
-        throwStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                throwStmtMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        synchronizedStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(synchronizedStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        synchronizedStmtMetaModel.getDeclaredPropertyMetaModels().add(synchronizedStmtMetaModel.expressionPropertyMetaModel);
+        throwStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(throwStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         throwStmtMetaModel.getDeclaredPropertyMetaModels().add(throwStmtMetaModel.expressionPropertyMetaModel);
-        tryStmtMetaModel.catchClausesPropertyMetaModel = new PropertyMetaModel(
-                tryStmtMetaModel,
-                "catchClauses",
-                com.github.javaparser.ast.stmt.CatchClause.class,
-                Optional.of(catchClauseMetaModel),
-                false,
-                false,
-                true,
-                false);
+        tryStmtMetaModel.catchClausesPropertyMetaModel = new PropertyMetaModel(tryStmtMetaModel, "catchClauses", com.github.javaparser.ast.stmt.CatchClause.class, Optional.of(catchClauseMetaModel), false, false, true, false);
         tryStmtMetaModel.getDeclaredPropertyMetaModels().add(tryStmtMetaModel.catchClausesPropertyMetaModel);
-        tryStmtMetaModel.finallyBlockPropertyMetaModel = new PropertyMetaModel(
-                tryStmtMetaModel,
-                "finallyBlock",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                true,
-                false,
-                false,
-                false);
+        tryStmtMetaModel.finallyBlockPropertyMetaModel = new PropertyMetaModel(tryStmtMetaModel, "finallyBlock", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), true, false, false, false);
         tryStmtMetaModel.getDeclaredPropertyMetaModels().add(tryStmtMetaModel.finallyBlockPropertyMetaModel);
-        tryStmtMetaModel.resourcesPropertyMetaModel = new PropertyMetaModel(
-                tryStmtMetaModel,
-                "resources",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                true,
-                false);
+        tryStmtMetaModel.resourcesPropertyMetaModel = new PropertyMetaModel(tryStmtMetaModel, "resources", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
         tryStmtMetaModel.getDeclaredPropertyMetaModels().add(tryStmtMetaModel.resourcesPropertyMetaModel);
-        tryStmtMetaModel.tryBlockPropertyMetaModel = new PropertyMetaModel(
-                tryStmtMetaModel,
-                "tryBlock",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                false,
-                false,
-                false,
-                false);
+        tryStmtMetaModel.tryBlockPropertyMetaModel = new PropertyMetaModel(tryStmtMetaModel, "tryBlock", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false);
         tryStmtMetaModel.getDeclaredPropertyMetaModels().add(tryStmtMetaModel.tryBlockPropertyMetaModel);
-        whileStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(
-                whileStmtMetaModel,
-                "body",
-                com.github.javaparser.ast.stmt.Statement.class,
-                Optional.of(statementMetaModel),
-                false,
-                false,
-                false,
-                false);
+        whileStmtMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(whileStmtMetaModel, "body", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false);
         whileStmtMetaModel.getDeclaredPropertyMetaModels().add(whileStmtMetaModel.bodyPropertyMetaModel);
-        whileStmtMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(
-                whileStmtMetaModel,
-                "condition",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        whileStmtMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(whileStmtMetaModel, "condition", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         whileStmtMetaModel.getDeclaredPropertyMetaModels().add(whileStmtMetaModel.conditionPropertyMetaModel);
-        whileStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(
-                whileStmtMetaModel,
-                "contracts",
-                com.github.javaparser.ast.jml.clauses.JmlContract.class,
-                Optional.of(jmlContractMetaModel),
-                false,
-                false,
-                true,
-                false);
+        whileStmtMetaModel.contractsPropertyMetaModel = new PropertyMetaModel(whileStmtMetaModel, "contracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false);
         whileStmtMetaModel.getDeclaredPropertyMetaModels().add(whileStmtMetaModel.contractsPropertyMetaModel);
-        yieldStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                yieldStmtMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
+        yieldStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(yieldStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
         yieldStmtMetaModel.getDeclaredPropertyMetaModels().add(yieldStmtMetaModel.expressionPropertyMetaModel);
-        jmlGhostStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlGhostStmtMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
+        arrayTypeMetaModel.componentTypePropertyMetaModel = new PropertyMetaModel(arrayTypeMetaModel, "componentType", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
+        arrayTypeMetaModel.getDeclaredPropertyMetaModels().add(arrayTypeMetaModel.componentTypePropertyMetaModel);
+        arrayTypeMetaModel.originPropertyMetaModel = new PropertyMetaModel(arrayTypeMetaModel, "origin", com.github.javaparser.ast.type.ArrayType.Origin.class, Optional.empty(), false, false, false, false);
+        arrayTypeMetaModel.getDeclaredPropertyMetaModels().add(arrayTypeMetaModel.originPropertyMetaModel);
+        classOrInterfaceTypeMetaModel.namePropertyMetaModel = new PropertyMetaModel(classOrInterfaceTypeMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
+        classOrInterfaceTypeMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceTypeMetaModel.namePropertyMetaModel);
+        classOrInterfaceTypeMetaModel.scopePropertyMetaModel = new PropertyMetaModel(classOrInterfaceTypeMetaModel, "scope", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), true, false, false, false);
+        classOrInterfaceTypeMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceTypeMetaModel.scopePropertyMetaModel);
+        classOrInterfaceTypeMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(classOrInterfaceTypeMetaModel, "typeArguments", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, true, false);
+        classOrInterfaceTypeMetaModel.getDeclaredPropertyMetaModels().add(classOrInterfaceTypeMetaModel.typeArgumentsPropertyMetaModel);
+        classOrInterfaceTypeMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(classOrInterfaceTypeMetaModel, "usingDiamondOperator", boolean.class, Optional.empty(), false, false, false, false);
+        classOrInterfaceTypeMetaModel.getDerivedPropertyMetaModels().add(classOrInterfaceTypeMetaModel.usingDiamondOperatorPropertyMetaModel);
+        intersectionTypeMetaModel.elementsPropertyMetaModel = new PropertyMetaModel(intersectionTypeMetaModel, "elements", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), false, true, true, false);
+        intersectionTypeMetaModel.getDeclaredPropertyMetaModels().add(intersectionTypeMetaModel.elementsPropertyMetaModel);
+        primitiveTypeMetaModel.typePropertyMetaModel = new PropertyMetaModel(primitiveTypeMetaModel, "type", com.github.javaparser.ast.type.PrimitiveType.Primitive.class, Optional.empty(), false, false, false, false);
+        primitiveTypeMetaModel.getDeclaredPropertyMetaModels().add(primitiveTypeMetaModel.typePropertyMetaModel);
+        typeParameterMetaModel.namePropertyMetaModel = new PropertyMetaModel(typeParameterMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
+        typeParameterMetaModel.getDeclaredPropertyMetaModels().add(typeParameterMetaModel.namePropertyMetaModel);
+        typeParameterMetaModel.typeBoundPropertyMetaModel = new PropertyMetaModel(typeParameterMetaModel, "typeBound", com.github.javaparser.ast.type.ClassOrInterfaceType.class, Optional.of(classOrInterfaceTypeMetaModel), false, false, true, false);
+        typeParameterMetaModel.getDeclaredPropertyMetaModels().add(typeParameterMetaModel.typeBoundPropertyMetaModel);
+        unionTypeMetaModel.elementsPropertyMetaModel = new PropertyMetaModel(unionTypeMetaModel, "elements", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), false, true, true, false);
+        unionTypeMetaModel.getDeclaredPropertyMetaModels().add(unionTypeMetaModel.elementsPropertyMetaModel);
+        wildcardTypeMetaModel.extendedTypePropertyMetaModel = new PropertyMetaModel(wildcardTypeMetaModel, "extendedType", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), true, false, false, false);
+        wildcardTypeMetaModel.getDeclaredPropertyMetaModels().add(wildcardTypeMetaModel.extendedTypePropertyMetaModel);
+        wildcardTypeMetaModel.superTypePropertyMetaModel = new PropertyMetaModel(wildcardTypeMetaModel, "superType", com.github.javaparser.ast.type.ReferenceType.class, Optional.of(referenceTypeMetaModel), true, false, false, false);
+        wildcardTypeMetaModel.getDeclaredPropertyMetaModels().add(wildcardTypeMetaModel.superTypePropertyMetaModel);
+        moduleExportsDirectiveMetaModel.moduleNamesPropertyMetaModel = new PropertyMetaModel(moduleExportsDirectiveMetaModel, "moduleNames", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, true, false);
+        moduleExportsDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleExportsDirectiveMetaModel.moduleNamesPropertyMetaModel);
+        moduleExportsDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(moduleExportsDirectiveMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        moduleExportsDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleExportsDirectiveMetaModel.namePropertyMetaModel);
+        moduleOpensDirectiveMetaModel.moduleNamesPropertyMetaModel = new PropertyMetaModel(moduleOpensDirectiveMetaModel, "moduleNames", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, true, false);
+        moduleOpensDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleOpensDirectiveMetaModel.moduleNamesPropertyMetaModel);
+        moduleOpensDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(moduleOpensDirectiveMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        moduleOpensDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleOpensDirectiveMetaModel.namePropertyMetaModel);
+        moduleProvidesDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(moduleProvidesDirectiveMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        moduleProvidesDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleProvidesDirectiveMetaModel.namePropertyMetaModel);
+        moduleProvidesDirectiveMetaModel.withPropertyMetaModel = new PropertyMetaModel(moduleProvidesDirectiveMetaModel, "with", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, true, false);
+        moduleProvidesDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleProvidesDirectiveMetaModel.withPropertyMetaModel);
+        moduleRequiresDirectiveMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(moduleRequiresDirectiveMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        moduleRequiresDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleRequiresDirectiveMetaModel.modifiersPropertyMetaModel);
+        moduleRequiresDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(moduleRequiresDirectiveMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        moduleRequiresDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleRequiresDirectiveMetaModel.namePropertyMetaModel);
+        moduleUsesDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(moduleUsesDirectiveMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        moduleUsesDirectiveMetaModel.getDeclaredPropertyMetaModels().add(moduleUsesDirectiveMetaModel.namePropertyMetaModel);
+        jmlDocMetaModel.contentPropertyMetaModel = new PropertyMetaModel(jmlDocMetaModel, "content", java.lang.String.class, Optional.empty(), false, false, false, false);
+        jmlDocMetaModel.getDeclaredPropertyMetaModels().add(jmlDocMetaModel.contentPropertyMetaModel);
+        jmlDocDeclarationMetaModel.jmlCommentsPropertyMetaModel = new PropertyMetaModel(jmlDocDeclarationMetaModel, "jmlComments", com.github.javaparser.ast.jml.doc.JmlDoc.class, Optional.of(jmlDocMetaModel), false, false, true, false);
+        jmlDocDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlDocDeclarationMetaModel.jmlCommentsPropertyMetaModel);
+        jmlDocStmtMetaModel.jmlCommentsPropertyMetaModel = new PropertyMetaModel(jmlDocStmtMetaModel, "jmlComments", com.github.javaparser.ast.jml.doc.JmlDoc.class, Optional.of(jmlDocMetaModel), false, false, true, false);
+        jmlDocStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlDocStmtMetaModel.jmlCommentsPropertyMetaModel);
+        jmlDocTypeMetaModel.jmlCommentsPropertyMetaModel = new PropertyMetaModel(jmlDocTypeMetaModel, "jmlComments", com.github.javaparser.ast.jml.doc.JmlDoc.class, Optional.of(jmlDocMetaModel), false, false, true, false);
+        jmlDocTypeMetaModel.getDeclaredPropertyMetaModels().add(jmlDocTypeMetaModel.jmlCommentsPropertyMetaModel);
+        jmlQuantifiedExprMetaModel.binderPropertyMetaModel = new PropertyMetaModel(jmlQuantifiedExprMetaModel, "binder", com.github.javaparser.ast.jml.expr.JmlQuantifiedExpr.JmlBinder.class, Optional.empty(), false, false, false, false);
+        jmlQuantifiedExprMetaModel.getDeclaredPropertyMetaModels().add(jmlQuantifiedExprMetaModel.binderPropertyMetaModel);
+        jmlQuantifiedExprMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(jmlQuantifiedExprMetaModel, "expressions", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, true, true, false);
+        jmlQuantifiedExprMetaModel.getDeclaredPropertyMetaModels().add(jmlQuantifiedExprMetaModel.expressionsPropertyMetaModel);
+        jmlQuantifiedExprMetaModel.variablesPropertyMetaModel = new PropertyMetaModel(jmlQuantifiedExprMetaModel, "variables", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, true, true, false);
+        jmlQuantifiedExprMetaModel.getDeclaredPropertyMetaModels().add(jmlQuantifiedExprMetaModel.variablesPropertyMetaModel);
+        jmlTypeExprMetaModel.typePropertyMetaModel = new PropertyMetaModel(jmlTypeExprMetaModel, "type", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
+        jmlTypeExprMetaModel.getDeclaredPropertyMetaModels().add(jmlTypeExprMetaModel.typePropertyMetaModel);
+        jmlBinaryInfixExprMetaModel.leftPropertyMetaModel = new PropertyMetaModel(jmlBinaryInfixExprMetaModel, "left", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlBinaryInfixExprMetaModel.getDeclaredPropertyMetaModels().add(jmlBinaryInfixExprMetaModel.leftPropertyMetaModel);
+        jmlBinaryInfixExprMetaModel.operatorPropertyMetaModel = new PropertyMetaModel(jmlBinaryInfixExprMetaModel, "operator", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
+        jmlBinaryInfixExprMetaModel.getDeclaredPropertyMetaModels().add(jmlBinaryInfixExprMetaModel.operatorPropertyMetaModel);
+        jmlBinaryInfixExprMetaModel.rightPropertyMetaModel = new PropertyMetaModel(jmlBinaryInfixExprMetaModel, "right", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlBinaryInfixExprMetaModel.getDeclaredPropertyMetaModels().add(jmlBinaryInfixExprMetaModel.rightPropertyMetaModel);
+        jmlLetExprMetaModel.bodyPropertyMetaModel = new PropertyMetaModel(jmlLetExprMetaModel, "body", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlLetExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLetExprMetaModel.bodyPropertyMetaModel);
+        jmlLetExprMetaModel.variablesPropertyMetaModel = new PropertyMetaModel(jmlLetExprMetaModel, "variables", com.github.javaparser.ast.expr.VariableDeclarationExpr.class, Optional.of(variableDeclarationExprMetaModel), false, false, false, false);
+        jmlLetExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLetExprMetaModel.variablesPropertyMetaModel);
+        jmlMultiCompareExprMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(jmlMultiCompareExprMetaModel, "expressions", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, true, true, false);
+        jmlMultiCompareExprMetaModel.getDeclaredPropertyMetaModels().add(jmlMultiCompareExprMetaModel.expressionsPropertyMetaModel);
+        jmlMultiCompareExprMetaModel.operatorsPropertyMetaModel = new PropertyMetaModel(jmlMultiCompareExprMetaModel, "operators", com.github.javaparser.ast.jml.expr.JmlMultiCompareExpr.Operators.class, Optional.empty(), false, false, false, false);
+        jmlMultiCompareExprMetaModel.getDeclaredPropertyMetaModels().add(jmlMultiCompareExprMetaModel.operatorsPropertyMetaModel);
+        jmlLabelExprMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(jmlLabelExprMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlLabelExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelExprMetaModel.expressionPropertyMetaModel);
+        jmlLabelExprMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlLabelExprMetaModel, "kind", com.github.javaparser.ast.jml.expr.JmlLabelExpr.Kind.class, Optional.empty(), false, false, false, false);
+        jmlLabelExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelExprMetaModel.kindPropertyMetaModel);
+        jmlLabelExprMetaModel.labelPropertyMetaModel = new PropertyMetaModel(jmlLabelExprMetaModel, "label", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
+        jmlLabelExprMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelExprMetaModel.labelPropertyMetaModel);
+        jmlSetComprehensionExprMetaModel.bindingPropertyMetaModel = new PropertyMetaModel(jmlSetComprehensionExprMetaModel, "binding", com.github.javaparser.ast.body.VariableDeclarator.class, Optional.of(variableDeclaratorMetaModel), false, false, false, false);
+        jmlSetComprehensionExprMetaModel.getDeclaredPropertyMetaModels().add(jmlSetComprehensionExprMetaModel.bindingPropertyMetaModel);
+        jmlSetComprehensionExprMetaModel.predicatePropertyMetaModel = new PropertyMetaModel(jmlSetComprehensionExprMetaModel, "predicate", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlSetComprehensionExprMetaModel.getDeclaredPropertyMetaModels().add(jmlSetComprehensionExprMetaModel.predicatePropertyMetaModel);
+        jmlGhostStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlGhostStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
         jmlGhostStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlGhostStmtMetaModel.jmlTagsPropertyMetaModel);
-        jmlGhostStmtMetaModel.statementPropertyMetaModel = new PropertyMetaModel(
-                jmlGhostStmtMetaModel,
-                "statement",
-                com.github.javaparser.ast.stmt.Statement.class,
-                Optional.of(statementMetaModel),
-                false,
-                false,
-                false,
-                false);
+        jmlGhostStmtMetaModel.statementPropertyMetaModel = new PropertyMetaModel(jmlGhostStmtMetaModel, "statement", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, false, false);
         jmlGhostStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlGhostStmtMetaModel.statementPropertyMetaModel);
-        jmlExpressionStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                jmlExpressionStmtMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlExpressionStmtMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlExpressionStmtMetaModel.expressionPropertyMetaModel);
-        jmlExpressionStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlExpressionStmtMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlExpressionStmtMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlExpressionStmtMetaModel.jmlTagsPropertyMetaModel);
-        jmlExpressionStmtMetaModel.kindPropertyMetaModel = new PropertyMetaModel(
-                jmlExpressionStmtMetaModel,
-                "kind",
-                com.github.javaparser.ast.jml.stmt.JmlExpressionStmt.JmlStmtKind.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        jmlExpressionStmtMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlExpressionStmtMetaModel.kindPropertyMetaModel);
-        jmlRefiningStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlRefiningStmtMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
+        jmlExpressionStmtMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(jmlExpressionStmtMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlExpressionStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlExpressionStmtMetaModel.expressionPropertyMetaModel);
+        jmlExpressionStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlExpressionStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
+        jmlExpressionStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlExpressionStmtMetaModel.jmlTagsPropertyMetaModel);
+        jmlExpressionStmtMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlExpressionStmtMetaModel, "kind", com.github.javaparser.ast.jml.stmt.JmlExpressionStmt.JmlStmtKind.class, Optional.empty(), false, false, false, false);
+        jmlExpressionStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlExpressionStmtMetaModel.kindPropertyMetaModel);
+        jmlRefiningStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlRefiningStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
         jmlRefiningStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlRefiningStmtMetaModel.jmlTagsPropertyMetaModel);
-        jmlUnreachableStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlUnreachableStmtMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlUnreachableStmtMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlUnreachableStmtMetaModel.jmlTagsPropertyMetaModel);
-        jmlLabelStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlLabelStmtMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
+        jmlUnreachableStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlUnreachableStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
+        jmlUnreachableStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlUnreachableStmtMetaModel.jmlTagsPropertyMetaModel);
+        jmlLabelStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlLabelStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
         jmlLabelStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelStmtMetaModel.jmlTagsPropertyMetaModel);
-        jmlLabelStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(
-                jmlLabelStmtMetaModel,
-                "label",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
+        jmlLabelStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(jmlLabelStmtMetaModel, "label", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
         jmlLabelStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlLabelStmtMetaModel.labelPropertyMetaModel);
-        jmlBeginStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlBeginStmtMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
+        jmlBeginStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlBeginStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
         jmlBeginStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlBeginStmtMetaModel.jmlTagsPropertyMetaModel);
-        jmlEndStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlEndStmtMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
+        jmlEndStmtMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlEndStmtMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
         jmlEndStmtMetaModel.getDeclaredPropertyMetaModels().add(jmlEndStmtMetaModel.jmlTagsPropertyMetaModel);
-        jmlMethodDeclarationMetaModel.contractPropertyMetaModel = new PropertyMetaModel(
-                jmlMethodDeclarationMetaModel,
-                "contract",
-                com.github.javaparser.ast.jml.clauses.JmlContract.class,
-                Optional.of(jmlContractMetaModel),
-                true,
-                false,
-                false,
-                false);
-        jmlMethodDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlMethodDeclarationMetaModel.contractPropertyMetaModel);
-        jmlMethodDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlMethodDeclarationMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlMethodDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlMethodDeclarationMetaModel.jmlTagsPropertyMetaModel);
-        jmlMethodDeclarationMetaModel.methodDeclarationPropertyMetaModel = new PropertyMetaModel(
-                jmlMethodDeclarationMetaModel,
-                "methodDeclaration",
-                com.github.javaparser.ast.body.MethodDeclaration.class,
-                Optional.of(methodDeclarationMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlMethodDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlMethodDeclarationMetaModel.methodDeclarationPropertyMetaModel);
-        jmlFieldDeclarationMetaModel.declPropertyMetaModel = new PropertyMetaModel(
-                jmlFieldDeclarationMetaModel,
-                "decl",
-                com.github.javaparser.ast.body.FieldDeclaration.class,
-                Optional.of(fieldDeclarationMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlFieldDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlFieldDeclarationMetaModel.declPropertyMetaModel);
-        jmlFieldDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlFieldDeclarationMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlFieldDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlFieldDeclarationMetaModel.jmlTagsPropertyMetaModel);
-        jmlClauseMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                jmlClauseMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                true,
-                false,
-                false,
-                false);
+        jmlMethodDeclarationMetaModel.contractPropertyMetaModel = new PropertyMetaModel(jmlMethodDeclarationMetaModel, "contract", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), true, false, false, false);
+        jmlMethodDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlMethodDeclarationMetaModel.contractPropertyMetaModel);
+        jmlMethodDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlMethodDeclarationMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
+        jmlMethodDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlMethodDeclarationMetaModel.jmlTagsPropertyMetaModel);
+        jmlMethodDeclarationMetaModel.methodDeclarationPropertyMetaModel = new PropertyMetaModel(jmlMethodDeclarationMetaModel, "methodDeclaration", com.github.javaparser.ast.body.MethodDeclaration.class, Optional.of(methodDeclarationMetaModel), false, false, false, false);
+        jmlMethodDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlMethodDeclarationMetaModel.methodDeclarationPropertyMetaModel);
+        jmlFieldDeclarationMetaModel.declPropertyMetaModel = new PropertyMetaModel(jmlFieldDeclarationMetaModel, "decl", com.github.javaparser.ast.body.FieldDeclaration.class, Optional.of(fieldDeclarationMetaModel), false, false, false, false);
+        jmlFieldDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlFieldDeclarationMetaModel.declPropertyMetaModel);
+        jmlFieldDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlFieldDeclarationMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
+        jmlFieldDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlFieldDeclarationMetaModel.jmlTagsPropertyMetaModel);
+        jmlClauseMetaModel.namePropertyMetaModel = new PropertyMetaModel(jmlClauseMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, false, false);
         jmlClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseMetaModel.namePropertyMetaModel);
-        jmlSimpleExprClauseMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                jmlSimpleExprClauseMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlSimpleExprClauseMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlSimpleExprClauseMetaModel.expressionPropertyMetaModel);
-        jmlSimpleExprClauseMetaModel.heapsPropertyMetaModel = new PropertyMetaModel(
-                jmlSimpleExprClauseMetaModel,
-                "heaps",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                true,
-                false,
-                true,
-                false);
-        jmlSimpleExprClauseMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlSimpleExprClauseMetaModel.heapsPropertyMetaModel);
-        jmlSimpleExprClauseMetaModel.kindPropertyMetaModel = new PropertyMetaModel(
-                jmlSimpleExprClauseMetaModel,
-                "kind",
-                com.github.javaparser.ast.jml.clauses.JmlClauseKind.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        jmlSimpleExprClauseMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlSimpleExprClauseMetaModel.kindPropertyMetaModel);
-        jmlMultiExprClauseMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(
-                jmlMultiExprClauseMetaModel,
-                "expressions",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlMultiExprClauseMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlMultiExprClauseMetaModel.expressionsPropertyMetaModel);
-        jmlMultiExprClauseMetaModel.heapsPropertyMetaModel = new PropertyMetaModel(
-                jmlMultiExprClauseMetaModel,
-                "heaps",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                true,
-                false,
-                true,
-                false);
-        jmlMultiExprClauseMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlMultiExprClauseMetaModel.heapsPropertyMetaModel);
-        jmlMultiExprClauseMetaModel.kindPropertyMetaModel = new PropertyMetaModel(
-                jmlMultiExprClauseMetaModel,
-                "kind",
-                com.github.javaparser.ast.jml.clauses.JmlClauseKind.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        jmlMultiExprClauseMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlMultiExprClauseMetaModel.kindPropertyMetaModel);
-        jmlSignalsClauseMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                jmlSignalsClauseMetaModel,
-                "expression",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlSignalsClauseMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlSignalsClauseMetaModel.expressionPropertyMetaModel);
-        jmlSignalsClauseMetaModel.parameterPropertyMetaModel = new PropertyMetaModel(
-                jmlSignalsClauseMetaModel,
-                "parameter",
-                com.github.javaparser.ast.body.Parameter.class,
-                Optional.of(parameterMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlSignalsClauseMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlSignalsClauseMetaModel.parameterPropertyMetaModel);
-        jmlSignalsOnlyClauseMetaModel.typesPropertyMetaModel = new PropertyMetaModel(
-                jmlSignalsOnlyClauseMetaModel,
-                "types",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlSignalsOnlyClauseMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlSignalsOnlyClauseMetaModel.typesPropertyMetaModel);
-        jmlClauseLabelMetaModel.exprPropertyMetaModel = new PropertyMetaModel(
-                jmlClauseLabelMetaModel,
-                "expr",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlClauseLabelMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseLabelMetaModel.exprPropertyMetaModel);
-        jmlClauseLabelMetaModel.kindPropertyMetaModel = new PropertyMetaModel(
-                jmlClauseLabelMetaModel,
-                "kind",
-                com.github.javaparser.ast.jml.clauses.JmlClauseKind.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        jmlClauseLabelMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseLabelMetaModel.kindPropertyMetaModel);
-        jmlClauseLabelMetaModel.labelPropertyMetaModel = new PropertyMetaModel(
-                jmlClauseLabelMetaModel,
-                "label",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                true,
-                false,
-                false,
-                false);
-        jmlClauseLabelMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseLabelMetaModel.labelPropertyMetaModel);
-        jmlForallClauseMetaModel.boundedVariablesPropertyMetaModel = new PropertyMetaModel(
-                jmlForallClauseMetaModel,
-                "boundedVariables",
-                com.github.javaparser.ast.body.Parameter.class,
-                Optional.of(parameterMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlForallClauseMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlForallClauseMetaModel.boundedVariablesPropertyMetaModel);
-        jmlOldClauseMetaModel.declarationsPropertyMetaModel = new PropertyMetaModel(
-                jmlOldClauseMetaModel,
-                "declarations",
-                com.github.javaparser.ast.expr.VariableDeclarationExpr.class,
-                Optional.of(variableDeclarationExprMetaModel),
-                false,
-                false,
-                false,
-                false);
+        jmlSimpleExprClauseMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(jmlSimpleExprClauseMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlSimpleExprClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlSimpleExprClauseMetaModel.expressionPropertyMetaModel);
+        jmlSimpleExprClauseMetaModel.heapsPropertyMetaModel = new PropertyMetaModel(jmlSimpleExprClauseMetaModel, "heaps", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, true, false);
+        jmlSimpleExprClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlSimpleExprClauseMetaModel.heapsPropertyMetaModel);
+        jmlSimpleExprClauseMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlSimpleExprClauseMetaModel, "kind", com.github.javaparser.ast.jml.clauses.JmlClauseKind.class, Optional.empty(), false, false, false, false);
+        jmlSimpleExprClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlSimpleExprClauseMetaModel.kindPropertyMetaModel);
+        jmlMultiExprClauseMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(jmlMultiExprClauseMetaModel, "expressions", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
+        jmlMultiExprClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlMultiExprClauseMetaModel.expressionsPropertyMetaModel);
+        jmlMultiExprClauseMetaModel.heapsPropertyMetaModel = new PropertyMetaModel(jmlMultiExprClauseMetaModel, "heaps", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, true, false);
+        jmlMultiExprClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlMultiExprClauseMetaModel.heapsPropertyMetaModel);
+        jmlMultiExprClauseMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlMultiExprClauseMetaModel, "kind", com.github.javaparser.ast.jml.clauses.JmlClauseKind.class, Optional.empty(), false, false, false, false);
+        jmlMultiExprClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlMultiExprClauseMetaModel.kindPropertyMetaModel);
+        jmlSignalsClauseMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(jmlSignalsClauseMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlSignalsClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlSignalsClauseMetaModel.expressionPropertyMetaModel);
+        jmlSignalsClauseMetaModel.parameterPropertyMetaModel = new PropertyMetaModel(jmlSignalsClauseMetaModel, "parameter", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, false, false, false);
+        jmlSignalsClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlSignalsClauseMetaModel.parameterPropertyMetaModel);
+        jmlSignalsOnlyClauseMetaModel.typesPropertyMetaModel = new PropertyMetaModel(jmlSignalsOnlyClauseMetaModel, "types", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, true, false);
+        jmlSignalsOnlyClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlSignalsOnlyClauseMetaModel.typesPropertyMetaModel);
+        jmlLabledClauseMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(jmlLabledClauseMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlLabledClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlLabledClauseMetaModel.expressionPropertyMetaModel);
+        jmlLabledClauseMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlLabledClauseMetaModel, "kind", com.github.javaparser.ast.jml.clauses.JmlClauseKind.class, Optional.empty(), false, false, false, false);
+        jmlLabledClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlLabledClauseMetaModel.kindPropertyMetaModel);
+        jmlLabledClauseMetaModel.labelPropertyMetaModel = new PropertyMetaModel(jmlLabledClauseMetaModel, "label", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, false, false);
+        jmlLabledClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlLabledClauseMetaModel.labelPropertyMetaModel);
+        jmlForallClauseMetaModel.boundedVariablesPropertyMetaModel = new PropertyMetaModel(jmlForallClauseMetaModel, "boundedVariables", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), false, false, true, false);
+        jmlForallClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlForallClauseMetaModel.boundedVariablesPropertyMetaModel);
+        jmlOldClauseMetaModel.declarationsPropertyMetaModel = new PropertyMetaModel(jmlOldClauseMetaModel, "declarations", com.github.javaparser.ast.expr.VariableDeclarationExpr.class, Optional.of(variableDeclarationExprMetaModel), false, false, false, false);
         jmlOldClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlOldClauseMetaModel.declarationsPropertyMetaModel);
-        jmlCallableClauseMetaModel.methodSignaturesPropertyMetaModel = new PropertyMetaModel(
-                jmlCallableClauseMetaModel,
-                "methodSignatures",
-                com.github.javaparser.ast.jml.clauses.JmlMethodSignature.class,
-                Optional.of(jmlMethodSignatureMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlCallableClauseMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlCallableClauseMetaModel.methodSignaturesPropertyMetaModel);
-        jmlClauseIfMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(
-                jmlClauseIfMetaModel,
-                "condition",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlClauseIfMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseIfMetaModel.conditionPropertyMetaModel);
-        jmlClauseIfMetaModel.kindPropertyMetaModel = new PropertyMetaModel(
-                jmlClauseIfMetaModel,
-                "kind",
-                com.github.javaparser.ast.jml.clauses.JmlClauseKind.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        jmlClauseIfMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseIfMetaModel.kindPropertyMetaModel);
-        jmlClauseIfMetaModel.thenPropertyMetaModel = new PropertyMetaModel(
-                jmlClauseIfMetaModel,
-                "then",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlClauseIfMetaModel.getDeclaredPropertyMetaModels().add(jmlClauseIfMetaModel.thenPropertyMetaModel);
-        jmlMethodSignatureMetaModel.argumentTypesPropertyMetaModel = new PropertyMetaModel(
-                jmlMethodSignatureMetaModel,
-                "argumentTypes",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlMethodSignatureMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlMethodSignatureMetaModel.argumentTypesPropertyMetaModel);
-        jmlMethodSignatureMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                jmlMethodSignatureMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlMethodSignatureMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlMethodSignatureMetaModel.namePropertyMetaModel);
-        jmlMethodSignatureMetaModel.receiverPropertyMetaModel = new PropertyMetaModel(
-                jmlMethodSignatureMetaModel,
-                "receiver",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                true,
-                false,
-                false,
-                false);
-        jmlMethodSignatureMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlMethodSignatureMetaModel.receiverPropertyMetaModel);
-        jmlContractMetaModel.behaviorPropertyMetaModel = new PropertyMetaModel(
-                jmlContractMetaModel,
-                "behavior",
-                com.github.javaparser.ast.stmt.Behavior.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
+        jmlCallableClauseMetaModel.methodSignaturesPropertyMetaModel = new PropertyMetaModel(jmlCallableClauseMetaModel, "methodSignatures", com.github.javaparser.ast.jml.clauses.JmlMethodSignature.class, Optional.of(jmlMethodSignatureMetaModel), false, false, true, false);
+        jmlCallableClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlCallableClauseMetaModel.methodSignaturesPropertyMetaModel);
+        jmlConditionalClauseMetaModel.conditionPropertyMetaModel = new PropertyMetaModel(jmlConditionalClauseMetaModel, "condition", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlConditionalClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlConditionalClauseMetaModel.conditionPropertyMetaModel);
+        jmlConditionalClauseMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(jmlConditionalClauseMetaModel, "expression", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlConditionalClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlConditionalClauseMetaModel.expressionPropertyMetaModel);
+        jmlConditionalClauseMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlConditionalClauseMetaModel, "kind", com.github.javaparser.ast.jml.clauses.JmlClauseKind.class, Optional.empty(), false, false, false, false);
+        jmlConditionalClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlConditionalClauseMetaModel.kindPropertyMetaModel);
+        jmlMethodSignatureMetaModel.argumentTypesPropertyMetaModel = new PropertyMetaModel(jmlMethodSignatureMetaModel, "argumentTypes", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, true, false);
+        jmlMethodSignatureMetaModel.getDeclaredPropertyMetaModels().add(jmlMethodSignatureMetaModel.argumentTypesPropertyMetaModel);
+        jmlMethodSignatureMetaModel.namePropertyMetaModel = new PropertyMetaModel(jmlMethodSignatureMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
+        jmlMethodSignatureMetaModel.getDeclaredPropertyMetaModels().add(jmlMethodSignatureMetaModel.namePropertyMetaModel);
+        jmlMethodSignatureMetaModel.receiverPropertyMetaModel = new PropertyMetaModel(jmlMethodSignatureMetaModel, "receiver", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), true, false, false, false);
+        jmlMethodSignatureMetaModel.getDeclaredPropertyMetaModels().add(jmlMethodSignatureMetaModel.receiverPropertyMetaModel);
+        jmlInfFlowClauseMetaModel.byPropertyMetaModel = new PropertyMetaModel(jmlInfFlowClauseMetaModel, "by", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
+        jmlInfFlowClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlInfFlowClauseMetaModel.byPropertyMetaModel);
+        jmlInfFlowClauseMetaModel.declassifiesPropertyMetaModel = new PropertyMetaModel(jmlInfFlowClauseMetaModel, "declassifies", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
+        jmlInfFlowClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlInfFlowClauseMetaModel.declassifiesPropertyMetaModel);
+        jmlInfFlowClauseMetaModel.erasesPropertyMetaModel = new PropertyMetaModel(jmlInfFlowClauseMetaModel, "erases", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
+        jmlInfFlowClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlInfFlowClauseMetaModel.erasesPropertyMetaModel);
+        jmlInfFlowClauseMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(jmlInfFlowClauseMetaModel, "expressions", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
+        jmlInfFlowClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlInfFlowClauseMetaModel.expressionsPropertyMetaModel);
+        jmlInfFlowClauseMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlInfFlowClauseMetaModel, "kind", com.github.javaparser.ast.jml.clauses.JmlClauseKind.class, Optional.empty(), false, false, false, false);
+        jmlInfFlowClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlInfFlowClauseMetaModel.kindPropertyMetaModel);
+        jmlInfFlowClauseMetaModel.newObjectsPropertyMetaModel = new PropertyMetaModel(jmlInfFlowClauseMetaModel, "newObjects", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
+        jmlInfFlowClauseMetaModel.getDeclaredPropertyMetaModels().add(jmlInfFlowClauseMetaModel.newObjectsPropertyMetaModel);
+        jmlContractMetaModel.behaviorPropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "behavior", com.github.javaparser.ast.stmt.Behavior.class, Optional.empty(), false, false, false, false);
         jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.behaviorPropertyMetaModel);
-        jmlContractMetaModel.clausesPropertyMetaModel = new PropertyMetaModel(
-                jmlContractMetaModel,
-                "clauses",
-                com.github.javaparser.ast.jml.clauses.JmlClause.class,
-                Optional.of(jmlClauseMetaModel),
-                false,
-                false,
-                true,
-                false);
+        jmlContractMetaModel.clausesPropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "clauses", com.github.javaparser.ast.jml.clauses.JmlClause.class, Optional.of(jmlClauseMetaModel), false, false, true, false);
         jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.clausesPropertyMetaModel);
-        jmlContractMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlContractMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
+        jmlContractMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
         jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.jmlTagsPropertyMetaModel);
-        jmlContractMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                jmlContractMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
+        jmlContractMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
         jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.modifiersPropertyMetaModel);
-        jmlContractMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                jmlContractMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                true,
-                false,
-                false,
-                false);
+        jmlContractMetaModel.namePropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, false, false);
         jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.namePropertyMetaModel);
-        jmlContractMetaModel.subContractsPropertyMetaModel = new PropertyMetaModel(
-                jmlContractMetaModel,
-                "subContracts",
-                com.github.javaparser.ast.jml.clauses.JmlContract.class,
-                Optional.of(jmlContractMetaModel),
-                false,
-                false,
-                true,
-                false);
+        jmlContractMetaModel.subContractsPropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "subContracts", com.github.javaparser.ast.jml.clauses.JmlContract.class, Optional.of(jmlContractMetaModel), false, false, true, false);
         jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.subContractsPropertyMetaModel);
-        jmlContractMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                jmlContractMetaModel,
-                "type",
-                com.github.javaparser.ast.jml.clauses.ContractType.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
+        jmlContractMetaModel.typePropertyMetaModel = new PropertyMetaModel(jmlContractMetaModel, "type", com.github.javaparser.ast.jml.clauses.ContractType.class, Optional.empty(), false, false, false, false);
         jmlContractMetaModel.getDeclaredPropertyMetaModels().add(jmlContractMetaModel.typePropertyMetaModel);
-        jmlClassExprDeclarationMetaModel.invariantPropertyMetaModel = new PropertyMetaModel(
-                jmlClassExprDeclarationMetaModel,
-                "invariant",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlClassExprDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlClassExprDeclarationMetaModel.invariantPropertyMetaModel);
-        jmlClassExprDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlClassExprDeclarationMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlClassExprDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlClassExprDeclarationMetaModel.jmlTagsPropertyMetaModel);
-        jmlClassExprDeclarationMetaModel.kindPropertyMetaModel = new PropertyMetaModel(
-                jmlClassExprDeclarationMetaModel,
-                "kind",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlClassExprDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlClassExprDeclarationMetaModel.kindPropertyMetaModel);
-        jmlClassExprDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                jmlClassExprDeclarationMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlClassExprDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlClassExprDeclarationMetaModel.modifiersPropertyMetaModel);
-        jmlClassExprDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                jmlClassExprDeclarationMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                true,
-                false,
-                false,
-                false);
-        jmlClassExprDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlClassExprDeclarationMetaModel.namePropertyMetaModel);
-        jmlRepresentsDeclarationMetaModel.exprPropertyMetaModel = new PropertyMetaModel(
-                jmlRepresentsDeclarationMetaModel,
-                "expr",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlRepresentsDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlRepresentsDeclarationMetaModel.exprPropertyMetaModel);
-        jmlRepresentsDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlRepresentsDeclarationMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlRepresentsDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlRepresentsDeclarationMetaModel.jmlTagsPropertyMetaModel);
-        jmlRepresentsDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                jmlRepresentsDeclarationMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlRepresentsDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlRepresentsDeclarationMetaModel.modifiersPropertyMetaModel);
-        jmlRepresentsDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                jmlRepresentsDeclarationMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlRepresentsDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlRepresentsDeclarationMetaModel.namePropertyMetaModel);
-        jmlClassAccessibleDeclarationMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(
-                jmlClassAccessibleDeclarationMetaModel,
-                "expressions",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlClassAccessibleDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlClassAccessibleDeclarationMetaModel.expressionsPropertyMetaModel);
-        jmlClassAccessibleDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(
-                jmlClassAccessibleDeclarationMetaModel,
-                "jmlTags",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlClassAccessibleDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlClassAccessibleDeclarationMetaModel.jmlTagsPropertyMetaModel);
-        jmlClassAccessibleDeclarationMetaModel.measuredByPropertyMetaModel = new PropertyMetaModel(
-                jmlClassAccessibleDeclarationMetaModel,
-                "measuredBy",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                false,
-                false);
-        jmlClassAccessibleDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlClassAccessibleDeclarationMetaModel.measuredByPropertyMetaModel);
-        jmlClassAccessibleDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                jmlClassAccessibleDeclarationMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        jmlClassAccessibleDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlClassAccessibleDeclarationMetaModel.modifiersPropertyMetaModel);
-        jmlClassAccessibleDeclarationMetaModel.variablePropertyMetaModel = new PropertyMetaModel(
-                jmlClassAccessibleDeclarationMetaModel,
-                "variable",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        jmlClassAccessibleDeclarationMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(jmlClassAccessibleDeclarationMetaModel.variablePropertyMetaModel);
-        arrayTypeMetaModel.componentTypePropertyMetaModel = new PropertyMetaModel(
-                arrayTypeMetaModel,
-                "componentType",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
-        arrayTypeMetaModel.getDeclaredPropertyMetaModels().add(arrayTypeMetaModel.componentTypePropertyMetaModel);
-        arrayTypeMetaModel.originPropertyMetaModel = new PropertyMetaModel(
-                arrayTypeMetaModel,
-                "origin",
-                com.github.javaparser.ast.type.ArrayType.Origin.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        arrayTypeMetaModel.getDeclaredPropertyMetaModels().add(arrayTypeMetaModel.originPropertyMetaModel);
-        classOrInterfaceTypeMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                classOrInterfaceTypeMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        classOrInterfaceTypeMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(classOrInterfaceTypeMetaModel.namePropertyMetaModel);
-        classOrInterfaceTypeMetaModel.scopePropertyMetaModel = new PropertyMetaModel(
-                classOrInterfaceTypeMetaModel,
-                "scope",
-                com.github.javaparser.ast.type.ClassOrInterfaceType.class,
-                Optional.of(classOrInterfaceTypeMetaModel),
-                true,
-                false,
-                false,
-                false);
-        classOrInterfaceTypeMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(classOrInterfaceTypeMetaModel.scopePropertyMetaModel);
-        classOrInterfaceTypeMetaModel.typeArgumentsPropertyMetaModel = new PropertyMetaModel(
-                classOrInterfaceTypeMetaModel,
-                "typeArguments",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                true,
-                false,
-                true,
-                false);
-        classOrInterfaceTypeMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(classOrInterfaceTypeMetaModel.typeArgumentsPropertyMetaModel);
-        classOrInterfaceTypeMetaModel.usingDiamondOperatorPropertyMetaModel = new PropertyMetaModel(
-                classOrInterfaceTypeMetaModel,
-                "usingDiamondOperator",
-                boolean.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        classOrInterfaceTypeMetaModel
-                .getDerivedPropertyMetaModels()
-                .add(classOrInterfaceTypeMetaModel.usingDiamondOperatorPropertyMetaModel);
-        intersectionTypeMetaModel.elementsPropertyMetaModel = new PropertyMetaModel(
-                intersectionTypeMetaModel,
-                "elements",
-                com.github.javaparser.ast.type.ReferenceType.class,
-                Optional.of(referenceTypeMetaModel),
-                false,
-                true,
-                true,
-                false);
-        intersectionTypeMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(intersectionTypeMetaModel.elementsPropertyMetaModel);
-        primitiveTypeMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                primitiveTypeMetaModel,
-                "type",
-                com.github.javaparser.ast.type.PrimitiveType.Primitive.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        primitiveTypeMetaModel.getDeclaredPropertyMetaModels().add(primitiveTypeMetaModel.typePropertyMetaModel);
-        typeParameterMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                typeParameterMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.SimpleName.class,
-                Optional.of(simpleNameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        typeParameterMetaModel.getDeclaredPropertyMetaModels().add(typeParameterMetaModel.namePropertyMetaModel);
-        typeParameterMetaModel.typeBoundPropertyMetaModel = new PropertyMetaModel(
-                typeParameterMetaModel,
-                "typeBound",
-                com.github.javaparser.ast.type.ClassOrInterfaceType.class,
-                Optional.of(classOrInterfaceTypeMetaModel),
-                false,
-                false,
-                true,
-                false);
-        typeParameterMetaModel.getDeclaredPropertyMetaModels().add(typeParameterMetaModel.typeBoundPropertyMetaModel);
-        unionTypeMetaModel.elementsPropertyMetaModel = new PropertyMetaModel(
-                unionTypeMetaModel,
-                "elements",
-                com.github.javaparser.ast.type.ReferenceType.class,
-                Optional.of(referenceTypeMetaModel),
-                false,
-                true,
-                true,
-                false);
-        unionTypeMetaModel.getDeclaredPropertyMetaModels().add(unionTypeMetaModel.elementsPropertyMetaModel);
-        wildcardTypeMetaModel.extendedTypePropertyMetaModel = new PropertyMetaModel(
-                wildcardTypeMetaModel,
-                "extendedType",
-                com.github.javaparser.ast.type.ReferenceType.class,
-                Optional.of(referenceTypeMetaModel),
-                true,
-                false,
-                false,
-                false);
-        wildcardTypeMetaModel.getDeclaredPropertyMetaModels().add(wildcardTypeMetaModel.extendedTypePropertyMetaModel);
-        wildcardTypeMetaModel.superTypePropertyMetaModel = new PropertyMetaModel(
-                wildcardTypeMetaModel,
-                "superType",
-                com.github.javaparser.ast.type.ReferenceType.class,
-                Optional.of(referenceTypeMetaModel),
-                true,
-                false,
-                false,
-                false);
-        wildcardTypeMetaModel.getDeclaredPropertyMetaModels().add(wildcardTypeMetaModel.superTypePropertyMetaModel);
-        moduleExportsDirectiveMetaModel.moduleNamesPropertyMetaModel = new PropertyMetaModel(
-                moduleExportsDirectiveMetaModel,
-                "moduleNames",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                true,
-                false);
-        moduleExportsDirectiveMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleExportsDirectiveMetaModel.moduleNamesPropertyMetaModel);
-        moduleExportsDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                moduleExportsDirectiveMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        moduleExportsDirectiveMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleExportsDirectiveMetaModel.namePropertyMetaModel);
-        moduleOpensDirectiveMetaModel.moduleNamesPropertyMetaModel = new PropertyMetaModel(
-                moduleOpensDirectiveMetaModel,
-                "moduleNames",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                true,
-                false);
-        moduleOpensDirectiveMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleOpensDirectiveMetaModel.moduleNamesPropertyMetaModel);
-        moduleOpensDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                moduleOpensDirectiveMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        moduleOpensDirectiveMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleOpensDirectiveMetaModel.namePropertyMetaModel);
-        moduleProvidesDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                moduleProvidesDirectiveMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        moduleProvidesDirectiveMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleProvidesDirectiveMetaModel.namePropertyMetaModel);
-        moduleProvidesDirectiveMetaModel.withPropertyMetaModel = new PropertyMetaModel(
-                moduleProvidesDirectiveMetaModel,
-                "with",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                true,
-                false);
-        moduleProvidesDirectiveMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleProvidesDirectiveMetaModel.withPropertyMetaModel);
-        moduleRequiresDirectiveMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(
-                moduleRequiresDirectiveMetaModel,
-                "modifiers",
-                com.github.javaparser.ast.Modifier.class,
-                Optional.of(modifierMetaModel),
-                false,
-                false,
-                true,
-                false);
-        moduleRequiresDirectiveMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleRequiresDirectiveMetaModel.modifiersPropertyMetaModel);
-        moduleRequiresDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                moduleRequiresDirectiveMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        moduleRequiresDirectiveMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleRequiresDirectiveMetaModel.namePropertyMetaModel);
-        moduleUsesDirectiveMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                moduleUsesDirectiveMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        moduleUsesDirectiveMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(moduleUsesDirectiveMetaModel.namePropertyMetaModel);
-        keyCatchAllStatementMetaModel.blockPropertyMetaModel = new PropertyMetaModel(
-                keyCatchAllStatementMetaModel,
-                "block",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyCatchAllStatementMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyCatchAllStatementMetaModel.blockPropertyMetaModel);
-        keyCatchAllStatementMetaModel.labelPropertyMetaModel = new PropertyMetaModel(
-                keyCatchAllStatementMetaModel,
-                "label",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyCatchAllStatementMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyCatchAllStatementMetaModel.labelPropertyMetaModel);
-        keyCcatchBreakMetaModel.blockPropertyMetaModel = new PropertyMetaModel(
-                keyCcatchBreakMetaModel,
-                "block",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                true,
-                false,
-                false,
-                false);
+        jmlClassExprDeclarationMetaModel.invariantPropertyMetaModel = new PropertyMetaModel(jmlClassExprDeclarationMetaModel, "invariant", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlClassExprDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassExprDeclarationMetaModel.invariantPropertyMetaModel);
+        jmlClassExprDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlClassExprDeclarationMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
+        jmlClassExprDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassExprDeclarationMetaModel.jmlTagsPropertyMetaModel);
+        jmlClassExprDeclarationMetaModel.kindPropertyMetaModel = new PropertyMetaModel(jmlClassExprDeclarationMetaModel, "kind", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, false, false);
+        jmlClassExprDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassExprDeclarationMetaModel.kindPropertyMetaModel);
+        jmlClassExprDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(jmlClassExprDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        jmlClassExprDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassExprDeclarationMetaModel.modifiersPropertyMetaModel);
+        jmlClassExprDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(jmlClassExprDeclarationMetaModel, "name", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), true, false, false, false);
+        jmlClassExprDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassExprDeclarationMetaModel.namePropertyMetaModel);
+        jmlRepresentsDeclarationMetaModel.exprPropertyMetaModel = new PropertyMetaModel(jmlRepresentsDeclarationMetaModel, "expr", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlRepresentsDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlRepresentsDeclarationMetaModel.exprPropertyMetaModel);
+        jmlRepresentsDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlRepresentsDeclarationMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
+        jmlRepresentsDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlRepresentsDeclarationMetaModel.jmlTagsPropertyMetaModel);
+        jmlRepresentsDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(jmlRepresentsDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        jmlRepresentsDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlRepresentsDeclarationMetaModel.modifiersPropertyMetaModel);
+        jmlRepresentsDeclarationMetaModel.namePropertyMetaModel = new PropertyMetaModel(jmlRepresentsDeclarationMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        jmlRepresentsDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlRepresentsDeclarationMetaModel.namePropertyMetaModel);
+        jmlClassAccessibleDeclarationMetaModel.expressionsPropertyMetaModel = new PropertyMetaModel(jmlClassAccessibleDeclarationMetaModel, "expressions", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, true, false);
+        jmlClassAccessibleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassAccessibleDeclarationMetaModel.expressionsPropertyMetaModel);
+        jmlClassAccessibleDeclarationMetaModel.jmlTagsPropertyMetaModel = new PropertyMetaModel(jmlClassAccessibleDeclarationMetaModel, "jmlTags", com.github.javaparser.ast.expr.SimpleName.class, Optional.of(simpleNameMetaModel), false, false, true, false);
+        jmlClassAccessibleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassAccessibleDeclarationMetaModel.jmlTagsPropertyMetaModel);
+        jmlClassAccessibleDeclarationMetaModel.measuredByPropertyMetaModel = new PropertyMetaModel(jmlClassAccessibleDeclarationMetaModel, "measuredBy", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
+        jmlClassAccessibleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassAccessibleDeclarationMetaModel.measuredByPropertyMetaModel);
+        jmlClassAccessibleDeclarationMetaModel.modifiersPropertyMetaModel = new PropertyMetaModel(jmlClassAccessibleDeclarationMetaModel, "modifiers", com.github.javaparser.ast.Modifier.class, Optional.of(modifierMetaModel), false, false, true, false);
+        jmlClassAccessibleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassAccessibleDeclarationMetaModel.modifiersPropertyMetaModel);
+        jmlClassAccessibleDeclarationMetaModel.variablePropertyMetaModel = new PropertyMetaModel(jmlClassAccessibleDeclarationMetaModel, "variable", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        jmlClassAccessibleDeclarationMetaModel.getDeclaredPropertyMetaModels().add(jmlClassAccessibleDeclarationMetaModel.variablePropertyMetaModel);
+        keyCatchAllStmtMetaModel.blockPropertyMetaModel = new PropertyMetaModel(keyCatchAllStmtMetaModel, "block", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false);
+        keyCatchAllStmtMetaModel.getDeclaredPropertyMetaModels().add(keyCatchAllStmtMetaModel.blockPropertyMetaModel);
+        keyCatchAllStmtMetaModel.labelPropertyMetaModel = new PropertyMetaModel(keyCatchAllStmtMetaModel, "label", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        keyCatchAllStmtMetaModel.getDeclaredPropertyMetaModels().add(keyCatchAllStmtMetaModel.labelPropertyMetaModel);
+        keyCcatchBreakMetaModel.blockPropertyMetaModel = new PropertyMetaModel(keyCcatchBreakMetaModel, "block", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), true, false, false, false);
         keyCcatchBreakMetaModel.getDeclaredPropertyMetaModels().add(keyCcatchBreakMetaModel.blockPropertyMetaModel);
-        keyCcatchBreakMetaModel.labelPropertyMetaModel = new PropertyMetaModel(
-                keyCcatchBreakMetaModel,
-                "label",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                true,
-                false,
-                false,
-                false);
+        keyCcatchBreakMetaModel.labelPropertyMetaModel = new PropertyMetaModel(keyCcatchBreakMetaModel, "label", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false);
         keyCcatchBreakMetaModel.getDeclaredPropertyMetaModels().add(keyCcatchBreakMetaModel.labelPropertyMetaModel);
-        keyCcatchContinueMetaModel.blockPropertyMetaModel = new PropertyMetaModel(
-                keyCcatchContinueMetaModel,
-                "block",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                true,
-                false,
-                false,
-                false);
-        keyCcatchContinueMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyCcatchContinueMetaModel.blockPropertyMetaModel);
-        keyCcatchContinueMetaModel.labelPropertyMetaModel = new PropertyMetaModel(
-                keyCcatchContinueMetaModel,
-                "label",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                true,
-                false,
-                false,
-                false);
-        keyCcatchContinueMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyCcatchContinueMetaModel.labelPropertyMetaModel);
-        keyCcatchParameterMetaModel.blockPropertyMetaModel = new PropertyMetaModel(
-                keyCcatchParameterMetaModel,
-                "block",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                true,
-                false,
-                false,
-                false);
-        keyCcatchParameterMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyCcatchParameterMetaModel.blockPropertyMetaModel);
-        keyCcatchParameterMetaModel.parameterPropertyMetaModel = new PropertyMetaModel(
-                keyCcatchParameterMetaModel,
-                "parameter",
-                com.github.javaparser.ast.body.Parameter.class,
-                Optional.of(parameterMetaModel),
-                true,
-                false,
-                false,
-                false);
-        keyCcatchParameterMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyCcatchParameterMetaModel.parameterPropertyMetaModel);
-        keyCcatchReturnMetaModel.blockPropertyMetaModel = new PropertyMetaModel(
-                keyCcatchReturnMetaModel,
-                "block",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                true,
-                false,
-                false,
-                false);
+        keyCcatchContinueMetaModel.blockPropertyMetaModel = new PropertyMetaModel(keyCcatchContinueMetaModel, "block", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), true, false, false, false);
+        keyCcatchContinueMetaModel.getDeclaredPropertyMetaModels().add(keyCcatchContinueMetaModel.blockPropertyMetaModel);
+        keyCcatchContinueMetaModel.labelPropertyMetaModel = new PropertyMetaModel(keyCcatchContinueMetaModel, "label", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false);
+        keyCcatchContinueMetaModel.getDeclaredPropertyMetaModels().add(keyCcatchContinueMetaModel.labelPropertyMetaModel);
+        keyCcatchParameterMetaModel.blockPropertyMetaModel = new PropertyMetaModel(keyCcatchParameterMetaModel, "block", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), true, false, false, false);
+        keyCcatchParameterMetaModel.getDeclaredPropertyMetaModels().add(keyCcatchParameterMetaModel.blockPropertyMetaModel);
+        keyCcatchParameterMetaModel.parameterPropertyMetaModel = new PropertyMetaModel(keyCcatchParameterMetaModel, "parameter", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), true, false, false, false);
+        keyCcatchParameterMetaModel.getDeclaredPropertyMetaModels().add(keyCcatchParameterMetaModel.parameterPropertyMetaModel);
+        keyCcatchReturnMetaModel.blockPropertyMetaModel = new PropertyMetaModel(keyCcatchReturnMetaModel, "block", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), true, false, false, false);
         keyCcatchReturnMetaModel.getDeclaredPropertyMetaModels().add(keyCcatchReturnMetaModel.blockPropertyMetaModel);
-        keyCcatchReturnMetaModel.parameterPropertyMetaModel = new PropertyMetaModel(
-                keyCcatchReturnMetaModel,
-                "parameter",
-                com.github.javaparser.ast.body.Parameter.class,
-                Optional.of(parameterMetaModel),
-                true,
-                false,
-                false,
-                false);
-        keyCcatchReturnMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyCcatchReturnMetaModel.parameterPropertyMetaModel);
-        keyEscapeExpressionMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(
-                keyEscapeExpressionMetaModel,
-                "arguments",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                true,
-                false);
-        keyEscapeExpressionMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyEscapeExpressionMetaModel.argumentsPropertyMetaModel);
-        keyEscapeExpressionMetaModel.calleePropertyMetaModel = new PropertyMetaModel(
-                keyEscapeExpressionMetaModel,
-                "callee",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyEscapeExpressionMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyEscapeExpressionMetaModel.calleePropertyMetaModel);
-        keyExecStatementMetaModel.branchesPropertyMetaModel = new PropertyMetaModel(
-                keyExecStatementMetaModel,
-                "branches",
-                com.github.javaparser.ast.key.KeyCcatchBranch.class,
-                Optional.of(keyCcatchBranchMetaModel),
-                false,
-                false,
-                true,
-                false);
-        keyExecStatementMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyExecStatementMetaModel.branchesPropertyMetaModel);
-        keyExecStatementMetaModel.execBlockPropertyMetaModel = new PropertyMetaModel(
-                keyExecStatementMetaModel,
-                "execBlock",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyExecStatementMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyExecStatementMetaModel.execBlockPropertyMetaModel);
-        keyExecutionContextMetaModel.contextPropertyMetaModel = new PropertyMetaModel(
-                keyExecutionContextMetaModel,
-                "context",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyExecutionContextMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyExecutionContextMetaModel.contextPropertyMetaModel);
-        keyExecutionContextMetaModel.instancePropertyMetaModel = new PropertyMetaModel(
-                keyExecutionContextMetaModel,
-                "instance",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                true,
-                false,
-                false,
-                false);
-        keyExecutionContextMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyExecutionContextMetaModel.instancePropertyMetaModel);
-        keyExecutionContextMetaModel.signaturePropertyMetaModel = new PropertyMetaModel(
-                keyExecutionContextMetaModel,
-                "signature",
-                com.github.javaparser.ast.key.KeyMethodSignature.class,
-                Optional.of(keyMethodSignatureMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyExecutionContextMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyExecutionContextMetaModel.signaturePropertyMetaModel);
-        keyLoopScopeBlockMetaModel.blockPropertyMetaModel = new PropertyMetaModel(
-                keyLoopScopeBlockMetaModel,
-                "block",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyLoopScopeBlockMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyLoopScopeBlockMetaModel.blockPropertyMetaModel);
-        keyLoopScopeBlockMetaModel.indexPVPropertyMetaModel = new PropertyMetaModel(
-                keyLoopScopeBlockMetaModel,
-                "indexPV",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyLoopScopeBlockMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyLoopScopeBlockMetaModel.indexPVPropertyMetaModel);
-        keyMergePointStatementMetaModel.exprPropertyMetaModel = new PropertyMetaModel(
-                keyMergePointStatementMetaModel,
-                "expr",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyMergePointStatementMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMergePointStatementMetaModel.exprPropertyMetaModel);
-        keyMethodBodyStatementMetaModel.exprPropertyMetaModel = new PropertyMetaModel(
-                keyMethodBodyStatementMetaModel,
-                "expr",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyMethodBodyStatementMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMethodBodyStatementMetaModel.exprPropertyMetaModel);
-        keyMethodBodyStatementMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                keyMethodBodyStatementMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                true,
-                false,
-                false,
-                false);
-        keyMethodBodyStatementMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMethodBodyStatementMetaModel.namePropertyMetaModel);
-        keyMethodBodyStatementMetaModel.sourcePropertyMetaModel = new PropertyMetaModel(
-                keyMethodBodyStatementMetaModel,
-                "source",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyMethodBodyStatementMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMethodBodyStatementMetaModel.sourcePropertyMetaModel);
-        keyMethodCallStatementMetaModel.blockPropertyMetaModel = new PropertyMetaModel(
-                keyMethodCallStatementMetaModel,
-                "block",
-                com.github.javaparser.ast.stmt.BlockStmt.class,
-                Optional.of(blockStmtMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyMethodCallStatementMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMethodCallStatementMetaModel.blockPropertyMetaModel);
-        keyMethodCallStatementMetaModel.contextPropertyMetaModel = new PropertyMetaModel(
-                keyMethodCallStatementMetaModel,
-                "context",
-                com.github.javaparser.ast.key.KeyAbstractExecutionContext.class,
-                Optional.of(keyAbstractExecutionContextMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyMethodCallStatementMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMethodCallStatementMetaModel.contextPropertyMetaModel);
-        keyMethodCallStatementMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                keyMethodCallStatementMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                true,
-                false,
-                false,
-                false);
-        keyMethodCallStatementMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMethodCallStatementMetaModel.namePropertyMetaModel);
-        keyMethodSignatureMetaModel.namePropertyMetaModel = new PropertyMetaModel(
-                keyMethodSignatureMetaModel,
-                "name",
-                com.github.javaparser.ast.expr.Name.class,
-                Optional.of(nameMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyMethodSignatureMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMethodSignatureMetaModel.namePropertyMetaModel);
-        keyMethodSignatureMetaModel.paramTypesPropertyMetaModel = new PropertyMetaModel(
-                keyMethodSignatureMetaModel,
-                "paramTypes",
-                com.github.javaparser.ast.type.Type.class,
-                Optional.of(typeMetaModel),
-                false,
-                false,
-                true,
-                false);
-        keyMethodSignatureMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMethodSignatureMetaModel.paramTypesPropertyMetaModel);
-        keyRangeExpressionMetaModel.lowerPropertyMetaModel = new PropertyMetaModel(
-                keyRangeExpressionMetaModel,
-                "lower",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyRangeExpressionMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyRangeExpressionMetaModel.lowerPropertyMetaModel);
-        keyRangeExpressionMetaModel.upperPropertyMetaModel = new PropertyMetaModel(
-                keyRangeExpressionMetaModel,
-                "upper",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyRangeExpressionMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyRangeExpressionMetaModel.upperPropertyMetaModel);
-        keyTransactionStatementMetaModel.typePropertyMetaModel = new PropertyMetaModel(
-                keyTransactionStatementMetaModel,
-                "type",
-                com.github.javaparser.ast.key.KeyTransactionStatement.TransactionType.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        keyTransactionStatementMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyTransactionStatementMetaModel.typePropertyMetaModel);
-        keyContextStatementBlockMetaModel.contextPropertyMetaModel = new PropertyMetaModel(
-                keyContextStatementBlockMetaModel,
-                "context",
-                com.github.javaparser.ast.key.sv.KeyExecCtxtSV.class,
-                Optional.of(keyExecCtxtSVMetaModel),
-                true,
-                false,
-                false,
-                false);
-        keyContextStatementBlockMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyContextStatementBlockMetaModel.contextPropertyMetaModel);
-        keyContextStatementBlockMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(
-                keyContextStatementBlockMetaModel,
-                "expression",
-                com.github.javaparser.ast.key.sv.KeyExpressionSV.class,
-                Optional.of(keyExpressionSVMetaModel),
-                true,
-                false,
-                false,
-                false);
-        keyContextStatementBlockMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyContextStatementBlockMetaModel.expressionPropertyMetaModel);
-        keyContextStatementBlockMetaModel.signaturePropertyMetaModel = new PropertyMetaModel(
-                keyContextStatementBlockMetaModel,
-                "signature",
-                com.github.javaparser.ast.key.sv.KeyMethodSignatureSV.class,
-                Optional.of(keyMethodSignatureSVMetaModel),
-                true,
-                false,
-                false,
-                false);
-        keyContextStatementBlockMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyContextStatementBlockMetaModel.signaturePropertyMetaModel);
-        keyContextStatementBlockMetaModel.statementsPropertyMetaModel = new PropertyMetaModel(
-                keyContextStatementBlockMetaModel,
-                "statements",
-                com.github.javaparser.ast.stmt.Statement.class,
-                Optional.of(statementMetaModel),
-                false,
-                false,
-                true,
-                false);
-        keyContextStatementBlockMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyContextStatementBlockMetaModel.statementsPropertyMetaModel);
-        keyContextStatementBlockMetaModel.trPropertyMetaModel = new PropertyMetaModel(
-                keyContextStatementBlockMetaModel,
-                "tr",
-                com.github.javaparser.ast.key.sv.KeyTypeSV.class,
-                Optional.of(keyTypeSVMetaModel),
-                true,
-                false,
-                false,
-                false);
-        keyContextStatementBlockMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyContextStatementBlockMetaModel.trPropertyMetaModel);
-        keyExecCtxtSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(
-                keyExecCtxtSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
+        keyCcatchReturnMetaModel.parameterPropertyMetaModel = new PropertyMetaModel(keyCcatchReturnMetaModel, "parameter", com.github.javaparser.ast.body.Parameter.class, Optional.of(parameterMetaModel), true, false, false, false);
+        keyCcatchReturnMetaModel.getDeclaredPropertyMetaModels().add(keyCcatchReturnMetaModel.parameterPropertyMetaModel);
+        keyEscapeExpressionMetaModel.argumentsPropertyMetaModel = new PropertyMetaModel(keyEscapeExpressionMetaModel, "arguments", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, true, false);
+        keyEscapeExpressionMetaModel.getDeclaredPropertyMetaModels().add(keyEscapeExpressionMetaModel.argumentsPropertyMetaModel);
+        keyEscapeExpressionMetaModel.calleePropertyMetaModel = new PropertyMetaModel(keyEscapeExpressionMetaModel, "callee", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        keyEscapeExpressionMetaModel.getDeclaredPropertyMetaModels().add(keyEscapeExpressionMetaModel.calleePropertyMetaModel);
+        keyExecStmtMetaModel.branchesPropertyMetaModel = new PropertyMetaModel(keyExecStmtMetaModel, "branches", com.github.javaparser.ast.key.KeyCcatchBranch.class, Optional.of(keyCcatchBranchMetaModel), false, false, true, false);
+        keyExecStmtMetaModel.getDeclaredPropertyMetaModels().add(keyExecStmtMetaModel.branchesPropertyMetaModel);
+        keyExecStmtMetaModel.execBlockPropertyMetaModel = new PropertyMetaModel(keyExecStmtMetaModel, "execBlock", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false);
+        keyExecStmtMetaModel.getDeclaredPropertyMetaModels().add(keyExecStmtMetaModel.execBlockPropertyMetaModel);
+        keyExecutionContextMetaModel.contextPropertyMetaModel = new PropertyMetaModel(keyExecutionContextMetaModel, "context", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
+        keyExecutionContextMetaModel.getDeclaredPropertyMetaModels().add(keyExecutionContextMetaModel.contextPropertyMetaModel);
+        keyExecutionContextMetaModel.instancePropertyMetaModel = new PropertyMetaModel(keyExecutionContextMetaModel, "instance", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), true, false, false, false);
+        keyExecutionContextMetaModel.getDeclaredPropertyMetaModels().add(keyExecutionContextMetaModel.instancePropertyMetaModel);
+        keyExecutionContextMetaModel.signaturePropertyMetaModel = new PropertyMetaModel(keyExecutionContextMetaModel, "signature", com.github.javaparser.ast.key.KeyMethodSignature.class, Optional.of(keyMethodSignatureMetaModel), false, false, false, false);
+        keyExecutionContextMetaModel.getDeclaredPropertyMetaModels().add(keyExecutionContextMetaModel.signaturePropertyMetaModel);
+        keyLoopScopeBlockStmtMetaModel.blockPropertyMetaModel = new PropertyMetaModel(keyLoopScopeBlockStmtMetaModel, "block", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false);
+        keyLoopScopeBlockStmtMetaModel.getDeclaredPropertyMetaModels().add(keyLoopScopeBlockStmtMetaModel.blockPropertyMetaModel);
+        keyLoopScopeBlockStmtMetaModel.indexPVPropertyMetaModel = new PropertyMetaModel(keyLoopScopeBlockStmtMetaModel, "indexPV", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        keyLoopScopeBlockStmtMetaModel.getDeclaredPropertyMetaModels().add(keyLoopScopeBlockStmtMetaModel.indexPVPropertyMetaModel);
+        keyMergePointStmtMetaModel.exprPropertyMetaModel = new PropertyMetaModel(keyMergePointStmtMetaModel, "expr", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        keyMergePointStmtMetaModel.getDeclaredPropertyMetaModels().add(keyMergePointStmtMetaModel.exprPropertyMetaModel);
+        keyMethodBodyStatementMetaModel.exprPropertyMetaModel = new PropertyMetaModel(keyMethodBodyStatementMetaModel, "expr", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        keyMethodBodyStatementMetaModel.getDeclaredPropertyMetaModels().add(keyMethodBodyStatementMetaModel.exprPropertyMetaModel);
+        keyMethodBodyStatementMetaModel.namePropertyMetaModel = new PropertyMetaModel(keyMethodBodyStatementMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false);
+        keyMethodBodyStatementMetaModel.getDeclaredPropertyMetaModels().add(keyMethodBodyStatementMetaModel.namePropertyMetaModel);
+        keyMethodBodyStatementMetaModel.sourcePropertyMetaModel = new PropertyMetaModel(keyMethodBodyStatementMetaModel, "source", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, false, false);
+        keyMethodBodyStatementMetaModel.getDeclaredPropertyMetaModels().add(keyMethodBodyStatementMetaModel.sourcePropertyMetaModel);
+        keyMethodCallStmtMetaModel.blockPropertyMetaModel = new PropertyMetaModel(keyMethodCallStmtMetaModel, "block", com.github.javaparser.ast.stmt.BlockStmt.class, Optional.of(blockStmtMetaModel), false, false, false, false);
+        keyMethodCallStmtMetaModel.getDeclaredPropertyMetaModels().add(keyMethodCallStmtMetaModel.blockPropertyMetaModel);
+        keyMethodCallStmtMetaModel.contextPropertyMetaModel = new PropertyMetaModel(keyMethodCallStmtMetaModel, "context", com.github.javaparser.ast.key.KeyAbstractExecutionContext.class, Optional.of(keyAbstractExecutionContextMetaModel), false, false, false, false);
+        keyMethodCallStmtMetaModel.getDeclaredPropertyMetaModels().add(keyMethodCallStmtMetaModel.contextPropertyMetaModel);
+        keyMethodCallStmtMetaModel.namePropertyMetaModel = new PropertyMetaModel(keyMethodCallStmtMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), true, false, false, false);
+        keyMethodCallStmtMetaModel.getDeclaredPropertyMetaModels().add(keyMethodCallStmtMetaModel.namePropertyMetaModel);
+        keyMethodSignatureMetaModel.namePropertyMetaModel = new PropertyMetaModel(keyMethodSignatureMetaModel, "name", com.github.javaparser.ast.expr.Name.class, Optional.of(nameMetaModel), false, false, false, false);
+        keyMethodSignatureMetaModel.getDeclaredPropertyMetaModels().add(keyMethodSignatureMetaModel.namePropertyMetaModel);
+        keyMethodSignatureMetaModel.paramTypesPropertyMetaModel = new PropertyMetaModel(keyMethodSignatureMetaModel, "paramTypes", com.github.javaparser.ast.type.Type.class, Optional.of(typeMetaModel), false, false, true, false);
+        keyMethodSignatureMetaModel.getDeclaredPropertyMetaModels().add(keyMethodSignatureMetaModel.paramTypesPropertyMetaModel);
+        keyTransactionStmtMetaModel.typePropertyMetaModel = new PropertyMetaModel(keyTransactionStmtMetaModel, "type", com.github.javaparser.ast.key.KeyTransactionStmt.TransactionType.class, Optional.empty(), false, false, false, false);
+        keyTransactionStmtMetaModel.getDeclaredPropertyMetaModels().add(keyTransactionStmtMetaModel.typePropertyMetaModel);
+        keYMarkerStatementMetaModel.kindPropertyMetaModel = new PropertyMetaModel(keYMarkerStatementMetaModel, "kind", int.class, Optional.empty(), false, false, false, false);
+        keYMarkerStatementMetaModel.getDeclaredPropertyMetaModels().add(keYMarkerStatementMetaModel.kindPropertyMetaModel);
+        keyContextStatementBlockMetaModel.contextPropertyMetaModel = new PropertyMetaModel(keyContextStatementBlockMetaModel, "context", com.github.javaparser.ast.key.sv.KeyExecCtxtSV.class, Optional.of(keyExecCtxtSVMetaModel), true, false, false, false);
+        keyContextStatementBlockMetaModel.getDeclaredPropertyMetaModels().add(keyContextStatementBlockMetaModel.contextPropertyMetaModel);
+        keyContextStatementBlockMetaModel.expressionPropertyMetaModel = new PropertyMetaModel(keyContextStatementBlockMetaModel, "expression", com.github.javaparser.ast.key.sv.KeyExpressionSV.class, Optional.of(keyExpressionSVMetaModel), true, false, false, false);
+        keyContextStatementBlockMetaModel.getDeclaredPropertyMetaModels().add(keyContextStatementBlockMetaModel.expressionPropertyMetaModel);
+        keyContextStatementBlockMetaModel.signaturePropertyMetaModel = new PropertyMetaModel(keyContextStatementBlockMetaModel, "signature", com.github.javaparser.ast.key.sv.KeyMethodSignatureSV.class, Optional.of(keyMethodSignatureSVMetaModel), true, false, false, false);
+        keyContextStatementBlockMetaModel.getDeclaredPropertyMetaModels().add(keyContextStatementBlockMetaModel.signaturePropertyMetaModel);
+        keyContextStatementBlockMetaModel.statementsPropertyMetaModel = new PropertyMetaModel(keyContextStatementBlockMetaModel, "statements", com.github.javaparser.ast.stmt.Statement.class, Optional.of(statementMetaModel), false, false, true, false);
+        keyContextStatementBlockMetaModel.getDeclaredPropertyMetaModels().add(keyContextStatementBlockMetaModel.statementsPropertyMetaModel);
+        keyContextStatementBlockMetaModel.trPropertyMetaModel = new PropertyMetaModel(keyContextStatementBlockMetaModel, "tr", com.github.javaparser.ast.key.sv.KeyTypeSV.class, Optional.of(keyTypeSVMetaModel), true, false, false, false);
+        keyContextStatementBlockMetaModel.getDeclaredPropertyMetaModels().add(keyContextStatementBlockMetaModel.trPropertyMetaModel);
+        keyExecCtxtSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(keyExecCtxtSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
         keyExecCtxtSVMetaModel.getDeclaredPropertyMetaModels().add(keyExecCtxtSVMetaModel.textPropertyMetaModel);
-        keyExpressionSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(
-                keyExpressionSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
+        keyExpressionSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(keyExpressionSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
         keyExpressionSVMetaModel.getDeclaredPropertyMetaModels().add(keyExpressionSVMetaModel.textPropertyMetaModel);
-        keyJumpLabelSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(
-                keyJumpLabelSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
+        keyJumpLabelSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(keyJumpLabelSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
         keyJumpLabelSVMetaModel.getDeclaredPropertyMetaModels().add(keyJumpLabelSVMetaModel.textPropertyMetaModel);
-        keyMetaConstructMetaModel.childPropertyMetaModel = new PropertyMetaModel(
-                keyMetaConstructMetaModel,
-                "child",
-                com.github.javaparser.ast.Node.class,
-                Optional.of(nodeMetaModel),
-                false,
-                false,
-                false,
-                false);
+        keyMetaConstructMetaModel.childPropertyMetaModel = new PropertyMetaModel(keyMetaConstructMetaModel, "child", com.github.javaparser.ast.Node.class, Optional.of(nodeMetaModel), false, false, false, false);
         keyMetaConstructMetaModel.getDeclaredPropertyMetaModels().add(keyMetaConstructMetaModel.childPropertyMetaModel);
-        keyMetaConstructMetaModel.kindPropertyMetaModel = new PropertyMetaModel(
-                keyMetaConstructMetaModel,
-                "kind",
-                java.lang.String.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
+        keyMetaConstructMetaModel.kindPropertyMetaModel = new PropertyMetaModel(keyMetaConstructMetaModel, "kind", java.lang.String.class, Optional.empty(), false, false, false, false);
         keyMetaConstructMetaModel.getDeclaredPropertyMetaModels().add(keyMetaConstructMetaModel.kindPropertyMetaModel);
-        keyMetaConstructMetaModel.schemasPropertyMetaModel = new PropertyMetaModel(
-                keyMetaConstructMetaModel,
-                "schemas",
-                com.github.javaparser.ast.Node.class,
-                Optional.of(nodeMetaModel),
-                false,
-                false,
-                true,
-                false);
-        keyMetaConstructMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMetaConstructMetaModel.schemasPropertyMetaModel);
-        keyMetaConstructExpressionMetaModel.childPropertyMetaModel = new PropertyMetaModel(
-                keyMetaConstructExpressionMetaModel,
-                "child",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyMetaConstructExpressionMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMetaConstructExpressionMetaModel.childPropertyMetaModel);
-        keyMetaConstructExpressionMetaModel.textPropertyMetaModel = new PropertyMetaModel(
-                keyMetaConstructExpressionMetaModel,
-                "text",
-                java.lang.String.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        keyMetaConstructExpressionMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMetaConstructExpressionMetaModel.textPropertyMetaModel);
-        keyMetaConstructTypeMetaModel.exprPropertyMetaModel = new PropertyMetaModel(
-                keyMetaConstructTypeMetaModel,
-                "expr",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyMetaConstructTypeMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMetaConstructTypeMetaModel.exprPropertyMetaModel);
-        keyMetaConstructTypeMetaModel.kindPropertyMetaModel = new PropertyMetaModel(
-                keyMetaConstructTypeMetaModel,
-                "kind",
-                java.lang.String.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        keyMetaConstructTypeMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMetaConstructTypeMetaModel.kindPropertyMetaModel);
-        keyMethodSignatureSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(
-                keyMethodSignatureSVMetaModel,
-                "text",
-                java.lang.String.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        keyMethodSignatureSVMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyMethodSignatureSVMetaModel.textPropertyMetaModel);
-        keyPassiveExpressionMetaModel.exprPropertyMetaModel = new PropertyMetaModel(
-                keyPassiveExpressionMetaModel,
-                "expr",
-                com.github.javaparser.ast.expr.Expression.class,
-                Optional.of(expressionMetaModel),
-                false,
-                false,
-                false,
-                false);
-        keyPassiveExpressionMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyPassiveExpressionMetaModel.exprPropertyMetaModel);
-        keyProgramVariableSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(
-                keyProgramVariableSVMetaModel,
-                "text",
-                java.lang.String.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        keyProgramVariableSVMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyProgramVariableSVMetaModel.textPropertyMetaModel);
-        keyStatementSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(
-                keyStatementSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
+        keyMetaConstructMetaModel.schemasPropertyMetaModel = new PropertyMetaModel(keyMetaConstructMetaModel, "schemas", com.github.javaparser.ast.Node.class, Optional.of(nodeMetaModel), false, false, true, false);
+        keyMetaConstructMetaModel.getDeclaredPropertyMetaModels().add(keyMetaConstructMetaModel.schemasPropertyMetaModel);
+        keyMetaConstructExpressionMetaModel.childPropertyMetaModel = new PropertyMetaModel(keyMetaConstructExpressionMetaModel, "child", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        keyMetaConstructExpressionMetaModel.getDeclaredPropertyMetaModels().add(keyMetaConstructExpressionMetaModel.childPropertyMetaModel);
+        keyMetaConstructExpressionMetaModel.textPropertyMetaModel = new PropertyMetaModel(keyMetaConstructExpressionMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
+        keyMetaConstructExpressionMetaModel.getDeclaredPropertyMetaModels().add(keyMetaConstructExpressionMetaModel.textPropertyMetaModel);
+        keyMetaConstructTypeMetaModel.exprPropertyMetaModel = new PropertyMetaModel(keyMetaConstructTypeMetaModel, "expr", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        keyMetaConstructTypeMetaModel.getDeclaredPropertyMetaModels().add(keyMetaConstructTypeMetaModel.exprPropertyMetaModel);
+        keyMetaConstructTypeMetaModel.kindPropertyMetaModel = new PropertyMetaModel(keyMetaConstructTypeMetaModel, "kind", java.lang.String.class, Optional.empty(), false, false, false, false);
+        keyMetaConstructTypeMetaModel.getDeclaredPropertyMetaModels().add(keyMetaConstructTypeMetaModel.kindPropertyMetaModel);
+        keyMethodSignatureSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(keyMethodSignatureSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
+        keyMethodSignatureSVMetaModel.getDeclaredPropertyMetaModels().add(keyMethodSignatureSVMetaModel.textPropertyMetaModel);
+        keyPassiveExpressionMetaModel.exprPropertyMetaModel = new PropertyMetaModel(keyPassiveExpressionMetaModel, "expr", com.github.javaparser.ast.expr.Expression.class, Optional.of(expressionMetaModel), false, false, false, false);
+        keyPassiveExpressionMetaModel.getDeclaredPropertyMetaModels().add(keyPassiveExpressionMetaModel.exprPropertyMetaModel);
+        keyProgramVariableSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(keyProgramVariableSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
+        keyProgramVariableSVMetaModel.getDeclaredPropertyMetaModels().add(keyProgramVariableSVMetaModel.textPropertyMetaModel);
+        keyStatementSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(keyStatementSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
         keyStatementSVMetaModel.getDeclaredPropertyMetaModels().add(keyStatementSVMetaModel.textPropertyMetaModel);
-        keyTypeSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(
-                keyTypeSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
+        keyTypeSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(keyTypeSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
         keyTypeSVMetaModel.getDeclaredPropertyMetaModels().add(keyTypeSVMetaModel.textPropertyMetaModel);
-        keyCcatchSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(
-                keyCcatchSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
+        keyCcatchSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(keyCcatchSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
         keyCcatchSVMetaModel.getDeclaredPropertyMetaModels().add(keyCcatchSVMetaModel.textPropertyMetaModel);
-        keyExecutionContextSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(
-                keyExecutionContextSVMetaModel,
-                "text",
-                java.lang.String.class,
-                Optional.empty(),
-                false,
-                false,
-                false,
-                false);
-        keyExecutionContextSVMetaModel
-                .getDeclaredPropertyMetaModels()
-                .add(keyExecutionContextSVMetaModel.textPropertyMetaModel);
+        keyExecutionContextSVMetaModel.textPropertyMetaModel = new PropertyMetaModel(keyExecutionContextSVMetaModel, "text", java.lang.String.class, Optional.empty(), false, false, false, false);
+        keyExecutionContextSVMetaModel.getDeclaredPropertyMetaModels().add(keyExecutionContextSVMetaModel.textPropertyMetaModel);
     }
 
     public static Optional<BaseNodeMetaModel> getNodeMetaModel(Class<?> c) {
@@ -4912,12 +1409,10 @@ public static Optional<BaseNodeMetaModel> getNodeMetaModel(Class<?> c) {
     public static final NodeMetaModel nodeMetaModel = new NodeMetaModel(Optional.empty());
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final BodyDeclarationMetaModel bodyDeclarationMetaModel =
-            new BodyDeclarationMetaModel(Optional.of(nodeMetaModel));
+    public static final BodyDeclarationMetaModel bodyDeclarationMetaModel = new BodyDeclarationMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final CallableDeclarationMetaModel callableDeclarationMetaModel =
-            new CallableDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
+    public static final CallableDeclarationMetaModel callableDeclarationMetaModel = new CallableDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     public static final ExpressionMetaModel expressionMetaModel = new ExpressionMetaModel(Optional.of(nodeMetaModel));
@@ -4929,216 +1424,166 @@ public static Optional<BaseNodeMetaModel> getNodeMetaModel(Class<?> c) {
     public static final TypeMetaModel typeMetaModel = new TypeMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final AnnotationExprMetaModel annotationExprMetaModel =
-            new AnnotationExprMetaModel(Optional.of(expressionMetaModel));
+    public static final AnnotationExprMetaModel annotationExprMetaModel = new AnnotationExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ReferenceTypeMetaModel referenceTypeMetaModel =
-            new ReferenceTypeMetaModel(Optional.of(typeMetaModel));
+    public static final ReferenceTypeMetaModel referenceTypeMetaModel = new ReferenceTypeMetaModel(Optional.of(typeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final TypeDeclarationMetaModel typeDeclarationMetaModel =
-            new TypeDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
+    public static final TypeDeclarationMetaModel typeDeclarationMetaModel = new TypeDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final LiteralExprMetaModel literalExprMetaModel =
-            new LiteralExprMetaModel(Optional.of(expressionMetaModel));
+    public static final LiteralExprMetaModel literalExprMetaModel = new LiteralExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final LiteralStringValueExprMetaModel literalStringValueExprMetaModel =
-            new LiteralStringValueExprMetaModel(Optional.of(literalExprMetaModel));
+    public static final LiteralStringValueExprMetaModel literalStringValueExprMetaModel = new LiteralStringValueExprMetaModel(Optional.of(literalExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final StringLiteralExprMetaModel stringLiteralExprMetaModel =
-            new StringLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel));
+    public static final StringLiteralExprMetaModel stringLiteralExprMetaModel = new StringLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ModuleDeclarationMetaModel moduleDeclarationMetaModel =
-            new ModuleDeclarationMetaModel(Optional.of(nodeMetaModel));
+    public static final ModuleDeclarationMetaModel moduleDeclarationMetaModel = new ModuleDeclarationMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ModuleDirectiveMetaModel moduleDirectiveMetaModel =
-            new ModuleDirectiveMetaModel(Optional.of(nodeMetaModel));
+    public static final ModuleDirectiveMetaModel moduleDirectiveMetaModel = new ModuleDirectiveMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ArrayCreationLevelMetaModel arrayCreationLevelMetaModel =
-            new ArrayCreationLevelMetaModel(Optional.of(nodeMetaModel));
+    public static final ArrayCreationLevelMetaModel arrayCreationLevelMetaModel = new ArrayCreationLevelMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final CompilationUnitMetaModel compilationUnitMetaModel =
-            new CompilationUnitMetaModel(Optional.of(nodeMetaModel));
+    public static final CompilationUnitMetaModel compilationUnitMetaModel = new CompilationUnitMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ImportDeclarationMetaModel importDeclarationMetaModel =
-            new ImportDeclarationMetaModel(Optional.of(nodeMetaModel));
+    public static final ImportDeclarationMetaModel importDeclarationMetaModel = new ImportDeclarationMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     public static final ModifierMetaModel modifierMetaModel = new ModifierMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final PackageDeclarationMetaModel packageDeclarationMetaModel =
-            new PackageDeclarationMetaModel(Optional.of(nodeMetaModel));
+    public static final PackageDeclarationMetaModel packageDeclarationMetaModel = new PackageDeclarationMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final AnnotationDeclarationMetaModel annotationDeclarationMetaModel =
-            new AnnotationDeclarationMetaModel(Optional.of(typeDeclarationMetaModel));
+    public static final AnnotationDeclarationMetaModel annotationDeclarationMetaModel = new AnnotationDeclarationMetaModel(Optional.of(typeDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final AnnotationMemberDeclarationMetaModel annotationMemberDeclarationMetaModel =
-            new AnnotationMemberDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
+    public static final AnnotationMemberDeclarationMetaModel annotationMemberDeclarationMetaModel = new AnnotationMemberDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ClassOrInterfaceDeclarationMetaModel classOrInterfaceDeclarationMetaModel =
-            new ClassOrInterfaceDeclarationMetaModel(Optional.of(typeDeclarationMetaModel));
+    public static final ClassOrInterfaceDeclarationMetaModel classOrInterfaceDeclarationMetaModel = new ClassOrInterfaceDeclarationMetaModel(Optional.of(typeDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ConstructorDeclarationMetaModel constructorDeclarationMetaModel =
-            new ConstructorDeclarationMetaModel(Optional.of(callableDeclarationMetaModel));
+    public static final ConstructorDeclarationMetaModel constructorDeclarationMetaModel = new ConstructorDeclarationMetaModel(Optional.of(callableDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final EnumConstantDeclarationMetaModel enumConstantDeclarationMetaModel =
-            new EnumConstantDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
+    public static final EnumConstantDeclarationMetaModel enumConstantDeclarationMetaModel = new EnumConstantDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final EnumDeclarationMetaModel enumDeclarationMetaModel =
-            new EnumDeclarationMetaModel(Optional.of(typeDeclarationMetaModel));
+    public static final EnumDeclarationMetaModel enumDeclarationMetaModel = new EnumDeclarationMetaModel(Optional.of(typeDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final FieldDeclarationMetaModel fieldDeclarationMetaModel =
-            new FieldDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
+    public static final FieldDeclarationMetaModel fieldDeclarationMetaModel = new FieldDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final InitializerDeclarationMetaModel initializerDeclarationMetaModel =
-            new InitializerDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
+    public static final InitializerDeclarationMetaModel initializerDeclarationMetaModel = new InitializerDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final MethodDeclarationMetaModel methodDeclarationMetaModel =
-            new MethodDeclarationMetaModel(Optional.of(callableDeclarationMetaModel));
+    public static final MethodDeclarationMetaModel methodDeclarationMetaModel = new MethodDeclarationMetaModel(Optional.of(callableDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     public static final ParameterMetaModel parameterMetaModel = new ParameterMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ReceiverParameterMetaModel receiverParameterMetaModel =
-            new ReceiverParameterMetaModel(Optional.of(nodeMetaModel));
+    public static final ReceiverParameterMetaModel receiverParameterMetaModel = new ReceiverParameterMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final RecordDeclarationMetaModel recordDeclarationMetaModel =
-            new RecordDeclarationMetaModel(Optional.of(typeDeclarationMetaModel));
+    public static final RecordDeclarationMetaModel recordDeclarationMetaModel = new RecordDeclarationMetaModel(Optional.of(typeDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final CompactConstructorDeclarationMetaModel compactConstructorDeclarationMetaModel =
-            new CompactConstructorDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
+    public static final CompactConstructorDeclarationMetaModel compactConstructorDeclarationMetaModel = new CompactConstructorDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final VariableDeclaratorMetaModel variableDeclaratorMetaModel =
-            new VariableDeclaratorMetaModel(Optional.of(nodeMetaModel));
+    public static final VariableDeclaratorMetaModel variableDeclaratorMetaModel = new VariableDeclaratorMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     public static final CommentMetaModel commentMetaModel = new CommentMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JavadocCommentMetaModel javadocCommentMetaModel =
-            new JavadocCommentMetaModel(Optional.of(commentMetaModel));
+    public static final JavadocCommentMetaModel javadocCommentMetaModel = new JavadocCommentMetaModel(Optional.of(commentMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final BlockCommentMetaModel blockCommentMetaModel =
-            new BlockCommentMetaModel(Optional.of(commentMetaModel));
+    public static final BlockCommentMetaModel blockCommentMetaModel = new BlockCommentMetaModel(Optional.of(commentMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final TraditionalJavadocCommentMetaModel traditionalJavadocCommentMetaModel =
-            new TraditionalJavadocCommentMetaModel(Optional.of(javadocCommentMetaModel));
+    public static final TraditionalJavadocCommentMetaModel traditionalJavadocCommentMetaModel = new TraditionalJavadocCommentMetaModel(Optional.of(javadocCommentMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final LineCommentMetaModel lineCommentMetaModel =
-            new LineCommentMetaModel(Optional.of(commentMetaModel));
+    public static final LineCommentMetaModel lineCommentMetaModel = new LineCommentMetaModel(Optional.of(commentMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final MarkdownCommentMetaModel markdownCommentMetaModel =
-            new MarkdownCommentMetaModel(Optional.of(javadocCommentMetaModel));
+    public static final MarkdownCommentMetaModel markdownCommentMetaModel = new MarkdownCommentMetaModel(Optional.of(javadocCommentMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ArrayAccessExprMetaModel arrayAccessExprMetaModel =
-            new ArrayAccessExprMetaModel(Optional.of(expressionMetaModel));
+    public static final ArrayAccessExprMetaModel arrayAccessExprMetaModel = new ArrayAccessExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ArrayCreationExprMetaModel arrayCreationExprMetaModel =
-            new ArrayCreationExprMetaModel(Optional.of(expressionMetaModel));
+    public static final ArrayCreationExprMetaModel arrayCreationExprMetaModel = new ArrayCreationExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ArrayInitializerExprMetaModel arrayInitializerExprMetaModel =
-            new ArrayInitializerExprMetaModel(Optional.of(expressionMetaModel));
+    public static final ArrayInitializerExprMetaModel arrayInitializerExprMetaModel = new ArrayInitializerExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final AssignExprMetaModel assignExprMetaModel =
-            new AssignExprMetaModel(Optional.of(expressionMetaModel));
+    public static final AssignExprMetaModel assignExprMetaModel = new AssignExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final BinaryExprMetaModel binaryExprMetaModel =
-            new BinaryExprMetaModel(Optional.of(expressionMetaModel));
+    public static final BinaryExprMetaModel binaryExprMetaModel = new BinaryExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final BooleanLiteralExprMetaModel booleanLiteralExprMetaModel =
-            new BooleanLiteralExprMetaModel(Optional.of(literalExprMetaModel));
+    public static final BooleanLiteralExprMetaModel booleanLiteralExprMetaModel = new BooleanLiteralExprMetaModel(Optional.of(literalExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     public static final CastExprMetaModel castExprMetaModel = new CastExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final CharLiteralExprMetaModel charLiteralExprMetaModel =
-            new CharLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel));
+    public static final CharLiteralExprMetaModel charLiteralExprMetaModel = new CharLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ClassExprMetaModel classExprMetaModel =
-            new ClassExprMetaModel(Optional.of(expressionMetaModel));
+    public static final ClassExprMetaModel classExprMetaModel = new ClassExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ConditionalExprMetaModel conditionalExprMetaModel =
-            new ConditionalExprMetaModel(Optional.of(expressionMetaModel));
+    public static final ConditionalExprMetaModel conditionalExprMetaModel = new ConditionalExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final DoubleLiteralExprMetaModel doubleLiteralExprMetaModel =
-            new DoubleLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel));
+    public static final DoubleLiteralExprMetaModel doubleLiteralExprMetaModel = new DoubleLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final EnclosedExprMetaModel enclosedExprMetaModel =
-            new EnclosedExprMetaModel(Optional.of(expressionMetaModel));
+    public static final EnclosedExprMetaModel enclosedExprMetaModel = new EnclosedExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final FieldAccessExprMetaModel fieldAccessExprMetaModel =
-            new FieldAccessExprMetaModel(Optional.of(expressionMetaModel));
+    public static final FieldAccessExprMetaModel fieldAccessExprMetaModel = new FieldAccessExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final InstanceOfExprMetaModel instanceOfExprMetaModel =
-            new InstanceOfExprMetaModel(Optional.of(expressionMetaModel));
+    public static final InstanceOfExprMetaModel instanceOfExprMetaModel = new InstanceOfExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final IntegerLiteralExprMetaModel integerLiteralExprMetaModel =
-            new IntegerLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel));
+    public static final IntegerLiteralExprMetaModel integerLiteralExprMetaModel = new IntegerLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final LambdaExprMetaModel lambdaExprMetaModel =
-            new LambdaExprMetaModel(Optional.of(expressionMetaModel));
+    public static final LambdaExprMetaModel lambdaExprMetaModel = new LambdaExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final LongLiteralExprMetaModel longLiteralExprMetaModel =
-            new LongLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel));
+    public static final LongLiteralExprMetaModel longLiteralExprMetaModel = new LongLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final MarkerAnnotationExprMetaModel markerAnnotationExprMetaModel =
-            new MarkerAnnotationExprMetaModel(Optional.of(annotationExprMetaModel));
+    public static final MarkerAnnotationExprMetaModel markerAnnotationExprMetaModel = new MarkerAnnotationExprMetaModel(Optional.of(annotationExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final MemberValuePairMetaModel memberValuePairMetaModel =
-            new MemberValuePairMetaModel(Optional.of(nodeMetaModel));
+    public static final MemberValuePairMetaModel memberValuePairMetaModel = new MemberValuePairMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final MethodCallExprMetaModel methodCallExprMetaModel =
-            new MethodCallExprMetaModel(Optional.of(expressionMetaModel));
+    public static final MethodCallExprMetaModel methodCallExprMetaModel = new MethodCallExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final MethodReferenceExprMetaModel methodReferenceExprMetaModel =
-            new MethodReferenceExprMetaModel(Optional.of(expressionMetaModel));
+    public static final MethodReferenceExprMetaModel methodReferenceExprMetaModel = new MethodReferenceExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     public static final NameExprMetaModel nameExprMetaModel = new NameExprMetaModel(Optional.of(expressionMetaModel));
@@ -5147,47 +1592,37 @@ public static Optional<BaseNodeMetaModel> getNodeMetaModel(Class<?> c) {
     public static final NameMetaModel nameMetaModel = new NameMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final NormalAnnotationExprMetaModel normalAnnotationExprMetaModel =
-            new NormalAnnotationExprMetaModel(Optional.of(annotationExprMetaModel));
+    public static final NormalAnnotationExprMetaModel normalAnnotationExprMetaModel = new NormalAnnotationExprMetaModel(Optional.of(annotationExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final NullLiteralExprMetaModel nullLiteralExprMetaModel =
-            new NullLiteralExprMetaModel(Optional.of(literalExprMetaModel));
+    public static final NullLiteralExprMetaModel nullLiteralExprMetaModel = new NullLiteralExprMetaModel(Optional.of(literalExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ObjectCreationExprMetaModel objectCreationExprMetaModel =
-            new ObjectCreationExprMetaModel(Optional.of(expressionMetaModel));
+    public static final ObjectCreationExprMetaModel objectCreationExprMetaModel = new ObjectCreationExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ComponentPatternExprMetaModel componentPatternExprMetaModel =
-            new ComponentPatternExprMetaModel(Optional.of(expressionMetaModel));
+    public static final ComponentPatternExprMetaModel componentPatternExprMetaModel = new ComponentPatternExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final PatternExprMetaModel patternExprMetaModel =
-            new PatternExprMetaModel(Optional.of(componentPatternExprMetaModel));
+    public static final PatternExprMetaModel patternExprMetaModel = new PatternExprMetaModel(Optional.of(componentPatternExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final RecordPatternExprMetaModel recordPatternExprMetaModel =
-            new RecordPatternExprMetaModel(Optional.of(patternExprMetaModel));
+    public static final RecordPatternExprMetaModel recordPatternExprMetaModel = new RecordPatternExprMetaModel(Optional.of(patternExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final SingleMemberAnnotationExprMetaModel singleMemberAnnotationExprMetaModel =
-            new SingleMemberAnnotationExprMetaModel(Optional.of(annotationExprMetaModel));
+    public static final SingleMemberAnnotationExprMetaModel singleMemberAnnotationExprMetaModel = new SingleMemberAnnotationExprMetaModel(Optional.of(annotationExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     public static final SimpleNameMetaModel simpleNameMetaModel = new SimpleNameMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final SuperExprMetaModel superExprMetaModel =
-            new SuperExprMetaModel(Optional.of(expressionMetaModel));
+    public static final SuperExprMetaModel superExprMetaModel = new SuperExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final SwitchExprMetaModel switchExprMetaModel =
-            new SwitchExprMetaModel(Optional.of(expressionMetaModel));
+    public static final SwitchExprMetaModel switchExprMetaModel = new SwitchExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final TextBlockLiteralExprMetaModel textBlockLiteralExprMetaModel =
-            new TextBlockLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel));
+    public static final TextBlockLiteralExprMetaModel textBlockLiteralExprMetaModel = new TextBlockLiteralExprMetaModel(Optional.of(literalStringValueExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     public static final ThisExprMetaModel thisExprMetaModel = new ThisExprMetaModel(Optional.of(expressionMetaModel));
@@ -5196,432 +1631,340 @@ public static Optional<BaseNodeMetaModel> getNodeMetaModel(Class<?> c) {
     public static final TypeExprMetaModel typeExprMetaModel = new TypeExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final TypePatternExprMetaModel typePatternExprMetaModel =
-            new TypePatternExprMetaModel(Optional.of(patternExprMetaModel));
+    public static final TypePatternExprMetaModel typePatternExprMetaModel = new TypePatternExprMetaModel(Optional.of(patternExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final UnaryExprMetaModel unaryExprMetaModel =
-            new UnaryExprMetaModel(Optional.of(expressionMetaModel));
+    public static final UnaryExprMetaModel unaryExprMetaModel = new UnaryExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final MatchAllPatternExprMetaModel matchAllPatternExprMetaModel =
-            new MatchAllPatternExprMetaModel(Optional.of(componentPatternExprMetaModel));
+    public static final MatchAllPatternExprMetaModel matchAllPatternExprMetaModel = new MatchAllPatternExprMetaModel(Optional.of(componentPatternExprMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final VariableDeclarationExprMetaModel variableDeclarationExprMetaModel =
-            new VariableDeclarationExprMetaModel(Optional.of(expressionMetaModel));
+    public static final VariableDeclarationExprMetaModel variableDeclarationExprMetaModel = new VariableDeclarationExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlDocMetaModel jmlDocMetaModel = new JmlDocMetaModel(Optional.of(nodeMetaModel));
+    public static final AssertStmtMetaModel assertStmtMetaModel = new AssertStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlDocDeclarationMetaModel jmlDocDeclarationMetaModel =
-            new JmlDocDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
+    public static final BlockStmtMetaModel blockStmtMetaModel = new BlockStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlDocStmtMetaModel jmlDocStmtMetaModel =
-            new JmlDocStmtMetaModel(Optional.of(statementMetaModel));
+    public static final BreakStmtMetaModel breakStmtMetaModel = new BreakStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlDocTypeMetaModel jmlDocTypeMetaModel =
-            new JmlDocTypeMetaModel(Optional.of(typeDeclarationMetaModel));
+    public static final CatchClauseMetaModel catchClauseMetaModel = new CatchClauseMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlQuantifiedExprMetaModel jmlQuantifiedExprMetaModel =
-            new JmlQuantifiedExprMetaModel(Optional.of(expressionMetaModel));
+    public static final ContinueStmtMetaModel continueStmtMetaModel = new ContinueStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlTypeExprMetaModel jmlTypeExprMetaModel =
-            new JmlTypeExprMetaModel(Optional.of(expressionMetaModel));
+    public static final DoStmtMetaModel doStmtMetaModel = new DoStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlBinaryInfixExprMetaModel jmlBinaryInfixExprMetaModel =
-            new JmlBinaryInfixExprMetaModel(Optional.of(expressionMetaModel));
+    public static final EmptyStmtMetaModel emptyStmtMetaModel = new EmptyStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlLetExprMetaModel jmlLetExprMetaModel =
-            new JmlLetExprMetaModel(Optional.of(expressionMetaModel));
+    public static final ExplicitConstructorInvocationStmtMetaModel explicitConstructorInvocationStmtMetaModel = new ExplicitConstructorInvocationStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlMultiCompareExprMetaModel jmlMultiCompareExprMetaModel =
-            new JmlMultiCompareExprMetaModel(Optional.of(expressionMetaModel));
+    public static final ExpressionStmtMetaModel expressionStmtMetaModel = new ExpressionStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlLabelExprMetaModel jmlLabelExprMetaModel =
-            new JmlLabelExprMetaModel(Optional.of(expressionMetaModel));
+    public static final ForEachStmtMetaModel forEachStmtMetaModel = new ForEachStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlSetComprehensionExprMetaModel jmlSetComprehensionExprMetaModel =
-            new JmlSetComprehensionExprMetaModel(Optional.of(expressionMetaModel));
+    public static final ForStmtMetaModel forStmtMetaModel = new ForStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final AssertStmtMetaModel assertStmtMetaModel =
-            new AssertStmtMetaModel(Optional.of(statementMetaModel));
+    public static final IfStmtMetaModel ifStmtMetaModel = new IfStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final BlockStmtMetaModel blockStmtMetaModel = new BlockStmtMetaModel(Optional.of(statementMetaModel));
+    public static final LabeledStmtMetaModel labeledStmtMetaModel = new LabeledStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final BreakStmtMetaModel breakStmtMetaModel = new BreakStmtMetaModel(Optional.of(statementMetaModel));
+    public static final LocalClassDeclarationStmtMetaModel localClassDeclarationStmtMetaModel = new LocalClassDeclarationStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final CatchClauseMetaModel catchClauseMetaModel =
-            new CatchClauseMetaModel(Optional.of(nodeMetaModel));
+    public static final LocalRecordDeclarationStmtMetaModel localRecordDeclarationStmtMetaModel = new LocalRecordDeclarationStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ContinueStmtMetaModel continueStmtMetaModel =
-            new ContinueStmtMetaModel(Optional.of(statementMetaModel));
+    public static final ReturnStmtMetaModel returnStmtMetaModel = new ReturnStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final DoStmtMetaModel doStmtMetaModel = new DoStmtMetaModel(Optional.of(statementMetaModel));
+    public static final SwitchEntryMetaModel switchEntryMetaModel = new SwitchEntryMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final EmptyStmtMetaModel emptyStmtMetaModel = new EmptyStmtMetaModel(Optional.of(statementMetaModel));
+    public static final SwitchStmtMetaModel switchStmtMetaModel = new SwitchStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ExplicitConstructorInvocationStmtMetaModel explicitConstructorInvocationStmtMetaModel =
-            new ExplicitConstructorInvocationStmtMetaModel(Optional.of(statementMetaModel));
+    public static final SynchronizedStmtMetaModel synchronizedStmtMetaModel = new SynchronizedStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ExpressionStmtMetaModel expressionStmtMetaModel =
-            new ExpressionStmtMetaModel(Optional.of(statementMetaModel));
+    public static final ThrowStmtMetaModel throwStmtMetaModel = new ThrowStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ForEachStmtMetaModel forEachStmtMetaModel =
-            new ForEachStmtMetaModel(Optional.of(statementMetaModel));
+    public static final TryStmtMetaModel tryStmtMetaModel = new TryStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ForStmtMetaModel forStmtMetaModel = new ForStmtMetaModel(Optional.of(statementMetaModel));
+    public static final UnparsableStmtMetaModel unparsableStmtMetaModel = new UnparsableStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final IfStmtMetaModel ifStmtMetaModel = new IfStmtMetaModel(Optional.of(statementMetaModel));
+    public static final WhileStmtMetaModel whileStmtMetaModel = new WhileStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final LabeledStmtMetaModel labeledStmtMetaModel =
-            new LabeledStmtMetaModel(Optional.of(statementMetaModel));
+    public static final YieldStmtMetaModel yieldStmtMetaModel = new YieldStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final LocalClassDeclarationStmtMetaModel localClassDeclarationStmtMetaModel =
-            new LocalClassDeclarationStmtMetaModel(Optional.of(statementMetaModel));
+    public static final ArrayTypeMetaModel arrayTypeMetaModel = new ArrayTypeMetaModel(Optional.of(referenceTypeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final LocalRecordDeclarationStmtMetaModel localRecordDeclarationStmtMetaModel =
-            new LocalRecordDeclarationStmtMetaModel(Optional.of(statementMetaModel));
+    public static final ClassOrInterfaceTypeMetaModel classOrInterfaceTypeMetaModel = new ClassOrInterfaceTypeMetaModel(Optional.of(referenceTypeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ReturnStmtMetaModel returnStmtMetaModel =
-            new ReturnStmtMetaModel(Optional.of(statementMetaModel));
+    public static final IntersectionTypeMetaModel intersectionTypeMetaModel = new IntersectionTypeMetaModel(Optional.of(typeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final SwitchEntryMetaModel switchEntryMetaModel =
-            new SwitchEntryMetaModel(Optional.of(nodeMetaModel));
+    public static final PrimitiveTypeMetaModel primitiveTypeMetaModel = new PrimitiveTypeMetaModel(Optional.of(typeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final SwitchStmtMetaModel switchStmtMetaModel =
-            new SwitchStmtMetaModel(Optional.of(statementMetaModel));
+    public static final TypeParameterMetaModel typeParameterMetaModel = new TypeParameterMetaModel(Optional.of(referenceTypeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final SynchronizedStmtMetaModel synchronizedStmtMetaModel =
-            new SynchronizedStmtMetaModel(Optional.of(statementMetaModel));
+    public static final UnionTypeMetaModel unionTypeMetaModel = new UnionTypeMetaModel(Optional.of(typeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ThrowStmtMetaModel throwStmtMetaModel = new ThrowStmtMetaModel(Optional.of(statementMetaModel));
+    public static final UnknownTypeMetaModel unknownTypeMetaModel = new UnknownTypeMetaModel(Optional.of(typeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final TryStmtMetaModel tryStmtMetaModel = new TryStmtMetaModel(Optional.of(statementMetaModel));
+    public static final VarTypeMetaModel varTypeMetaModel = new VarTypeMetaModel(Optional.of(typeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final UnparsableStmtMetaModel unparsableStmtMetaModel =
-            new UnparsableStmtMetaModel(Optional.of(statementMetaModel));
+    public static final VoidTypeMetaModel voidTypeMetaModel = new VoidTypeMetaModel(Optional.of(typeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final WhileStmtMetaModel whileStmtMetaModel = new WhileStmtMetaModel(Optional.of(statementMetaModel));
+    public static final WildcardTypeMetaModel wildcardTypeMetaModel = new WildcardTypeMetaModel(Optional.of(typeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final YieldStmtMetaModel yieldStmtMetaModel = new YieldStmtMetaModel(Optional.of(statementMetaModel));
+    public static final ModuleExportsDirectiveMetaModel moduleExportsDirectiveMetaModel = new ModuleExportsDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlStatementMetaModel jmlStatementMetaModel =
-            new JmlStatementMetaModel(Optional.of(statementMetaModel));
+    public static final ModuleOpensDirectiveMetaModel moduleOpensDirectiveMetaModel = new ModuleOpensDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlGhostStmtMetaModel jmlGhostStmtMetaModel =
-            new JmlGhostStmtMetaModel(Optional.of(jmlStatementMetaModel));
+    public static final ModuleProvidesDirectiveMetaModel moduleProvidesDirectiveMetaModel = new ModuleProvidesDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlExpressionStmtMetaModel jmlExpressionStmtMetaModel =
-            new JmlExpressionStmtMetaModel(Optional.of(jmlStatementMetaModel));
+    public static final ModuleRequiresDirectiveMetaModel moduleRequiresDirectiveMetaModel = new ModuleRequiresDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlRefiningStmtMetaModel jmlRefiningStmtMetaModel =
-            new JmlRefiningStmtMetaModel(Optional.of(jmlStatementMetaModel));
+    public static final ModuleUsesDirectiveMetaModel moduleUsesDirectiveMetaModel = new ModuleUsesDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlUnreachableStmtMetaModel jmlUnreachableStmtMetaModel =
-            new JmlUnreachableStmtMetaModel(Optional.of(jmlStatementMetaModel));
+    public static final JmlDocMetaModel jmlDocMetaModel = new JmlDocMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlLabelStmtMetaModel jmlLabelStmtMetaModel =
-            new JmlLabelStmtMetaModel(Optional.of(jmlStatementMetaModel));
+    public static final JmlDocDeclarationMetaModel jmlDocDeclarationMetaModel = new JmlDocDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlBeginStmtMetaModel jmlBeginStmtMetaModel =
-            new JmlBeginStmtMetaModel(Optional.of(jmlStatementMetaModel));
+    public static final JmlDocStmtMetaModel jmlDocStmtMetaModel = new JmlDocStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlEndStmtMetaModel jmlEndStmtMetaModel =
-            new JmlEndStmtMetaModel(Optional.of(jmlStatementMetaModel));
+    public static final JmlDocTypeMetaModel jmlDocTypeMetaModel = new JmlDocTypeMetaModel(Optional.of(typeDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlClassLevelDeclarationMetaModel jmlClassLevelDeclarationMetaModel =
-            new JmlClassLevelDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
+    public static final JmlQuantifiedExprMetaModel jmlQuantifiedExprMetaModel = new JmlQuantifiedExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlMethodDeclarationMetaModel jmlMethodDeclarationMetaModel =
-            new JmlMethodDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel));
+    public static final JmlTypeExprMetaModel jmlTypeExprMetaModel = new JmlTypeExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlFieldDeclarationMetaModel jmlFieldDeclarationMetaModel =
-            new JmlFieldDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel));
+    public static final JmlBinaryInfixExprMetaModel jmlBinaryInfixExprMetaModel = new JmlBinaryInfixExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlClauseMetaModel jmlClauseMetaModel = new JmlClauseMetaModel(Optional.of(nodeMetaModel));
+    public static final JmlLetExprMetaModel jmlLetExprMetaModel = new JmlLetExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlSimpleExprClauseMetaModel jmlSimpleExprClauseMetaModel =
-            new JmlSimpleExprClauseMetaModel(Optional.of(jmlClauseMetaModel));
+    public static final JmlMultiCompareExprMetaModel jmlMultiCompareExprMetaModel = new JmlMultiCompareExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlMultiExprClauseMetaModel jmlMultiExprClauseMetaModel =
-            new JmlMultiExprClauseMetaModel(Optional.of(jmlClauseMetaModel));
+    public static final JmlLabelExprMetaModel jmlLabelExprMetaModel = new JmlLabelExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlSignalsClauseMetaModel jmlSignalsClauseMetaModel =
-            new JmlSignalsClauseMetaModel(Optional.of(jmlClauseMetaModel));
+    public static final JmlSetComprehensionExprMetaModel jmlSetComprehensionExprMetaModel = new JmlSetComprehensionExprMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlSignalsOnlyClauseMetaModel jmlSignalsOnlyClauseMetaModel =
-            new JmlSignalsOnlyClauseMetaModel(Optional.of(jmlClauseMetaModel));
+    public static final JmlStatementMetaModel jmlStatementMetaModel = new JmlStatementMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlClauseLabelMetaModel jmlClauseLabelMetaModel =
-            new JmlClauseLabelMetaModel(Optional.of(jmlClauseMetaModel));
+    public static final JmlGhostStmtMetaModel jmlGhostStmtMetaModel = new JmlGhostStmtMetaModel(Optional.of(jmlStatementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlForallClauseMetaModel jmlForallClauseMetaModel =
-            new JmlForallClauseMetaModel(Optional.of(jmlClauseMetaModel));
+    public static final JmlExpressionStmtMetaModel jmlExpressionStmtMetaModel = new JmlExpressionStmtMetaModel(Optional.of(jmlStatementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlOldClauseMetaModel jmlOldClauseMetaModel =
-            new JmlOldClauseMetaModel(Optional.of(jmlClauseMetaModel));
+    public static final JmlRefiningStmtMetaModel jmlRefiningStmtMetaModel = new JmlRefiningStmtMetaModel(Optional.of(jmlStatementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlCallableClauseMetaModel jmlCallableClauseMetaModel =
-            new JmlCallableClauseMetaModel(Optional.of(jmlClauseMetaModel));
+    public static final JmlUnreachableStmtMetaModel jmlUnreachableStmtMetaModel = new JmlUnreachableStmtMetaModel(Optional.of(jmlStatementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlClauseIfMetaModel jmlClauseIfMetaModel =
-            new JmlClauseIfMetaModel(Optional.of(jmlClauseMetaModel));
+    public static final JmlLabelStmtMetaModel jmlLabelStmtMetaModel = new JmlLabelStmtMetaModel(Optional.of(jmlStatementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlMethodSignatureMetaModel jmlMethodSignatureMetaModel =
-            new JmlMethodSignatureMetaModel(Optional.of(nodeMetaModel));
+    public static final JmlBeginStmtMetaModel jmlBeginStmtMetaModel = new JmlBeginStmtMetaModel(Optional.of(jmlStatementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlContractMetaModel jmlContractMetaModel =
-            new JmlContractMetaModel(Optional.of(nodeMetaModel));
+    public static final JmlEndStmtMetaModel jmlEndStmtMetaModel = new JmlEndStmtMetaModel(Optional.of(jmlStatementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlClassExprDeclarationMetaModel jmlClassExprDeclarationMetaModel =
-            new JmlClassExprDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel));
+    public static final JmlClassLevelDeclarationMetaModel jmlClassLevelDeclarationMetaModel = new JmlClassLevelDeclarationMetaModel(Optional.of(bodyDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlRepresentsDeclarationMetaModel jmlRepresentsDeclarationMetaModel =
-            new JmlRepresentsDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel));
+    public static final JmlMethodDeclarationMetaModel jmlMethodDeclarationMetaModel = new JmlMethodDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final JmlClassAccessibleDeclarationMetaModel jmlClassAccessibleDeclarationMetaModel =
-            new JmlClassAccessibleDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel));
+    public static final JmlFieldDeclarationMetaModel jmlFieldDeclarationMetaModel = new JmlFieldDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ArrayTypeMetaModel arrayTypeMetaModel =
-            new ArrayTypeMetaModel(Optional.of(referenceTypeMetaModel));
+    public static final JmlClauseMetaModel jmlClauseMetaModel = new JmlClauseMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ClassOrInterfaceTypeMetaModel classOrInterfaceTypeMetaModel =
-            new ClassOrInterfaceTypeMetaModel(Optional.of(referenceTypeMetaModel));
+    public static final JmlSimpleExprClauseMetaModel jmlSimpleExprClauseMetaModel = new JmlSimpleExprClauseMetaModel(Optional.of(jmlClauseMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final IntersectionTypeMetaModel intersectionTypeMetaModel =
-            new IntersectionTypeMetaModel(Optional.of(typeMetaModel));
+    public static final JmlMultiExprClauseMetaModel jmlMultiExprClauseMetaModel = new JmlMultiExprClauseMetaModel(Optional.of(jmlClauseMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final PrimitiveTypeMetaModel primitiveTypeMetaModel =
-            new PrimitiveTypeMetaModel(Optional.of(typeMetaModel));
+    public static final JmlSignalsClauseMetaModel jmlSignalsClauseMetaModel = new JmlSignalsClauseMetaModel(Optional.of(jmlClauseMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final TypeParameterMetaModel typeParameterMetaModel =
-            new TypeParameterMetaModel(Optional.of(referenceTypeMetaModel));
+    public static final JmlSignalsOnlyClauseMetaModel jmlSignalsOnlyClauseMetaModel = new JmlSignalsOnlyClauseMetaModel(Optional.of(jmlClauseMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final UnionTypeMetaModel unionTypeMetaModel = new UnionTypeMetaModel(Optional.of(typeMetaModel));
+    public static final JmlLabledClauseMetaModel jmlLabledClauseMetaModel = new JmlLabledClauseMetaModel(Optional.of(jmlClauseMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final UnknownTypeMetaModel unknownTypeMetaModel =
-            new UnknownTypeMetaModel(Optional.of(typeMetaModel));
+    public static final JmlForallClauseMetaModel jmlForallClauseMetaModel = new JmlForallClauseMetaModel(Optional.of(jmlClauseMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final VarTypeMetaModel varTypeMetaModel = new VarTypeMetaModel(Optional.of(typeMetaModel));
+    public static final JmlOldClauseMetaModel jmlOldClauseMetaModel = new JmlOldClauseMetaModel(Optional.of(jmlClauseMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final VoidTypeMetaModel voidTypeMetaModel = new VoidTypeMetaModel(Optional.of(typeMetaModel));
+    public static final JmlCallableClauseMetaModel jmlCallableClauseMetaModel = new JmlCallableClauseMetaModel(Optional.of(jmlClauseMetaModel));
+
+    @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+    public static final JmlConditionalClauseMetaModel jmlConditionalClauseMetaModel = new JmlConditionalClauseMetaModel(Optional.of(jmlClauseMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final WildcardTypeMetaModel wildcardTypeMetaModel =
-            new WildcardTypeMetaModel(Optional.of(typeMetaModel));
+    public static final JmlMethodSignatureMetaModel jmlMethodSignatureMetaModel = new JmlMethodSignatureMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ModuleExportsDirectiveMetaModel moduleExportsDirectiveMetaModel =
-            new ModuleExportsDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel));
+    public static final JmlInfFlowClauseMetaModel jmlInfFlowClauseMetaModel = new JmlInfFlowClauseMetaModel(Optional.of(jmlClauseMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ModuleOpensDirectiveMetaModel moduleOpensDirectiveMetaModel =
-            new ModuleOpensDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel));
+    public static final JmlContractMetaModel jmlContractMetaModel = new JmlContractMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ModuleProvidesDirectiveMetaModel moduleProvidesDirectiveMetaModel =
-            new ModuleProvidesDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel));
+    public static final JmlClassExprDeclarationMetaModel jmlClassExprDeclarationMetaModel = new JmlClassExprDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ModuleRequiresDirectiveMetaModel moduleRequiresDirectiveMetaModel =
-            new ModuleRequiresDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel));
+    public static final JmlRepresentsDeclarationMetaModel jmlRepresentsDeclarationMetaModel = new JmlRepresentsDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final ModuleUsesDirectiveMetaModel moduleUsesDirectiveMetaModel =
-            new ModuleUsesDirectiveMetaModel(Optional.of(moduleDirectiveMetaModel));
+    public static final JmlClassAccessibleDeclarationMetaModel jmlClassAccessibleDeclarationMetaModel = new JmlClassAccessibleDeclarationMetaModel(Optional.of(jmlClassLevelDeclarationMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyAbstractExecutionContextMetaModel keyAbstractExecutionContextMetaModel =
-            new KeyAbstractExecutionContextMetaModel(Optional.of(nodeMetaModel));
+    public static final KeyAbstractExecutionContextMetaModel keyAbstractExecutionContextMetaModel = new KeyAbstractExecutionContextMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyCatchAllStatementMetaModel keyCatchAllStatementMetaModel =
-            new KeyCatchAllStatementMetaModel(Optional.of(statementMetaModel));
+    public static final KeyCatchAllStmtMetaModel keyCatchAllStmtMetaModel = new KeyCatchAllStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyCcatchBranchMetaModel keyCcatchBranchMetaModel =
-            new KeyCcatchBranchMetaModel(Optional.of(nodeMetaModel));
+    public static final KeyCcatchBranchMetaModel keyCcatchBranchMetaModel = new KeyCcatchBranchMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyCcatchBreakMetaModel keyCcatchBreakMetaModel =
-            new KeyCcatchBreakMetaModel(Optional.of(keyCcatchBranchMetaModel));
+    public static final KeyCcatchBreakMetaModel keyCcatchBreakMetaModel = new KeyCcatchBreakMetaModel(Optional.of(keyCcatchBranchMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyCcatchContinueMetaModel keyCcatchContinueMetaModel =
-            new KeyCcatchContinueMetaModel(Optional.of(keyCcatchBranchMetaModel));
+    public static final KeyCcatchContinueMetaModel keyCcatchContinueMetaModel = new KeyCcatchContinueMetaModel(Optional.of(keyCcatchBranchMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyCcatchParameterMetaModel keyCcatchParameterMetaModel =
-            new KeyCcatchParameterMetaModel(Optional.of(keyCcatchBranchMetaModel));
+    public static final KeyCcatchParameterMetaModel keyCcatchParameterMetaModel = new KeyCcatchParameterMetaModel(Optional.of(keyCcatchBranchMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyCcatchReturnMetaModel keyCcatchReturnMetaModel =
-            new KeyCcatchReturnMetaModel(Optional.of(keyCcatchBranchMetaModel));
+    public static final KeyCcatchReturnMetaModel keyCcatchReturnMetaModel = new KeyCcatchReturnMetaModel(Optional.of(keyCcatchBranchMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyEscapeExpressionMetaModel keyEscapeExpressionMetaModel =
-            new KeyEscapeExpressionMetaModel(Optional.of(expressionMetaModel));
+    public static final KeyEscapeExpressionMetaModel keyEscapeExpressionMetaModel = new KeyEscapeExpressionMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyExecStatementMetaModel keyExecStatementMetaModel =
-            new KeyExecStatementMetaModel(Optional.of(statementMetaModel));
+    public static final KeyExecStmtMetaModel keyExecStmtMetaModel = new KeyExecStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyExecutionContextMetaModel keyExecutionContextMetaModel =
-            new KeyExecutionContextMetaModel(Optional.of(keyAbstractExecutionContextMetaModel));
+    public static final KeyExecutionContextMetaModel keyExecutionContextMetaModel = new KeyExecutionContextMetaModel(Optional.of(keyAbstractExecutionContextMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyLoopScopeBlockMetaModel keyLoopScopeBlockMetaModel =
-            new KeyLoopScopeBlockMetaModel(Optional.of(statementMetaModel));
+    public static final KeyLoopScopeBlockStmtMetaModel keyLoopScopeBlockStmtMetaModel = new KeyLoopScopeBlockStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyMergePointStatementMetaModel keyMergePointStatementMetaModel =
-            new KeyMergePointStatementMetaModel(Optional.of(statementMetaModel));
+    public static final KeyMergePointStmtMetaModel keyMergePointStmtMetaModel = new KeyMergePointStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyMethodBodyStatementMetaModel keyMethodBodyStatementMetaModel =
-            new KeyMethodBodyStatementMetaModel(Optional.of(statementMetaModel));
+    public static final KeyMethodBodyStatementMetaModel keyMethodBodyStatementMetaModel = new KeyMethodBodyStatementMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyMethodCallStatementMetaModel keyMethodCallStatementMetaModel =
-            new KeyMethodCallStatementMetaModel(Optional.of(statementMetaModel));
+    public static final KeyMethodCallStmtMetaModel keyMethodCallStmtMetaModel = new KeyMethodCallStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyMethodSignatureMetaModel keyMethodSignatureMetaModel =
-            new KeyMethodSignatureMetaModel(Optional.of(nodeMetaModel));
+    public static final KeyMethodSignatureMetaModel keyMethodSignatureMetaModel = new KeyMethodSignatureMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyRangeExpressionMetaModel keyRangeExpressionMetaModel =
-            new KeyRangeExpressionMetaModel(Optional.of(expressionMetaModel));
+    public static final KeyTransactionStmtMetaModel keyTransactionStmtMetaModel = new KeyTransactionStmtMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyTransactionStatementMetaModel keyTransactionStatementMetaModel =
-            new KeyTransactionStatementMetaModel(Optional.of(statementMetaModel));
+    public static final KeYMarkerStatementMetaModel keYMarkerStatementMetaModel = new KeYMarkerStatementMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyContextStatementBlockMetaModel keyContextStatementBlockMetaModel =
-            new KeyContextStatementBlockMetaModel(Optional.of(statementMetaModel));
+    public static final KeyContextStatementBlockMetaModel keyContextStatementBlockMetaModel = new KeyContextStatementBlockMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyExecCtxtSVMetaModel keyExecCtxtSVMetaModel =
-            new KeyExecCtxtSVMetaModel(Optional.of(statementMetaModel));
+    public static final KeyExecCtxtSVMetaModel keyExecCtxtSVMetaModel = new KeyExecCtxtSVMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyExpressionSVMetaModel keyExpressionSVMetaModel =
-            new KeyExpressionSVMetaModel(Optional.of(expressionMetaModel));
+    public static final KeyExpressionSVMetaModel keyExpressionSVMetaModel = new KeyExpressionSVMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyJumpLabelSVMetaModel keyJumpLabelSVMetaModel =
-            new KeyJumpLabelSVMetaModel(Optional.of(nodeMetaModel));
+    public static final KeyJumpLabelSVMetaModel keyJumpLabelSVMetaModel = new KeyJumpLabelSVMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyMetaConstructMetaModel keyMetaConstructMetaModel =
-            new KeyMetaConstructMetaModel(Optional.of(statementMetaModel));
+    public static final KeyMetaConstructMetaModel keyMetaConstructMetaModel = new KeyMetaConstructMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyMetaConstructExpressionMetaModel keyMetaConstructExpressionMetaModel =
-            new KeyMetaConstructExpressionMetaModel(Optional.of(expressionMetaModel));
+    public static final KeyMetaConstructExpressionMetaModel keyMetaConstructExpressionMetaModel = new KeyMetaConstructExpressionMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyMetaConstructTypeMetaModel keyMetaConstructTypeMetaModel =
-            new KeyMetaConstructTypeMetaModel(Optional.of(typeMetaModel));
+    public static final KeyMetaConstructTypeMetaModel keyMetaConstructTypeMetaModel = new KeyMetaConstructTypeMetaModel(Optional.of(typeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyMethodSignatureSVMetaModel keyMethodSignatureSVMetaModel =
-            new KeyMethodSignatureSVMetaModel(Optional.of(nodeMetaModel));
+    public static final KeyMethodSignatureSVMetaModel keyMethodSignatureSVMetaModel = new KeyMethodSignatureSVMetaModel(Optional.of(nodeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyPassiveExpressionMetaModel keyPassiveExpressionMetaModel =
-            new KeyPassiveExpressionMetaModel(Optional.of(expressionMetaModel));
+    public static final KeyPassiveExpressionMetaModel keyPassiveExpressionMetaModel = new KeyPassiveExpressionMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyProgramVariableSVMetaModel keyProgramVariableSVMetaModel =
-            new KeyProgramVariableSVMetaModel(Optional.of(expressionMetaModel));
+    public static final KeyProgramVariableSVMetaModel keyProgramVariableSVMetaModel = new KeyProgramVariableSVMetaModel(Optional.of(expressionMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyStatementSVMetaModel keyStatementSVMetaModel =
-            new KeyStatementSVMetaModel(Optional.of(statementMetaModel));
+    public static final KeyStatementSVMetaModel keyStatementSVMetaModel = new KeyStatementSVMetaModel(Optional.of(statementMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     public static final KeyTypeSVMetaModel keyTypeSVMetaModel = new KeyTypeSVMetaModel(Optional.of(typeMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyCcatchSVMetaModel keyCcatchSVMetaModel =
-            new KeyCcatchSVMetaModel(Optional.of(keyCcatchBranchMetaModel));
+    public static final KeyCcatchSVMetaModel keyCcatchSVMetaModel = new KeyCcatchSVMetaModel(Optional.of(keyCcatchBranchMetaModel));
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    public static final KeyExecutionContextSVMetaModel keyExecutionContextSVMetaModel =
-            new KeyExecutionContextSVMetaModel(Optional.of(keyAbstractExecutionContextMetaModel));
+    public static final KeyExecutionContextSVMetaModel keyExecutionContextSVMetaModel = new KeyExecutionContextSVMetaModel(Optional.of(keyAbstractExecutionContextMetaModel));
 
     static {
         initializeNodeMetaModels();
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavadocCommentMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavadocCommentMetaModel.java
index 9002cf33b2..0ff37fd4bc 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavadocCommentMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JavadocCommentMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.comments.JavadocComment;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.comments.JavadocComment;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class JavadocCommentMetaModel extends CommentMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JavadocCommentMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JavadocComment.class,
-                "JavadocComment",
-                "com.github.javaparser.ast.comments",
-                true,
-                false);
+        super(superBaseNodeMetaModel, JavadocComment.class, "JavadocComment", "com.github.javaparser.ast.comments", true, false);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected JavadocCommentMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected JavadocCommentMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlAssertStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlAssertStmtMetaModel.java
index c8c134ecc0..63103b6936 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlAssertStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlAssertStmtMetaModel.java
@@ -38,13 +38,7 @@ public class JmlAssertStmtMetaModel extends JmlStatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlAssertStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlExpressionStmt.class,
-                "JmlAssertStmt",
-                "com.github.javaparser.ast.jml.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlExpressionStmt.class, "JmlAssertStmt", "com.github.javaparser.ast.jml.stmt", false, false);
     }
 
     public PropertyMetaModel expressionPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBeginStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBeginStmtMetaModel.java
index 6c15e5774e..9f69caf338 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBeginStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBeginStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.stmt.JmlBeginStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.stmt.JmlBeginStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlBeginStmtMetaModel extends JmlStatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlBeginStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlBeginStmt.class,
-                "JmlBeginStmt",
-                "com.github.javaparser.ast.jml.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlBeginStmt.class, "JmlBeginStmt", "com.github.javaparser.ast.jml.stmt", false, false);
     }
 
     public PropertyMetaModel jmlTagsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBinaryInfixExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBinaryInfixExprMetaModel.java
index 7c8fcebe2a..c6940fa0a4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBinaryInfixExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBinaryInfixExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.expr.JmlBinaryInfixExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.expr.JmlBinaryInfixExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlBinaryInfixExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlBinaryInfixExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlBinaryInfixExpr.class,
-                "JmlBinaryInfixExpr",
-                "com.github.javaparser.ast.jml.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlBinaryInfixExpr.class, "JmlBinaryInfixExpr", "com.github.javaparser.ast.jml.expr", false, false);
     }
 
     public PropertyMetaModel leftPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBindingExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBindingExprMetaModel.java
index 38bfaffc67..afb24d1a91 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBindingExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlBindingExprMetaModel.java
@@ -38,13 +38,7 @@ public class JmlBindingExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlBindingExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlQuantifiedExpr.class,
-                "JmlBindingExpr",
-                "com.github.javaparser.ast.jml.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlQuantifiedExpr.class, "JmlBindingExpr", "com.github.javaparser.ast.jml.expr", false, false);
     }
 
     public PropertyMetaModel binderPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlCallableClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlCallableClauseMetaModel.java
index 093788945e..ac43883409 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlCallableClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlCallableClauseMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlCallableClause;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlCallableClause;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlCallableClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlCallableClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlCallableClause.class,
-                "JmlCallableClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlCallableClause.class, "JmlCallableClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel methodSignaturesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassAccessibleDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassAccessibleDeclarationMetaModel.java
index 1bbcd99508..a12f80b7b5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassAccessibleDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassAccessibleDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.body.JmlClassAccessibleDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.body.JmlClassAccessibleDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlClassAccessibleDeclarationMetaModel extends JmlClassLevelDeclara
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlClassAccessibleDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlClassAccessibleDeclaration.class,
-                "JmlClassAccessibleDeclaration",
-                "com.github.javaparser.ast.jml.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlClassAccessibleDeclaration.class, "JmlClassAccessibleDeclaration", "com.github.javaparser.ast.jml.body", false, false);
     }
 
     public PropertyMetaModel expressionsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassExprDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassExprDeclarationMetaModel.java
index 07d82f02a7..5eb5fe089a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassExprDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassExprDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.body.JmlClassExprDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.body.JmlClassExprDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlClassExprDeclarationMetaModel extends JmlClassLevelDeclarationMe
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlClassExprDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlClassExprDeclaration.class,
-                "JmlClassExprDeclaration",
-                "com.github.javaparser.ast.jml.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlClassExprDeclaration.class, "JmlClassExprDeclaration", "com.github.javaparser.ast.jml.body", false, false);
     }
 
     public PropertyMetaModel invariantPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassInvariantDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassInvariantDeclarationMetaModel.java
index 8fac51fe60..6dce997976 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassInvariantDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassInvariantDeclarationMetaModel.java
@@ -38,13 +38,7 @@ public class JmlClassInvariantDeclarationMetaModel extends JmlClassLevelMetaMode
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlClassInvariantDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlClassExprDeclaration.class,
-                "JmlClassInvariantDeclaration",
-                "com.github.javaparser.ast.jml.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlClassExprDeclaration.class, "JmlClassInvariantDeclaration", "com.github.javaparser.ast.jml.body", false, false);
     }
 
     public PropertyMetaModel invariantPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelDeclarationMetaModel.java
index a777a214c9..841047d88e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelDeclarationMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.jml.body.JmlClassLevelDeclaration;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.jml.body.JmlClassLevelDeclaration;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class JmlClassLevelDeclarationMetaModel extends BodyDeclarationMetaModel
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlClassLevelDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlClassLevelDeclaration.class,
-                "JmlClassLevelDeclaration",
-                "com.github.javaparser.ast.jml.body",
-                true,
-                true);
+        super(superBaseNodeMetaModel, JmlClassLevelDeclaration.class, "JmlClassLevelDeclaration", "com.github.javaparser.ast.jml.body", true, true);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected JmlClassLevelDeclarationMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected JmlClassLevelDeclarationMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelMetaModel.java
index 304f4c7521..a66c404d1d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClassLevelMetaModel.java
@@ -39,23 +39,11 @@ public class JmlClassLevelMetaModel extends BodyDeclarationMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlClassLevelMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlClassLevelDeclaration.class,
-                "JmlClassLevelDeclaration",
-                "com.github.javaparser.ast.jml.body",
-                true,
-                true);
+        super(superBaseNodeMetaModel, JmlClassLevelDeclaration.class, "JmlClassLevelDeclaration", "com.github.javaparser.ast.jml.body", true, true);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected JmlClassLevelMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected JmlClassLevelMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseIfMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseIfMetaModel.java
index b5e0ecfdca..c00a57fdae 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseIfMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseIfMetaModel.java
@@ -21,7 +21,7 @@
 package com.github.javaparser.metamodel;
 
 import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlClauseIf;
+import com.github.javaparser.ast.jml.clauses.JmlConditionalClause;
 import java.util.Optional;
 
 /**
@@ -38,18 +38,12 @@ public class JmlClauseIfMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlClauseIfMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlClauseIf.class,
-                "JmlClauseIf",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlConditionalClause.class, "JmlClauseIf", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel conditionPropertyMetaModel;
 
-    public PropertyMetaModel kindPropertyMetaModel;
+    public PropertyMetaModel expressionPropertyMetaModel;
 
-    public PropertyMetaModel thenPropertyMetaModel;
+    public PropertyMetaModel kindPropertyMetaModel;
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLEMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLEMetaModel.java
index d10d53e42c..50c5fafae3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLEMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLEMetaModel.java
@@ -21,7 +21,7 @@
 package com.github.javaparser.metamodel;
 
 import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlClauseLabel;
+import com.github.javaparser.ast.jml.clauses.JmlLabledClause;
 import java.util.Optional;
 
 /**
@@ -38,13 +38,7 @@ public class JmlClauseLEMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlClauseLEMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlClauseLabel.class,
-                "JmlClauseLE",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlLabledClause.class, "JmlClauseLE", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel exprPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLabelMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLabelMetaModel.java
index e62d0d03f3..a25e700c3b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLabelMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseLabelMetaModel.java
@@ -21,7 +21,7 @@
 package com.github.javaparser.metamodel;
 
 import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlClauseLabel;
+import com.github.javaparser.ast.jml.clauses.JmlLabledClause;
 import java.util.Optional;
 
 /**
@@ -38,16 +38,10 @@ public class JmlClauseLabelMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlClauseLabelMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlClauseLabel.class,
-                "JmlClauseLabel",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlLabledClause.class, "JmlClauseLabel", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
-    public PropertyMetaModel exprPropertyMetaModel;
+    public PropertyMetaModel expressionPropertyMetaModel;
 
     public PropertyMetaModel kindPropertyMetaModel;
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseMetaModel.java
index 449635abb3..d2f5556aae 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlClauseMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlClause;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.jml.clauses.JmlClause;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class JmlClauseMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlClause.class,
-                "JmlClause",
-                "com.github.javaparser.ast.jml.clauses",
-                true,
-                false);
+        super(superBaseNodeMetaModel, JmlClause.class, "JmlClause", "com.github.javaparser.ast.jml.clauses", true, false);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected JmlClauseMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected JmlClauseMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassInvariantClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlConditionalClauseMetaModel.java
similarity index 70%
rename from javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassInvariantClauseMetaModel.java
rename to javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlConditionalClauseMetaModel.java
index 8b7228dcf1..c67e1e1287 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ClassInvariantClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlConditionalClauseMetaModel.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2021 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.body.JmlClassExprDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlConditionalClause;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -30,24 +30,20 @@
  *     <li>The contents and annotations within the package `com.github.javaparser.ast`, and</li>
  *     <li>`ALL_NODE_CLASSES` within the class `com.github.javaparser.generator.metamodel.MetaModelGenerator`.</li>
  * </ul>
- * <p>
+ *
  * For this reason, any changes made directly to this file will be overwritten the next time generators are run.
  */
 @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-public class ClassInvariantClauseMetaModel extends JmlClassLevelMetaModel {
+public class JmlConditionalClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    ClassInvariantClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlClassExprDeclaration.class,
-                "ClassInvariantClause",
-                "com.github.javaparser.ast.jml.body",
-                false,
-                false);
+    JmlConditionalClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
+        super(superBaseNodeMetaModel, JmlConditionalClause.class, "JmlConditionalClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
-    public PropertyMetaModel invariantPropertyMetaModel;
+    public PropertyMetaModel conditionPropertyMetaModel;
+
+    public PropertyMetaModel expressionPropertyMetaModel;
 
-    public PropertyMetaModel modifiersPropertyMetaModel;
+    public PropertyMetaModel kindPropertyMetaModel;
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlContractMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlContractMetaModel.java
index 9060540ac4..993efe6cc2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlContractMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlContractMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlContract;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlContract;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlContractMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlContractMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlContract.class,
-                "JmlContract",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlContract.class, "JmlContract", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel behaviorPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDefaultClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDefaultClauseMetaModel.java
index 7c1f97c631..d1d1d00d16 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDefaultClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDefaultClauseMetaModel.java
@@ -38,13 +38,7 @@ public class JmlDefaultClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlDefaultClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlSimpleExprClause.class,
-                "JmlDefaultClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlSimpleExprClause.class, "JmlDefaultClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel expressionPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocDeclarationMetaModel.java
index c450cf611b..ac72a8263f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.doc.JmlDocDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.doc.JmlDocDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlDocDeclarationMetaModel extends BodyDeclarationMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlDocDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlDocDeclaration.class,
-                "JmlDocDeclaration",
-                "com.github.javaparser.ast.jml.doc",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlDocDeclaration.class, "JmlDocDeclaration", "com.github.javaparser.ast.jml.doc", false, false);
     }
 
     public PropertyMetaModel jmlCommentsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocMetaModel.java
index e41bee1de4..d8f4d6cc81 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.doc.JmlDoc;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocStmtMetaModel.java
index df8a176d87..6ddb15962d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.doc.JmlDocStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.doc.JmlDocStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlDocStmtMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlDocStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlDocStmt.class,
-                "JmlDocStmt",
-                "com.github.javaparser.ast.jml.doc",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlDocStmt.class, "JmlDocStmt", "com.github.javaparser.ast.jml.doc", false, false);
     }
 
     public PropertyMetaModel jmlCommentsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocTypeMetaModel.java
index 68bb90e0f5..61dd17fce7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocTypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlDocTypeMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.doc.JmlDocType;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.doc.JmlDocType;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlDocTypeMetaModel extends TypeDeclarationMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlDocTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlDocType.class,
-                "JmlDocType",
-                "com.github.javaparser.ast.jml.doc",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlDocType.class, "JmlDocType", "com.github.javaparser.ast.jml.doc", false, false);
     }
 
     public PropertyMetaModel jmlCommentsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlEndStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlEndStmtMetaModel.java
index 41b6ea6159..23a01b3c2a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlEndStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlEndStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.stmt.JmlEndStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.stmt.JmlEndStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlEndStmtMetaModel extends JmlStatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlEndStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlEndStmt.class,
-                "JmlEndStmt",
-                "com.github.javaparser.ast.jml.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlEndStmt.class, "JmlEndStmt", "com.github.javaparser.ast.jml.stmt", false, false);
     }
 
     public PropertyMetaModel jmlTagsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlExpressionStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlExpressionStmtMetaModel.java
index 71942971b2..31755e5e40 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlExpressionStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlExpressionStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.stmt.JmlExpressionStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.stmt.JmlExpressionStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlExpressionStmtMetaModel extends JmlStatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlExpressionStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlExpressionStmt.class,
-                "JmlExpressionStmt",
-                "com.github.javaparser.ast.jml.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlExpressionStmt.class, "JmlExpressionStmt", "com.github.javaparser.ast.jml.stmt", false, false);
     }
 
     public PropertyMetaModel expressionPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlFieldDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlFieldDeclarationMetaModel.java
index c941be4323..1eb5c5eb70 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlFieldDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlFieldDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.body.JmlFieldDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.body.JmlFieldDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlFieldDeclarationMetaModel extends JmlClassLevelDeclarationMetaMo
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlFieldDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlFieldDeclaration.class,
-                "JmlFieldDeclaration",
-                "com.github.javaparser.ast.jml.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlFieldDeclaration.class, "JmlFieldDeclaration", "com.github.javaparser.ast.jml.body", false, false);
     }
 
     public PropertyMetaModel declPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlForallClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlForallClauseMetaModel.java
index 3076275e85..78dd442f6c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlForallClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlForallClauseMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlForallClause;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlForallClause;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlForallClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlForallClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlForallClause.class,
-                "JmlForallClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlForallClause.class, "JmlForallClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel boundedVariablesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementMetaModel.java
index fbd163de35..0abb6b4b13 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementMetaModel.java
@@ -38,13 +38,7 @@ public class JmlGhostStatementMetaModel extends JmlStatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlGhostStatementMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlGhostStmt.class,
-                "JmlGhostStatement",
-                "com.github.javaparser.ast.jml.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlGhostStmt.class, "JmlGhostStatement", "com.github.javaparser.ast.jml.stmt", false, false);
     }
 
     public PropertyMetaModel statementPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementsMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementsMetaModel.java
index 63b509bc16..c1d1e5b8d0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementsMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStatementsMetaModel.java
@@ -38,13 +38,7 @@ public class JmlGhostStatementsMetaModel extends JmlStatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlGhostStatementsMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlGhostStmt.class,
-                "JmlGhostStatements",
-                "com.github.javaparser.ast.jml.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlGhostStmt.class, "JmlGhostStatements", "com.github.javaparser.ast.jml.stmt", false, false);
     }
 
     public PropertyMetaModel statementsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStmtMetaModel.java
index 6199c07bf6..aa8ca5972e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlGhostStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.stmt.JmlGhostStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.stmt.JmlGhostStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlGhostStmtMetaModel extends JmlStatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlGhostStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlGhostStmt.class,
-                "JmlGhostStmt",
-                "com.github.javaparser.ast.jml.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlGhostStmt.class, "JmlGhostStmt", "com.github.javaparser.ast.jml.stmt", false, false);
     }
 
     public PropertyMetaModel jmlTagsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlInfFlowClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlInfFlowClauseMetaModel.java
new file mode 100644
index 0000000000..702ceffe9c
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlInfFlowClauseMetaModel.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.metamodel;
+
+import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlInfFlowClause;
+import com.github.javaparser.ast.Generated;
+
+/**
+ * This file, class, and its contents are completely generated based on:
+ * <ul>
+ *     <li>The contents and annotations within the package `com.github.javaparser.ast`, and</li>
+ *     <li>`ALL_NODE_CLASSES` within the class `com.github.javaparser.generator.metamodel.MetaModelGenerator`.</li>
+ * </ul>
+ *
+ * For this reason, any changes made directly to this file will be overwritten the next time generators are run.
+ */
+@Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+public class JmlInfFlowClauseMetaModel extends JmlClauseMetaModel {
+
+    @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+    JmlInfFlowClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
+        super(superBaseNodeMetaModel, JmlInfFlowClause.class, "JmlInfFlowClause", "com.github.javaparser.ast.jml.clauses", false, false);
+    }
+
+    public PropertyMetaModel byPropertyMetaModel;
+
+    public PropertyMetaModel declassifiesPropertyMetaModel;
+
+    public PropertyMetaModel erasesPropertyMetaModel;
+
+    public PropertyMetaModel expressionsPropertyMetaModel;
+
+    public PropertyMetaModel kindPropertyMetaModel;
+
+    public PropertyMetaModel newObjectsPropertyMetaModel;
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelExprMetaModel.java
index 97e7f15da2..7ee44c1612 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.expr.JmlLabelExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.expr.JmlLabelExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlLabelExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlLabelExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlLabelExpr.class,
-                "JmlLabelExpr",
-                "com.github.javaparser.ast.jml.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlLabelExpr.class, "JmlLabelExpr", "com.github.javaparser.ast.jml.expr", false, false);
     }
 
     public PropertyMetaModel expressionPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelMetaModel.java
index bb9c9cb510..bc8b23215a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelMetaModel.java
@@ -38,13 +38,7 @@ public class JmlLabelMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlLabelMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlLabelExpr.class,
-                "JmlLabel",
-                "com.github.javaparser.ast.jml.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlLabelExpr.class, "JmlLabel", "com.github.javaparser.ast.jml.expr", false, false);
     }
 
     public PropertyMetaModel expressionPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelStmtMetaModel.java
index e6ecd0feaf..4445a4ea6b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabelStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.stmt.JmlLabelStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.stmt.JmlLabelStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlLabelStmtMetaModel extends JmlStatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlLabelStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlLabelStmt.class,
-                "JmlLabelStmt",
-                "com.github.javaparser.ast.jml.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlLabelStmt.class, "JmlLabelStmt", "com.github.javaparser.ast.jml.stmt", false, false);
     }
 
     public PropertyMetaModel jmlTagsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabledClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabledClauseMetaModel.java
new file mode 100644
index 0000000000..37d9a0d781
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLabledClauseMetaModel.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.metamodel;
+
+import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlLabledClause;
+import com.github.javaparser.ast.Generated;
+
+/**
+ * This file, class, and its contents are completely generated based on:
+ * <ul>
+ *     <li>The contents and annotations within the package `com.github.javaparser.ast`, and</li>
+ *     <li>`ALL_NODE_CLASSES` within the class `com.github.javaparser.generator.metamodel.MetaModelGenerator`.</li>
+ * </ul>
+ *
+ * For this reason, any changes made directly to this file will be overwritten the next time generators are run.
+ */
+@Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+public class JmlLabledClauseMetaModel extends JmlClauseMetaModel {
+
+    @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+    JmlLabledClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
+        super(superBaseNodeMetaModel, JmlLabledClause.class, "JmlLabledClause", "com.github.javaparser.ast.jml.clauses", false, false);
+    }
+
+    public PropertyMetaModel expressionPropertyMetaModel;
+
+    public PropertyMetaModel kindPropertyMetaModel;
+
+    public PropertyMetaModel labelPropertyMetaModel;
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLetExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLetExprMetaModel.java
index 50aface54a..b8645d357c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLetExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlLetExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.expr.JmlLetExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.expr.JmlLetExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlLetExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlLetExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlLetExpr.class,
-                "JmlLetExpr",
-                "com.github.javaparser.ast.jml.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlLetExpr.class, "JmlLetExpr", "com.github.javaparser.ast.jml.expr", false, false);
     }
 
     public PropertyMetaModel bodyPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodDeclarationMetaModel.java
index 293a65a839..c3c89402b7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.body.JmlMethodDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.body.JmlMethodDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlMethodDeclarationMetaModel extends JmlClassLevelDeclarationMetaM
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlMethodDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlMethodDeclaration.class,
-                "JmlMethodDeclaration",
-                "com.github.javaparser.ast.jml.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlMethodDeclaration.class, "JmlMethodDeclaration", "com.github.javaparser.ast.jml.body", false, false);
     }
 
     public PropertyMetaModel contractPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodSignatureMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodSignatureMetaModel.java
index ce8b27a419..586a439ead 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodSignatureMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMethodSignatureMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlMethodSignature;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlMethodSignature;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlMethodSignatureMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlMethodSignatureMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlMethodSignature.class,
-                "JmlMethodSignature",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlMethodSignature.class, "JmlMethodSignature", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel argumentTypesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiCompareExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiCompareExprMetaModel.java
index 3ed6a981a8..3f465da67e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiCompareExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiCompareExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.expr.JmlMultiCompareExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.expr.JmlMultiCompareExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlMultiCompareExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlMultiCompareExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlMultiCompareExpr.class,
-                "JmlMultiCompareExpr",
-                "com.github.javaparser.ast.jml.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlMultiCompareExpr.class, "JmlMultiCompareExpr", "com.github.javaparser.ast.jml.expr", false, false);
     }
 
     public PropertyMetaModel expressionsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiExprClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiExprClauseMetaModel.java
index 751cdc110e..6435fb6bd6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiExprClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlMultiExprClauseMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlMultiExprClause;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlMultiExprClause;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlMultiExprClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlMultiExprClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlMultiExprClause.class,
-                "JmlMultiExprClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlMultiExprClause.class, "JmlMultiExprClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel expressionsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlOldClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlOldClauseMetaModel.java
index 8fd0955a6b..2bc5e8dafd 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlOldClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlOldClauseMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlOldClause;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlOldClause;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlOldClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlOldClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlOldClause.class,
-                "JmlOldClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlOldClause.class, "JmlOldClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel declarationsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlQuantifiedExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlQuantifiedExprMetaModel.java
index 0c8afcde81..fa6dde646c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlQuantifiedExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlQuantifiedExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.expr.JmlQuantifiedExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.expr.JmlQuantifiedExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlQuantifiedExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlQuantifiedExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlQuantifiedExpr.class,
-                "JmlQuantifiedExpr",
-                "com.github.javaparser.ast.jml.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlQuantifiedExpr.class, "JmlQuantifiedExpr", "com.github.javaparser.ast.jml.expr", false, false);
     }
 
     public PropertyMetaModel binderPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRefiningStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRefiningStmtMetaModel.java
index 21c365702f..cd59527579 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRefiningStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRefiningStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.stmt.JmlRefiningStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.stmt.JmlRefiningStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlRefiningStmtMetaModel extends JmlStatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlRefiningStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlRefiningStmt.class,
-                "JmlRefiningStmt",
-                "com.github.javaparser.ast.jml.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlRefiningStmt.class, "JmlRefiningStmt", "com.github.javaparser.ast.jml.stmt", false, false);
     }
 
     public PropertyMetaModel jmlTagsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRepresentsDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRepresentsDeclarationMetaModel.java
index b0933b37f4..7f98b45e67 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRepresentsDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlRepresentsDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.body.JmlRepresentsDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.body.JmlRepresentsDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlRepresentsDeclarationMetaModel extends JmlClassLevelDeclarationM
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlRepresentsDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlRepresentsDeclaration.class,
-                "JmlRepresentsDeclaration",
-                "com.github.javaparser.ast.jml.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlRepresentsDeclaration.class, "JmlRepresentsDeclaration", "com.github.javaparser.ast.jml.body", false, false);
     }
 
     public PropertyMetaModel exprPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionExprMetaModel.java
index d9af009d41..387c8d8fac 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.expr.JmlSetComprehensionExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.expr.JmlSetComprehensionExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlSetComprehensionExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlSetComprehensionExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlSetComprehensionExpr.class,
-                "JmlSetComprehensionExpr",
-                "com.github.javaparser.ast.jml.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlSetComprehensionExpr.class, "JmlSetComprehensionExpr", "com.github.javaparser.ast.jml.expr", false, false);
     }
 
     public PropertyMetaModel bindingPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionMetaModel.java
index 9454dd7109..2c4d84645c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSetComprehensionMetaModel.java
@@ -38,13 +38,7 @@ public class JmlSetComprehensionMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlSetComprehensionMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlSetComprehensionExpr.class,
-                "JmlSetComprehensionExpr",
-                "com.github.javaparser.ast.jml.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlSetComprehensionExpr.class, "JmlSetComprehensionExpr", "com.github.javaparser.ast.jml.expr", false, false);
     }
 
     public PropertyMetaModel bindingPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsClauseMetaModel.java
index 7a9bb9e242..a6e47c8ec1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsClauseMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlSignalsClause;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlSignalsClause;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlSignalsClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlSignalsClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlSignalsClause.class,
-                "JmlSignalsClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlSignalsClause.class, "JmlSignalsClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel expressionPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsOnlyClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsOnlyClauseMetaModel.java
index 02391d856b..8adf427978 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsOnlyClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSignalsOnlyClauseMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlSignalsOnlyClause;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlSignalsOnlyClause;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlSignalsOnlyClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlSignalsOnlyClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlSignalsOnlyClause.class,
-                "JmlSignalsOnlyClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlSignalsOnlyClause.class, "JmlSignalsOnlyClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel typesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSimpleExprClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSimpleExprClauseMetaModel.java
index ca544638f8..1edab8a92c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSimpleExprClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlSimpleExprClauseMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlSimpleExprClause;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.clauses.JmlSimpleExprClause;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlSimpleExprClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlSimpleExprClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlSimpleExprClause.class,
-                "JmlSimpleExprClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlSimpleExprClause.class, "JmlSimpleExprClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel expressionPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStatementMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStatementMetaModel.java
index 442a328288..8eb9628861 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStatementMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStatementMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.jml.stmt.JmlStatement;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.jml.stmt.JmlStatement;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class JmlStatementMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlStatementMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlStatement.class,
-                "JmlStatement",
-                "com.github.javaparser.ast.jml.stmt",
-                true,
-                false);
+        super(superBaseNodeMetaModel, JmlStatement.class, "JmlStatement", "com.github.javaparser.ast.jml.stmt", true, false);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected JmlStatementMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected JmlStatementMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStmtWithExpressionMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStmtWithExpressionMetaModel.java
index 3240f798dc..4765dbd7a7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStmtWithExpressionMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlStmtWithExpressionMetaModel.java
@@ -38,13 +38,7 @@ public class JmlStmtWithExpressionMetaModel extends JmlStatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlStmtWithExpressionMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlExpressionStmt.class,
-                "JmlStmtWithExpression",
-                "com.github.javaparser.ast.jml.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlExpressionStmt.class, "JmlStmtWithExpression", "com.github.javaparser.ast.jml.stmt", false, false);
     }
 
     public PropertyMetaModel expressionPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlTypeExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlTypeExprMetaModel.java
index 4e45135c03..260398ca75 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlTypeExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlTypeExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.expr.JmlTypeExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.expr.JmlTypeExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlTypeExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlTypeExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlTypeExpr.class,
-                "JmlTypeExpr",
-                "com.github.javaparser.ast.jml.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlTypeExpr.class, "JmlTypeExpr", "com.github.javaparser.ast.jml.expr", false, false);
     }
 
     public PropertyMetaModel typePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlUnreachableStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlUnreachableStmtMetaModel.java
index 0edeb454bf..bf2703eee3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlUnreachableStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/JmlUnreachableStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.stmt.JmlUnreachableStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.jml.stmt.JmlUnreachableStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class JmlUnreachableStmtMetaModel extends JmlStatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     JmlUnreachableStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlUnreachableStmt.class,
-                "JmlUnreachableStmt",
-                "com.github.javaparser.ast.jml.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlUnreachableStmt.class, "JmlUnreachableStmt", "com.github.javaparser.ast.jml.stmt", false, false);
     }
 
     public PropertyMetaModel jmlTagsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchBranchMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchBranchMetaModel.java
index 4ac87db2a7..ee8f6dc01b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchBranchMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchBranchMetaModel.java
@@ -39,23 +39,11 @@ public class KeYCcatchBranchMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeYCcatchBranchMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyCcatchBranch.class,
-                "KeYCcatchBranch",
-                "com.github.javaparser.ast.key",
-                true,
-                false);
+        super(superBaseNodeMetaModel, KeyCcatchBranch.class, "KeYCcatchBranch", "com.github.javaparser.ast.key", true, false);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected KeYCcatchBranchMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected KeYCcatchBranchMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchBreakMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchBreakMetaModel.java
index 8f90ad027b..d36582cd8c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchBreakMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchBreakMetaModel.java
@@ -38,13 +38,7 @@ public class KeYCcatchBreakMetaModel extends KeYCcatchBranchMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeYCcatchBreakMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyCcatchBreak.class,
-                "KeYCcatchBreak",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyCcatchBreak.class, "KeYCcatchBreak", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel blockPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchContinueMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchContinueMetaModel.java
index 0665835454..3f04d20642 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchContinueMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchContinueMetaModel.java
@@ -38,13 +38,7 @@ public class KeYCcatchContinueMetaModel extends KeYCcatchBranchMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeYCcatchContinueMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyCcatchContinue.class,
-                "KeYCcatchContinue",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyCcatchContinue.class, "KeYCcatchContinue", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel blockPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchParameterMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchParameterMetaModel.java
index 45ba469483..cfc5cd7720 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchParameterMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchParameterMetaModel.java
@@ -38,13 +38,7 @@ public class KeYCcatchParameterMetaModel extends KeYCcatchBranchMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeYCcatchParameterMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyCcatchParameter.class,
-                "KeYCcatchParameter",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyCcatchParameter.class, "KeYCcatchParameter", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel blockPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchReturnMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchReturnMetaModel.java
index ee8cabd33f..50d85e87f7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchReturnMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYCcatchReturnMetaModel.java
@@ -38,13 +38,7 @@ public class KeYCcatchReturnMetaModel extends KeYCcatchBranchMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeYCcatchReturnMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyCcatchReturn.class,
-                "KeYCcatchReturn",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyCcatchReturn.class, "KeYCcatchReturn", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel blockPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyRangeExpressionMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYMarkerStatementMetaModel.java
similarity index 74%
rename from javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyRangeExpressionMetaModel.java
rename to javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYMarkerStatementMetaModel.java
index 6b70da323c..452c14fbd8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyRangeExpressionMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeYMarkerStatementMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyRangeExpression;
 import java.util.Optional;
+import com.github.javaparser.ast.key.KeYMarkerStatement;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -34,20 +34,12 @@
  * For this reason, any changes made directly to this file will be overwritten the next time generators are run.
  */
 @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-public class KeyRangeExpressionMetaModel extends ExpressionMetaModel {
+public class KeYMarkerStatementMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    KeyRangeExpressionMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyRangeExpression.class,
-                "KeyRangeExpression",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+    KeYMarkerStatementMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
+        super(superBaseNodeMetaModel, KeYMarkerStatement.class, "KeYMarkerStatement", "com.github.javaparser.ast.key", false, false);
     }
 
-    public PropertyMetaModel lowerPropertyMetaModel;
-
-    public PropertyMetaModel upperPropertyMetaModel;
+    public PropertyMetaModel kindPropertyMetaModel;
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyAbstractExecutionContextMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyAbstractExecutionContextMetaModel.java
index 2823572e54..f2d5da1ff3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyAbstractExecutionContextMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyAbstractExecutionContextMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.key.KeyAbstractExecutionContext;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.key.KeyAbstractExecutionContext;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class KeyAbstractExecutionContextMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyAbstractExecutionContextMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyAbstractExecutionContext.class,
-                "KeyAbstractExecutionContext",
-                "com.github.javaparser.ast.key",
-                true,
-                false);
+        super(superBaseNodeMetaModel, KeyAbstractExecutionContext.class, "KeyAbstractExecutionContext", "com.github.javaparser.ast.key", true, false);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected KeyAbstractExecutionContextMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected KeyAbstractExecutionContextMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCatchAllStatementMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCatchAllStatementMetaModel.java
index c5f5d1749c..9a87b29a8c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCatchAllStatementMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCatchAllStatementMetaModel.java
@@ -21,7 +21,7 @@
 package com.github.javaparser.metamodel;
 
 import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyCatchAllStatement;
+import com.github.javaparser.ast.key.KeyCatchAllStmt;
 import java.util.Optional;
 
 /**
@@ -38,13 +38,7 @@ public class KeyCatchAllStatementMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyCatchAllStatementMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyCatchAllStatement.class,
-                "KeyCatchAllStatement",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyCatchAllStmt.class, "KeyCatchAllStatement", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel blockPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCatchAllStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCatchAllStmtMetaModel.java
new file mode 100644
index 0000000000..00c80de2a1
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCatchAllStmtMetaModel.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.metamodel;
+
+import java.util.Optional;
+import com.github.javaparser.ast.key.KeyCatchAllStmt;
+import com.github.javaparser.ast.Generated;
+
+/**
+ * This file, class, and its contents are completely generated based on:
+ * <ul>
+ *     <li>The contents and annotations within the package `com.github.javaparser.ast`, and</li>
+ *     <li>`ALL_NODE_CLASSES` within the class `com.github.javaparser.generator.metamodel.MetaModelGenerator`.</li>
+ * </ul>
+ *
+ * For this reason, any changes made directly to this file will be overwritten the next time generators are run.
+ */
+@Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+public class KeyCatchAllStmtMetaModel extends StatementMetaModel {
+
+    @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+    KeyCatchAllStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
+        super(superBaseNodeMetaModel, KeyCatchAllStmt.class, "KeyCatchAllStmt", "com.github.javaparser.ast.key", false, false);
+    }
+
+    public PropertyMetaModel blockPropertyMetaModel;
+
+    public PropertyMetaModel labelPropertyMetaModel;
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchBranchMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchBranchMetaModel.java
index 6423ce3915..539d1ba015 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchBranchMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchBranchMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.key.KeyCcatchBranch;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.key.KeyCcatchBranch;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class KeyCcatchBranchMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyCcatchBranchMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyCcatchBranch.class,
-                "KeyCcatchBranch",
-                "com.github.javaparser.ast.key",
-                true,
-                false);
+        super(superBaseNodeMetaModel, KeyCcatchBranch.class, "KeyCcatchBranch", "com.github.javaparser.ast.key", true, false);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected KeyCcatchBranchMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected KeyCcatchBranchMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchBreakMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchBreakMetaModel.java
index 829516eabb..60461f4b8c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchBreakMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchBreakMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyCcatchBreak;
 import java.util.Optional;
+import com.github.javaparser.ast.key.KeyCcatchBreak;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyCcatchBreakMetaModel extends KeyCcatchBranchMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyCcatchBreakMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyCcatchBreak.class,
-                "KeyCcatchBreak",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyCcatchBreak.class, "KeyCcatchBreak", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel blockPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchContinueMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchContinueMetaModel.java
index ca8a1b4533..ab07b2b8f8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchContinueMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchContinueMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyCcatchContinue;
 import java.util.Optional;
+import com.github.javaparser.ast.key.KeyCcatchContinue;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyCcatchContinueMetaModel extends KeyCcatchBranchMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyCcatchContinueMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyCcatchContinue.class,
-                "KeyCcatchContinue",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyCcatchContinue.class, "KeyCcatchContinue", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel blockPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchParameterMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchParameterMetaModel.java
index b225468351..4c431042df 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchParameterMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchParameterMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyCcatchParameter;
 import java.util.Optional;
+import com.github.javaparser.ast.key.KeyCcatchParameter;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyCcatchParameterMetaModel extends KeyCcatchBranchMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyCcatchParameterMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyCcatchParameter.class,
-                "KeyCcatchParameter",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyCcatchParameter.class, "KeyCcatchParameter", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel blockPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchReturnMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchReturnMetaModel.java
index 13d9d356e1..a0648bd802 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchReturnMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchReturnMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyCcatchReturn;
 import java.util.Optional;
+import com.github.javaparser.ast.key.KeyCcatchReturn;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyCcatchReturnMetaModel extends KeyCcatchBranchMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyCcatchReturnMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyCcatchReturn.class,
-                "KeyCcatchReturn",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyCcatchReturn.class, "KeyCcatchReturn", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel blockPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchSVMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchSVMetaModel.java
index ac1889243d..24f717db45 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchSVMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyCcatchSVMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyCcatchSV;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyCcatchSV;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyCcatchSVMetaModel extends KeyCcatchBranchMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyCcatchSVMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyCcatchSV.class,
-                "KeyCcatchSV",
-                "com.github.javaparser.ast.key.sv",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyCcatchSV.class, "KeyCcatchSV", "com.github.javaparser.ast.key.sv", false, false);
     }
 
     public PropertyMetaModel textPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyContextStatementBlockMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyContextStatementBlockMetaModel.java
index edb59e008b..6713201dd3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyContextStatementBlockMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyContextStatementBlockMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyContextStatementBlock;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyContextStatementBlock;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyContextStatementBlockMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyContextStatementBlockMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyContextStatementBlock.class,
-                "KeyContextStatementBlock",
-                "com.github.javaparser.ast.key.sv",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyContextStatementBlock.class, "KeyContextStatementBlock", "com.github.javaparser.ast.key.sv", false, false);
     }
 
     public PropertyMetaModel contextPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyEscapeExpressionMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyEscapeExpressionMetaModel.java
index 4fc4852629..d8f51f9867 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyEscapeExpressionMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyEscapeExpressionMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyEscapeExpression;
 import java.util.Optional;
+import com.github.javaparser.ast.key.KeyEscapeExpression;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyEscapeExpressionMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyEscapeExpressionMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyEscapeExpression.class,
-                "KeyEscapeExpression",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyEscapeExpression.class, "KeyEscapeExpression", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel argumentsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecCtxtSVMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecCtxtSVMetaModel.java
index 297e4acb8f..e5ab1deb39 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecCtxtSVMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecCtxtSVMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyExecCtxtSV;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyExecCtxtSV;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyExecCtxtSVMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyExecCtxtSVMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyExecCtxtSV.class,
-                "KeyExecCtxtSV",
-                "com.github.javaparser.ast.key.sv",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyExecCtxtSV.class, "KeyExecCtxtSV", "com.github.javaparser.ast.key.sv", false, false);
     }
 
     public PropertyMetaModel textPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecStatementMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecStatementMetaModel.java
index 1df8ff7eac..00c68883e5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecStatementMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecStatementMetaModel.java
@@ -21,7 +21,7 @@
 package com.github.javaparser.metamodel;
 
 import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyExecStatement;
+import com.github.javaparser.ast.key.KeyExecStmt;
 import java.util.Optional;
 
 /**
@@ -38,13 +38,7 @@ public class KeyExecStatementMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyExecStatementMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyExecStatement.class,
-                "KeyExecStatement",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyExecStmt.class, "KeyExecStatement", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel branchesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecStmtMetaModel.java
new file mode 100644
index 0000000000..288b6f5f7c
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecStmtMetaModel.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.metamodel;
+
+import java.util.Optional;
+import com.github.javaparser.ast.key.KeyExecStmt;
+import com.github.javaparser.ast.Generated;
+
+/**
+ * This file, class, and its contents are completely generated based on:
+ * <ul>
+ *     <li>The contents and annotations within the package `com.github.javaparser.ast`, and</li>
+ *     <li>`ALL_NODE_CLASSES` within the class `com.github.javaparser.generator.metamodel.MetaModelGenerator`.</li>
+ * </ul>
+ *
+ * For this reason, any changes made directly to this file will be overwritten the next time generators are run.
+ */
+@Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+public class KeyExecStmtMetaModel extends StatementMetaModel {
+
+    @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+    KeyExecStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
+        super(superBaseNodeMetaModel, KeyExecStmt.class, "KeyExecStmt", "com.github.javaparser.ast.key", false, false);
+    }
+
+    public PropertyMetaModel branchesPropertyMetaModel;
+
+    public PropertyMetaModel execBlockPropertyMetaModel;
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecutionContextMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecutionContextMetaModel.java
index 595e07550e..7d28a19378 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecutionContextMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecutionContextMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyExecutionContext;
 import java.util.Optional;
+import com.github.javaparser.ast.key.KeyExecutionContext;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyExecutionContextMetaModel extends KeyAbstractExecutionContextMet
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyExecutionContextMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyExecutionContext.class,
-                "KeyExecutionContext",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyExecutionContext.class, "KeyExecutionContext", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel contextPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecutionContextSVMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecutionContextSVMetaModel.java
index fe66355f92..fec60fc357 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecutionContextSVMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExecutionContextSVMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyExecutionContextSV;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyExecutionContextSV;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyExecutionContextSVMetaModel extends KeyAbstractExecutionContextM
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyExecutionContextSVMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyExecutionContextSV.class,
-                "KeyExecutionContextSV",
-                "com.github.javaparser.ast.key.sv",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyExecutionContextSV.class, "KeyExecutionContextSV", "com.github.javaparser.ast.key.sv", false, false);
     }
 
     public PropertyMetaModel textPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExpressionSVMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExpressionSVMetaModel.java
index 848295aaa2..5cd24d24ee 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExpressionSVMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyExpressionSVMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyExpressionSV;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyExpressionSV;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyExpressionSVMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyExpressionSVMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyExpressionSV.class,
-                "KeyExpressionSV",
-                "com.github.javaparser.ast.key.sv",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyExpressionSV.class, "KeyExpressionSV", "com.github.javaparser.ast.key.sv", false, false);
     }
 
     public PropertyMetaModel textPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyJumpLabelSVMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyJumpLabelSVMetaModel.java
index 275a1ba9d3..f4ec61946e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyJumpLabelSVMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyJumpLabelSVMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyJumpLabelSV;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyJumpLabelSV;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyJumpLabelSVMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyJumpLabelSVMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyJumpLabelSV.class,
-                "KeyJumpLabelSV",
-                "com.github.javaparser.ast.key.sv",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyJumpLabelSV.class, "KeyJumpLabelSV", "com.github.javaparser.ast.key.sv", false, false);
     }
 
     public PropertyMetaModel textPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyLoopScopeBlockMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyLoopScopeBlockMetaModel.java
index f485b1fef8..848cd89562 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyLoopScopeBlockMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyLoopScopeBlockMetaModel.java
@@ -21,7 +21,7 @@
 package com.github.javaparser.metamodel;
 
 import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyLoopScopeBlock;
+import com.github.javaparser.ast.key.KeyLoopScopeBlockStmt;
 import java.util.Optional;
 
 /**
@@ -38,13 +38,7 @@ public class KeyLoopScopeBlockMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyLoopScopeBlockMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyLoopScopeBlock.class,
-                "KeyLoopScopeBlock",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyLoopScopeBlockStmt.class, "KeyLoopScopeBlock", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel blockPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyLoopScopeBlockStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyLoopScopeBlockStmtMetaModel.java
new file mode 100644
index 0000000000..a9f885c4d1
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyLoopScopeBlockStmtMetaModel.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.metamodel;
+
+import java.util.Optional;
+import com.github.javaparser.ast.key.KeyLoopScopeBlockStmt;
+import com.github.javaparser.ast.Generated;
+
+/**
+ * This file, class, and its contents are completely generated based on:
+ * <ul>
+ *     <li>The contents and annotations within the package `com.github.javaparser.ast`, and</li>
+ *     <li>`ALL_NODE_CLASSES` within the class `com.github.javaparser.generator.metamodel.MetaModelGenerator`.</li>
+ * </ul>
+ *
+ * For this reason, any changes made directly to this file will be overwritten the next time generators are run.
+ */
+@Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+public class KeyLoopScopeBlockStmtMetaModel extends StatementMetaModel {
+
+    @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+    KeyLoopScopeBlockStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
+        super(superBaseNodeMetaModel, KeyLoopScopeBlockStmt.class, "KeyLoopScopeBlockStmt", "com.github.javaparser.ast.key", false, false);
+    }
+
+    public PropertyMetaModel blockPropertyMetaModel;
+
+    public PropertyMetaModel indexPVPropertyMetaModel;
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMergePointStatementMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMergePointStatementMetaModel.java
index 63ec413ae2..94827aef04 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMergePointStatementMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMergePointStatementMetaModel.java
@@ -21,7 +21,7 @@
 package com.github.javaparser.metamodel;
 
 import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyMergePointStatement;
+import com.github.javaparser.ast.key.KeyMergePointStmt;
 import java.util.Optional;
 
 /**
@@ -38,13 +38,7 @@ public class KeyMergePointStatementMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyMergePointStatementMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyMergePointStatement.class,
-                "KeyMergePointStatement",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyMergePointStmt.class, "KeyMergePointStatement", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel exprPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMergePointStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMergePointStmtMetaModel.java
new file mode 100644
index 0000000000..7e6a4bd256
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMergePointStmtMetaModel.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.metamodel;
+
+import java.util.Optional;
+import com.github.javaparser.ast.key.KeyMergePointStmt;
+import com.github.javaparser.ast.Generated;
+
+/**
+ * This file, class, and its contents are completely generated based on:
+ * <ul>
+ *     <li>The contents and annotations within the package `com.github.javaparser.ast`, and</li>
+ *     <li>`ALL_NODE_CLASSES` within the class `com.github.javaparser.generator.metamodel.MetaModelGenerator`.</li>
+ * </ul>
+ *
+ * For this reason, any changes made directly to this file will be overwritten the next time generators are run.
+ */
+@Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+public class KeyMergePointStmtMetaModel extends StatementMetaModel {
+
+    @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+    KeyMergePointStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
+        super(superBaseNodeMetaModel, KeyMergePointStmt.class, "KeyMergePointStmt", "com.github.javaparser.ast.key", false, false);
+    }
+
+    public PropertyMetaModel exprPropertyMetaModel;
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMetaConstructExpressionMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMetaConstructExpressionMetaModel.java
index f3deaa2af8..b27d0732d5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMetaConstructExpressionMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMetaConstructExpressionMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyMetaConstructExpression;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyMetaConstructExpression;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyMetaConstructExpressionMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyMetaConstructExpressionMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyMetaConstructExpression.class,
-                "KeyMetaConstructExpression",
-                "com.github.javaparser.ast.key.sv",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyMetaConstructExpression.class, "KeyMetaConstructExpression", "com.github.javaparser.ast.key.sv", false, false);
     }
 
     public PropertyMetaModel childPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMetaConstructMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMetaConstructMetaModel.java
index 0bbff632e1..6ad3cfbfd8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMetaConstructMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMetaConstructMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyMetaConstruct;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyMetaConstruct;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyMetaConstructMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyMetaConstructMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyMetaConstruct.class,
-                "KeyMetaConstruct",
-                "com.github.javaparser.ast.key.sv",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyMetaConstruct.class, "KeyMetaConstruct", "com.github.javaparser.ast.key.sv", false, false);
     }
 
     public PropertyMetaModel childPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMetaConstructTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMetaConstructTypeMetaModel.java
index e90b9583cb..8c3e0935a4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMetaConstructTypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMetaConstructTypeMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyMetaConstructType;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyMetaConstructType;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyMetaConstructTypeMetaModel extends TypeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyMetaConstructTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyMetaConstructType.class,
-                "KeyMetaConstructType",
-                "com.github.javaparser.ast.key.sv",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyMetaConstructType.class, "KeyMetaConstructType", "com.github.javaparser.ast.key.sv", false, false);
     }
 
     public PropertyMetaModel exprPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodBodyStatementMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodBodyStatementMetaModel.java
index e467b4f1e0..2ceddeff3f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodBodyStatementMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodBodyStatementMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyMethodBodyStatement;
 import java.util.Optional;
+import com.github.javaparser.ast.key.KeyMethodBodyStatement;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyMethodBodyStatementMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyMethodBodyStatementMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyMethodBodyStatement.class,
-                "KeyMethodBodyStatement",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyMethodBodyStatement.class, "KeyMethodBodyStatement", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel exprPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodCallStatementMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodCallStatementMetaModel.java
index 3e7360acf8..c5668968c5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodCallStatementMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodCallStatementMetaModel.java
@@ -21,7 +21,7 @@
 package com.github.javaparser.metamodel;
 
 import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyMethodCallStatement;
+import com.github.javaparser.ast.key.KeyMethodCallStmt;
 import java.util.Optional;
 
 /**
@@ -38,13 +38,7 @@ public class KeyMethodCallStatementMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyMethodCallStatementMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyMethodCallStatement.class,
-                "KeyMethodCallStatement",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyMethodCallStmt.class, "KeyMethodCallStatement", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel blockPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodCallStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodCallStmtMetaModel.java
new file mode 100644
index 0000000000..4f47c291e6
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodCallStmtMetaModel.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.metamodel;
+
+import java.util.Optional;
+import com.github.javaparser.ast.key.KeyMethodCallStmt;
+import com.github.javaparser.ast.Generated;
+
+/**
+ * This file, class, and its contents are completely generated based on:
+ * <ul>
+ *     <li>The contents and annotations within the package `com.github.javaparser.ast`, and</li>
+ *     <li>`ALL_NODE_CLASSES` within the class `com.github.javaparser.generator.metamodel.MetaModelGenerator`.</li>
+ * </ul>
+ *
+ * For this reason, any changes made directly to this file will be overwritten the next time generators are run.
+ */
+@Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+public class KeyMethodCallStmtMetaModel extends StatementMetaModel {
+
+    @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+    KeyMethodCallStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
+        super(superBaseNodeMetaModel, KeyMethodCallStmt.class, "KeyMethodCallStmt", "com.github.javaparser.ast.key", false, false);
+    }
+
+    public PropertyMetaModel blockPropertyMetaModel;
+
+    public PropertyMetaModel contextPropertyMetaModel;
+
+    public PropertyMetaModel namePropertyMetaModel;
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodSignatureMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodSignatureMetaModel.java
index dc3dc91eab..2cfcc4c4aa 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodSignatureMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodSignatureMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyMethodSignature;
 import java.util.Optional;
+import com.github.javaparser.ast.key.KeyMethodSignature;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyMethodSignatureMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyMethodSignatureMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyMethodSignature.class,
-                "KeyMethodSignature",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyMethodSignature.class, "KeyMethodSignature", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel namePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodSignatureSVMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodSignatureSVMetaModel.java
index c0c3a58284..d5d9b35ed6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodSignatureSVMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyMethodSignatureSVMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyMethodSignatureSV;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyMethodSignatureSV;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyMethodSignatureSVMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyMethodSignatureSVMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyMethodSignatureSV.class,
-                "KeyMethodSignatureSV",
-                "com.github.javaparser.ast.key.sv",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyMethodSignatureSV.class, "KeyMethodSignatureSV", "com.github.javaparser.ast.key.sv", false, false);
     }
 
     public PropertyMetaModel textPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyPassiveExpressionMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyPassiveExpressionMetaModel.java
index a1fa69ddaa..f1b8cb4095 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyPassiveExpressionMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyPassiveExpressionMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyPassiveExpression;
 import java.util.Optional;
+import com.github.javaparser.ast.key.KeyPassiveExpression;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyPassiveExpressionMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyPassiveExpressionMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyPassiveExpression.class,
-                "KeyPassiveExpression",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyPassiveExpression.class, "KeyPassiveExpression", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel exprPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyProgramVariableSVMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyProgramVariableSVMetaModel.java
index 18b58fa405..f1977ba379 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyProgramVariableSVMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyProgramVariableSVMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyProgramVariableSV;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyProgramVariableSV;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyProgramVariableSVMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyProgramVariableSVMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyProgramVariableSV.class,
-                "KeyProgramVariableSV",
-                "com.github.javaparser.ast.key.sv",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyProgramVariableSV.class, "KeyProgramVariableSV", "com.github.javaparser.ast.key.sv", false, false);
     }
 
     public PropertyMetaModel textPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyStatementSVMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyStatementSVMetaModel.java
index 4cad4c351d..672e833916 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyStatementSVMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyStatementSVMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyStatementSV;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyStatementSV;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class KeyStatementSVMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyStatementSVMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyStatementSV.class,
-                "KeyStatementSV",
-                "com.github.javaparser.ast.key.sv",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyStatementSV.class, "KeyStatementSV", "com.github.javaparser.ast.key.sv", false, false);
     }
 
     public PropertyMetaModel textPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyTransactionStatementMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyTransactionStatementMetaModel.java
index 1b3f5fd5be..9c6227d865 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyTransactionStatementMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyTransactionStatementMetaModel.java
@@ -21,7 +21,7 @@
 package com.github.javaparser.metamodel;
 
 import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.KeyTransactionStatement;
+import com.github.javaparser.ast.key.KeyTransactionStmt;
 import java.util.Optional;
 
 /**
@@ -38,13 +38,7 @@ public class KeyTransactionStatementMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     KeyTransactionStatementMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                KeyTransactionStatement.class,
-                "KeyTransactionStatement",
-                "com.github.javaparser.ast.key",
-                false,
-                false);
+        super(superBaseNodeMetaModel, KeyTransactionStmt.class, "KeyTransactionStatement", "com.github.javaparser.ast.key", false, false);
     }
 
     public PropertyMetaModel typePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyTransactionStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyTransactionStmtMetaModel.java
new file mode 100644
index 0000000000..d95dda3247
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyTransactionStmtMetaModel.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.metamodel;
+
+import java.util.Optional;
+import com.github.javaparser.ast.key.KeyTransactionStmt;
+import com.github.javaparser.ast.Generated;
+
+/**
+ * This file, class, and its contents are completely generated based on:
+ * <ul>
+ *     <li>The contents and annotations within the package `com.github.javaparser.ast`, and</li>
+ *     <li>`ALL_NODE_CLASSES` within the class `com.github.javaparser.generator.metamodel.MetaModelGenerator`.</li>
+ * </ul>
+ *
+ * For this reason, any changes made directly to this file will be overwritten the next time generators are run.
+ */
+@Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+public class KeyTransactionStmtMetaModel extends StatementMetaModel {
+
+    @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
+    KeyTransactionStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
+        super(superBaseNodeMetaModel, KeyTransactionStmt.class, "KeyTransactionStmt", "com.github.javaparser.ast.key", false, false);
+    }
+
+    public PropertyMetaModel typePropertyMetaModel;
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyTypeSVMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyTypeSVMetaModel.java
index 13be77fa24..1cdc521092 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyTypeSVMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/KeyTypeSVMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.key.sv.KeyTypeSV;
 import java.util.Optional;
+import com.github.javaparser.ast.key.sv.KeyTypeSV;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LabeledStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LabeledStmtMetaModel.java
index 33bb26a718..625c5886a8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LabeledStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LabeledStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.LabeledStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.LabeledStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LambdaExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LambdaExprMetaModel.java
index 3de191ff57..4dc883da39 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LambdaExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LambdaExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.LambdaExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.LambdaExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LineCommentMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LineCommentMetaModel.java
index e5a960cef4..c5e842e32c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LineCommentMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LineCommentMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.comments.LineComment;
 import java.util.Optional;
+import com.github.javaparser.ast.comments.LineComment;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class LineCommentMetaModel extends CommentMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     LineCommentMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                LineComment.class,
-                "LineComment",
-                "com.github.javaparser.ast.comments",
-                false,
-                false);
+        super(superBaseNodeMetaModel, LineComment.class, "LineComment", "com.github.javaparser.ast.comments", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralExprMetaModel.java
index 6b849ba2d7..72eb220eb7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralExprMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.expr.LiteralExpr;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.expr.LiteralExpr;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -43,13 +43,7 @@ public class LiteralExprMetaModel extends ExpressionMetaModel {
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected LiteralExprMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected LiteralExprMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralStringValueExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralStringValueExprMetaModel.java
index 638bffe612..7b36829063 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralStringValueExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LiteralStringValueExprMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.expr.LiteralStringValueExpr;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.expr.LiteralStringValueExpr;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class LiteralStringValueExprMetaModel extends LiteralExprMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     LiteralStringValueExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                LiteralStringValueExpr.class,
-                "LiteralStringValueExpr",
-                "com.github.javaparser.ast.expr",
-                true,
-                false);
+        super(superBaseNodeMetaModel, LiteralStringValueExpr.class, "LiteralStringValueExpr", "com.github.javaparser.ast.expr", true, false);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected LiteralStringValueExprMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected LiteralStringValueExprMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalClassDeclarationStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalClassDeclarationStmtMetaModel.java
index ecd093bf29..2387c94937 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalClassDeclarationStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalClassDeclarationStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.LocalClassDeclarationStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.LocalClassDeclarationStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class LocalClassDeclarationStmtMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     LocalClassDeclarationStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                LocalClassDeclarationStmt.class,
-                "LocalClassDeclarationStmt",
-                "com.github.javaparser.ast.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, LocalClassDeclarationStmt.class, "LocalClassDeclarationStmt", "com.github.javaparser.ast.stmt", false, false);
     }
 
     public PropertyMetaModel classDeclarationPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalRecordDeclarationStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalRecordDeclarationStmtMetaModel.java
index 69fed56455..d96c7d9c54 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalRecordDeclarationStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LocalRecordDeclarationStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.LocalRecordDeclarationStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.LocalRecordDeclarationStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class LocalRecordDeclarationStmtMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     LocalRecordDeclarationStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                LocalRecordDeclarationStmt.class,
-                "LocalRecordDeclarationStmt",
-                "com.github.javaparser.ast.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, LocalRecordDeclarationStmt.class, "LocalRecordDeclarationStmt", "com.github.javaparser.ast.stmt", false, false);
     }
 
     public PropertyMetaModel recordDeclarationPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LongLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LongLiteralExprMetaModel.java
index 0768c58102..1c9beaaa4f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/LongLiteralExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/LongLiteralExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.LongLiteralExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.LongLiteralExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class LongLiteralExprMetaModel extends LiteralStringValueExprMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     LongLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                LongLiteralExpr.class,
-                "LongLiteralExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, LongLiteralExpr.class, "LongLiteralExpr", "com.github.javaparser.ast.expr", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MarkdownCommentMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MarkdownCommentMetaModel.java
index 2d43bbc16d..33348ada4b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MarkdownCommentMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MarkdownCommentMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.comments.MarkdownComment;
 import java.util.Optional;
+import com.github.javaparser.ast.comments.MarkdownComment;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class MarkdownCommentMetaModel extends JavadocCommentMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     MarkdownCommentMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                MarkdownComment.class,
-                "MarkdownComment",
-                "com.github.javaparser.ast.comments",
-                false,
-                false);
+        super(superBaseNodeMetaModel, MarkdownComment.class, "MarkdownComment", "com.github.javaparser.ast.comments", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MarkerAnnotationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MarkerAnnotationExprMetaModel.java
index 6b72a48c90..8b7bea9cd7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MarkerAnnotationExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MarkerAnnotationExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.MarkerAnnotationExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.MarkerAnnotationExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class MarkerAnnotationExprMetaModel extends AnnotationExprMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     MarkerAnnotationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                MarkerAnnotationExpr.class,
-                "MarkerAnnotationExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, MarkerAnnotationExpr.class, "MarkerAnnotationExpr", "com.github.javaparser.ast.expr", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MatchAllPatternExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MatchAllPatternExprMetaModel.java
index 610699219e..40cc2cd933 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MatchAllPatternExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MatchAllPatternExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.MatchAllPatternExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.MatchAllPatternExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class MatchAllPatternExprMetaModel extends ComponentPatternExprMetaModel
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     MatchAllPatternExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                MatchAllPatternExpr.class,
-                "MatchAllPatternExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, MatchAllPatternExpr.class, "MatchAllPatternExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel modifiersPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MemberValuePairMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MemberValuePairMetaModel.java
index 1331e6d7c2..58a2c27927 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MemberValuePairMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MemberValuePairMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.MemberValuePair;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.MemberValuePair;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class MemberValuePairMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     MemberValuePairMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                MemberValuePair.class,
-                "MemberValuePair",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, MemberValuePair.class, "MemberValuePair", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel namePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodCallExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodCallExprMetaModel.java
index a04e83b9eb..6eb89f1aef 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodCallExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodCallExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.MethodCallExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.MethodCallExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class MethodCallExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     MethodCallExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                MethodCallExpr.class,
-                "MethodCallExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, MethodCallExpr.class, "MethodCallExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel argumentsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodDeclarationMetaModel.java
index 9b5f53beda..8b641b0fe3 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.MethodDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.body.MethodDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class MethodDeclarationMetaModel extends CallableDeclarationMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     MethodDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                MethodDeclaration.class,
-                "MethodDeclaration",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, MethodDeclaration.class, "MethodDeclaration", "com.github.javaparser.ast.body", false, false);
     }
 
     public PropertyMetaModel bodyPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodReferenceExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodReferenceExprMetaModel.java
index b6b11a73a9..4cee8f64eb 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodReferenceExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/MethodReferenceExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.MethodReferenceExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.MethodReferenceExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class MethodReferenceExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     MethodReferenceExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                MethodReferenceExpr.class,
-                "MethodReferenceExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, MethodReferenceExpr.class, "MethodReferenceExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel identifierPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModifierMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModifierMetaModel.java
index 6024db6ce3..3ef9e18313 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModifierMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModifierMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.Modifier;
 import java.util.Optional;
+import com.github.javaparser.ast.Modifier;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDeclarationMetaModel.java
index 804dc02cdd..6b57678b21 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.modules.ModuleDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.modules.ModuleDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ModuleDeclarationMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ModuleDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ModuleDeclaration.class,
-                "ModuleDeclaration",
-                "com.github.javaparser.ast.modules",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ModuleDeclaration.class, "ModuleDeclaration", "com.github.javaparser.ast.modules", false, false);
     }
 
     public PropertyMetaModel annotationsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDirectiveMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDirectiveMetaModel.java
index ac1c7e1c8f..473c54aa58 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDirectiveMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleDirectiveMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.modules.ModuleDirective;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.modules.ModuleDirective;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class ModuleDirectiveMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ModuleDirectiveMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ModuleDirective.class,
-                "ModuleDirective",
-                "com.github.javaparser.ast.modules",
-                true,
-                false);
+        super(superBaseNodeMetaModel, ModuleDirective.class, "ModuleDirective", "com.github.javaparser.ast.modules", true, false);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected ModuleDirectiveMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected ModuleDirectiveMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleExportsDirectiveMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleExportsDirectiveMetaModel.java
index de2bea0fbc..5dadfad174 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleExportsDirectiveMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleExportsDirectiveMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.modules.ModuleExportsDirective;
 import java.util.Optional;
+import com.github.javaparser.ast.modules.ModuleExportsDirective;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ModuleExportsDirectiveMetaModel extends ModuleDirectiveMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ModuleExportsDirectiveMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ModuleExportsDirective.class,
-                "ModuleExportsDirective",
-                "com.github.javaparser.ast.modules",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ModuleExportsDirective.class, "ModuleExportsDirective", "com.github.javaparser.ast.modules", false, false);
     }
 
     public PropertyMetaModel moduleNamesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleOpensDirectiveMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleOpensDirectiveMetaModel.java
index d6d6a3fdf9..689b80664a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleOpensDirectiveMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleOpensDirectiveMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.modules.ModuleOpensDirective;
 import java.util.Optional;
+import com.github.javaparser.ast.modules.ModuleOpensDirective;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ModuleOpensDirectiveMetaModel extends ModuleDirectiveMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ModuleOpensDirectiveMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ModuleOpensDirective.class,
-                "ModuleOpensDirective",
-                "com.github.javaparser.ast.modules",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ModuleOpensDirective.class, "ModuleOpensDirective", "com.github.javaparser.ast.modules", false, false);
     }
 
     public PropertyMetaModel moduleNamesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleProvidesDirectiveMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleProvidesDirectiveMetaModel.java
index f0dc04ba53..5c241782da 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleProvidesDirectiveMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleProvidesDirectiveMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.modules.ModuleProvidesDirective;
 import java.util.Optional;
+import com.github.javaparser.ast.modules.ModuleProvidesDirective;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ModuleProvidesDirectiveMetaModel extends ModuleDirectiveMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ModuleProvidesDirectiveMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ModuleProvidesDirective.class,
-                "ModuleProvidesDirective",
-                "com.github.javaparser.ast.modules",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ModuleProvidesDirective.class, "ModuleProvidesDirective", "com.github.javaparser.ast.modules", false, false);
     }
 
     public PropertyMetaModel namePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleRequiresDirectiveMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleRequiresDirectiveMetaModel.java
index 47444b227d..fac31aaabf 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleRequiresDirectiveMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleRequiresDirectiveMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.modules.ModuleRequiresDirective;
 import java.util.Optional;
+import com.github.javaparser.ast.modules.ModuleRequiresDirective;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ModuleRequiresDirectiveMetaModel extends ModuleDirectiveMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ModuleRequiresDirectiveMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ModuleRequiresDirective.class,
-                "ModuleRequiresDirective",
-                "com.github.javaparser.ast.modules",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ModuleRequiresDirective.class, "ModuleRequiresDirective", "com.github.javaparser.ast.modules", false, false);
     }
 
     public PropertyMetaModel modifiersPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleUsesDirectiveMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleUsesDirectiveMetaModel.java
index e4109f4b16..13d0f0a842 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleUsesDirectiveMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ModuleUsesDirectiveMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.modules.ModuleUsesDirective;
 import java.util.Optional;
+import com.github.javaparser.ast.modules.ModuleUsesDirective;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ModuleUsesDirectiveMetaModel extends ModuleDirectiveMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ModuleUsesDirectiveMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ModuleUsesDirective.class,
-                "ModuleUsesDirective",
-                "com.github.javaparser.ast.modules",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ModuleUsesDirective.class, "ModuleUsesDirective", "com.github.javaparser.ast.modules", false, false);
     }
 
     public PropertyMetaModel namePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameExprMetaModel.java
index 62f3045c53..fe42116ed2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.NameExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.NameExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameMetaModel.java
index fd4ed2eeac..4e92b789de 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NameMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.Name;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.Name;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NodeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NodeMetaModel.java
index 422fcdb855..a46705e49a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NodeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NodeMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.Node;
 import java.util.Optional;
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -42,13 +42,7 @@ public class NodeMetaModel extends BaseNodeMetaModel {
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected NodeMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected NodeMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NonEmptyProperty.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NonEmptyProperty.java
index 6605ea9bcf..476f93d949 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NonEmptyProperty.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NonEmptyProperty.java
@@ -23,7 +23,6 @@
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -33,5 +32,6 @@
  * (Used during generation of the meta model.)
  */
 @Retention(RUNTIME)
-@Target({FIELD, METHOD})
-public @interface NonEmptyProperty {}
+@Target({ FIELD, METHOD })
+public @interface NonEmptyProperty {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NormalAnnotationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NormalAnnotationExprMetaModel.java
index 3e086c7f7d..08bf167713 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NormalAnnotationExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NormalAnnotationExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.NormalAnnotationExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.NormalAnnotationExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class NormalAnnotationExprMetaModel extends AnnotationExprMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     NormalAnnotationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                NormalAnnotationExpr.class,
-                "NormalAnnotationExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, NormalAnnotationExpr.class, "NormalAnnotationExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel pairsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NullLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NullLiteralExprMetaModel.java
index 19a25f8fb7..4d09d757a9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/NullLiteralExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/NullLiteralExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.NullLiteralExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.NullLiteralExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class NullLiteralExprMetaModel extends LiteralExprMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     NullLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                NullLiteralExpr.class,
-                "NullLiteralExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, NullLiteralExpr.class, "NullLiteralExpr", "com.github.javaparser.ast.expr", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ObjectCreationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ObjectCreationExprMetaModel.java
index b7f37471c6..f3124dbe6c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ObjectCreationExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ObjectCreationExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.ObjectCreationExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.ObjectCreationExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ObjectCreationExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ObjectCreationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ObjectCreationExpr.class,
-                "ObjectCreationExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ObjectCreationExpr.class, "ObjectCreationExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel anonymousClassBodyPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/OptionalProperty.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/OptionalProperty.java
index c746f2d3b8..9e814ebe09 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/OptionalProperty.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/OptionalProperty.java
@@ -22,7 +22,6 @@
 
 import static java.lang.annotation.ElementType.FIELD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
@@ -32,4 +31,5 @@
  */
 @Retention(RUNTIME)
 @Target(FIELD)
-public @interface OptionalProperty {}
+public @interface OptionalProperty {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PackageDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PackageDeclarationMetaModel.java
index 010caf483a..7b2dd8b587 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PackageDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PackageDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.PackageDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.PackageDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class PackageDeclarationMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     PackageDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                PackageDeclaration.class,
-                "PackageDeclaration",
-                "com.github.javaparser.ast",
-                false,
-                false);
+        super(superBaseNodeMetaModel, PackageDeclaration.class, "PackageDeclaration", "com.github.javaparser.ast", false, false);
     }
 
     public PropertyMetaModel annotationsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ParameterMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ParameterMetaModel.java
index 059a6cbffb..95bacf596a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ParameterMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ParameterMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.Parameter;
 import java.util.Optional;
+import com.github.javaparser.ast.body.Parameter;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PatternExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PatternExprMetaModel.java
index 4fd907fcb0..eaa8440a5b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PatternExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PatternExprMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.expr.PatternExpr;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.expr.PatternExpr;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -43,13 +43,7 @@ public class PatternExprMetaModel extends ComponentPatternExprMetaModel {
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected PatternExprMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected PatternExprMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PrimitiveTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PrimitiveTypeMetaModel.java
index 103ae7ff61..2ce17a7edc 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PrimitiveTypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PrimitiveTypeMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.type.PrimitiveType;
 import java.util.Optional;
+import com.github.javaparser.ast.type.PrimitiveType;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class PrimitiveTypeMetaModel extends TypeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     PrimitiveTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                PrimitiveType.class,
-                "PrimitiveType",
-                "com.github.javaparser.ast.type",
-                false,
-                false);
+        super(superBaseNodeMetaModel, PrimitiveType.class, "PrimitiveType", "com.github.javaparser.ast.type", false, false);
     }
 
     public PropertyMetaModel typePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PropertyMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PropertyMetaModel.java
index c9839b8d2a..2c2e83aba4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/PropertyMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/PropertyMetaModel.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.CodeGenerationUtils.getterName;
 import static com.github.javaparser.utils.CodeGenerationUtils.setterName;
-
 import com.github.javaparser.ast.Node;
 import java.lang.reflect.Field;
 import java.util.Optional;
@@ -48,15 +47,7 @@ public class PropertyMetaModel {
 
     private final boolean hasWildcard;
 
-    public PropertyMetaModel(
-            BaseNodeMetaModel containingNodeMetaModel,
-            String name,
-            Class<?> type,
-            Optional<BaseNodeMetaModel> nodeReference,
-            boolean isOptional,
-            boolean isNonEmpty,
-            boolean isNodeList,
-            boolean hasWildcard) {
+    public PropertyMetaModel(BaseNodeMetaModel containingNodeMetaModel, String name, Class<?> type, Optional<BaseNodeMetaModel> nodeReference, boolean isOptional, boolean isNonEmpty, boolean isNodeList, boolean hasWildcard) {
         this.containingNodeMetaModel = containingNodeMetaModel;
         this.name = name;
         this.type = type;
@@ -172,11 +163,15 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         PropertyMetaModel that = (PropertyMetaModel) o;
-        if (!name.equals(that.name)) return false;
-        if (!type.equals(that.type)) return false;
+        if (!name.equals(that.name))
+            return false;
+        if (!type.equals(that.type))
+            return false;
         return true;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReceiverParameterMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReceiverParameterMetaModel.java
index 1100399d5c..f1b028fcec 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReceiverParameterMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReceiverParameterMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.ReceiverParameter;
 import java.util.Optional;
+import com.github.javaparser.ast.body.ReceiverParameter;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class ReceiverParameterMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ReceiverParameterMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ReceiverParameter.class,
-                "ReceiverParameter",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, ReceiverParameter.class, "ReceiverParameter", "com.github.javaparser.ast.body", false, false);
     }
 
     public PropertyMetaModel annotationsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordDeclarationMetaModel.java
index 3b49cf27f5..9a2f6d48b1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordDeclarationMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.RecordDeclaration;
 import java.util.Optional;
+import com.github.javaparser.ast.body.RecordDeclaration;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class RecordDeclarationMetaModel extends TypeDeclarationMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     RecordDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                RecordDeclaration.class,
-                "RecordDeclaration",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, RecordDeclaration.class, "RecordDeclaration", "com.github.javaparser.ast.body", false, false);
     }
 
     public PropertyMetaModel implementedTypesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordPatternExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordPatternExprMetaModel.java
index e6c2f0cdf5..d54925ec45 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordPatternExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/RecordPatternExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.RecordPatternExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.RecordPatternExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class RecordPatternExprMetaModel extends PatternExprMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     RecordPatternExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                RecordPatternExpr.class,
-                "RecordPatternExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, RecordPatternExpr.class, "RecordPatternExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel modifiersPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReferenceTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReferenceTypeMetaModel.java
index ef24f2ae06..c02b82854e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReferenceTypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReferenceTypeMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.type.ReferenceType;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.type.ReferenceType;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class ReferenceTypeMetaModel extends TypeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     ReferenceTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                ReferenceType.class,
-                "ReferenceType",
-                "com.github.javaparser.ast.type",
-                true,
-                false);
+        super(superBaseNodeMetaModel, ReferenceType.class, "ReferenceType", "com.github.javaparser.ast.type", true, false);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected ReferenceTypeMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected ReferenceTypeMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReturnStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReturnStmtMetaModel.java
index 6b3be0d880..920e46d07d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReturnStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ReturnStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.ReturnStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.ReturnStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsClauseMetaModel.java
index 9d655e6549..a1da11bd7b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsClauseMetaModel.java
@@ -38,13 +38,7 @@ public class SignalsClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     SignalsClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlSignalsClause.class,
-                "SignalsClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlSignalsClause.class, "SignalsClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel exprPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsMetaModel.java
index a4d563d5af..d33be42012 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsMetaModel.java
@@ -38,12 +38,6 @@ public class SignalsMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     SignalsMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlSignalsClause.class,
-                "Signals",
-                "com.github.javaparser.ast.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlSignalsClause.class, "Signals", "com.github.javaparser.ast.clauses", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyClauseMetaModel.java
index 015c05ca9e..3796ae5fc1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyClauseMetaModel.java
@@ -38,13 +38,7 @@ public class SignalsOnlyClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     SignalsOnlyClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlSignalsOnlyClause.class,
-                "SignalsOnlyClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlSignalsOnlyClause.class, "SignalsOnlyClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 
     public PropertyMetaModel typesPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyMetaModel.java
index d4c4f286e2..14a283ea92 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SignalsOnlyMetaModel.java
@@ -38,12 +38,6 @@ public class SignalsOnlyMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     SignalsOnlyMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlSignalsOnlyClause.class,
-                "SignalsOnly",
-                "com.github.javaparser.ast.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlSignalsOnlyClause.class, "SignalsOnly", "com.github.javaparser.ast.clauses", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SimpleNameMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SimpleNameMetaModel.java
index bbda4650a2..bf0180f933 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SimpleNameMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SimpleNameMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.SimpleName;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.SimpleName;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SingleMemberAnnotationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SingleMemberAnnotationExprMetaModel.java
index 192043bd95..44ab2fbed5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SingleMemberAnnotationExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SingleMemberAnnotationExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class SingleMemberAnnotationExprMetaModel extends AnnotationExprMetaModel
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     SingleMemberAnnotationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                SingleMemberAnnotationExpr.class,
-                "SingleMemberAnnotationExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, SingleMemberAnnotationExpr.class, "SingleMemberAnnotationExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel memberValuePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/StatementMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/StatementMetaModel.java
index 1e330aa076..535bdce0aa 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/StatementMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/StatementMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.stmt.Statement;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.stmt.Statement;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -43,13 +43,7 @@ public class StatementMetaModel extends NodeMetaModel {
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected StatementMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected StatementMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/StringLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/StringLiteralExprMetaModel.java
index 8df965dcd6..729c30f1f1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/StringLiteralExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/StringLiteralExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.StringLiteralExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.StringLiteralExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class StringLiteralExprMetaModel extends LiteralStringValueExprMetaModel
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     StringLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                StringLiteralExpr.class,
-                "StringLiteralExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, StringLiteralExpr.class, "StringLiteralExpr", "com.github.javaparser.ast.expr", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SuperExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SuperExprMetaModel.java
index f35dc7125e..98a043c13f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SuperExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SuperExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.SuperExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.SuperExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryMetaModel.java
index fe91a4d5a8..ef28819c57 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchEntryMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.SwitchEntry;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.SwitchEntry;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchExprMetaModel.java
index 36c583abf2..cdf5031901 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.SwitchExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.SwitchExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchStmtMetaModel.java
index c45c4b9109..52b1292443 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SwitchStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.SwitchStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.SwitchStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SynchronizedStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SynchronizedStmtMetaModel.java
index d401297601..e51d396598 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/SynchronizedStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/SynchronizedStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.SynchronizedStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.SynchronizedStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class SynchronizedStmtMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     SynchronizedStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                SynchronizedStmt.class,
-                "SynchronizedStmt",
-                "com.github.javaparser.ast.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, SynchronizedStmt.class, "SynchronizedStmt", "com.github.javaparser.ast.stmt", false, false);
     }
 
     public PropertyMetaModel bodyPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TextBlockLiteralExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TextBlockLiteralExprMetaModel.java
index c600c8e432..49fb69182d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TextBlockLiteralExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TextBlockLiteralExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.TextBlockLiteralExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.TextBlockLiteralExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class TextBlockLiteralExprMetaModel extends LiteralStringValueExprMetaMod
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     TextBlockLiteralExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                TextBlockLiteralExpr.class,
-                "TextBlockLiteralExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, TextBlockLiteralExpr.class, "TextBlockLiteralExpr", "com.github.javaparser.ast.expr", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThisExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThisExprMetaModel.java
index e40cb8f995..dee10a3a54 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThisExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThisExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.ThisExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.ThisExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThrowStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThrowStmtMetaModel.java
index f5eddc586a..b389b369d4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThrowStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/ThrowStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.ThrowStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.ThrowStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TraditionalJavadocCommentMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TraditionalJavadocCommentMetaModel.java
index 4751f4d1ea..de66acc697 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TraditionalJavadocCommentMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TraditionalJavadocCommentMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.comments.TraditionalJavadocComment;
 import java.util.Optional;
+import com.github.javaparser.ast.comments.TraditionalJavadocComment;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class TraditionalJavadocCommentMetaModel extends JavadocCommentMetaModel
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     TraditionalJavadocCommentMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                TraditionalJavadocComment.class,
-                "TraditionalJavadocComment",
-                "com.github.javaparser.ast.comments",
-                false,
-                false);
+        super(superBaseNodeMetaModel, TraditionalJavadocComment.class, "TraditionalJavadocComment", "com.github.javaparser.ast.comments", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TryStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TryStmtMetaModel.java
index 3bc3e332dd..f8eb254b83 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TryStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TryStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.TryStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.TryStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeDeclarationMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeDeclarationMetaModel.java
index 53e4f7b046..31bac5a264 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeDeclarationMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeDeclarationMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.body.TypeDeclaration;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.body.TypeDeclaration;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -39,23 +39,11 @@ public class TypeDeclarationMetaModel extends BodyDeclarationMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     TypeDeclarationMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                TypeDeclaration.class,
-                "TypeDeclaration",
-                "com.github.javaparser.ast.body",
-                true,
-                true);
+        super(superBaseNodeMetaModel, TypeDeclaration.class, "TypeDeclaration", "com.github.javaparser.ast.body", true, true);
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected TypeDeclarationMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected TypeDeclarationMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeExprMetaModel.java
index b7af87a125..128c27d4e5 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.TypeExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.TypeExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeMetaModel.java
index 377ea66770..c28460f0b6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeMetaModel.java
@@ -20,10 +20,10 @@
  */
 package com.github.javaparser.metamodel;
 
+import java.util.Optional;
+import com.github.javaparser.ast.type.Type;
 import com.github.javaparser.ast.Generated;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.type.Type;
-import java.util.Optional;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -43,13 +43,7 @@ public class TypeMetaModel extends NodeMetaModel {
     }
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
-    protected TypeMetaModel(
-            Optional<BaseNodeMetaModel> superNodeMetaModel,
-            Class<? extends Node> type,
-            String name,
-            String packageName,
-            boolean isAbstract,
-            boolean hasWildcard) {
+    protected TypeMetaModel(Optional<BaseNodeMetaModel> superNodeMetaModel, Class<? extends Node> type, String name, String packageName, boolean isAbstract, boolean hasWildcard) {
         super(superNodeMetaModel, type, name, packageName, isAbstract, hasWildcard);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeParameterMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeParameterMetaModel.java
index 0a815a75fb..4c1a84b231 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeParameterMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypeParameterMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.type.TypeParameter;
 import java.util.Optional;
+import com.github.javaparser.ast.type.TypeParameter;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class TypeParameterMetaModel extends ReferenceTypeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     TypeParameterMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                TypeParameter.class,
-                "TypeParameter",
-                "com.github.javaparser.ast.type",
-                false,
-                false);
+        super(superBaseNodeMetaModel, TypeParameter.class, "TypeParameter", "com.github.javaparser.ast.type", false, false);
     }
 
     public PropertyMetaModel namePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypePatternExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypePatternExprMetaModel.java
index a5a10483dc..8dc1132746 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypePatternExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/TypePatternExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.TypePatternExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.TypePatternExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class TypePatternExprMetaModel extends PatternExprMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     TypePatternExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                TypePatternExpr.class,
-                "TypePatternExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, TypePatternExpr.class, "TypePatternExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel modifiersPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnaryExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnaryExprMetaModel.java
index 4b19ad7e78..1d480caaf0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnaryExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnaryExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.UnaryExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.UnaryExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnionTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnionTypeMetaModel.java
index 03ecee2f5c..ff20d8a2ac 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnionTypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnionTypeMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.type.UnionType;
 import java.util.Optional;
+import com.github.javaparser.ast.type.UnionType;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnknownTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnknownTypeMetaModel.java
index 669b9a673f..aec7103dad 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnknownTypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnknownTypeMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.type.UnknownType;
 import java.util.Optional;
+import com.github.javaparser.ast.type.UnknownType;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnparsableStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnparsableStmtMetaModel.java
index fc724f8af2..5c23415c5a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnparsableStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnparsableStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.UnparsableStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.UnparsableStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,12 +38,6 @@ public class UnparsableStmtMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     UnparsableStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                UnparsableStmt.class,
-                "UnparsableStmt",
-                "com.github.javaparser.ast.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, UnparsableStmt.class, "UnparsableStmt", "com.github.javaparser.ast.stmt", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnreachableStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnreachableStmtMetaModel.java
index 9ea5bc4a00..a7929e118c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnreachableStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/UnreachableStmtMetaModel.java
@@ -38,12 +38,6 @@ public class UnreachableStmtMetaModel extends StatementMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     UnreachableStmtMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlUnreachableStmt.class,
-                "UnreachableStmt",
-                "com.github.javaparser.ast.stmt",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlUnreachableStmt.class, "UnreachableStmt", "com.github.javaparser.ast.stmt", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VarTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VarTypeMetaModel.java
index 7cf0f432f2..bc95153b8b 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VarTypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VarTypeMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.type.VarType;
 import java.util.Optional;
+import com.github.javaparser.ast.type.VarType;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclarationExprMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclarationExprMetaModel.java
index dec1e3170b..c86ab2af7c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclarationExprMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclarationExprMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.expr.VariableDeclarationExpr;
 import java.util.Optional;
+import com.github.javaparser.ast.expr.VariableDeclarationExpr;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class VariableDeclarationExprMetaModel extends ExpressionMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     VariableDeclarationExprMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                VariableDeclarationExpr.class,
-                "VariableDeclarationExpr",
-                "com.github.javaparser.ast.expr",
-                false,
-                false);
+        super(superBaseNodeMetaModel, VariableDeclarationExpr.class, "VariableDeclarationExpr", "com.github.javaparser.ast.expr", false, false);
     }
 
     public PropertyMetaModel annotationsPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclaratorMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclaratorMetaModel.java
index 8a1560efd8..ecd32a17fd 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclaratorMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VariableDeclaratorMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.body.VariableDeclarator;
 import java.util.Optional;
+import com.github.javaparser.ast.body.VariableDeclarator;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class VariableDeclaratorMetaModel extends NodeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     VariableDeclaratorMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                VariableDeclarator.class,
-                "VariableDeclarator",
-                "com.github.javaparser.ast.body",
-                false,
-                false);
+        super(superBaseNodeMetaModel, VariableDeclarator.class, "VariableDeclarator", "com.github.javaparser.ast.body", false, false);
     }
 
     public PropertyMetaModel initializerPropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VoidTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VoidTypeMetaModel.java
index ab2fdc241b..087b4d9e4a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/VoidTypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/VoidTypeMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.type.VoidType;
 import java.util.Optional;
+import com.github.javaparser.ast.type.VoidType;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/WhileStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/WhileStmtMetaModel.java
index ec58c99e88..ed04aef35c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/WhileStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/WhileStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.WhileStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.WhileStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/WildcardTypeMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/WildcardTypeMetaModel.java
index 5c8d845dde..54a2f4a5f7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/WildcardTypeMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/WildcardTypeMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.type.WildcardType;
 import java.util.Optional;
+import com.github.javaparser.ast.type.WildcardType;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
@@ -38,13 +38,7 @@ public class WildcardTypeMetaModel extends TypeMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     WildcardTypeMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                WildcardType.class,
-                "WildcardType",
-                "com.github.javaparser.ast.type",
-                false,
-                false);
+        super(superBaseNodeMetaModel, WildcardType.class, "WildcardType", "com.github.javaparser.ast.type", false, false);
     }
 
     public PropertyMetaModel extendedTypePropertyMetaModel;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/WorkingSpaceClauseMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/WorkingSpaceClauseMetaModel.java
index 86d39e33c7..26908941a7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/WorkingSpaceClauseMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/WorkingSpaceClauseMetaModel.java
@@ -21,7 +21,7 @@
 package com.github.javaparser.metamodel;
 
 import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.jml.clauses.JmlClauseIf;
+import com.github.javaparser.ast.jml.clauses.JmlConditionalClause;
 import java.util.Optional;
 
 /**
@@ -38,12 +38,6 @@ public class WorkingSpaceClauseMetaModel extends JmlClauseMetaModel {
 
     @Generated("com.github.javaparser.generator.metamodel.NodeMetaModelGenerator")
     WorkingSpaceClauseMetaModel(Optional<BaseNodeMetaModel> superBaseNodeMetaModel) {
-        super(
-                superBaseNodeMetaModel,
-                JmlClauseIf.class,
-                "WorkingSpaceClause",
-                "com.github.javaparser.ast.jml.clauses",
-                false,
-                false);
+        super(superBaseNodeMetaModel, JmlConditionalClause.class, "WorkingSpaceClause", "com.github.javaparser.ast.jml.clauses", false, false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/metamodel/YieldStmtMetaModel.java b/javaparser-core/src/main/java/com/github/javaparser/metamodel/YieldStmtMetaModel.java
index eb48e892d9..6634a1c474 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/metamodel/YieldStmtMetaModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/metamodel/YieldStmtMetaModel.java
@@ -20,9 +20,9 @@
  */
 package com.github.javaparser.metamodel;
 
-import com.github.javaparser.ast.Generated;
-import com.github.javaparser.ast.stmt.YieldStmt;
 import java.util.Optional;
+import com.github.javaparser.ast.stmt.YieldStmt;
+import com.github.javaparser.ast.Generated;
 
 /**
  * This file, class, and its contents are completely generated based on:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java b/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java
index c0c050e1f1..0800723e58 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/ConcreteSyntaxModel.java
@@ -26,7 +26,6 @@
 import static com.github.javaparser.ast.observer.ObservableProperty.TYPE;
 import static com.github.javaparser.printer.concretesyntaxmodel.CsmConditional.Condition.*;
 import static com.github.javaparser.printer.concretesyntaxmodel.CsmElement.*;
-
 import com.github.javaparser.GeneratedJavaParserConstants;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
@@ -35,9 +34,10 @@
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
+import com.github.javaparser.ast.jml.doc.JmlDocModifier;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
-import com.github.javaparser.ast.jml.type.*;
 import com.github.javaparser.ast.key.*;
 import com.github.javaparser.ast.key.sv.*;
 import com.github.javaparser.ast.modules.*;
@@ -85,1306 +85,214 @@ private static CsmElement onlineAnnotations() {
     }
 
     private static CsmElement typeParameters() {
-        return list(
-                ObservableProperty.TYPE_PARAMETERS,
-                sequence(comma(), space()),
-                token(GeneratedJavaParserConstants.LT),
-                sequence(token(GeneratedJavaParserConstants.GT), space()));
+        return list(ObservableProperty.TYPE_PARAMETERS, sequence(comma(), space()), token(GeneratedJavaParserConstants.LT), sequence(token(GeneratedJavaParserConstants.GT), space()));
     }
 
     private static CsmElement typeArguments() {
-        return list(
-                ObservableProperty.TYPE_ARGUMENTS,
-                sequence(comma(), space()),
-                token(GeneratedJavaParserConstants.LT),
-                sequence(token(GeneratedJavaParserConstants.GT)));
+        return list(ObservableProperty.TYPE_ARGUMENTS, sequence(comma(), space()), token(GeneratedJavaParserConstants.LT), sequence(token(GeneratedJavaParserConstants.GT)));
     }
 
     static {
         // /
         // / Body
         // /
-        concreteSyntaxModelByClass.put(
-                AnnotationDeclaration.class,
-                sequence(
-                        comment(),
-                        memberAnnotations(),
-                        modifiers(),
-                        token(GeneratedJavaParserConstants.AT),
-                        token(GeneratedJavaParserConstants.INTERFACE),
-                        space(),
-                        child(ObservableProperty.NAME),
-                        space(),
-                        token(LBRACE),
-                        newline(),
-                        indent(),
-                        list(ObservableProperty.MEMBERS, newline(), none(), none(), newline()),
-                        unindent(),
-                        token(RBRACE)));
-        concreteSyntaxModelByClass.put(
-                AnnotationMemberDeclaration.class,
-                sequence(
-                        comment(),
-                        memberAnnotations(),
-                        modifiers(),
-                        child(ObservableProperty.TYPE),
-                        space(),
-                        child(ObservableProperty.NAME),
-                        token(LPAREN),
-                        token(RPAREN),
-                        conditional(
-                                ObservableProperty.DEFAULT_VALUE,
-                                IS_PRESENT,
-                                sequence(
-                                        space(),
-                                        token(GeneratedJavaParserConstants._DEFAULT),
-                                        space(),
-                                        child(DEFAULT_VALUE))),
-                        semicolon()));
-        concreteSyntaxModelByClass.put(
-                ClassOrInterfaceDeclaration.class,
-                sequence(conditional(
-                        ObservableProperty.COMPACT,
-                        FLAG,
-                        list(ObservableProperty.MEMBERS, sequence(newline(), newline()), newline(), none()),
-                        sequence(
-                                comment(),
-                                memberAnnotations(),
-                                modifiers(),
-                                conditional(
-                                        ObservableProperty.INTERFACE,
-                                        FLAG,
-                                        token(GeneratedJavaParserConstants.INTERFACE),
-                                        token(GeneratedJavaParserConstants.CLASS)),
-                                space(),
-                                child(ObservableProperty.NAME),
-                                list(
-                                        TYPE_PARAMETERS,
-                                        sequence(comma(), space()),
-                                        string(GeneratedJavaParserConstants.LT),
-                                        string(GeneratedJavaParserConstants.GT)),
-                                list(
-                                        ObservableProperty.EXTENDED_TYPES,
-                                        sequence(string(GeneratedJavaParserConstants.COMMA), space()),
-                                        sequence(space(), token(GeneratedJavaParserConstants.EXTENDS), space()),
-                                        none()),
-                                list(
-                                        ObservableProperty.IMPLEMENTED_TYPES,
-                                        sequence(string(GeneratedJavaParserConstants.COMMA), space()),
-                                        sequence(space(), token(GeneratedJavaParserConstants.IMPLEMENTS), space()),
-                                        none()),
-                                space(),
-                                list(
-                                        ObservableProperty.PERMITTED_TYPES,
-                                        sequence(string(GeneratedJavaParserConstants.COMMA), space()),
-                                        sequence(space(), token(GeneratedJavaParserConstants.PERMITS), space()),
-                                        none()),
-                                block(sequence(
-                                        newline(),
-                                        list(
-                                                ObservableProperty.MEMBERS,
-                                                sequence(newline(), newline()),
-                                                newline(),
-                                                newline())))))));
-        concreteSyntaxModelByClass.put(
-                ConstructorDeclaration.class,
-                sequence(
-                        comment(),
-                        memberAnnotations(),
-                        modifiers(),
-                        typeParameters(),
-                        child(ObservableProperty.NAME),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        list(ObservableProperty.PARAMETERS, sequence(comma(), space()), none(), none()),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        list(
-                                ObservableProperty.THROWN_EXCEPTIONS,
-                                sequence(comma(), space()),
-                                sequence(space(), token(GeneratedJavaParserConstants.THROWS), space()),
-                                none()),
-                        space(),
-                        child(ObservableProperty.BODY)));
-        concreteSyntaxModelByClass.put(
-                RecordDeclaration.class,
-                sequence(
-                        comment(),
-                        memberAnnotations(),
-                        modifiers(),
-                        token(GeneratedJavaParserConstants.RECORD),
-                        space(),
-                        child(ObservableProperty.NAME),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        list(ObservableProperty.PARAMETERS, sequence(comma(), space()), none(), none()),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        list(
-                                TYPE_PARAMETERS,
-                                sequence(comma(), space()),
-                                string(GeneratedJavaParserConstants.LT),
-                                string(GeneratedJavaParserConstants.GT)),
-                        list(
-                                ObservableProperty.IMPLEMENTED_TYPES,
-                                sequence(string(GeneratedJavaParserConstants.COMMA), space()),
-                                sequence(space(), token(GeneratedJavaParserConstants.IMPLEMENTS), space()),
-                                none()),
-                        space(),
-                        block(sequence(
-                                newline(),
-                                list(
-                                        ObservableProperty.MEMBERS,
-                                        sequence(newline(), newline()),
-                                        newline(),
-                                        newline())))));
-        concreteSyntaxModelByClass.put(
-                CompactConstructorDeclaration.class,
-                sequence(
-                        comment(),
-                        memberAnnotations(),
-                        modifiers(),
-                        typeParameters(),
-                        child(ObservableProperty.NAME),
-                        list(
-                                ObservableProperty.THROWN_EXCEPTIONS,
-                                sequence(comma(), space()),
-                                sequence(space(), token(GeneratedJavaParserConstants.THROWS), space()),
-                                none()),
-                        space(),
-                        child(ObservableProperty.BODY)));
-        concreteSyntaxModelByClass.put(
-                EnumConstantDeclaration.class,
-                sequence(
-                        comment(),
-                        memberAnnotations(),
-                        child(ObservableProperty.NAME),
-                        list(
-                                ObservableProperty.ARGUMENTS,
-                                sequence(comma(), space()),
-                                token(GeneratedJavaParserConstants.LPAREN),
-                                token(GeneratedJavaParserConstants.RPAREN)),
-                        conditional(
-                                CLASS_BODY,
-                                IS_NOT_EMPTY,
-                                sequence(
-                                        space(),
-                                        token(GeneratedJavaParserConstants.LBRACE),
-                                        newline(),
-                                        indent(),
-                                        newline(),
-                                        list(ObservableProperty.CLASS_BODY, newline(), newline(), none(), newline()),
-                                        unindent(),
-                                        token(RBRACE),
-                                        newline()))));
-        concreteSyntaxModelByClass.put(
-                EnumDeclaration.class,
-                sequence(
-                        comment(),
-                        annotations(),
-                        modifiers(),
-                        token(GeneratedJavaParserConstants.ENUM),
-                        space(),
-                        child(ObservableProperty.NAME),
-                        list(
-                                ObservableProperty.IMPLEMENTED_TYPES,
-                                sequence(comma(), space()),
-                                sequence(space(), token(GeneratedJavaParserConstants.IMPLEMENTS), space()),
-                                none()),
-                        space(),
-                        token(GeneratedJavaParserConstants.LBRACE),
-                        newline(),
-                        indent(),
-                        newline(),
-                        list(ObservableProperty.ENTRIES, sequence(comma(), newline()), none(), none()),
-                        conditional(
-                                ObservableProperty.MEMBERS,
-                                IS_EMPTY,
-                                conditional(ObservableProperty.ENTRIES, IS_NOT_EMPTY, newline()),
-                                sequence(
-                                        semicolon(),
-                                        newline(),
-                                        newline(),
-                                        list(ObservableProperty.MEMBERS, newline(), newline(), none(), newline()))),
-                        unindent(),
-                        token(RBRACE)));
-        concreteSyntaxModelByClass.put(
-                FieldDeclaration.class,
-                sequence(
-                        orphanCommentsBeforeThis(),
-                        comment(),
-                        mix(annotations(), modifiers()),
-                        conditional(
-                                ObservableProperty.VARIABLES,
-                                IS_NOT_EMPTY,
-                                child(ObservableProperty.MAXIMUM_COMMON_TYPE)),
-                        space(),
-                        list(ObservableProperty.VARIABLES, sequence(comma(), space())),
-                        semicolon()));
-        concreteSyntaxModelByClass.put(
-                InitializerDeclaration.class,
-                sequence(
-                        comment(),
-                        conditional(
-                                ObservableProperty.STATIC,
-                                FLAG,
-                                sequence(token(GeneratedJavaParserConstants.STATIC), space())),
-                        child(ObservableProperty.BODY)));
-        concreteSyntaxModelByClass.put(
-                MethodDeclaration.class,
-                sequence(
-                        orphanCommentsBeforeThis(),
-                        comment(),
-                        mix(memberAnnotations(), modifiers()),
-                        typeParameters(),
-                        child(ObservableProperty.TYPE),
-                        space(),
-                        child(ObservableProperty.NAME),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        conditional(
-                                ObservableProperty.RECEIVER_PARAMETER,
-                                IS_PRESENT,
-                                sequence(child(ObservableProperty.RECEIVER_PARAMETER), comma(), space())),
-                        list(ObservableProperty.PARAMETERS, sequence(comma(), space()), none(), none()),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        list(
-                                ObservableProperty.THROWN_EXCEPTIONS,
-                                sequence(comma(), space()),
-                                sequence(space(), token(GeneratedJavaParserConstants.THROWS), space()),
-                                none()),
-                        conditional(
-                                ObservableProperty.BODY,
-                                IS_PRESENT,
-                                sequence(space(), child(ObservableProperty.BODY)),
-                                semicolon())));
-        concreteSyntaxModelByClass.put(
-                Parameter.class,
-                sequence(
-                        comment(),
-                        mix(onlineAnnotations(), modifiers()),
-                        child(ObservableProperty.TYPE),
-                        conditional(
-                                ObservableProperty.VAR_ARGS,
-                                FLAG,
-                                sequence(
-                                        list(ObservableProperty.VAR_ARGS_ANNOTATIONS, space(), none(), none()),
-                                        token(GeneratedJavaParserConstants.ELLIPSIS))),
-                        space(),
-                        child(ObservableProperty.NAME)));
-        concreteSyntaxModelByClass.put(
-                ReceiverParameter.class,
-                sequence(
-                        comment(),
-                        onlineAnnotations(),
-                        child(ObservableProperty.TYPE),
-                        space(),
-                        child(ObservableProperty.NAME)));
-        concreteSyntaxModelByClass.put(
-                VariableDeclarator.class,
-                sequence(
-                        /* FIXME: we should introduce a derived property */
-                        comment(), /* list(ObservableProperty.EXTRA_ARRAY_LEVELS), */
-                        child(ObservableProperty.NAME),
-                        conditional(
-                                ObservableProperty.INITIALIZER,
-                                IS_PRESENT,
-                                sequence(
-                                        space(),
-                                        token(GeneratedJavaParserConstants.ASSIGN),
-                                        space(),
-                                        child(ObservableProperty.INITIALIZER)))));
+        concreteSyntaxModelByClass.put(AnnotationDeclaration.class, sequence(comment(), memberAnnotations(), modifiers(), token(GeneratedJavaParserConstants.AT), token(GeneratedJavaParserConstants.INTERFACE), space(), child(ObservableProperty.NAME), space(), token(LBRACE), newline(), indent(), list(ObservableProperty.MEMBERS, newline(), none(), none(), newline()), unindent(), token(RBRACE)));
+        concreteSyntaxModelByClass.put(AnnotationMemberDeclaration.class, sequence(comment(), memberAnnotations(), modifiers(), child(ObservableProperty.TYPE), space(), child(ObservableProperty.NAME), token(LPAREN), token(RPAREN), conditional(ObservableProperty.DEFAULT_VALUE, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants._DEFAULT), space(), child(DEFAULT_VALUE))), semicolon()));
+        concreteSyntaxModelByClass.put(ClassOrInterfaceDeclaration.class, sequence(conditional(ObservableProperty.COMPACT, FLAG, list(ObservableProperty.MEMBERS, sequence(newline(), newline()), newline(), none()), sequence(comment(), memberAnnotations(), modifiers(), conditional(ObservableProperty.INTERFACE, FLAG, token(GeneratedJavaParserConstants.INTERFACE), token(GeneratedJavaParserConstants.CLASS)), space(), child(ObservableProperty.NAME), list(TYPE_PARAMETERS, sequence(comma(), space()), string(GeneratedJavaParserConstants.LT), string(GeneratedJavaParserConstants.GT)), list(ObservableProperty.EXTENDED_TYPES, sequence(string(GeneratedJavaParserConstants.COMMA), space()), sequence(space(), token(GeneratedJavaParserConstants.EXTENDS), space()), none()), list(ObservableProperty.IMPLEMENTED_TYPES, sequence(string(GeneratedJavaParserConstants.COMMA), space()), sequence(space(), token(GeneratedJavaParserConstants.IMPLEMENTS), space()), none()), space(), list(ObservableProperty.PERMITTED_TYPES, sequence(string(GeneratedJavaParserConstants.COMMA), space()), sequence(space(), token(GeneratedJavaParserConstants.PERMITS), space()), none()), block(sequence(newline(), list(ObservableProperty.MEMBERS, sequence(newline(), newline()), newline(), newline())))))));
+        concreteSyntaxModelByClass.put(ConstructorDeclaration.class, sequence(comment(), memberAnnotations(), modifiers(), typeParameters(), child(ObservableProperty.NAME), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.PARAMETERS, sequence(comma(), space()), none(), none()), token(GeneratedJavaParserConstants.RPAREN), list(ObservableProperty.THROWN_EXCEPTIONS, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.THROWS), space()), none()), space(), child(ObservableProperty.BODY)));
+        concreteSyntaxModelByClass.put(RecordDeclaration.class, sequence(comment(), memberAnnotations(), modifiers(), token(GeneratedJavaParserConstants.RECORD), space(), child(ObservableProperty.NAME), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.PARAMETERS, sequence(comma(), space()), none(), none()), token(GeneratedJavaParserConstants.RPAREN), list(TYPE_PARAMETERS, sequence(comma(), space()), string(GeneratedJavaParserConstants.LT), string(GeneratedJavaParserConstants.GT)), list(ObservableProperty.IMPLEMENTED_TYPES, sequence(string(GeneratedJavaParserConstants.COMMA), space()), sequence(space(), token(GeneratedJavaParserConstants.IMPLEMENTS), space()), none()), space(), block(sequence(newline(), list(ObservableProperty.MEMBERS, sequence(newline(), newline()), newline(), newline())))));
+        concreteSyntaxModelByClass.put(CompactConstructorDeclaration.class, sequence(comment(), memberAnnotations(), modifiers(), typeParameters(), child(ObservableProperty.NAME), list(ObservableProperty.THROWN_EXCEPTIONS, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.THROWS), space()), none()), space(), child(ObservableProperty.BODY)));
+        concreteSyntaxModelByClass.put(EnumConstantDeclaration.class, sequence(comment(), memberAnnotations(), child(ObservableProperty.NAME), list(ObservableProperty.ARGUMENTS, sequence(comma(), space()), token(GeneratedJavaParserConstants.LPAREN), token(GeneratedJavaParserConstants.RPAREN)), conditional(CLASS_BODY, IS_NOT_EMPTY, sequence(space(), token(GeneratedJavaParserConstants.LBRACE), newline(), indent(), newline(), list(ObservableProperty.CLASS_BODY, newline(), newline(), none(), newline()), unindent(), token(RBRACE), newline()))));
+        concreteSyntaxModelByClass.put(EnumDeclaration.class, sequence(comment(), annotations(), modifiers(), token(GeneratedJavaParserConstants.ENUM), space(), child(ObservableProperty.NAME), list(ObservableProperty.IMPLEMENTED_TYPES, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.IMPLEMENTS), space()), none()), space(), token(GeneratedJavaParserConstants.LBRACE), newline(), indent(), newline(), list(ObservableProperty.ENTRIES, sequence(comma(), newline()), none(), none()), conditional(ObservableProperty.MEMBERS, IS_EMPTY, conditional(ObservableProperty.ENTRIES, IS_NOT_EMPTY, newline()), sequence(semicolon(), newline(), newline(), list(ObservableProperty.MEMBERS, newline(), newline(), none(), newline()))), unindent(), token(RBRACE)));
+        concreteSyntaxModelByClass.put(FieldDeclaration.class, sequence(orphanCommentsBeforeThis(), comment(), mix(annotations(), modifiers()), conditional(ObservableProperty.VARIABLES, IS_NOT_EMPTY, child(ObservableProperty.MAXIMUM_COMMON_TYPE)), space(), list(ObservableProperty.VARIABLES, sequence(comma(), space())), semicolon()));
+        concreteSyntaxModelByClass.put(InitializerDeclaration.class, sequence(comment(), conditional(ObservableProperty.STATIC, FLAG, sequence(token(GeneratedJavaParserConstants.STATIC), space())), child(ObservableProperty.BODY)));
+        concreteSyntaxModelByClass.put(MethodDeclaration.class, sequence(orphanCommentsBeforeThis(), comment(), mix(memberAnnotations(), modifiers()), typeParameters(), child(ObservableProperty.TYPE), space(), child(ObservableProperty.NAME), token(GeneratedJavaParserConstants.LPAREN), conditional(ObservableProperty.RECEIVER_PARAMETER, IS_PRESENT, sequence(child(ObservableProperty.RECEIVER_PARAMETER), comma(), space())), list(ObservableProperty.PARAMETERS, sequence(comma(), space()), none(), none()), token(GeneratedJavaParserConstants.RPAREN), list(ObservableProperty.THROWN_EXCEPTIONS, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.THROWS), space()), none()), conditional(ObservableProperty.BODY, IS_PRESENT, sequence(space(), child(ObservableProperty.BODY)), semicolon())));
+        concreteSyntaxModelByClass.put(Parameter.class, sequence(comment(), mix(onlineAnnotations(), modifiers()), child(ObservableProperty.TYPE), conditional(ObservableProperty.VAR_ARGS, FLAG, sequence(list(ObservableProperty.VAR_ARGS_ANNOTATIONS, space(), none(), none()), token(GeneratedJavaParserConstants.ELLIPSIS))), space(), child(ObservableProperty.NAME)));
+        concreteSyntaxModelByClass.put(ReceiverParameter.class, sequence(comment(), onlineAnnotations(), child(ObservableProperty.TYPE), space(), child(ObservableProperty.NAME)));
+        concreteSyntaxModelByClass.put(VariableDeclarator.class, sequence(/* FIXME: we should introduce a derived property */
+        comment(), /* list(ObservableProperty.EXTRA_ARRAY_LEVELS), */
+        child(ObservableProperty.NAME), conditional(ObservableProperty.INITIALIZER, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants.ASSIGN), space(), child(ObservableProperty.INITIALIZER)))));
         // /
         // / Expressions
         // /
-        concreteSyntaxModelByClass.put(
-                ArrayAccessExpr.class,
-                sequence(
-                        comment(),
-                        child(ObservableProperty.NAME),
-                        token(GeneratedJavaParserConstants.LBRACKET),
-                        child(ObservableProperty.INDEX),
-                        token(GeneratedJavaParserConstants.RBRACKET)));
-        concreteSyntaxModelByClass.put(
-                ArrayCreationExpr.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.NEW),
-                        space(),
-                        child(ObservableProperty.ELEMENT_TYPE),
-                        list(ObservableProperty.LEVELS),
-                        conditional(
-                                ObservableProperty.INITIALIZER,
-                                IS_PRESENT,
-                                sequence(space(), child(ObservableProperty.INITIALIZER)))));
-        concreteSyntaxModelByClass.put(
-                ArrayInitializerExpr.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.LBRACE),
-                        list(ObservableProperty.VALUES, sequence(comma(), space()), space(), space()),
-                        orphanCommentsEnding(),
-                        token(RBRACE)));
-        concreteSyntaxModelByClass.put(
-                AssignExpr.class,
-                sequence(
-                        comment(),
-                        child(ObservableProperty.TARGET),
-                        space(),
-                        attribute(ObservableProperty.OPERATOR),
-                        space(),
-                        child(ObservableProperty.VALUE)));
-        concreteSyntaxModelByClass.put(
-                BinaryExpr.class,
-                sequence(
-                        comment(),
-                        child(ObservableProperty.LEFT),
-                        space(),
-                        attribute(ObservableProperty.OPERATOR),
-                        space(),
-                        child(ObservableProperty.RIGHT)));
+        concreteSyntaxModelByClass.put(ArrayAccessExpr.class, sequence(comment(), child(ObservableProperty.NAME), token(GeneratedJavaParserConstants.LBRACKET), child(ObservableProperty.INDEX), token(GeneratedJavaParserConstants.RBRACKET)));
+        concreteSyntaxModelByClass.put(ArrayCreationExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.NEW), space(), child(ObservableProperty.ELEMENT_TYPE), list(ObservableProperty.LEVELS), conditional(ObservableProperty.INITIALIZER, IS_PRESENT, sequence(space(), child(ObservableProperty.INITIALIZER)))));
+        concreteSyntaxModelByClass.put(ArrayInitializerExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.LBRACE), list(ObservableProperty.VALUES, sequence(comma(), space()), space(), space()), orphanCommentsEnding(), token(RBRACE)));
+        concreteSyntaxModelByClass.put(AssignExpr.class, sequence(comment(), child(ObservableProperty.TARGET), space(), attribute(ObservableProperty.OPERATOR), space(), child(ObservableProperty.VALUE)));
+        concreteSyntaxModelByClass.put(BinaryExpr.class, sequence(comment(), child(ObservableProperty.LEFT), space(), attribute(ObservableProperty.OPERATOR), space(), child(ObservableProperty.RIGHT)));
         concreteSyntaxModelByClass.put(BooleanLiteralExpr.class, sequence(comment(), attribute(VALUE)));
-        concreteSyntaxModelByClass.put(
-                CastExpr.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        child(ObservableProperty.TYPE),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        space(),
-                        child(ObservableProperty.EXPRESSION)));
+        concreteSyntaxModelByClass.put(CastExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.TYPE), token(GeneratedJavaParserConstants.RPAREN), space(), child(ObservableProperty.EXPRESSION)));
         concreteSyntaxModelByClass.put(CharLiteralExpr.class, sequence(comment(), charToken(ObservableProperty.VALUE)));
-        concreteSyntaxModelByClass.put(
-                ClassExpr.class,
-                sequence(
-                        comment(),
-                        child(ObservableProperty.TYPE),
-                        token(GeneratedJavaParserConstants.DOT),
-                        token(GeneratedJavaParserConstants.CLASS)));
-        concreteSyntaxModelByClass.put(
-                ConditionalExpr.class,
-                sequence(
-                        comment(),
-                        child(ObservableProperty.CONDITION),
-                        space(),
-                        token(GeneratedJavaParserConstants.HOOK),
-                        space(),
-                        child(ObservableProperty.THEN_EXPR),
-                        space(),
-                        token(GeneratedJavaParserConstants.COLON),
-                        space(),
-                        child(ObservableProperty.ELSE_EXPR)));
-        concreteSyntaxModelByClass.put(
-                DoubleLiteralExpr.class, sequence(comment(), attribute(ObservableProperty.VALUE)));
-        concreteSyntaxModelByClass.put(
-                EnclosedExpr.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        child(ObservableProperty.INNER),
-                        token(GeneratedJavaParserConstants.RPAREN)));
-        concreteSyntaxModelByClass.put(
-                FieldAccessExpr.class,
-                sequence(
-                        comment(),
-                        child(SCOPE),
-                        token(GeneratedJavaParserConstants.DOT),
-                        child(ObservableProperty.NAME)));
-        concreteSyntaxModelByClass.put(
-                InstanceOfExpr.class,
-                sequence(
-                        comment(),
-                        child(ObservableProperty.EXPRESSION),
-                        space(),
-                        token(GeneratedJavaParserConstants.INSTANCEOF),
-                        space(),
-                        child(ObservableProperty.TYPE)));
-        concreteSyntaxModelByClass.put(
-                IntegerLiteralExpr.class, sequence(comment(), attribute(ObservableProperty.VALUE)));
-        concreteSyntaxModelByClass.put(
-                LambdaExpr.class,
-                sequence(
-                        comment(),
-                        conditional(
-                                ObservableProperty.ENCLOSING_PARAMETERS,
-                                FLAG,
-                                token(GeneratedJavaParserConstants.LPAREN)),
-                        list(ObservableProperty.PARAMETERS, sequence(comma(), space())),
-                        conditional(
-                                ObservableProperty.ENCLOSING_PARAMETERS,
-                                FLAG,
-                                token(GeneratedJavaParserConstants.RPAREN)),
-                        space(),
-                        token(GeneratedJavaParserConstants.ARROW),
-                        space(),
-                        conditional(
-                                ObservableProperty.EXPRESSION_BODY,
-                                IS_PRESENT,
-                                child(ObservableProperty.EXPRESSION_BODY),
-                                child(ObservableProperty.BODY))));
+        concreteSyntaxModelByClass.put(ClassExpr.class, sequence(comment(), child(ObservableProperty.TYPE), token(GeneratedJavaParserConstants.DOT), token(GeneratedJavaParserConstants.CLASS)));
+        concreteSyntaxModelByClass.put(ConditionalExpr.class, sequence(comment(), child(ObservableProperty.CONDITION), space(), token(GeneratedJavaParserConstants.HOOK), space(), child(ObservableProperty.THEN_EXPR), space(), token(GeneratedJavaParserConstants.COLON), space(), child(ObservableProperty.ELSE_EXPR)));
+        concreteSyntaxModelByClass.put(DoubleLiteralExpr.class, sequence(comment(), attribute(ObservableProperty.VALUE)));
+        concreteSyntaxModelByClass.put(EnclosedExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.INNER), token(GeneratedJavaParserConstants.RPAREN)));
+        concreteSyntaxModelByClass.put(FieldAccessExpr.class, sequence(comment(), child(SCOPE), token(GeneratedJavaParserConstants.DOT), child(ObservableProperty.NAME)));
+        concreteSyntaxModelByClass.put(InstanceOfExpr.class, sequence(comment(), child(ObservableProperty.EXPRESSION), space(), token(GeneratedJavaParserConstants.INSTANCEOF), space(), child(ObservableProperty.TYPE)));
+        concreteSyntaxModelByClass.put(IntegerLiteralExpr.class, sequence(comment(), attribute(ObservableProperty.VALUE)));
+        concreteSyntaxModelByClass.put(LambdaExpr.class, sequence(comment(), conditional(ObservableProperty.ENCLOSING_PARAMETERS, FLAG, token(GeneratedJavaParserConstants.LPAREN)), list(ObservableProperty.PARAMETERS, sequence(comma(), space())), conditional(ObservableProperty.ENCLOSING_PARAMETERS, FLAG, token(GeneratedJavaParserConstants.RPAREN)), space(), token(GeneratedJavaParserConstants.ARROW), space(), conditional(ObservableProperty.EXPRESSION_BODY, IS_PRESENT, child(ObservableProperty.EXPRESSION_BODY), child(ObservableProperty.BODY))));
         concreteSyntaxModelByClass.put(LongLiteralExpr.class, sequence(comment(), attribute(ObservableProperty.VALUE)));
-        concreteSyntaxModelByClass.put(
-                MarkerAnnotationExpr.class,
-                sequence(comment(), token(GeneratedJavaParserConstants.AT), attribute(ObservableProperty.NAME)));
-        concreteSyntaxModelByClass.put(
-                MatchAllPatternExpr.class,
-                sequence(comment(), token(GeneratedJavaParserConstants.UNNAMED_PLACEHOLDER)));
-        concreteSyntaxModelByClass.put(
-                MemberValuePair.class,
-                sequence(
-                        comment(),
-                        child(ObservableProperty.NAME),
-                        space(),
-                        token(GeneratedJavaParserConstants.ASSIGN),
-                        space(),
-                        child(ObservableProperty.VALUE)));
-        concreteSyntaxModelByClass.put(
-                MethodCallExpr.class,
-                sequence(
-                        comment(),
-                        conditional(
-                                ObservableProperty.SCOPE,
-                                IS_PRESENT,
-                                sequence(child(ObservableProperty.SCOPE), token(GeneratedJavaParserConstants.DOT))),
-                        typeArguments(),
-                        child(ObservableProperty.NAME),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        list(ObservableProperty.ARGUMENTS, sequence(comma(), space()), none(), none()),
-                        token(GeneratedJavaParserConstants.RPAREN)));
-        concreteSyntaxModelByClass.put(
-                MethodReferenceExpr.class,
-                sequence(
-                        comment(),
-                        child(ObservableProperty.SCOPE),
-                        token(GeneratedJavaParserConstants.DOUBLECOLON),
-                        typeArguments(),
-                        attribute(ObservableProperty.IDENTIFIER)));
+        concreteSyntaxModelByClass.put(MarkerAnnotationExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.AT), attribute(ObservableProperty.NAME)));
+        concreteSyntaxModelByClass.put(MatchAllPatternExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.UNNAMED_PLACEHOLDER)));
+        concreteSyntaxModelByClass.put(MemberValuePair.class, sequence(comment(), child(ObservableProperty.NAME), space(), token(GeneratedJavaParserConstants.ASSIGN), space(), child(ObservableProperty.VALUE)));
+        concreteSyntaxModelByClass.put(MethodCallExpr.class, sequence(comment(), conditional(ObservableProperty.SCOPE, IS_PRESENT, sequence(child(ObservableProperty.SCOPE), token(GeneratedJavaParserConstants.DOT))), typeArguments(), child(ObservableProperty.NAME), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.ARGUMENTS, sequence(comma(), space()), none(), none()), token(GeneratedJavaParserConstants.RPAREN)));
+        concreteSyntaxModelByClass.put(MethodReferenceExpr.class, sequence(comment(), child(ObservableProperty.SCOPE), token(GeneratedJavaParserConstants.DOUBLECOLON), typeArguments(), attribute(ObservableProperty.IDENTIFIER)));
         concreteSyntaxModelByClass.put(Modifier.class, attribute(ObservableProperty.KEYWORD));
-        concreteSyntaxModelByClass.put(
-                Name.class,
-                sequence(
-                        comment(),
-                        conditional(
-                                ObservableProperty.QUALIFIER,
-                                IS_PRESENT,
-                                sequence(child(ObservableProperty.QUALIFIER), token(GeneratedJavaParserConstants.DOT))),
-                        attribute(ObservableProperty.IDENTIFIER),
-                        orphanCommentsEnding()));
-        concreteSyntaxModelByClass.put(
-                NameExpr.class, sequence(comment(), child(ObservableProperty.NAME), orphanCommentsEnding()));
-        concreteSyntaxModelByClass.put(
-                NormalAnnotationExpr.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.AT),
-                        child(ObservableProperty.NAME),
-                        conditional(ObservableProperty.PAIRS, IS_NOT_EMPTY, token(GeneratedJavaParserConstants.LPAREN)),
-                        list(ObservableProperty.PAIRS, sequence(comma(), space())),
-                        conditional(
-                                ObservableProperty.PAIRS, IS_NOT_EMPTY, token(GeneratedJavaParserConstants.RPAREN))));
-        concreteSyntaxModelByClass.put(
-                NullLiteralExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.NULL)));
-        concreteSyntaxModelByClass.put(
-                ObjectCreationExpr.class,
-                sequence(
-                        comment(),
-                        conditional(
-                                ObservableProperty.SCOPE,
-                                IS_PRESENT,
-                                sequence(child(ObservableProperty.SCOPE), token(GeneratedJavaParserConstants.DOT))),
-                        token(GeneratedJavaParserConstants.NEW),
-                        space(),
-                        list(ObservableProperty.TYPE_ARGUMENTS, sequence(comma(), space()), token(LT), token(GT)),
-                        conditional(ObservableProperty.TYPE_ARGUMENTS, IS_NOT_EMPTY, space()),
-                        child(ObservableProperty.TYPE),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        list(ObservableProperty.ARGUMENTS, sequence(comma(), space()), none(), none()),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        conditional(
-                                ObservableProperty.ANONYMOUS_CLASS_BODY,
-                                IS_PRESENT,
-                                sequence(
-                                        space(),
-                                        token(LBRACE),
-                                        newline(),
-                                        indent(),
-                                        list(
-                                                ObservableProperty.ANONYMOUS_CLASS_BODY,
-                                                newline(),
-                                                newline(),
-                                                newline(),
-                                                newline()),
-                                        unindent(),
-                                        token(RBRACE)))));
-        concreteSyntaxModelByClass.put(
-                RecordPatternExpr.class,
-                sequence(
-                        comment(),
-                        child(ObservableProperty.TYPE),
-                        space(),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        list(ObservableProperty.PATTERN_LIST, sequence(comma(), space()), none(), none()),
-                        token(GeneratedJavaParserConstants.RPAREN)));
+        concreteSyntaxModelByClass.put(Name.class, sequence(comment(), conditional(ObservableProperty.QUALIFIER, IS_PRESENT, sequence(child(ObservableProperty.QUALIFIER), token(GeneratedJavaParserConstants.DOT))), attribute(ObservableProperty.IDENTIFIER), orphanCommentsEnding()));
+        concreteSyntaxModelByClass.put(NameExpr.class, sequence(comment(), child(ObservableProperty.NAME), orphanCommentsEnding()));
+        concreteSyntaxModelByClass.put(NormalAnnotationExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.AT), child(ObservableProperty.NAME), conditional(ObservableProperty.PAIRS, IS_NOT_EMPTY, token(GeneratedJavaParserConstants.LPAREN)), list(ObservableProperty.PAIRS, sequence(comma(), space())), conditional(ObservableProperty.PAIRS, IS_NOT_EMPTY, token(GeneratedJavaParserConstants.RPAREN))));
+        concreteSyntaxModelByClass.put(NullLiteralExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.NULL)));
+        concreteSyntaxModelByClass.put(ObjectCreationExpr.class, sequence(comment(), conditional(ObservableProperty.SCOPE, IS_PRESENT, sequence(child(ObservableProperty.SCOPE), token(GeneratedJavaParserConstants.DOT))), token(GeneratedJavaParserConstants.NEW), space(), list(ObservableProperty.TYPE_ARGUMENTS, sequence(comma(), space()), token(LT), token(GT)), conditional(ObservableProperty.TYPE_ARGUMENTS, IS_NOT_EMPTY, space()), child(ObservableProperty.TYPE), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.ARGUMENTS, sequence(comma(), space()), none(), none()), token(GeneratedJavaParserConstants.RPAREN), conditional(ObservableProperty.ANONYMOUS_CLASS_BODY, IS_PRESENT, sequence(space(), token(LBRACE), newline(), indent(), list(ObservableProperty.ANONYMOUS_CLASS_BODY, newline(), newline(), newline(), newline()), unindent(), token(RBRACE)))));
+        concreteSyntaxModelByClass.put(RecordPatternExpr.class, sequence(comment(), child(ObservableProperty.TYPE), space(), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.PATTERN_LIST, sequence(comma(), space()), none(), none()), token(GeneratedJavaParserConstants.RPAREN)));
         concreteSyntaxModelByClass.put(SimpleName.class, attribute(ObservableProperty.IDENTIFIER));
-        concreteSyntaxModelByClass.put(
-                SingleMemberAnnotationExpr.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.AT),
-                        child(ObservableProperty.NAME),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        child(ObservableProperty.MEMBER_VALUE),
-                        token(GeneratedJavaParserConstants.RPAREN)));
-        concreteSyntaxModelByClass.put(
-                StringLiteralExpr.class, sequence(comment(), stringToken(ObservableProperty.VALUE)));
-        concreteSyntaxModelByClass.put(
-                SuperExpr.class,
-                sequence(
-                        comment(),
-                        conditional(
-                                TYPE_NAME,
-                                IS_PRESENT,
-                                sequence(child(TYPE_NAME), token(GeneratedJavaParserConstants.DOT))),
-                        token(GeneratedJavaParserConstants.SUPER)));
-        concreteSyntaxModelByClass.put(
-                TextBlockLiteralExpr.class, sequence(comment(), textBlockToken(ObservableProperty.VALUE)));
-        concreteSyntaxModelByClass.put(
-                TypePatternExpr.class,
-                sequence(child(ObservableProperty.TYPE), space(), child(ObservableProperty.NAME)));
-        concreteSyntaxModelByClass.put(
-                ThisExpr.class,
-                sequence(
-                        comment(),
-                        conditional(
-                                TYPE_NAME,
-                                IS_PRESENT,
-                                sequence(child(TYPE_NAME), token(GeneratedJavaParserConstants.DOT))),
-                        token(GeneratedJavaParserConstants.THIS)));
+        concreteSyntaxModelByClass.put(SingleMemberAnnotationExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.AT), child(ObservableProperty.NAME), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.MEMBER_VALUE), token(GeneratedJavaParserConstants.RPAREN)));
+        concreteSyntaxModelByClass.put(StringLiteralExpr.class, sequence(comment(), stringToken(ObservableProperty.VALUE)));
+        concreteSyntaxModelByClass.put(SuperExpr.class, sequence(comment(), conditional(TYPE_NAME, IS_PRESENT, sequence(child(TYPE_NAME), token(GeneratedJavaParserConstants.DOT))), token(GeneratedJavaParserConstants.SUPER)));
+        concreteSyntaxModelByClass.put(TextBlockLiteralExpr.class, sequence(comment(), textBlockToken(ObservableProperty.VALUE)));
+        concreteSyntaxModelByClass.put(TypePatternExpr.class, sequence(child(ObservableProperty.TYPE), space(), child(ObservableProperty.NAME)));
+        concreteSyntaxModelByClass.put(ThisExpr.class, sequence(comment(), conditional(TYPE_NAME, IS_PRESENT, sequence(child(TYPE_NAME), token(GeneratedJavaParserConstants.DOT))), token(GeneratedJavaParserConstants.THIS)));
         concreteSyntaxModelByClass.put(TypeExpr.class, sequence(comment(), child(ObservableProperty.TYPE)));
-        concreteSyntaxModelByClass.put(
-                UnaryExpr.class,
-                sequence(
-                        conditional(ObservableProperty.PREFIX, FLAG, attribute(ObservableProperty.OPERATOR)),
-                        child(ObservableProperty.EXPRESSION),
-                        conditional(ObservableProperty.POSTFIX, FLAG, attribute(ObservableProperty.OPERATOR))));
-        concreteSyntaxModelByClass.put(
-                VariableDeclarationExpr.class,
-                sequence(
-                        comment(),
-                        onlineAnnotations(),
-                        modifiers(),
-                        child(ObservableProperty.MAXIMUM_COMMON_TYPE),
-                        space(),
-                        list(ObservableProperty.VARIABLES, sequence(comma(), space()))));
+        concreteSyntaxModelByClass.put(UnaryExpr.class, sequence(conditional(ObservableProperty.PREFIX, FLAG, attribute(ObservableProperty.OPERATOR)), child(ObservableProperty.EXPRESSION), conditional(ObservableProperty.POSTFIX, FLAG, attribute(ObservableProperty.OPERATOR))));
+        concreteSyntaxModelByClass.put(VariableDeclarationExpr.class, sequence(comment(), onlineAnnotations(), modifiers(), child(ObservableProperty.MAXIMUM_COMMON_TYPE), space(), list(ObservableProperty.VARIABLES, sequence(comma(), space()))));
         // /
         // / Statements
         // /
-        concreteSyntaxModelByClass.put(
-                AssertStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.ASSERT),
-                        space(),
-                        child(ObservableProperty.CHECK),
-                        conditional(
-                                ObservableProperty.MESSAGE,
-                                IS_PRESENT,
-                                sequence(
-                                        space(),
-                                        token(GeneratedJavaParserConstants.COLON),
-                                        space(),
-                                        child(ObservableProperty.MESSAGE))),
-                        semicolon()));
-        concreteSyntaxModelByClass.put(
-                BlockStmt.class,
-                sequence(
-                        orphanCommentsBeforeThis(),
-                        comment(),
-                        token(GeneratedJavaParserConstants.LBRACE),
-                        newline(),
-                        list(ObservableProperty.STATEMENTS, newline(), indent(), sequence(newline(), unindent())),
-                        orphanCommentsEnding(),
-                        token(RBRACE)));
-        concreteSyntaxModelByClass.put(
-                BreakStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.BREAK),
-                        conditional(
-                                ObservableProperty.LABEL,
-                                IS_PRESENT,
-                                sequence(space(), child(ObservableProperty.LABEL))),
-                        semicolon()));
-        concreteSyntaxModelByClass.put(
-                CatchClause.class,
-                sequence(
-                        comment(),
-                        space(),
-                        token(GeneratedJavaParserConstants.CATCH),
-                        space(),
-                        token(LPAREN),
-                        child(ObservableProperty.PARAMETER),
-                        token(RPAREN),
-                        space(),
-                        child(BODY)));
-        concreteSyntaxModelByClass.put(
-                ContinueStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.CONTINUE),
-                        conditional(
-                                ObservableProperty.LABEL,
-                                IS_PRESENT,
-                                sequence(space(), child(ObservableProperty.LABEL))),
-                        semicolon()));
-        concreteSyntaxModelByClass.put(
-                DoStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.DO),
-                        space(),
-                        child(ObservableProperty.BODY),
-                        space(),
-                        token(GeneratedJavaParserConstants.WHILE),
-                        space(),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        child(ObservableProperty.CONDITION),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        semicolon()));
-        concreteSyntaxModelByClass.put(
-                EmptyStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.SEMICOLON)));
-        concreteSyntaxModelByClass.put(
-                UnparsableStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.SEMICOLON)));
-        concreteSyntaxModelByClass.put(
-                ExplicitConstructorInvocationStmt.class,
-                sequence(
-                        comment(),
-                        conditional(
-                                ObservableProperty.THIS,
-                                FLAG,
-                                sequence(typeArguments(), token(GeneratedJavaParserConstants.THIS)),
-                                sequence(
-                                        conditional(
-                                                ObservableProperty.EXPRESSION,
-                                                IS_PRESENT,
-                                                sequence(
-                                                        child(ObservableProperty.EXPRESSION),
-                                                        token(GeneratedJavaParserConstants.DOT))),
-                                        typeArguments(),
-                                        token(GeneratedJavaParserConstants.SUPER))),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        list(ObservableProperty.ARGUMENTS, sequence(comma(), space())),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        semicolon()));
-        concreteSyntaxModelByClass.put(
-                ExpressionStmt.class,
-                sequence(orphanCommentsBeforeThis(), comment(), child(ObservableProperty.EXPRESSION), semicolon()));
-        concreteSyntaxModelByClass.put(
-                ForEachStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.FOR),
-                        space(),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        child(ObservableProperty.VARIABLE),
-                        space(),
-                        token(GeneratedJavaParserConstants.COLON),
-                        space(),
-                        child(ObservableProperty.ITERABLE),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        space(),
-                        child(ObservableProperty.BODY)));
-        concreteSyntaxModelByClass.put(
-                ForStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.FOR),
-                        space(),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        list(ObservableProperty.INITIALIZATION, sequence(comma(), space())),
-                        semicolon(),
-                        space(),
-                        child(ObservableProperty.COMPARE),
-                        semicolon(),
-                        space(),
-                        list(ObservableProperty.UPDATE, sequence(comma(), space())),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        space(),
-                        child(ObservableProperty.BODY)));
-        concreteSyntaxModelByClass.put(
-                IfStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.IF),
-                        space(),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        child(ObservableProperty.CONDITION),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        conditional(
-                                ObservableProperty.THEN_BLOCK,
-                                CsmConditional.Condition.FLAG,
-                                sequence(
-                                        space(),
-                                        child(ObservableProperty.THEN_STMT),
-                                        conditional(ObservableProperty.ELSE_STMT, IS_PRESENT, space())),
-                                sequence(
-                                        newline(),
-                                        indent(),
-                                        child(ObservableProperty.THEN_STMT),
-                                        conditional(ObservableProperty.ELSE_STMT, IS_PRESENT, newline()),
-                                        unindent())),
-                        conditional(
-                                ObservableProperty.ELSE_STMT,
-                                IS_PRESENT,
-                                sequence(
-                                        token(GeneratedJavaParserConstants.ELSE),
-                                        conditional(
-                                                Arrays.asList(
-                                                        ObservableProperty.ELSE_BLOCK,
-                                                        ObservableProperty.CASCADING_IF_STMT),
-                                                CsmConditional.Condition.FLAG,
-                                                sequence(space(), child(ObservableProperty.ELSE_STMT)),
-                                                sequence(
-                                                        newline(),
-                                                        indent(),
-                                                        child(ObservableProperty.ELSE_STMT),
-                                                        unindent()))))));
-        concreteSyntaxModelByClass.put(
-                LabeledStmt.class,
-                sequence(
-                        comment(),
-                        child(ObservableProperty.LABEL),
-                        token(GeneratedJavaParserConstants.COLON),
-                        space(),
-                        child(ObservableProperty.STATEMENT)));
-        concreteSyntaxModelByClass.put(
-                LocalClassDeclarationStmt.class, sequence(comment(), child(ObservableProperty.CLASS_DECLARATION)));
-        concreteSyntaxModelByClass.put(
-                LocalRecordDeclarationStmt.class, sequence(comment(), child(ObservableProperty.RECORD_DECLARATION)));
-        concreteSyntaxModelByClass.put(
-                ReturnStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.RETURN),
-                        conditional(
-                                ObservableProperty.EXPRESSION,
-                                IS_PRESENT,
-                                sequence(space(), child(ObservableProperty.EXPRESSION))),
-                        semicolon()));
-        concreteSyntaxModelByClass.put(
-                YieldStmt.class,
-                sequence(
-                        comment(),
-                        token(YIELD),
-                        conditional(
-                                ObservableProperty.EXPRESSION,
-                                IS_PRESENT,
-                                sequence(space(), child(ObservableProperty.EXPRESSION))),
-                        semicolon()));
-        concreteSyntaxModelByClass.put(
-                SwitchEntry.class,
-                sequence(
-                        comment(),
-                        conditional(
-                                SWITCH_STATEMENT_ENTRY,
-                                FLAG,
-                                sequence(
-                                        conditional(
-                                                ObservableProperty.LABELS,
-                                                IS_NOT_EMPTY,
-                                                sequence(
-                                                        token(GeneratedJavaParserConstants.CASE),
-                                                        space(),
-                                                        list(ObservableProperty.LABELS)),
-                                                token(GeneratedJavaParserConstants._DEFAULT)),
-                                        token(GeneratedJavaParserConstants.COLON),
-                                        newline()),
-                                sequence(
-                                        conditional(
-                                                ObservableProperty.LABELS,
-                                                IS_NOT_EMPTY,
-                                                conditional(
-                                                        ObservableProperty.DEFAULT,
-                                                        FLAG,
-                                                        sequence(
-                                                                token(GeneratedJavaParserConstants.CASE),
-                                                                space(),
-                                                                list(ObservableProperty.LABELS),
-                                                                comma(),
-                                                                space(),
-                                                                token(GeneratedJavaParserConstants._DEFAULT)),
-                                                        sequence(
-                                                                token(GeneratedJavaParserConstants.CASE),
-                                                                space(),
-                                                                list(ObservableProperty.LABELS),
-                                                                conditional(
-                                                                        ObservableProperty.GUARD,
-                                                                        IS_PRESENT,
-                                                                        sequence(
-                                                                                space(),
-                                                                                token(
-                                                                                        GeneratedJavaParserConstants
-                                                                                                .WHEN),
-                                                                                space(),
-                                                                                child(ObservableProperty.GUARD))))),
-                                                token(GeneratedJavaParserConstants._DEFAULT)),
-                                        space(),
-                                        token(GeneratedJavaParserConstants.ARROW),
-                                        space())),
-                        indent(),
-                        list(ObservableProperty.STATEMENTS, newline(), none(), newline()),
-                        unindent()));
-        concreteSyntaxModelByClass.put(
-                SwitchStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.SWITCH),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        child(ObservableProperty.SELECTOR),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        space(),
-                        token(GeneratedJavaParserConstants.LBRACE),
-                        newline(),
-                        list(ObservableProperty.ENTRIES, none(), indent(), unindent()),
-                        token(GeneratedJavaParserConstants.RBRACE)));
-        concreteSyntaxModelByClass.put(
-                SwitchExpr.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.SWITCH),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        child(ObservableProperty.SELECTOR),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        space(),
-                        token(GeneratedJavaParserConstants.LBRACE),
-                        newline(),
-                        list(ObservableProperty.ENTRIES, none(), indent(), unindent()),
-                        token(GeneratedJavaParserConstants.RBRACE)));
-        concreteSyntaxModelByClass.put(
-                SynchronizedStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.SYNCHRONIZED),
-                        space(),
-                        token(LPAREN),
-                        child(EXPRESSION),
-                        token(RPAREN),
-                        space(),
-                        child(BODY)));
-        concreteSyntaxModelByClass.put(
-                ThrowStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.THROW),
-                        space(),
-                        child(ObservableProperty.EXPRESSION),
-                        semicolon()));
-        concreteSyntaxModelByClass.put(
-                TryStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.TRY),
-                        space(),
-                        conditional(
-                                ObservableProperty.RESOURCES,
-                                CsmConditional.Condition.IS_NOT_EMPTY,
-                                sequence(
-                                        token(LPAREN),
-                                        list(
-                                                ObservableProperty.RESOURCES,
-                                                sequence(semicolon(), newline()),
-                                                indent(),
-                                                unindent()),
-                                        token(RPAREN),
-                                        space())),
-                        child(ObservableProperty.TRY_BLOCK),
-                        list(ObservableProperty.CATCH_CLAUSES),
-                        conditional(
-                                ObservableProperty.FINALLY_BLOCK,
-                                IS_PRESENT,
-                                sequence(
-                                        space(),
-                                        token(GeneratedJavaParserConstants.FINALLY),
-                                        space(),
-                                        child(ObservableProperty.FINALLY_BLOCK)))));
-        concreteSyntaxModelByClass.put(
-                WhileStmt.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.WHILE),
-                        space(),
-                        token(GeneratedJavaParserConstants.LPAREN),
-                        child(ObservableProperty.CONDITION),
-                        token(GeneratedJavaParserConstants.RPAREN),
-                        space(),
-                        child(ObservableProperty.BODY)));
+        concreteSyntaxModelByClass.put(AssertStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.ASSERT), space(), child(ObservableProperty.CHECK), conditional(ObservableProperty.MESSAGE, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants.COLON), space(), child(ObservableProperty.MESSAGE))), semicolon()));
+        concreteSyntaxModelByClass.put(BlockStmt.class, sequence(orphanCommentsBeforeThis(), comment(), token(GeneratedJavaParserConstants.LBRACE), newline(), list(ObservableProperty.STATEMENTS, newline(), indent(), sequence(newline(), unindent())), orphanCommentsEnding(), token(RBRACE)));
+        concreteSyntaxModelByClass.put(BreakStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.BREAK), conditional(ObservableProperty.LABEL, IS_PRESENT, sequence(space(), child(ObservableProperty.LABEL))), semicolon()));
+        concreteSyntaxModelByClass.put(CatchClause.class, sequence(comment(), space(), token(GeneratedJavaParserConstants.CATCH), space(), token(LPAREN), child(ObservableProperty.PARAMETER), token(RPAREN), space(), child(BODY)));
+        concreteSyntaxModelByClass.put(ContinueStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.CONTINUE), conditional(ObservableProperty.LABEL, IS_PRESENT, sequence(space(), child(ObservableProperty.LABEL))), semicolon()));
+        concreteSyntaxModelByClass.put(DoStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.DO), space(), child(ObservableProperty.BODY), space(), token(GeneratedJavaParserConstants.WHILE), space(), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.CONDITION), token(GeneratedJavaParserConstants.RPAREN), semicolon()));
+        concreteSyntaxModelByClass.put(EmptyStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.SEMICOLON)));
+        concreteSyntaxModelByClass.put(UnparsableStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.SEMICOLON)));
+        concreteSyntaxModelByClass.put(ExplicitConstructorInvocationStmt.class, sequence(comment(), conditional(ObservableProperty.THIS, FLAG, sequence(typeArguments(), token(GeneratedJavaParserConstants.THIS)), sequence(conditional(ObservableProperty.EXPRESSION, IS_PRESENT, sequence(child(ObservableProperty.EXPRESSION), token(GeneratedJavaParserConstants.DOT))), typeArguments(), token(GeneratedJavaParserConstants.SUPER))), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.ARGUMENTS, sequence(comma(), space())), token(GeneratedJavaParserConstants.RPAREN), semicolon()));
+        concreteSyntaxModelByClass.put(ExpressionStmt.class, sequence(orphanCommentsBeforeThis(), comment(), child(ObservableProperty.EXPRESSION), semicolon()));
+        concreteSyntaxModelByClass.put(ForEachStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.FOR), space(), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.VARIABLE), space(), token(GeneratedJavaParserConstants.COLON), space(), child(ObservableProperty.ITERABLE), token(GeneratedJavaParserConstants.RPAREN), space(), child(ObservableProperty.BODY)));
+        concreteSyntaxModelByClass.put(ForStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.FOR), space(), token(GeneratedJavaParserConstants.LPAREN), list(ObservableProperty.INITIALIZATION, sequence(comma(), space())), semicolon(), space(), child(ObservableProperty.COMPARE), semicolon(), space(), list(ObservableProperty.UPDATE, sequence(comma(), space())), token(GeneratedJavaParserConstants.RPAREN), space(), child(ObservableProperty.BODY)));
+        concreteSyntaxModelByClass.put(IfStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.IF), space(), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.CONDITION), token(GeneratedJavaParserConstants.RPAREN), conditional(ObservableProperty.THEN_BLOCK, CsmConditional.Condition.FLAG, sequence(space(), child(ObservableProperty.THEN_STMT), conditional(ObservableProperty.ELSE_STMT, IS_PRESENT, space())), sequence(newline(), indent(), child(ObservableProperty.THEN_STMT), conditional(ObservableProperty.ELSE_STMT, IS_PRESENT, newline()), unindent())), conditional(ObservableProperty.ELSE_STMT, IS_PRESENT, sequence(token(GeneratedJavaParserConstants.ELSE), conditional(Arrays.asList(ObservableProperty.ELSE_BLOCK, ObservableProperty.CASCADING_IF_STMT), CsmConditional.Condition.FLAG, sequence(space(), child(ObservableProperty.ELSE_STMT)), sequence(newline(), indent(), child(ObservableProperty.ELSE_STMT), unindent()))))));
+        concreteSyntaxModelByClass.put(LabeledStmt.class, sequence(comment(), child(ObservableProperty.LABEL), token(GeneratedJavaParserConstants.COLON), space(), child(ObservableProperty.STATEMENT)));
+        concreteSyntaxModelByClass.put(LocalClassDeclarationStmt.class, sequence(comment(), child(ObservableProperty.CLASS_DECLARATION)));
+        concreteSyntaxModelByClass.put(LocalRecordDeclarationStmt.class, sequence(comment(), child(ObservableProperty.RECORD_DECLARATION)));
+        concreteSyntaxModelByClass.put(ReturnStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.RETURN), conditional(ObservableProperty.EXPRESSION, IS_PRESENT, sequence(space(), child(ObservableProperty.EXPRESSION))), semicolon()));
+        concreteSyntaxModelByClass.put(YieldStmt.class, sequence(comment(), token(YIELD), conditional(ObservableProperty.EXPRESSION, IS_PRESENT, sequence(space(), child(ObservableProperty.EXPRESSION))), semicolon()));
+        concreteSyntaxModelByClass.put(SwitchEntry.class, sequence(comment(), conditional(SWITCH_STATEMENT_ENTRY, FLAG, sequence(conditional(ObservableProperty.LABELS, IS_NOT_EMPTY, sequence(token(GeneratedJavaParserConstants.CASE), space(), list(ObservableProperty.LABELS)), token(GeneratedJavaParserConstants._DEFAULT)), token(GeneratedJavaParserConstants.COLON), newline()), sequence(conditional(ObservableProperty.LABELS, IS_NOT_EMPTY, conditional(ObservableProperty.DEFAULT, FLAG, sequence(token(GeneratedJavaParserConstants.CASE), space(), list(ObservableProperty.LABELS), comma(), space(), token(GeneratedJavaParserConstants._DEFAULT)), sequence(token(GeneratedJavaParserConstants.CASE), space(), list(ObservableProperty.LABELS), conditional(ObservableProperty.GUARD, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants.WHEN), space(), child(ObservableProperty.GUARD))))), token(GeneratedJavaParserConstants._DEFAULT)), space(), token(GeneratedJavaParserConstants.ARROW), space())), indent(), list(ObservableProperty.STATEMENTS, newline(), none(), newline()), unindent()));
+        concreteSyntaxModelByClass.put(SwitchStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.SWITCH), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.SELECTOR), token(GeneratedJavaParserConstants.RPAREN), space(), token(GeneratedJavaParserConstants.LBRACE), newline(), list(ObservableProperty.ENTRIES, none(), indent(), unindent()), token(GeneratedJavaParserConstants.RBRACE)));
+        concreteSyntaxModelByClass.put(SwitchExpr.class, sequence(comment(), token(GeneratedJavaParserConstants.SWITCH), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.SELECTOR), token(GeneratedJavaParserConstants.RPAREN), space(), token(GeneratedJavaParserConstants.LBRACE), newline(), list(ObservableProperty.ENTRIES, none(), indent(), unindent()), token(GeneratedJavaParserConstants.RBRACE)));
+        concreteSyntaxModelByClass.put(SynchronizedStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.SYNCHRONIZED), space(), token(LPAREN), child(EXPRESSION), token(RPAREN), space(), child(BODY)));
+        concreteSyntaxModelByClass.put(ThrowStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.THROW), space(), child(ObservableProperty.EXPRESSION), semicolon()));
+        concreteSyntaxModelByClass.put(TryStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.TRY), space(), conditional(ObservableProperty.RESOURCES, CsmConditional.Condition.IS_NOT_EMPTY, sequence(token(LPAREN), list(ObservableProperty.RESOURCES, sequence(semicolon(), newline()), indent(), unindent()), token(RPAREN), space())), child(ObservableProperty.TRY_BLOCK), list(ObservableProperty.CATCH_CLAUSES), conditional(ObservableProperty.FINALLY_BLOCK, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants.FINALLY), space(), child(ObservableProperty.FINALLY_BLOCK)))));
+        concreteSyntaxModelByClass.put(WhileStmt.class, sequence(comment(), token(GeneratedJavaParserConstants.WHILE), space(), token(GeneratedJavaParserConstants.LPAREN), child(ObservableProperty.CONDITION), token(GeneratedJavaParserConstants.RPAREN), space(), child(ObservableProperty.BODY)));
         // /
         // / Types
         // /
-        concreteSyntaxModelByClass.put(
-                ArrayType.class,
-                sequence(
-                        child(ObservableProperty.COMPONENT_TYPE),
-                        list(ObservableProperty.ANNOTATIONS),
-                        string(GeneratedJavaParserConstants.LBRACKET),
-                        string(GeneratedJavaParserConstants.RBRACKET)));
-        concreteSyntaxModelByClass.put(
-                ClassOrInterfaceType.class,
-                sequence(
-                        comment(),
-                        conditional(
-                                SCOPE, IS_PRESENT, sequence(child(SCOPE), string(GeneratedJavaParserConstants.DOT))),
-                        list(ANNOTATIONS, space(), none(), space()),
-                        child(NAME),
-                        conditional(
-                                ObservableProperty.USING_DIAMOND_OPERATOR,
-                                FLAG,
-                                sequence(
-                                        string(GeneratedJavaParserConstants.LT),
-                                        string(GeneratedJavaParserConstants.GT)),
-                                typeArguments())));
-        concreteSyntaxModelByClass.put(
-                IntersectionType.class,
-                sequence(
-                        comment(),
-                        annotations(),
-                        list(
-                                ObservableProperty.ELEMENTS,
-                                sequence(space(), token(GeneratedJavaParserConstants.BIT_AND), space()))));
-        concreteSyntaxModelByClass.put(
-                PrimitiveType.class,
-                sequence(comment(), list(ObservableProperty.ANNOTATIONS), attribute(ObservableProperty.TYPE)));
-        concreteSyntaxModelByClass.put(
-                TypeParameter.class,
-                sequence(
-                        comment(),
-                        annotations(),
-                        child(ObservableProperty.NAME),
-                        list(
-                                ObservableProperty.TYPE_BOUND,
-                                sequence(space(), token(GeneratedJavaParserConstants.BIT_AND), space()),
-                                sequence(space(), token(GeneratedJavaParserConstants.EXTENDS), space()),
-                                none())));
-        concreteSyntaxModelByClass.put(
-                UnionType.class,
-                sequence(
-                        comment(),
-                        annotations(),
-                        list(
-                                ObservableProperty.ELEMENTS,
-                                sequence(space(), token(GeneratedJavaParserConstants.BIT_OR), space()))));
+        concreteSyntaxModelByClass.put(ArrayType.class, sequence(child(ObservableProperty.COMPONENT_TYPE), list(ObservableProperty.ANNOTATIONS), string(GeneratedJavaParserConstants.LBRACKET), string(GeneratedJavaParserConstants.RBRACKET)));
+        concreteSyntaxModelByClass.put(ClassOrInterfaceType.class, sequence(comment(), conditional(SCOPE, IS_PRESENT, sequence(child(SCOPE), string(GeneratedJavaParserConstants.DOT))), list(ANNOTATIONS, space(), none(), space()), child(NAME), conditional(ObservableProperty.USING_DIAMOND_OPERATOR, FLAG, sequence(string(GeneratedJavaParserConstants.LT), string(GeneratedJavaParserConstants.GT)), typeArguments())));
+        concreteSyntaxModelByClass.put(IntersectionType.class, sequence(comment(), annotations(), list(ObservableProperty.ELEMENTS, sequence(space(), token(GeneratedJavaParserConstants.BIT_AND), space()))));
+        concreteSyntaxModelByClass.put(PrimitiveType.class, sequence(comment(), list(ObservableProperty.ANNOTATIONS), attribute(ObservableProperty.TYPE)));
+        concreteSyntaxModelByClass.put(TypeParameter.class, sequence(comment(), annotations(), child(ObservableProperty.NAME), list(ObservableProperty.TYPE_BOUND, sequence(space(), token(GeneratedJavaParserConstants.BIT_AND), space()), sequence(space(), token(GeneratedJavaParserConstants.EXTENDS), space()), none())));
+        concreteSyntaxModelByClass.put(UnionType.class, sequence(comment(), annotations(), list(ObservableProperty.ELEMENTS, sequence(space(), token(GeneratedJavaParserConstants.BIT_OR), space()))));
         concreteSyntaxModelByClass.put(UnknownType.class, none());
-        concreteSyntaxModelByClass.put(
-                VoidType.class, sequence(comment(), annotations(), token(GeneratedJavaParserConstants.VOID)));
-        concreteSyntaxModelByClass.put(
-                VarType.class,
-                sequence(comment(), annotations(), string(GeneratedJavaParserConstants.IDENTIFIER, "var")));
-        concreteSyntaxModelByClass.put(
-                WildcardType.class,
-                sequence(
-                        comment(),
-                        annotations(),
-                        token(GeneratedJavaParserConstants.HOOK),
-                        conditional(
-                                ObservableProperty.EXTENDED_TYPE,
-                                IS_PRESENT,
-                                sequence(
-                                        space(),
-                                        token(GeneratedJavaParserConstants.EXTENDS),
-                                        space(),
-                                        child(EXTENDED_TYPE))),
-                        conditional(
-                                ObservableProperty.SUPER_TYPE,
-                                IS_PRESENT,
-                                sequence(
-                                        space(),
-                                        token(GeneratedJavaParserConstants.SUPER),
-                                        space(),
-                                        child(SUPER_TYPE)))));
+        concreteSyntaxModelByClass.put(VoidType.class, sequence(comment(), annotations(), token(GeneratedJavaParserConstants.VOID)));
+        concreteSyntaxModelByClass.put(VarType.class, sequence(comment(), annotations(), string(GeneratedJavaParserConstants.IDENTIFIER, "var")));
+        concreteSyntaxModelByClass.put(WildcardType.class, sequence(comment(), annotations(), token(GeneratedJavaParserConstants.HOOK), conditional(ObservableProperty.EXTENDED_TYPE, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants.EXTENDS), space(), child(EXTENDED_TYPE))), conditional(ObservableProperty.SUPER_TYPE, IS_PRESENT, sequence(space(), token(GeneratedJavaParserConstants.SUPER), space(), child(SUPER_TYPE)))));
         // /
         // / Top Level
         // /
-        concreteSyntaxModelByClass.put(
-                ArrayCreationLevel.class,
-                sequence(
-                        annotations(),
-                        token(GeneratedJavaParserConstants.LBRACKET),
-                        child(ObservableProperty.DIMENSION),
-                        token(GeneratedJavaParserConstants.RBRACKET)));
-        concreteSyntaxModelByClass.put(
-                CompilationUnit.class,
-                sequence(
-                        comment(),
-                        child(ObservableProperty.PACKAGE_DECLARATION),
-                        list(ObservableProperty.IMPORTS, newline(), none(), sequence(newline(), newline())),
-                        list(TYPES, newline(), newline(), none(), newline()),
-                        child(ObservableProperty.MODULE),
-                        orphanCommentsEnding()));
-        concreteSyntaxModelByClass.put(
-                ImportDeclaration.class,
-                sequence(
-                        comment(),
-                        token(GeneratedJavaParserConstants.IMPORT),
-                        space(),
-                        conditional(
-                                ObservableProperty.STATIC,
-                                FLAG,
-                                sequence(token(GeneratedJavaParserConstants.STATIC), space())),
-                        conditional(
-                                ObservableProperty.MODULE,
-                                FLAG,
-                                sequence(token(GeneratedJavaParserConstants.MODULE), space())),
-                        child(ObservableProperty.NAME),
-                        conditional(
-                                ASTERISK,
-                                FLAG,
-                                sequence(
-                                        token(GeneratedJavaParserConstants.DOT),
-                                        token(GeneratedJavaParserConstants.STAR))),
-                        semicolon(),
-                        orphanCommentsEnding()));
-        concreteSyntaxModelByClass.put(
-                PackageDeclaration.class,
-                sequence(
-                        comment(),
-                        memberAnnotations(),
-                        token(GeneratedJavaParserConstants.PACKAGE),
-                        space(),
-                        child(ObservableProperty.NAME),
-                        semicolon(),
-                        newline(),
-                        newline(),
-                        orphanCommentsEnding()));
+        concreteSyntaxModelByClass.put(ArrayCreationLevel.class, sequence(annotations(), token(GeneratedJavaParserConstants.LBRACKET), child(ObservableProperty.DIMENSION), token(GeneratedJavaParserConstants.RBRACKET)));
+        concreteSyntaxModelByClass.put(CompilationUnit.class, sequence(comment(), child(ObservableProperty.PACKAGE_DECLARATION), list(ObservableProperty.IMPORTS, newline(), none(), sequence(newline(), newline())), list(TYPES, newline(), newline(), none(), newline()), child(ObservableProperty.MODULE), orphanCommentsEnding()));
+        concreteSyntaxModelByClass.put(ImportDeclaration.class, sequence(comment(), token(GeneratedJavaParserConstants.IMPORT), space(), conditional(ObservableProperty.STATIC, FLAG, sequence(token(GeneratedJavaParserConstants.STATIC), space())), conditional(ObservableProperty.MODULE, FLAG, sequence(token(GeneratedJavaParserConstants.MODULE), space())), child(ObservableProperty.NAME), conditional(ASTERISK, FLAG, sequence(token(GeneratedJavaParserConstants.DOT), token(GeneratedJavaParserConstants.STAR))), semicolon(), orphanCommentsEnding()));
+        concreteSyntaxModelByClass.put(PackageDeclaration.class, sequence(comment(), memberAnnotations(), token(GeneratedJavaParserConstants.PACKAGE), space(), child(ObservableProperty.NAME), semicolon(), newline(), newline(), orphanCommentsEnding()));
         // /
         // / Module info
         // /
-        concreteSyntaxModelByClass.put(
-                ModuleDeclaration.class,
-                sequence(
-                        memberAnnotations(),
-                        conditional(
-                                ObservableProperty.OPEN,
-                                FLAG,
-                                sequence(token(GeneratedJavaParserConstants.OPEN), space())),
-                        token(GeneratedJavaParserConstants.MODULE),
-                        space(),
-                        child(ObservableProperty.NAME),
-                        space(),
-                        token(GeneratedJavaParserConstants.LBRACE),
-                        newline(),
-                        indent(),
-                        list(ObservableProperty.DIRECTIVES),
-                        unindent(),
-                        token(GeneratedJavaParserConstants.RBRACE),
-                        newline()));
-        concreteSyntaxModelByClass.put(
-                ModuleExportsDirective.class,
-                sequence(
-                        token(GeneratedJavaParserConstants.EXPORTS),
-                        space(),
-                        child(ObservableProperty.NAME),
-                        list(
-                                ObservableProperty.MODULE_NAMES,
-                                sequence(comma(), space()),
-                                sequence(space(), token(GeneratedJavaParserConstants.TO), space()),
-                                none()),
-                        semicolon(),
-                        newline()));
-        concreteSyntaxModelByClass.put(
-                ModuleOpensDirective.class,
-                sequence(
-                        token(GeneratedJavaParserConstants.OPENS),
-                        space(),
-                        child(ObservableProperty.NAME),
-                        list(
-                                ObservableProperty.MODULE_NAMES,
-                                sequence(comma(), space()),
-                                sequence(space(), token(GeneratedJavaParserConstants.TO), space()),
-                                none()),
-                        semicolon(),
-                        newline()));
-        concreteSyntaxModelByClass.put(
-                ModuleProvidesDirective.class,
-                sequence(
-                        token(GeneratedJavaParserConstants.PROVIDES),
-                        space(),
-                        child(ObservableProperty.NAME),
-                        list(
-                                ObservableProperty.WITH,
-                                sequence(comma(), space()),
-                                sequence(space(), token(GeneratedJavaParserConstants.WITH), space()),
-                                none()),
-                        semicolon(),
-                        newline()));
-        concreteSyntaxModelByClass.put(
-                ModuleRequiresDirective.class,
-                sequence(
-                        token(GeneratedJavaParserConstants.REQUIRES),
-                        space(),
-                        modifiers(),
-                        child(ObservableProperty.NAME),
-                        semicolon(),
-                        newline()));
-        concreteSyntaxModelByClass.put(
-                ModuleUsesDirective.class,
-                sequence(
-                        token(GeneratedJavaParserConstants.USES),
-                        space(),
-                        child(ObservableProperty.NAME),
-                        semicolon(),
-                        newline()));
+        concreteSyntaxModelByClass.put(ModuleDeclaration.class, sequence(memberAnnotations(), conditional(ObservableProperty.OPEN, FLAG, sequence(token(GeneratedJavaParserConstants.OPEN), space())), token(GeneratedJavaParserConstants.MODULE), space(), child(ObservableProperty.NAME), space(), token(GeneratedJavaParserConstants.LBRACE), newline(), indent(), list(ObservableProperty.DIRECTIVES), unindent(), token(GeneratedJavaParserConstants.RBRACE), newline()));
+        concreteSyntaxModelByClass.put(ModuleExportsDirective.class, sequence(token(GeneratedJavaParserConstants.EXPORTS), space(), child(ObservableProperty.NAME), list(ObservableProperty.MODULE_NAMES, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.TO), space()), none()), semicolon(), newline()));
+        concreteSyntaxModelByClass.put(ModuleOpensDirective.class, sequence(token(GeneratedJavaParserConstants.OPENS), space(), child(ObservableProperty.NAME), list(ObservableProperty.MODULE_NAMES, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.TO), space()), none()), semicolon(), newline()));
+        concreteSyntaxModelByClass.put(ModuleProvidesDirective.class, sequence(token(GeneratedJavaParserConstants.PROVIDES), space(), child(ObservableProperty.NAME), list(ObservableProperty.WITH, sequence(comma(), space()), sequence(space(), token(GeneratedJavaParserConstants.WITH), space()), none()), semicolon(), newline()));
+        concreteSyntaxModelByClass.put(ModuleRequiresDirective.class, sequence(token(GeneratedJavaParserConstants.REQUIRES), space(), modifiers(), child(ObservableProperty.NAME), semicolon(), newline()));
+        concreteSyntaxModelByClass.put(ModuleUsesDirective.class, sequence(token(GeneratedJavaParserConstants.USES), space(), child(ObservableProperty.NAME), semicolon(), newline()));
         // region JML
-        concreteSyntaxModelByClass.put(JmlClauseIf.class, sequence());
-        concreteSyntaxModelByClass.put(JmlLabelStmt.class, sequence());
-        concreteSyntaxModelByClass.put(JmlMethodSignature.class, sequence());
-        concreteSyntaxModelByClass.put(JmlSetComprehensionExpr.class, sequence());
-        concreteSyntaxModelByClass.put(
-                JmlForallClause.class,
-                sequence(
-                        token(GeneratedJavaParserConstants.FORALL),
-                        space(),
-                        child(ObservableProperty.VARIABLES),
-                        semicolon(),
-                        newline()));
-        concreteSyntaxModelByClass.put(
-                JmlSimpleExprClause.class,
-                sequence(
-                        child(ObservableProperty.KIND),
-                        child(HEAPS),
-                        space(),
-                        child(EXPRESSION),
-                        semicolon(),
-                        newline()));
-        concreteSyntaxModelByClass.put(
-                JmlMultiExprClause.class,
-                sequence(
-                        child(ObservableProperty.KIND),
-                        child(HEAPS),
-                        space(),
-                        child(EXPRESSION),
-                        semicolon(),
-                        newline()));
-        concreteSyntaxModelByClass.put(
-                JmlClauseLabel.class,
-                sequence(
-                        child(ObservableProperty.KIND),
-                        token(LPAREN),
-                        child(LABEL),
-                        token(RPAREN),
-                        space(),
-                        child(EXPRESSION),
-                        semicolon(),
-                        newline()));
-        concreteSyntaxModelByClass.put(
-                JmlCallableClause.class,
-                sequence(
-                        child(MODIFIERS),
-                        token(CALLABLE), // space(),
-                        // child(EXPRESSION),
-                        semicolon()));
-        concreteSyntaxModelByClass.put(
-                JmlClassExprDeclaration.class,
-                sequence(child(MODIFIERS), token(INVARIANT), space(), child(EXPRESSION), semicolon()));
+        concreteSyntaxModelByClass.put(JmlConditionalClause.class, sequence(attribute(KIND), attribute(CONDITION), token(WHEN), attribute(CONDITION)));
+        concreteSyntaxModelByClass.put(JmlLabelStmt.class, sequence(list(JML_TAGS), attribute(LABEL), token(COLON)));
+        concreteSyntaxModelByClass.put(JmlMethodSignature.class, sequence(attribute(NAME), token(LPAREN), list(ARGUMENT_TYPES, token(COMMA)), token(RPAREN)));
+        concreteSyntaxModelByClass.put(JmlSetComprehensionExpr.class, sequence(token(LBRACE), space(), attribute(BINDING), space(), token(OR), space(), attribute(PREDICATE), space(), token(RBRACE)));
+        concreteSyntaxModelByClass.put(JmlForallClause.class, sequence(token(GeneratedJavaParserConstants.FORALL), space(), child(ObservableProperty.VARIABLES), semicolon(), newline()));
+        concreteSyntaxModelByClass.put(JmlSimpleExprClause.class, sequence(child(ObservableProperty.KIND), child(HEAPS), space(), child(EXPRESSION), semicolon(), newline()));
+        concreteSyntaxModelByClass.put(JmlMultiExprClause.class, sequence(child(ObservableProperty.KIND), child(HEAPS), space(), child(EXPRESSION), semicolon(), newline()));
+        concreteSyntaxModelByClass.put(JmlLabledClause.class, sequence(child(ObservableProperty.KIND), token(LPAREN), child(LABEL), token(RPAREN), space(), child(EXPRESSION), semicolon(), newline()));
+        concreteSyntaxModelByClass.put(JmlCallableClause.class, sequence(child(MODIFIERS), token(CALLABLE), semicolon()));
+        concreteSyntaxModelByClass.put(JmlClassExprDeclaration.class, sequence(child(MODIFIERS), space(), token(INVARIANT), space(), child(EXPRESSION), semicolon()));
         concreteSyntaxModelByClass.put(JmlClassAccessibleDeclaration.class, sequence());
         concreteSyntaxModelByClass.put(JmlContract.class, sequence());
-        concreteSyntaxModelByClass.put(JmlGhostStmt.class, sequence());
-        concreteSyntaxModelByClass.put(
-                JmlLabelExpr.class,
-                sequence(
-                        token(LPAREN),
-                        attribute(KIND),
-                        space(),
-                        child(LABEL),
-                        space(),
-                        child(EXPRESSION),
-                        token(RPAREN)));
-        concreteSyntaxModelByClass.put(
-                JmlLetExpr.class,
-                sequence(token(LPAREN), token(LET), space(), list(VARIABLES), space(), child(BODY), token(RPAREN)));
+        concreteSyntaxModelByClass.put(JmlGhostStmt.class, sequence(list(JML_TAGS), token(GHOST), attribute(STATEMENT)));
+        concreteSyntaxModelByClass.put(JmlLabelExpr.class, sequence(token(LPAREN), attribute(KIND), space(), child(LABEL), space(), child(EXPRESSION), token(RPAREN)));
+        concreteSyntaxModelByClass.put(JmlLetExpr.class, sequence(token(LPAREN), token(LET), space(), list(VARIABLES), space(), child(BODY), token(RPAREN)));
         concreteSyntaxModelByClass.put(JmlMultiCompareExpr.class, specialJmlMultiCompareExpr());
-        concreteSyntaxModelByClass.put(
-                JmlQuantifiedExpr.class,
-                sequence(
-                        token(LPAREN),
-                        attribute(BINDER),
-                        space(),
-                        list(VARIABLES, sequence(comma(), space())),
-                        token(SEMICOLON),
-                        space(),
-                        list(EXPRESSIONS, sequence(semicolon(), space())),
-                        token(RPAREN)));
+        concreteSyntaxModelByClass.put(JmlQuantifiedExpr.class, sequence(token(LPAREN), attribute(BINDER), space(), list(VARIABLES, sequence(comma(), space())), token(SEMICOLON), space(), list(EXPRESSIONS, sequence(semicolon(), space())), token(RPAREN)));
         concreteSyntaxModelByClass.put(JmlRefiningStmt.class, sequence());
         concreteSyntaxModelByClass.put(JmlRepresentsDeclaration.class, sequence());
-        concreteSyntaxModelByClass.put(
-                JmlExpressionStmt.class, sequence(child(KIND), space(), child(EXPRESSION), semicolon()));
+        concreteSyntaxModelByClass.put(JmlExpressionStmt.class, sequence(child(KIND), space(), child(EXPRESSION), semicolon()));
         concreteSyntaxModelByClass.put(JmlTypeExpr.class, sequence(child(ObservableProperty.TYPE)));
-        concreteSyntaxModelByClass.put(
-                JmlClassExprDeclaration.class,
-                sequence(modifiers(), attribute(KIND), attribute(NAME), child(EXPR), semicolon()));
+        concreteSyntaxModelByClass.put(JmlClassExprDeclaration.class, sequence(modifiers(), attribute(KIND), attribute(NAME), child(EXPR), semicolon()));
         concreteSyntaxModelByClass.put(JmlUnreachableStmt.class, sequence(token(UNREACHABLE), semicolon()));
-        concreteSyntaxModelByClass.put(
-                JmlBinaryInfixExpr.class,
-                sequence(token(LPAREN), child(LEFT), space(), child(OPERATOR), space(), child(RIGHT), token(RPAREN)));
+        concreteSyntaxModelByClass.put(JmlBinaryInfixExpr.class, sequence(token(LPAREN), child(LEFT), space(), child(OPERATOR), space(), child(RIGHT), token(RPAREN)));
         concreteSyntaxModelByClass.put(JmlDocDeclaration.class, sequence());
         concreteSyntaxModelByClass.put(JmlDocModifier.class, sequence());
-        concreteSyntaxModelByClass.put(
-                JmlOldClause.class, sequence(token(OLD), space(), child(DECLARATIONS), semicolon()));
+        concreteSyntaxModelByClass.put(JmlOldClause.class, sequence(token(OLD), space(), child(DECLARATIONS), semicolon()));
         concreteSyntaxModelByClass.put(JmlDocType.class, sequence());
         concreteSyntaxModelByClass.put(JmlDoc.class, sequence());
         concreteSyntaxModelByClass.put(JmlDocStmt.class, sequence());
         concreteSyntaxModelByClass.put(JmlFieldDeclaration.class, sequence(child(DECL)));
-        concreteSyntaxModelByClass.put(
-                JmlSignalsClause.class,
-                sequence(
-                        child(KIND), token(LPAREN), child(TYPE), child(NAME), token(RPAREN), child(EXPR), semicolon()));
+        concreteSyntaxModelByClass.put(JmlSignalsClause.class, sequence(child(KIND), token(LPAREN), child(TYPE), child(NAME), token(RPAREN), child(EXPR), semicolon()));
         concreteSyntaxModelByClass.put(JmlEndStmt.class, token(END));
         concreteSyntaxModelByClass.put(JmlBeginStmt.class, token(BEGIN));
-        concreteSyntaxModelByClass.put(
-                JmlMethodDeclaration.class, sequence(child(CONTRACT), child(METHOD_DECLARATION)));
-        concreteSyntaxModelByClass.put(
-                JmlSignalsOnlyClause.class, sequence(token(SIGNALS_ONLY), child(TYPES), semicolon(), newline()));
+        concreteSyntaxModelByClass.put(JmlMethodDeclaration.class, sequence(child(CONTRACT), child(METHOD_DECLARATION)));
+        concreteSyntaxModelByClass.put(JmlSignalsOnlyClause.class, sequence(token(SIGNALS_ONLY), child(TYPES), semicolon(), newline()));
         // endregion
+
+        // region KEY
         // TODO weigl maybe one day someone will complete this, but currently we do not need
         // the support of concrete syntax model.
         concreteSyntaxModelByClass.put(KeyCcatchBreak.class, sequence());
         concreteSyntaxModelByClass.put(KeyCcatchContinue.class, sequence());
         concreteSyntaxModelByClass.put(KeyCcatchParameter.class, sequence());
         concreteSyntaxModelByClass.put(KeyCcatchReturn.class, sequence());
-        concreteSyntaxModelByClass.put(KeyCatchAllStatement.class, sequence());
+        concreteSyntaxModelByClass.put(KeyCatchAllStmt.class, sequence());
         concreteSyntaxModelByClass.put(KeyCcatchSV.class, attribute(TEXT));
         concreteSyntaxModelByClass.put(KeyContextStatementBlock.class, sequence());
         concreteSyntaxModelByClass.put(KeyEscapeExpression.class, sequence());
         concreteSyntaxModelByClass.put(KeyExecCtxtSV.class, attribute(TEXT));
-        concreteSyntaxModelByClass.put(KeyExecStatement.class, sequence());
+        concreteSyntaxModelByClass.put(KeyExecStmt.class, sequence());
         concreteSyntaxModelByClass.put(KeyExecutionContext.class, sequence());
         concreteSyntaxModelByClass.put(KeyExecutionContextSV.class, attribute(TEXT));
-        concreteSyntaxModelByClass.put(KeyExpressionSV.class, sequence());
+        concreteSyntaxModelByClass.put(KeyExpressionSV.class, attribute(TEXT));
         concreteSyntaxModelByClass.put(KeyJumpLabelSV.class, attribute(TEXT));
-        concreteSyntaxModelByClass.put(KeyLoopScopeBlock.class, sequence());
-        concreteSyntaxModelByClass.put(KeyMergePointStatement.class, sequence());
+        concreteSyntaxModelByClass.put(KeYMarkerStatement.class, sequence());
+        concreteSyntaxModelByClass.put(KeyLoopScopeBlockStmt.class, sequence(token(LOOPSCOPE), token(LPAREN), attribute(INDEX_P_V), token(RPAREN), token(LBRACE), newline(), attribute(BLOCK), newline(), token(RBRACE)));
+        concreteSyntaxModelByClass.put(KeyMergePointStmt.class, sequence());
         concreteSyntaxModelByClass.put(KeyMetaConstructExpression.class, sequence());
         concreteSyntaxModelByClass.put(KeyMetaConstruct.class, sequence());
         concreteSyntaxModelByClass.put(KeyMetaConstructType.class, sequence());
         concreteSyntaxModelByClass.put(KeyMethodBodyStatement.class, sequence());
-        concreteSyntaxModelByClass.put(KeyMethodCallStatement.class, sequence());
+        concreteSyntaxModelByClass.put(KeyMethodCallStmt.class, sequence());
         concreteSyntaxModelByClass.put(KeyMethodSignature.class, sequence());
         concreteSyntaxModelByClass.put(KeyMethodSignatureSV.class, attribute(TEXT));
-        concreteSyntaxModelByClass.put(KeyPassiveExpression.class, sequence());
+        concreteSyntaxModelByClass.put(KeyPassiveExpression.class, sequence(token(AT), token(LPAREN), attribute(EXPR), token(RPAREN)));
         concreteSyntaxModelByClass.put(KeyProgramVariableSV.class, attribute(TEXT));
-        concreteSyntaxModelByClass.put(KeyRangeExpression.class, sequence());
         concreteSyntaxModelByClass.put(KeyStatementSV.class, attribute(TEXT));
-        concreteSyntaxModelByClass.put(KeyTransactionStatement.class, sequence());
+        concreteSyntaxModelByClass.put(KeyTransactionStmt.class, sequence());
         concreteSyntaxModelByClass.put(KeyTypeSV.class, attribute(TEXT));
-        List<String> unsupportedNodeClassNames = JavaParserMetaModel.getNodeMetaModels().stream()
-                .filter(c -> !c.isAbstract()
-                        && !Comment.class.isAssignableFrom(c.getType())
-                        && !concreteSyntaxModelByClass.containsKey(c.getType()))
-                .map(nm -> nm.getType().getSimpleName())
-                .collect(Collectors.toList());
+        // endregion
+        List<String> unsupportedNodeClassNames = JavaParserMetaModel.getNodeMetaModels().stream().filter(c -> !c.isAbstract() && !Comment.class.isAssignableFrom(c.getType()) && !concreteSyntaxModelByClass.containsKey(c.getType())).map(nm -> nm.getType().getSimpleName()).collect(Collectors.toList());
         if (unsupportedNodeClassNames.isEmpty()) {
             initializationError = Optional.empty();
         } else {
-            initializationError = Optional.of("The " + ConcreteSyntaxModel.class.getSimpleName()
-                    + " should include support for these classes: " + String.join(", ", unsupportedNodeClassNames));
+            initializationError = Optional.of("The " + ConcreteSyntaxModel.class.getSimpleName() + " should include support for these classes: " + String.join(", ", unsupportedNodeClassNames));
         }
     }
 
-    private ConcreteSyntaxModel() {}
+    private ConcreteSyntaxModel() {
+    }
 
     public static void genericPrettyPrint(Node node, SourcePrinter printer) {
         forClass(node.getClass()).prettyPrint(node, printer);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinter.java
index d5e39cef0c..394ce52003 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinter.java
@@ -68,8 +68,7 @@ public DefaultPrettyPrinter(PrinterConfiguration configuration) {
      * @param visitorFactory
      * @param configuration  Configuration to apply
      */
-    public DefaultPrettyPrinter(
-            Function<PrinterConfiguration, VoidVisitor<Void>> visitorFactory, PrinterConfiguration configuration) {
+    public DefaultPrettyPrinter(Function<PrinterConfiguration, VoidVisitor<Void>> visitorFactory, PrinterConfiguration configuration) {
         this.configuration = configuration;
         this.visitorFactory = visitorFactory;
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinterVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinterVisitor.java
index f630063ac7..65cce91f17 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinterVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinterVisitor.java
@@ -23,7 +23,6 @@
 import static com.github.javaparser.utils.PositionUtils.sortByBeginPosition;
 import static com.github.javaparser.utils.Utils.*;
 import static java.util.stream.Collectors.joining;
-
 import com.github.javaparser.Position;
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
@@ -102,13 +101,7 @@ public String toString() {
      */
     protected void printModifiers(final NodeList<Modifier> modifiers) {
         if (modifiers.size() > 0) {
-            printer.print(modifiers.stream()
-                            .map(Modifier::getKeyword)
-                            .map(it -> !inJmlComment() && it.name().startsWith("JML_")
-                                    ? "/*@ " + it.asString() + " */"
-                                    : it.asString())
-                            .collect(joining(" "))
-                    + " ");
+            printer.print(modifiers.stream().map(Modifier::getKeyword).map(it -> !inJmlComment() && it.name().startsWith("JML_") ? "/*@ " + it.asString() + " */" : it.asString()).collect(joining(" ")) + " ");
         }
     }
 
@@ -172,8 +165,7 @@ protected void printMemberAnnotations(final NodeList<AnnotationExpr> annotations
      * If {@code prefixWithASpace} is set, outputs an additional space at the beginning if there are annotations
      * to output.
      */
-    protected void printAnnotations(
-            final NodeList<AnnotationExpr> annotations, boolean prefixWithASpace, final Void arg) {
+    protected void printAnnotations(final NodeList<AnnotationExpr> annotations, boolean prefixWithASpace, final Void arg) {
         if (annotations.isEmpty()) {
             return;
         }
@@ -234,8 +226,7 @@ protected void printTypeParameters(final NodeList<TypeParameter> args, final Voi
     protected <T extends Expression> void printArguments(final NodeList<T> args, final Void arg) {
         printer.print("(");
         if (!isNullOrEmpty(args)) {
-            boolean columnAlignParameters = (args.size() > 1)
-                    && getOption(ConfigOption.COLUMN_ALIGN_PARAMETERS).isPresent();
+            boolean columnAlignParameters = (args.size() > 1) && getOption(ConfigOption.COLUMN_ALIGN_PARAMETERS).isPresent();
             if (columnAlignParameters) {
                 printer.indentWithAlignTo(printer.getCursor().column);
             }
@@ -270,8 +261,7 @@ protected <T extends Expression> void printArguments(final NodeList<T> args, fin
      * @param separator seperator between the list items
      * @param postfix suffix for the list output
      */
-    protected void printPrePostFixOptionalList(
-            final NodeList<? extends Visitable> args, final Void arg, String prefix, String separator, String postfix) {
+    protected void printPrePostFixOptionalList(final NodeList<? extends Visitable> args, final Void arg, String prefix, String separator, String postfix) {
         if (!args.isEmpty()) {
             printer.print(prefix);
             for (final Iterator<? extends Visitable> i = args.iterator(); i.hasNext(); ) {
@@ -297,8 +287,7 @@ protected void printPrePostFixOptionalList(
      * @param separator seperator between the list items
      * @param postfix suffix for the list output
      */
-    protected void printPrePostFixRequiredList(
-            final NodeList<? extends Visitable> args, final Void arg, String prefix, String separator, String postfix) {
+    protected void printPrePostFixRequiredList(final NodeList<? extends Visitable> args, final Void arg, String prefix, String separator, String postfix) {
         printer.print(prefix);
         if (!args.isEmpty()) {
             for (final Iterator<? extends Visitable> i = args.iterator(); i.hasNext(); ) {
@@ -397,9 +386,7 @@ public void visit(final ClassOrInterfaceDeclaration n, final Void arg) {
             printTypeParameters(n.getTypeParameters(), arg);
             if (!n.getExtendedTypes().isEmpty()) {
                 printer.print(" extends ");
-                for (final Iterator<ClassOrInterfaceType> i =
-                                n.getExtendedTypes().iterator();
-                        i.hasNext(); ) {
+                for (final Iterator<ClassOrInterfaceType> i = n.getExtendedTypes().iterator(); i.hasNext(); ) {
                     final ClassOrInterfaceType c = i.next();
                     c.accept(this, arg);
                     if (i.hasNext()) {
@@ -409,9 +396,7 @@ public void visit(final ClassOrInterfaceDeclaration n, final Void arg) {
             }
             if (!n.getImplementedTypes().isEmpty()) {
                 printer.print(" implements ");
-                for (final Iterator<ClassOrInterfaceType> i =
-                                n.getImplementedTypes().iterator();
-                        i.hasNext(); ) {
+                for (final Iterator<ClassOrInterfaceType> i = n.getImplementedTypes().iterator(); i.hasNext(); ) {
                     final ClassOrInterfaceType c = i.next();
                     c.accept(this, arg);
                     if (i.hasNext()) {
@@ -421,9 +406,7 @@ public void visit(final ClassOrInterfaceDeclaration n, final Void arg) {
             }
             if (!n.getPermittedTypes().isEmpty()) {
                 printer.print(" permits ");
-                for (final Iterator<ClassOrInterfaceType> i =
-                                n.getPermittedTypes().iterator();
-                        i.hasNext(); ) {
+                for (final Iterator<ClassOrInterfaceType> i = n.getPermittedTypes().iterator(); i.hasNext(); ) {
                     final ClassOrInterfaceType c = i.next();
                     c.accept(this, arg);
                     if (i.hasNext()) {
@@ -470,9 +453,7 @@ public void visit(RecordDeclaration n, Void arg) {
         printer.print(")");
         if (!n.getImplementedTypes().isEmpty()) {
             printer.print(" implements ");
-            for (final Iterator<ClassOrInterfaceType> i =
-                            n.getImplementedTypes().iterator();
-                    i.hasNext(); ) {
+            for (final Iterator<ClassOrInterfaceType> i = n.getImplementedTypes().iterator(); i.hasNext(); ) {
                 final ClassOrInterfaceType c = i.next();
                 c.accept(this, arg);
                 if (i.hasNext()) {
@@ -493,12 +474,9 @@ public void visit(RecordDeclaration n, Void arg) {
     @Override
     public void visit(final TraditionalJavadocComment n, final Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
-        if (getOption(ConfigOption.PRINT_COMMENTS).isPresent()
-                && getOption(ConfigOption.PRINT_JAVADOC).isPresent()) {
+        if (getOption(ConfigOption.PRINT_COMMENTS).isPresent() && getOption(ConfigOption.PRINT_JAVADOC).isPresent()) {
             printer.println(n.getHeader());
-            final String commentContent = normalizeEolInTextBlock(
-                    n.getContent(),
-                    getOption(ConfigOption.END_OF_LINE_CHARACTER).get().asString());
+            final String commentContent = normalizeEolInTextBlock(n.getContent(), getOption(ConfigOption.END_OF_LINE_CHARACTER).get().asString());
             String[] lines = commentContent.split("\\R");
             List<String> strippedLines = new ArrayList<>();
             for (String line : lines) {
@@ -685,21 +663,19 @@ public void visit(final VariableDeclarator n, final Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         n.getName().accept(this, arg);
-        n.findAncestor(NodeWithVariables.class).ifPresent(ancestor -> ((NodeWithVariables<?>) ancestor)
-                .getMaximumCommonType()
-                .ifPresent(commonType -> {
-                    final Type type = n.getType();
-                    ArrayType arrayType = null;
-                    for (int i = commonType.getArrayLevel(); i < type.getArrayLevel(); i++) {
-                        if (arrayType == null) {
-                            arrayType = (ArrayType) type;
-                        } else {
-                            arrayType = (ArrayType) arrayType.getComponentType();
-                        }
-                        printAnnotations(arrayType.getAnnotations(), true, arg);
-                        printer.print("[]");
-                    }
-                }));
+        n.findAncestor(NodeWithVariables.class).ifPresent(ancestor -> ((NodeWithVariables<?>) ancestor).getMaximumCommonType().ifPresent(commonType -> {
+            final Type type = n.getType();
+            ArrayType arrayType = null;
+            for (int i = commonType.getArrayLevel(); i < type.getArrayLevel(); i++) {
+                if (arrayType == null) {
+                    arrayType = (ArrayType) type;
+                } else {
+                    arrayType = (ArrayType) arrayType.getComponentType();
+                }
+                printAnnotations(arrayType.getAnnotations(), true, arg);
+                printer.print("[]");
+            }
+        }));
         if (n.getInitializer().isPresent()) {
             printer.print(" = ");
             n.getInitializer().get().accept(this, arg);
@@ -725,7 +701,8 @@ public void visit(final ArrayInitializerExpr n, final Void arg) {
                 expr.accept(this, arg);
                 if (i.hasNext()) {
                     printer.print(multiLine ? "," : ", ");
-                    if (multiLine) printer.println();
+                    if (multiLine)
+                        printer.println();
                 }
             }
             if (multiLine) {
@@ -747,8 +724,7 @@ public void visit(final ArrayInitializerExpr n, final Void arg) {
      * and the array consists of {@code AnnotationExpr} entries.
      */
     private boolean doPrintAsArrayOfAnnotations(final ArrayInitializerExpr n) {
-        return getOption(ConfigOption.INDENT_PRINT_ARRAYS_OF_ANNOTATIONS).isPresent()
-                && n.getValues().stream().allMatch(s -> s instanceof AnnotationExpr);
+        return getOption(ConfigOption.INDENT_PRINT_ARRAYS_OF_ANNOTATIONS).isPresent() && n.getValues().stream().allMatch(s -> s instanceof AnnotationExpr);
     }
 
     @Override
@@ -903,8 +879,7 @@ private <T extends Node> void printList(NodeList<T> args, String sep) {
         printList(args, sep, "", "", "", "");
     }
 
-    private <T extends Node> void printList(
-            NodeList<T> args, String sep, String delimStart, String delimEnd, String eachStart, String eachEnd) {
+    private <T extends Node> void printList(NodeList<T> args, String sep, String delimStart, String delimEnd, String eachStart, String eachEnd) {
         if (!isNullOrEmpty(args)) {
             printer.print(delimStart);
             for (final Iterator<T> i = args.iterator(); i.hasNext(); ) {
@@ -933,7 +908,7 @@ public void visit(JmlQuantifiedExpr n, Void arg) {
     }
 
     @Override
-    public void visit(JmlClauseLabel n, Void arg) {
+    public void visit(JmlLabledClause n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printer.print(n.getKind().jmlSymbol);
         n.getLabel().ifPresent(it -> {
@@ -973,7 +948,7 @@ public void visit(JmlExpressionStmt n, Void arg) {
     public void visit(JmlLabelExpr n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printer.print("(");
-        switch (n.getKind()) {
+        switch(n.getKind()) {
             case NEUTRAL:
                 printer.print("\\lbl");
                 break;
@@ -1088,7 +1063,7 @@ public void visit(JmlRefiningStmt n, Void arg) {
     }
 
     @Override
-    public void visit(JmlClauseIf n, Void arg) {
+    public void visit(JmlConditionalClause n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printClause(n.getKind(), new StringLiteralExpr(("")));
     }
@@ -1233,7 +1208,7 @@ public void visit(JmlDocStmt n, Void arg) {
 
     @Override
     public void visit(JmlDoc n, Void arg) {
-        printer.print(n.getContent().asString());
+        wrapInJmlIfNeeded(() -> printer.print(n.getContent()));
     }
 
     @Override
@@ -1321,8 +1296,7 @@ public void visit(KeyCcatchBreak n, Void arg) {
         printCCatch(n, "\\Break", n.getLabel(), n.getBlock(), arg);
     }
 
-    private void printCCatch(
-            KeyCcatchBranch n, String kind, Optional<? extends Node> label, Optional<? extends Node> body, Void arg) {
+    private void printCCatch(KeyCcatchBranch n, String kind, Optional<? extends Node> label, Optional<? extends Node> body, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print("ccatch(");
@@ -1354,7 +1328,7 @@ public void visit(KeyCcatchReturn n, Void arg) {
     }
 
     @Override
-    public void visit(KeyCatchAllStatement n, Void arg) {
+    public void visit(KeyCatchAllStmt n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print("#catchAll(");
@@ -1376,7 +1350,7 @@ public void visit(KeyEscapeExpression n, Void arg) {
     }
 
     @Override
-    public void visit(KeyExecStatement n, Void arg) {
+    public void visit(KeyExecStmt n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print("exec ");
@@ -1404,7 +1378,7 @@ public void visit(KeyExecutionContext n, Void arg) {
     }
 
     @Override
-    public void visit(KeyLoopScopeBlock n, Void arg) {
+    public void visit(KeyLoopScopeBlockStmt n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print("$loopScope( ");
@@ -1415,7 +1389,7 @@ public void visit(KeyLoopScopeBlock n, Void arg) {
     }
 
     @Override
-    public void visit(KeyMergePointStatement n, Void arg) {
+    public void visit(KeyMergePointStmt n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print("merge_point");
@@ -1435,7 +1409,7 @@ public void visit(KeyMethodBodyStatement n, Void arg) {
     }
 
     @Override
-    public void visit(KeyMethodCallStatement n, Void arg) {
+    public void visit(KeyMethodCallStmt n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print("method-frame(");
@@ -1460,16 +1434,7 @@ public void visit(KeyMethodSignature n, Void arg) {
     }
 
     @Override
-    public void visit(KeyRangeExpression n, Void arg) {
-        printOrphanCommentsBeforeThisChildNode(n);
-        printComment(n.getComment(), arg);
-        n.getLower().accept(this, arg);
-        printer.print("..");
-        n.getUpper().accept(this, arg);
-    }
-
-    @Override
-    public void visit(KeyTransactionStatement n, Void arg) {
+    public void visit(KeyTransactionStmt n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print(n.getType().symbol);
@@ -1605,6 +1570,35 @@ public void visit(KeyExecutionContextSV n, Void arg) {
         printer.print(n.getText());
     }
 
+    @Override
+    public void visit(KeYMarkerStatement n, Void arg) {
+        printer.println("//KEY MARKER STATEMENT: " + n.getKind());
+    }
+
+    @Override
+    public void visit(JmlInfFlowClause n, Void arg) {
+        printer.print(n.kind().toString());
+        printer.print(" ");
+        printList(n.getExpressions(), ", ");
+        if (n.kind() == JmlClauseKind.DETERMINES || n.kind() == JmlClauseKind.LOOP_DETERMINES) {
+            printer.print(" \\by ");
+            printList(n.getBy(), ", ");
+        }
+        if (n.declassifies().isNonEmpty()) {
+            printer.print(" \\declassifies ");
+            printList(n.getDeclassifies(), ", ");
+        }
+        if (n.getErases().isNonEmpty()) {
+            printer.print(" \\erases ");
+            printList(n.getErases(), ", ");
+        }
+        if (n.getNewObjects().isNonEmpty()) {
+            printer.print(" \\new_objects ");
+            printList(n.getNewObjects(), ", ");
+        }
+        printer.print(";\n");
+    }
+
     @Override
     public void visit(final RecordPatternExpr n, final Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
@@ -1720,24 +1714,16 @@ public void visit(final MethodCallExpr n, final Void arg) {
         AtomicBoolean columnAlignFirstMethodChain = new AtomicBoolean();
         if (getOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN).isPresent()) {
             // pick the kind of expressions where vertically aligning method calls is okay.
-            if (n.findAncestor(Statement.class)
-                    .map(p -> p.isReturnStmt() || p.isThrowStmt() || p.isAssertStmt() || p.isExpressionStmt())
-                    .orElse(false)) {
+            if (n.findAncestor(Statement.class).map(p -> p.isReturnStmt() || p.isThrowStmt() || p.isAssertStmt() || p.isExpressionStmt()).orElse(false)) {
                 // search for first parent that does not have its child as scope
                 Node c = n;
                 Optional<Node> p = c.getParentNode();
-                while (p.isPresent()
-                        && p.filter(NodeWithTraversableScope.class::isInstance)
-                                .map(NodeWithTraversableScope.class::cast)
-                                .flatMap(NodeWithTraversableScope::traverseScope)
-                                .map(c::equals)
-                                .orElse(false)) {
+                while (p.isPresent() && p.filter(NodeWithTraversableScope.class::isInstance).map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope).map(c::equals).orElse(false)) {
                     c = p.get();
                     p = c.getParentNode();
                 }
                 // check if the parent is a method call and thus we are in an argument list
-                columnAlignFirstMethodChain.set(
-                        !p.filter(MethodCallExpr.class::isInstance).isPresent());
+                columnAlignFirstMethodChain.set(!p.filter(MethodCallExpr.class::isInstance).isPresent());
             }
         }
         // we are at the last method call of a call chain
@@ -1745,12 +1731,7 @@ public void visit(final MethodCallExpr n, final Void arg) {
         AtomicBoolean lastMethodInCallChain = new AtomicBoolean(true);
         if (columnAlignFirstMethodChain.get()) {
             Node node = n;
-            while (node.getParentNode()
-                    .filter(NodeWithTraversableScope.class::isInstance)
-                    .map(NodeWithTraversableScope.class::cast)
-                    .flatMap(NodeWithTraversableScope::traverseScope)
-                    .map(node::equals)
-                    .orElse(false)) {
+            while (node.getParentNode().filter(NodeWithTraversableScope.class::isInstance).map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope).map(node::equals).orElse(false)) {
                 node = node.getParentNode().orElseThrow(AssertionError::new);
                 if (node instanceof MethodCallExpr) {
                     lastMethodInCallChain.set(false);
@@ -1764,8 +1745,7 @@ public void visit(final MethodCallExpr n, final Void arg) {
         if (columnAlignFirstMethodChain.get()) {
             Optional<Expression> s = n.getScope();
             while (s.filter(NodeWithTraversableScope.class::isInstance).isPresent()) {
-                Optional<Expression> parentScope =
-                        s.map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope);
+                Optional<Expression> parentScope = s.map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope);
                 if (s.filter(MethodCallExpr.class::isInstance).isPresent() && parentScope.isPresent()) {
                     methodCallWithScopeInScope.set(true);
                     break;
@@ -2209,9 +2189,7 @@ public void visit(final EnumDeclaration n, final Void arg) {
         n.getName().accept(this, arg);
         if (!n.getImplementedTypes().isEmpty()) {
             printer.print(" implements ");
-            for (final Iterator<ClassOrInterfaceType> i =
-                            n.getImplementedTypes().iterator();
-                    i.hasNext(); ) {
+            for (final Iterator<ClassOrInterfaceType> i = n.getImplementedTypes().iterator(); i.hasNext(); ) {
                 final ClassOrInterfaceType c = i.next();
                 c.accept(this, arg);
                 if (i.hasNext()) {
@@ -2223,11 +2201,7 @@ public void visit(final EnumDeclaration n, final Void arg) {
         printer.indent();
         if (n.getEntries().isNonEmpty()) {
             // Either we hit the constant amount limit in the configurations, or any of the constants has a comment
-            final boolean alignVertically = n.getEntries().size()
-                            > getOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY)
-                                    .get()
-                                    .asInteger()
-                    || n.getEntries().stream().anyMatch(e -> e.getComment().isPresent());
+            final boolean alignVertically = n.getEntries().size() > getOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY).get().asInteger() || n.getEntries().stream().anyMatch(e -> e.getComment().isPresent());
             printer.println();
             for (final Iterator<EnumConstantDeclaration> i = n.getEntries().iterator(); i.hasNext(); ) {
                 final EnumConstantDeclaration e = i.next();
@@ -2288,27 +2262,34 @@ public void visit(final IfStmt n, final Void arg) {
         printer.print("if (");
         n.getCondition().accept(this, arg);
         final boolean thenBlock = n.getThenStmt() instanceof BlockStmt;
-        if ( // block statement should start on the same line
-        thenBlock) printer.print(") ");
+        if (// block statement should start on the same line
+        thenBlock)
+            printer.print(") ");
         else {
             printer.println(")");
             printer.indent();
         }
         n.getThenStmt().accept(this, arg);
-        if (!thenBlock) printer.unindent();
+        if (!thenBlock)
+            printer.unindent();
         if (n.getElseStmt().isPresent()) {
-            if (thenBlock) printer.print(" ");
-            else printer.println();
+            if (thenBlock)
+                printer.print(" ");
+            else
+                printer.println();
             final boolean elseIf = n.getElseStmt().orElse(null) instanceof IfStmt;
             final boolean elseBlock = n.getElseStmt().orElse(null) instanceof BlockStmt;
-            if ( // put chained if and start of block statement on a same level
-            elseIf || elseBlock) printer.print("else ");
+            if (// put chained if and start of block statement on a same level
+            elseIf || elseBlock)
+                printer.print("else ");
             else {
                 printer.println("else");
                 printer.indent();
             }
-            if (n.getElseStmt().isPresent()) n.getElseStmt().get().accept(this, arg);
-            if (!(elseIf || elseBlock)) printer.unindent();
+            if (n.getElseStmt().isPresent())
+                n.getElseStmt().get().accept(this, arg);
+            if (!(elseIf || elseBlock))
+                printer.unindent();
         }
     }
 
@@ -2544,8 +2525,7 @@ public void visit(final LineComment n, final Void arg) {
         if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent()) {
             return;
         }
-        printer.print(n.getHeader())
-                .println(normalizeEolInTextBlock(RTRIM.matcher(n.getContent()).replaceAll(""), ""));
+        printer.print(n.getHeader()).println(normalizeEolInTextBlock(RTRIM.matcher(n.getContent()).replaceAll(""), ""));
     }
 
     @Override
@@ -2553,9 +2533,7 @@ public void visit(final BlockComment n, final Void arg) {
         if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent()) {
             return;
         }
-        final String commentContent = normalizeEolInTextBlock(
-                n.getContent(),
-                getOption(ConfigOption.END_OF_LINE_CHARACTER).get().asString());
+        final String commentContent = normalizeEolInTextBlock(n.getContent(), getOption(ConfigOption.END_OF_LINE_CHARACTER).get().asString());
         // as BlockComment should not be formatted, -1 to preserve any trailing empty line if present
         String[] lines = commentContent.split("\\R", -1);
         printer.print(n.getHeader());
@@ -2575,9 +2553,7 @@ public void visit(final MarkdownComment n, final Void arg) {
         if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent()) {
             return;
         }
-        final String commentContent = normalizeEolInTextBlock(
-                n.getContent(),
-                getOption(ConfigOption.END_OF_LINE_CHARACTER).get().asString());
+        final String commentContent = normalizeEolInTextBlock(n.getContent(), getOption(ConfigOption.END_OF_LINE_CHARACTER).get().asString());
         String[] lines = commentContent.split("\\R");
         for (int i = 0; i < (lines.length - 1); i++) {
             printer.print(n.getHeader());
@@ -2775,8 +2751,10 @@ private void printClause(JmlClauseKind name, NodeList<SimpleName> heaps, Express
     }
 
     private void printClause(JmlClauseKind name, NodeList<SimpleName> heaps, NodeList<Expression> expr) {
-        if (name == null) printer.print("/*ERROR name not set*/");
-        else printer.print(name.jmlSymbol);
+        if (name == null)
+            printer.print("/*ERROR name not set*/");
+        else
+            printer.print(name.jmlSymbol);
         printer.print(" ");
         printList(heaps, "", "", "", "<", ">");
         printList(expr, ", ");
@@ -2787,10 +2765,13 @@ private void printClause(JmlClauseKind name, NodeList<SimpleName> heaps, NodeLis
      * Print all orphaned comments coming right before {@code node}.
      */
     protected void printOrphanCommentsBeforeThisChildNode(final Node node) {
-        if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent()) return;
-        if (node instanceof Comment) return;
+        if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent())
+            return;
+        if (node instanceof Comment)
+            return;
         Node parent = node.getParentNode().orElse(null);
-        if (parent == null) return;
+        if (parent == null)
+            return;
         List<Node> everything = new ArrayList<>(parent.getChildNodes());
         sortByBeginPosition(everything);
         int positionOfTheChild = -1;
@@ -2806,14 +2787,13 @@ protected void printOrphanCommentsBeforeThisChildNode(final Node node) {
         }
         int positionOfPreviousChild = -1;
         for (int i = positionOfTheChild - 1; i >= 0 && positionOfPreviousChild == -1; i--) {
-            if (!(everything.get(i) instanceof Comment)) positionOfPreviousChild = i;
+            if (!(everything.get(i) instanceof Comment))
+                positionOfPreviousChild = i;
         }
         for (int i = positionOfPreviousChild + 1; i < positionOfTheChild; i++) {
             Node nodeToPrint = everything.get(i);
             if (!(nodeToPrint instanceof Comment))
-                throw new RuntimeException(
-                        "Expected comment, instead " + nodeToPrint.getClass() + ". Position of previous child: "
-                                + positionOfPreviousChild + ", position of child " + positionOfTheChild);
+                throw new RuntimeException("Expected comment, instead " + nodeToPrint.getClass() + ". Position of previous child: " + positionOfPreviousChild + ", position of child " + positionOfTheChild);
             nodeToPrint.accept(this, null);
         }
     }
@@ -2822,7 +2802,8 @@ protected void printOrphanCommentsBeforeThisChildNode(final Node node) {
      * Print all orphan comments coming at the end of the given {@code node}.
      */
     protected void printOrphanCommentsEnding(final Node node) {
-        if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent()) return;
+        if (!getOption(ConfigOption.PRINT_COMMENTS).isPresent())
+            return;
         List<Node> everything = new ArrayList<>(node.getChildNodes());
         sortByBeginPosition(everything);
         if (everything.isEmpty()) {
@@ -2846,14 +2827,16 @@ protected void printOrphanCommentsEnding(final Node node) {
      * Conditionally increase indent.
      */
     private void indentIf(boolean expr) {
-        if (expr) printer.indent();
+        if (expr)
+            printer.indent();
     }
 
     /**
      * Conditionally decrease indent.
      */
     private void unindentIf(boolean expr) {
-        if (expr) printer.unindent();
+        if (expr)
+            printer.unindent();
     }
 
     /**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/DotPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/DotPrinter.java
index c553bbe42f..74ef8ae141 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/DotPrinter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/DotPrinter.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import static java.util.stream.Collectors.toList;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.metamodel.NodeMetaModel;
@@ -56,32 +55,25 @@ public void output(Node node, String parentNodeName, String name, StringBuilder
         assertNotNull(node);
         NodeMetaModel metaModel = node.getMetaModel();
         List<PropertyMetaModel> allPropertyMetaModels = metaModel.getAllPropertyMetaModels();
-        List<PropertyMetaModel> attributes = allPropertyMetaModels.stream()
-                .filter(PropertyMetaModel::isAttribute)
-                .filter(PropertyMetaModel::isSingular)
-                .collect(toList());
-        List<PropertyMetaModel> subNodes = allPropertyMetaModels.stream()
-                .filter(PropertyMetaModel::isNode)
-                .filter(PropertyMetaModel::isSingular)
-                .collect(toList());
-        List<PropertyMetaModel> subLists = allPropertyMetaModels.stream()
-                .filter(PropertyMetaModel::isNodeList)
-                .collect(toList());
+        List<PropertyMetaModel> attributes = allPropertyMetaModels.stream().filter(PropertyMetaModel::isAttribute).filter(PropertyMetaModel::isSingular).collect(toList());
+        List<PropertyMetaModel> subNodes = allPropertyMetaModels.stream().filter(PropertyMetaModel::isNode).filter(PropertyMetaModel::isSingular).collect(toList());
+        List<PropertyMetaModel> subLists = allPropertyMetaModels.stream().filter(PropertyMetaModel::isNodeList).collect(toList());
         String ndName = nextNodeName();
         if (outputNodeType)
-            builder.append(LineSeparator.SYSTEM + ndName + " [label=\"" + escape(name) + " (" + metaModel.getTypeName()
-                    + ")\"];");
-        else builder.append(LineSeparator.SYSTEM + ndName + " [label=\"" + escape(name) + "\"];");
-        if (parentNodeName != null) builder.append(LineSeparator.SYSTEM + parentNodeName + " -> " + ndName + ";");
+            builder.append(LineSeparator.SYSTEM + ndName + " [label=\"" + escape(name) + " (" + metaModel.getTypeName() + ")\"];");
+        else
+            builder.append(LineSeparator.SYSTEM + ndName + " [label=\"" + escape(name) + "\"];");
+        if (parentNodeName != null)
+            builder.append(LineSeparator.SYSTEM + parentNodeName + " -> " + ndName + ";");
         for (PropertyMetaModel a : attributes) {
             String attrName = nextNodeName();
-            builder.append(LineSeparator.SYSTEM + attrName + " [label=\"" + escape(a.getName()) + "='"
-                    + escape(a.getValue(node).toString()) + "'\"];");
+            builder.append(LineSeparator.SYSTEM + attrName + " [label=\"" + escape(a.getName()) + "='" + escape(a.getValue(node).toString()) + "'\"];");
             builder.append(LineSeparator.SYSTEM + ndName + " -> " + attrName + ";");
         }
         for (PropertyMetaModel sn : subNodes) {
             Node nd = (Node) sn.getValue(node);
-            if (nd != null) output(nd, ndName, sn.getName(), builder);
+            if (nd != null)
+                output(nd, ndName, sn.getName(), builder);
         }
         for (PropertyMetaModel sl : subLists) {
             NodeList<? extends Node> nl = (NodeList<? extends Node>) sl.getValue(node);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
index 0a31dc4d96..0163433245 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
@@ -25,7 +25,6 @@
 import static com.github.javaparser.utils.Utils.*;
 import static java.util.Comparator.comparingInt;
 import static java.util.stream.Collectors.joining;
-
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.comments.*;
@@ -33,6 +32,7 @@
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
 import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.key.*;
@@ -91,11 +91,7 @@ public String toString() {
 
     protected void printModifiers(final NodeList<Modifier> modifiers) {
         if (modifiers.size() > 0) {
-            printer.print(
-                    modifiers.stream()
-                                    .map(Modifier::getKeyword)
-                                    .map(Modifier.Keyword::asString)
-                                    .collect(joining(" ")) + " ");
+            printer.print(modifiers.stream().map(Modifier::getKeyword).map(Modifier.Keyword::asString).collect(joining(" ")) + " ");
         }
     }
 
@@ -117,8 +113,7 @@ protected void printMemberAnnotations(final NodeList<AnnotationExpr> annotations
         }
     }
 
-    protected void printAnnotations(
-            final NodeList<AnnotationExpr> annotations, boolean prefixWithASpace, final Void arg) {
+    protected void printAnnotations(final NodeList<AnnotationExpr> annotations, boolean prefixWithASpace, final Void arg) {
         if (annotations.isEmpty()) {
             return;
         }
@@ -186,8 +181,7 @@ protected <T extends Expression> void printArguments(final NodeList<T> args, fin
         printer.print(")");
     }
 
-    protected void printPrePostFixOptionalList(
-            final NodeList<? extends Visitable> args, final Void arg, String prefix, String separator, String postfix) {
+    protected void printPrePostFixOptionalList(final NodeList<? extends Visitable> args, final Void arg, String prefix, String separator, String postfix) {
         if (!args.isEmpty()) {
             printer.print(prefix);
             for (final Iterator<? extends Visitable> i = args.iterator(); i.hasNext(); ) {
@@ -201,8 +195,7 @@ protected void printPrePostFixOptionalList(
         }
     }
 
-    protected void printPrePostFixRequiredList(
-            final NodeList<? extends Visitable> args, final Void arg, String prefix, String separator, String postfix) {
+    protected void printPrePostFixRequiredList(final NodeList<? extends Visitable> args, final Void arg, String prefix, String separator, String postfix) {
         printer.print(prefix);
         if (!args.isEmpty()) {
             for (final Iterator<? extends Visitable> i = args.iterator(); i.hasNext(); ) {
@@ -299,9 +292,7 @@ public void visit(final ClassOrInterfaceDeclaration n, final Void arg) {
             printTypeParameters(n.getTypeParameters(), arg);
             if (!n.getExtendedTypes().isEmpty()) {
                 printer.print(" extends ");
-                for (final Iterator<ClassOrInterfaceType> i =
-                                n.getExtendedTypes().iterator();
-                        i.hasNext(); ) {
+                for (final Iterator<ClassOrInterfaceType> i = n.getExtendedTypes().iterator(); i.hasNext(); ) {
                     final ClassOrInterfaceType c = i.next();
                     c.accept(this, arg);
                     if (i.hasNext()) {
@@ -311,9 +302,7 @@ public void visit(final ClassOrInterfaceDeclaration n, final Void arg) {
             }
             if (!n.getImplementedTypes().isEmpty()) {
                 printer.print(" implements ");
-                for (final Iterator<ClassOrInterfaceType> i =
-                                n.getImplementedTypes().iterator();
-                        i.hasNext(); ) {
+                for (final Iterator<ClassOrInterfaceType> i = n.getImplementedTypes().iterator(); i.hasNext(); ) {
                     final ClassOrInterfaceType c = i.next();
                     c.accept(this, arg);
                     if (i.hasNext()) {
@@ -323,9 +312,7 @@ public void visit(final ClassOrInterfaceDeclaration n, final Void arg) {
             }
             if (!n.getPermittedTypes().isEmpty()) {
                 printer.print(" permits ");
-                for (final Iterator<ClassOrInterfaceType> i =
-                                n.getPermittedTypes().iterator();
-                        i.hasNext(); ) {
+                for (final Iterator<ClassOrInterfaceType> i = n.getPermittedTypes().iterator(); i.hasNext(); ) {
                     final ClassOrInterfaceType c = i.next();
                     c.accept(this, arg);
                     if (i.hasNext()) {
@@ -393,9 +380,7 @@ public void visit(RecordDeclaration n, Void arg) {
         printTypeParameters(n.getTypeParameters(), arg);
         if (!n.getImplementedTypes().isEmpty()) {
             printer.print(" implements ");
-            for (final Iterator<ClassOrInterfaceType> i =
-                            n.getImplementedTypes().iterator();
-                    i.hasNext(); ) {
+            for (final Iterator<ClassOrInterfaceType> i = n.getImplementedTypes().iterator(); i.hasNext(); ) {
                 final ClassOrInterfaceType c = i.next();
                 c.accept(this, arg);
                 if (i.hasNext()) {
@@ -418,8 +403,7 @@ public void visit(final TraditionalJavadocComment n, final Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         if (configuration.isPrintComments() && configuration.isPrintJavadoc()) {
             printer.println(n.getHeader());
-            final String commentContent =
-                    normalizeEolInTextBlock(n.getContent(), configuration.getEndOfLineCharacter());
+            final String commentContent = normalizeEolInTextBlock(n.getContent(), configuration.getEndOfLineCharacter());
             String[] lines = commentContent.split("\\R");
             List<String> strippedLines = new ArrayList<>();
             for (String line : lines) {
@@ -606,21 +590,19 @@ public void visit(final VariableDeclarator n, final Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         n.getName().accept(this, arg);
-        n.findAncestor(NodeWithVariables.class).ifPresent(ancestor -> ((NodeWithVariables<?>) ancestor)
-                .getMaximumCommonType()
-                .ifPresent(commonType -> {
-                    final Type type = n.getType();
-                    ArrayType arrayType = null;
-                    for (int i = commonType.getArrayLevel(); i < type.getArrayLevel(); i++) {
-                        if (arrayType == null) {
-                            arrayType = (ArrayType) type;
-                        } else {
-                            arrayType = (ArrayType) arrayType.getComponentType();
-                        }
-                        printAnnotations(arrayType.getAnnotations(), true, arg);
-                        printer.print("[]");
-                    }
-                }));
+        n.findAncestor(NodeWithVariables.class).ifPresent(ancestor -> ((NodeWithVariables<?>) ancestor).getMaximumCommonType().ifPresent(commonType -> {
+            final Type type = n.getType();
+            ArrayType arrayType = null;
+            for (int i = commonType.getArrayLevel(); i < type.getArrayLevel(); i++) {
+                if (arrayType == null) {
+                    arrayType = (ArrayType) type;
+                } else {
+                    arrayType = (ArrayType) arrayType.getComponentType();
+                }
+                printAnnotations(arrayType.getAnnotations(), true, arg);
+                printer.print("[]");
+            }
+        }));
         if (n.getInitializer().isPresent()) {
             printer.print(" = ");
             n.getInitializer().get().accept(this, arg);
@@ -852,7 +834,7 @@ public void visit(KeyCcatchReturn n, Void arg) {
     }
 
     @Override
-    public void visit(KeyCatchAllStatement n, Void arg) {
+    public void visit(KeyCatchAllStmt n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print("#catchAll");
@@ -875,7 +857,7 @@ public void visit(KeyEscapeExpression n, Void arg) {
     }
 
     @Override
-    public void visit(KeyExecStatement n, Void arg) {
+    public void visit(KeyExecStmt n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print("exec");
@@ -903,7 +885,7 @@ public void visit(KeyExecutionContext n, Void arg) {
     }
 
     @Override
-    public void visit(KeyLoopScopeBlock n, Void arg) {
+    public void visit(KeyLoopScopeBlockStmt n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print("loop-scope");
@@ -914,7 +896,7 @@ public void visit(KeyLoopScopeBlock n, Void arg) {
     }
 
     @Override
-    public void visit(KeyMergePointStatement n, Void arg) {
+    public void visit(KeyMergePointStmt n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print("merge_point");
@@ -938,7 +920,7 @@ public void visit(KeyMethodBodyStatement n, Void arg) {
     }
 
     @Override
-    public void visit(KeyMethodCallStatement n, Void arg) {
+    public void visit(KeyMethodCallStmt n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print("method-frame");
@@ -968,16 +950,7 @@ public void visit(KeyMethodSignature n, Void arg) {
     }
 
     @Override
-    public void visit(KeyRangeExpression n, Void arg) {
-        printOrphanCommentsBeforeThisChildNode(n);
-        printComment(n.getComment(), arg);
-        n.getLower().accept(this, arg);
-        printer.print("..");
-        n.getUpper().accept(this, arg);
-    }
-
-    @Override
-    public void visit(KeyTransactionStatement n, Void arg) {
+    public void visit(KeyTransactionStmt n, Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
         printComment(n.getComment(), arg);
         printer.print(n.getType().symbol);
@@ -1112,6 +1085,35 @@ public void visit(KeyExecutionContextSV n, Void arg) {
         printer.print(n.getText());
     }
 
+    @Override
+    public void visit(KeYMarkerStatement n, Void arg) {
+        printer.println("//KEY MARKER STATEMENT: " + n.getKind());
+    }
+
+    @Override
+    public void visit(JmlInfFlowClause n, Void arg) {
+        printer.print(n.kind().toString());
+        printer.print(" ");
+        printArguments(n.getExpressions(), arg);
+        if (n.kind() == JmlClauseKind.DETERMINES || n.kind() == JmlClauseKind.LOOP_DETERMINES) {
+            printer.print(" \\by ");
+            printArguments(n.getBy(), arg);
+        }
+        if (n.declassifies().isNonEmpty()) {
+            printer.print(" \\declassifies ");
+            printArguments(n.getDeclassifies(), arg);
+        }
+        if (n.getErases().isNonEmpty()) {
+            printer.print(" \\erases ");
+            printArguments(n.getErases(), arg);
+        }
+        if (n.getNewObjects().isNonEmpty()) {
+            printer.print(" \\new_objects ");
+            printArguments(n.getNewObjects(), arg);
+        }
+        printer.print(";\n");
+    }
+
     @Override
     public void visit(final RecordPatternExpr n, final Void arg) {
         printOrphanCommentsBeforeThisChildNode(n);
@@ -1227,24 +1229,16 @@ public void visit(final MethodCallExpr n, final Void arg) {
         AtomicBoolean columnAlignFirstMethodChain = new AtomicBoolean();
         if (configuration.isColumnAlignFirstMethodChain()) {
             // pick the kind of expressions where vertically aligning method calls is okay.
-            if (n.findAncestor(Statement.class)
-                    .map(p -> p.isReturnStmt() || p.isThrowStmt() || p.isAssertStmt() || p.isExpressionStmt())
-                    .orElse(false)) {
+            if (n.findAncestor(Statement.class).map(p -> p.isReturnStmt() || p.isThrowStmt() || p.isAssertStmt() || p.isExpressionStmt()).orElse(false)) {
                 // search for first parent that does not have its child as scope
                 Node c = n;
                 Optional<Node> p = c.getParentNode();
-                while (p.isPresent()
-                        && p.filter(NodeWithTraversableScope.class::isInstance)
-                                .map(NodeWithTraversableScope.class::cast)
-                                .flatMap(NodeWithTraversableScope::traverseScope)
-                                .map(c::equals)
-                                .orElse(false)) {
+                while (p.isPresent() && p.filter(NodeWithTraversableScope.class::isInstance).map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope).map(c::equals).orElse(false)) {
                     c = p.get();
                     p = c.getParentNode();
                 }
                 // check if the parent is a method call and thus we are in an argument list
-                columnAlignFirstMethodChain.set(
-                        !p.filter(MethodCallExpr.class::isInstance).isPresent());
+                columnAlignFirstMethodChain.set(!p.filter(MethodCallExpr.class::isInstance).isPresent());
             }
         }
         // we are at the last method call of a call chain
@@ -1252,12 +1246,7 @@ public void visit(final MethodCallExpr n, final Void arg) {
         AtomicBoolean lastMethodInCallChain = new AtomicBoolean(true);
         if (columnAlignFirstMethodChain.get()) {
             Node node = n;
-            while (node.getParentNode()
-                    .filter(NodeWithTraversableScope.class::isInstance)
-                    .map(NodeWithTraversableScope.class::cast)
-                    .flatMap(NodeWithTraversableScope::traverseScope)
-                    .map(node::equals)
-                    .orElse(false)) {
+            while (node.getParentNode().filter(NodeWithTraversableScope.class::isInstance).map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope).map(node::equals).orElse(false)) {
                 node = node.getParentNode().orElseThrow(AssertionError::new);
                 if (node instanceof MethodCallExpr) {
                     lastMethodInCallChain.set(false);
@@ -1271,8 +1260,7 @@ public void visit(final MethodCallExpr n, final Void arg) {
         if (columnAlignFirstMethodChain.get()) {
             Optional<Expression> s = n.getScope();
             while (s.filter(NodeWithTraversableScope.class::isInstance).isPresent()) {
-                Optional<Expression> parentScope =
-                        s.map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope);
+                Optional<Expression> parentScope = s.map(NodeWithTraversableScope.class::cast).flatMap(NodeWithTraversableScope::traverseScope);
                 if (s.filter(MethodCallExpr.class::isInstance).isPresent() && parentScope.isPresent()) {
                     methodCallWithScopeInScope.set(true);
                     break;
@@ -1708,9 +1696,7 @@ public void visit(final EnumDeclaration n, final Void arg) {
         n.getName().accept(this, arg);
         if (!n.getImplementedTypes().isEmpty()) {
             printer.print(" implements ");
-            for (final Iterator<ClassOrInterfaceType> i =
-                            n.getImplementedTypes().iterator();
-                    i.hasNext(); ) {
+            for (final Iterator<ClassOrInterfaceType> i = n.getImplementedTypes().iterator(); i.hasNext(); ) {
                 final ClassOrInterfaceType c = i.next();
                 c.accept(this, arg);
                 if (i.hasNext()) {
@@ -1722,9 +1708,7 @@ public void visit(final EnumDeclaration n, final Void arg) {
         printer.indent();
         if (n.getEntries().isNonEmpty()) {
             // Either we hit the constant amount limit in the configurations, or any of the constants has a comment
-            final boolean alignVertically = n.getEntries().size()
-                            > configuration.getMaxEnumConstantsToAlignHorizontally()
-                    || n.getEntries().stream().anyMatch(e -> e.getComment().isPresent());
+            final boolean alignVertically = n.getEntries().size() > configuration.getMaxEnumConstantsToAlignHorizontally() || n.getEntries().stream().anyMatch(e -> e.getComment().isPresent());
             printer.println();
             for (final Iterator<EnumConstantDeclaration> i = n.getEntries().iterator(); i.hasNext(); ) {
                 final EnumConstantDeclaration e = i.next();
@@ -1785,27 +1769,34 @@ public void visit(final IfStmt n, final Void arg) {
         printer.print("if (");
         n.getCondition().accept(this, arg);
         final boolean thenBlock = n.getThenStmt() instanceof BlockStmt;
-        if ( // block statement should start on the same line
-        thenBlock) printer.print(") ");
+        if (// block statement should start on the same line
+        thenBlock)
+            printer.print(") ");
         else {
             printer.println(")");
             printer.indent();
         }
         n.getThenStmt().accept(this, arg);
-        if (!thenBlock) printer.unindent();
+        if (!thenBlock)
+            printer.unindent();
         if (n.getElseStmt().isPresent()) {
-            if (thenBlock) printer.print(" ");
-            else printer.println();
+            if (thenBlock)
+                printer.print(" ");
+            else
+                printer.println();
             final boolean elseIf = n.getElseStmt().orElse(null) instanceof IfStmt;
             final boolean elseBlock = n.getElseStmt().orElse(null) instanceof BlockStmt;
-            if ( // put chained if and start of block statement on a same level
-            elseIf || elseBlock) printer.print("else ");
+            if (// put chained if and start of block statement on a same level
+            elseIf || elseBlock)
+                printer.print("else ");
             else {
                 printer.println("else");
                 printer.indent();
             }
-            if (n.getElseStmt().isPresent()) n.getElseStmt().get().accept(this, arg);
-            if (!(elseIf || elseBlock)) printer.unindent();
+            if (n.getElseStmt().isPresent())
+                n.getElseStmt().get().accept(this, arg);
+            if (!(elseIf || elseBlock))
+                printer.unindent();
         }
     }
 
@@ -2033,8 +2024,7 @@ public void visit(final LineComment n, final Void arg) {
         if (configuration.isIgnoreComments()) {
             return;
         }
-        printer.print(n.getHeader())
-                .println(normalizeEolInTextBlock(RTRIM.matcher(n.getContent()).replaceAll(""), ""));
+        printer.print(n.getHeader()).println(normalizeEolInTextBlock(RTRIM.matcher(n.getContent()).replaceAll(""), ""));
     }
 
     @Override
@@ -2135,8 +2125,7 @@ public void visit(NodeList n, Void arg) {
         if (configuration.isOrderImports() && n.size() > 0 && n.get(0) instanceof ImportDeclaration) {
             // noinspection unchecked
             NodeList<ImportDeclaration> modifiableList = new NodeList<>(n);
-            modifiableList.sort(comparingInt((ImportDeclaration i) -> i.isStatic() ? 0 : 1)
-                    .thenComparing(NodeWithName::getNameAsString));
+            modifiableList.sort(comparingInt((ImportDeclaration i) -> i.isStatic() ? 0 : 1).thenComparing(NodeWithName::getNameAsString));
             for (Object node : modifiableList) {
                 ((Node) node).accept(this, arg);
             }
@@ -2224,64 +2213,84 @@ public void visit(UnparsableStmt n, Void arg) {
     }
 
     @Override
-    public void visit(JmlQuantifiedExpr jmlQuantifiedExpr, Void arg) {}
+    public void visit(JmlQuantifiedExpr jmlQuantifiedExpr, Void arg) {
+    }
 
     @Override
-    public void visit(JmlClauseLabel n, Void arg) {}
+    public void visit(JmlLabledClause n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlExpressionStmt n, Void arg) {}
+    public void visit(JmlExpressionStmt n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlLabelExpr n, Void arg) {}
+    public void visit(JmlLabelExpr n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlLetExpr n, Void arg) {}
+    public void visit(JmlLetExpr n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlMultiCompareExpr n, Void arg) {}
+    public void visit(JmlMultiCompareExpr n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlSimpleExprClause n, Void arg) {}
+    public void visit(JmlSimpleExprClause n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlSignalsClause n, Void arg) {}
+    public void visit(JmlSignalsClause n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlSignalsOnlyClause n, Void arg) {}
+    public void visit(JmlSignalsOnlyClause n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlUnreachableStmt n, Void arg) {}
+    public void visit(JmlUnreachableStmt n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlCallableClause n, Void arg) {}
+    public void visit(JmlCallableClause n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlForallClause n, Void arg) {}
+    public void visit(JmlForallClause n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlRefiningStmt n, Void arg) {}
+    public void visit(JmlRefiningStmt n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlClauseIf n, Void arg) {}
+    public void visit(JmlConditionalClause n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlClassExprDeclaration n, Void arg) {}
+    public void visit(JmlClassExprDeclaration n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlClassAccessibleDeclaration n, Void arg) {}
+    public void visit(JmlClassAccessibleDeclaration n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlRepresentsDeclaration n, Void arg) {}
+    public void visit(JmlRepresentsDeclaration n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlContract n, Void arg) {}
+    public void visit(JmlContract n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlSetComprehensionExpr n, Void arg) {}
+    public void visit(JmlSetComprehensionExpr n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlGhostStmt n, Void arg) {}
+    public void visit(JmlGhostStmt n, Void arg) {
+    }
 
     @Override
     public void visit(JmlMethodDeclaration n, Void arg) {
@@ -2289,7 +2298,8 @@ public void visit(JmlMethodDeclaration n, Void arg) {
     }
 
     @Override
-    public void visit(JmlBinaryInfixExpr n, Void arg) {}
+    public void visit(JmlBinaryInfixExpr n, Void arg) {
+    }
 
     @Override
     public void visit(JmlDocDeclaration n, Void arg) {
@@ -2303,17 +2313,20 @@ public void visit(JmlDocStmt n, Void arg) {
 
     @Override
     public void visit(JmlDoc n, Void arg) {
-        printer.print(n.getContent().asString());
+        printer.print(n.getContent());
     }
 
     @Override
-    public void visit(JmlDocType n, Void arg) {}
+    public void visit(JmlDocType n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlFieldDeclaration n, Void arg) {}
+    public void visit(JmlFieldDeclaration n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlOldClause n, Void arg) {}
+    public void visit(JmlOldClause n, Void arg) {
+    }
 
     @Override
     public void visit(JmlTypeExpr n, Void arg) {
@@ -2321,25 +2334,33 @@ public void visit(JmlTypeExpr n, Void arg) {
     }
 
     @Override
-    public void visit(JmlMultiExprClause n, Void arg) {}
+    public void visit(JmlMultiExprClause n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlBeginStmt n, Void arg) {}
+    public void visit(JmlBeginStmt n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlEndStmt n, Void arg) {}
+    public void visit(JmlEndStmt n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlLabelStmt n, Void arg) {}
+    public void visit(JmlLabelStmt n, Void arg) {
+    }
 
     @Override
-    public void visit(JmlMethodSignature n, Void arg) {}
+    public void visit(JmlMethodSignature n, Void arg) {
+    }
 
     private void printOrphanCommentsBeforeThisChildNode(final Node node) {
-        if (configuration.isIgnoreComments()) return;
-        if (node instanceof Comment) return;
+        if (configuration.isIgnoreComments())
+            return;
+        if (node instanceof Comment)
+            return;
         Node parent = node.getParentNode().orElse(null);
-        if (parent == null) return;
+        if (parent == null)
+            return;
         List<Node> everything = new ArrayList<>(parent.getChildNodes());
         sortByBeginPosition(everything);
         int positionOfTheChild = -1;
@@ -2355,23 +2376,22 @@ private void printOrphanCommentsBeforeThisChildNode(final Node node) {
         }
         int positionOfPreviousChild = -1;
         for (int i = positionOfTheChild - 1; i >= 0 && positionOfPreviousChild == -1; i--) {
-            if (!(everything.get(i) instanceof Comment)) positionOfPreviousChild = i;
+            if (!(everything.get(i) instanceof Comment))
+                positionOfPreviousChild = i;
         }
         for (int i = positionOfPreviousChild + 1; i < positionOfTheChild; i++) {
             Node nodeToPrint = everything.get(i);
             if (!(nodeToPrint instanceof Comment))
-                throw new RuntimeException(
-                        "Expected comment, instead " + nodeToPrint.getClass() + ". Position of previous child: "
-                                + positionOfPreviousChild + ", position of child " + positionOfTheChild);
+                throw new RuntimeException("Expected comment, instead " + nodeToPrint.getClass() + ". Position of previous child: " + positionOfPreviousChild + ", position of child " + positionOfTheChild);
             nodeToPrint.accept(this, null);
         }
     }
 
     private void printOrphanCommentsEnding(final Node node) {
-        if (configuration.isIgnoreComments()) return;
+        if (configuration.isIgnoreComments())
+            return;
         // extract all nodes for which the position/range is indicated to avoid to skip orphan comments
-        List<Node> everything =
-                node.getChildNodes().stream().filter(n -> n.hasRange()).collect(Collectors.toList());
+        List<Node> everything = node.getChildNodes().stream().filter(n -> n.hasRange()).collect(Collectors.toList());
         sortByBeginPosition(everything);
         if (everything.isEmpty()) {
             return;
@@ -2391,10 +2411,12 @@ private void printOrphanCommentsEnding(final Node node) {
     }
 
     private void indentIf(boolean expr) {
-        if (expr) printer.indent();
+        if (expr)
+            printer.indent();
     }
 
     private void unindentIf(boolean expr) {
-        if (expr) printer.unindent();
+        if (expr)
+            printer.unindent();
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrinter.java
index 76a211cb94..ac00cb6116 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrinter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrinter.java
@@ -49,9 +49,7 @@ public PrettyPrinter(PrettyPrinterConfiguration configuration) {
         this(configuration, PrettyPrintVisitor::new);
     }
 
-    public PrettyPrinter(
-            PrettyPrinterConfiguration configuration,
-            Function<PrettyPrinterConfiguration, VoidVisitor<Void>> visitorFactory) {
+    public PrettyPrinter(PrettyPrinterConfiguration configuration, Function<PrettyPrinterConfiguration, VoidVisitor<Void>> visitorFactory) {
         this.configuration = configuration;
         this.visitorFactory = visitorFactory;
     }
@@ -68,8 +66,7 @@ public PrinterConfiguration getConfiguration() {
      */
     public Printer setConfiguration(PrinterConfiguration configuration) {
         if (!(configuration instanceof PrettyPrinterConfiguration))
-            throw new IllegalArgumentException(
-                    "PrettyPrinter must be configured with a PrettyPrinterConfiguration class");
+            throw new IllegalArgumentException("PrettyPrinter must be configured with a PrettyPrinterConfiguration class");
         this.configuration = configuration;
         return this;
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/SourcePrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/SourcePrinter.java
index 78cbe5a0b2..d3d709a30f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/SourcePrinter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/SourcePrinter.java
@@ -59,15 +59,7 @@ public class SourcePrinter {
     }
 
     SourcePrinter(final PrinterConfiguration configuration) {
-        this(
-                configuration
-                        .get(new DefaultConfigurationOption(ConfigOption.INDENTATION))
-                        .get()
-                        .asValue(),
-                configuration
-                        .get(new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER))
-                        .get()
-                        .asString());
+        this(configuration.get(new DefaultConfigurationOption(ConfigOption.INDENTATION)).get().asValue(), configuration.get(new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER)).get().asString());
     }
 
     SourcePrinter(Indentation indentation, String eol) {
@@ -82,7 +74,7 @@ public class SourcePrinter {
      */
     public SourcePrinter indent() {
         String currentIndent = indents.peek();
-        switch (indentation.getType()) {
+        switch(indentation.getType()) {
             case SPACES:
             case TABS_WITH_SPACE_ALIGN:
                 indents.push(currentIndent + indentation.getIndent());
@@ -110,7 +102,7 @@ private String calculateIndentWithAlignTo(int column) {
             throw new IllegalStateException("Attempt to indent less than the previous indent.");
         }
         StringBuilder newIndent = new StringBuilder(lastPrintedIndent);
-        switch (indentation.getType()) {
+        switch(indentation.getType()) {
             case SPACES:
             case TABS_WITH_SPACE_ALIGN:
                 while (newIndent.length() < column) {
@@ -133,15 +125,9 @@ private String calculateIndentWithAlignTo(int column) {
                     fullTab.append(IndentType.SPACES.getCar());
                 }
                 String fullTabString = fullTab.toString();
-                if ((newIndent.length() >= currentIndentType.getWidth())
-                        && newIndent
-                                .substring(newIndent.length() - currentIndentType.getWidth())
-                                .equals(fullTabString)) {
+                if ((newIndent.length() >= currentIndentType.getWidth()) && newIndent.substring(newIndent.length() - currentIndentType.getWidth()).equals(fullTabString)) {
                     int i = newIndent.indexOf(fullTabString);
-                    newIndent.replace(
-                            i,
-                            i + currentIndentType.getWidth(),
-                            currentIndentType.getCar().toString());
+                    newIndent.replace(i, i + currentIndentType.getWidth(), currentIndentType.getCar().toString());
                 }
                 break;
             default:
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/XmlPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/XmlPrinter.java
index e4314cec80..d62e3a8b55 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/XmlPrinter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/XmlPrinter.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.assertNonEmpty;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.type.Type;
@@ -168,7 +167,7 @@ public void outputDocument(Node node, String name, XMLStreamWriter xmlWriter) th
      * @param name      Tag name of element corresponding to node
      * @param xmlWriter Target to get XML written to
      * @throws XMLStreamException When any error on outputting XML occours
-     * @see outputDocument(String, Node, XMLStreamWriter)
+     * @see #outputDocument(Node, String, XMLStreamWriter)
      */
     public void outputNode(Node node, String name, XMLStreamWriter xmlWriter) throws XMLStreamException {
         assertNotNull(node);
@@ -177,8 +176,7 @@ public void outputNode(Node node, String name, XMLStreamWriter xmlWriter) throws
         NodeMetaModel metaModel = node.getMetaModel();
         List<PropertyMetaModel> allPropertyMetaModels = metaModel.getAllPropertyMetaModels();
         Predicate<PropertyMetaModel> nonNullNode = propertyMetaModel -> propertyMetaModel.getValue(node) != null;
-        Predicate<PropertyMetaModel> nonEmptyList =
-                propertyMetaModel -> ((NodeList) propertyMetaModel.getValue(node)).isNonEmpty();
+        Predicate<PropertyMetaModel> nonEmptyList = propertyMetaModel -> ((NodeList) propertyMetaModel.getValue(node)).isNonEmpty();
         Predicate<PropertyMetaModel> typeList = propertyMetaModel -> TYPE_CLASS == propertyMetaModel.getType();
         xmlWriter.writeStartElement(name);
         // Output node type attribute
@@ -187,52 +185,40 @@ public void outputNode(Node node, String name, XMLStreamWriter xmlWriter) throws
         }
         try {
             // Output attributes
-            allPropertyMetaModels.stream()
-                    .filter(PropertyMetaModel::isAttribute)
-                    .filter(PropertyMetaModel::isSingular)
-                    .forEach(attributeMetaModel -> {
-                        try {
-                            final String attributeName = attributeMetaModel.getName();
-                            final String attributeValue =
-                                    attributeMetaModel.getValue(node).toString();
-                            xmlWriter.writeAttribute(attributeName, attributeValue);
-                        } catch (XMLStreamException ex) {
-                            throw new RuntimeXMLStreamException(ex);
-                        }
-                    });
+            allPropertyMetaModels.stream().filter(PropertyMetaModel::isAttribute).filter(PropertyMetaModel::isSingular).forEach(attributeMetaModel -> {
+                try {
+                    final String attributeName = attributeMetaModel.getName();
+                    final String attributeValue = attributeMetaModel.getValue(node).toString();
+                    xmlWriter.writeAttribute(attributeName, attributeValue);
+                } catch (XMLStreamException ex) {
+                    throw new RuntimeXMLStreamException(ex);
+                }
+            });
             // Output singular subNodes
-            allPropertyMetaModels.stream()
-                    .filter(PropertyMetaModel::isNode)
-                    .filter(PropertyMetaModel::isSingular)
-                    .filter(nonNullNode)
-                    .forEach(subNodeMetaModel -> {
-                        try {
-                            final Node subNode = (Node) subNodeMetaModel.getValue(node);
-                            final String subNodeName = subNodeMetaModel.getName();
-                            outputNode(subNode, subNodeName, xmlWriter);
-                        } catch (XMLStreamException ex) {
-                            throw new RuntimeXMLStreamException(ex);
-                        }
-                    });
+            allPropertyMetaModels.stream().filter(PropertyMetaModel::isNode).filter(PropertyMetaModel::isSingular).filter(nonNullNode).forEach(subNodeMetaModel -> {
+                try {
+                    final Node subNode = (Node) subNodeMetaModel.getValue(node);
+                    final String subNodeName = subNodeMetaModel.getName();
+                    outputNode(subNode, subNodeName, xmlWriter);
+                } catch (XMLStreamException ex) {
+                    throw new RuntimeXMLStreamException(ex);
+                }
+            });
             // Output list subNodes
-            allPropertyMetaModels.stream()
-                    .filter(PropertyMetaModel::isNodeList)
-                    .filter(nonNullNode)
-                    .filter(nonEmptyList.or(typeList))
-                    .forEach(listMetaModel -> {
-                        try {
-                            String listName = listMetaModel.getName();
-                            String singular = listName.substring(0, listName.length() - 1);
-                            NodeList<? extends Node> nodeList = (NodeList) listMetaModel.getValue(node);
-                            xmlWriter.writeStartElement(listName);
-                            for (Node subNode : nodeList) {
-                                outputNode(subNode, singular, xmlWriter);
-                            }
-                            xmlWriter.writeEndElement();
-                        } catch (XMLStreamException ex) {
-                            throw new RuntimeXMLStreamException(ex);
-                        }
-                    });
+            allPropertyMetaModels.stream().filter(PropertyMetaModel::isNodeList).filter(nonNullNode).filter(nonEmptyList.or(typeList)).forEach(listMetaModel -> {
+                try {
+                    String listName = listMetaModel.getName();
+                    String singular = listName.substring(0, listName.length() - 1);
+                    NodeList<? extends Node> nodeList = (NodeList) listMetaModel.getValue(node);
+                    xmlWriter.writeStartElement(listName);
+                    for (Node subNode : nodeList) {
+                        outputNode(subNode, singular, xmlWriter);
+                    }
+                    xmlWriter.writeEndElement();
+                } catch (XMLStreamException ex) {
+                    throw new RuntimeXMLStreamException(ex);
+                }
+            });
         } catch (RuntimeXMLStreamException ex) {
             throw ex.getXMLStreamCause();
         }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/YamlPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/YamlPrinter.java
index e2af442530..8027b9e89f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/YamlPrinter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/YamlPrinter.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import static java.util.stream.Collectors.toList;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.metamodel.NodeMetaModel;
@@ -54,28 +53,21 @@ public void output(Node node, String name, int level, StringBuilder builder) {
         assertNotNull(node);
         NodeMetaModel metaModel = node.getMetaModel();
         List<PropertyMetaModel> allPropertyMetaModels = metaModel.getAllPropertyMetaModels();
-        List<PropertyMetaModel> attributes = allPropertyMetaModels.stream()
-                .filter(PropertyMetaModel::isAttribute)
-                .filter(PropertyMetaModel::isSingular)
-                .collect(toList());
-        List<PropertyMetaModel> subNodes = allPropertyMetaModels.stream()
-                .filter(PropertyMetaModel::isNode)
-                .filter(PropertyMetaModel::isSingular)
-                .collect(toList());
-        List<PropertyMetaModel> subLists = allPropertyMetaModels.stream()
-                .filter(PropertyMetaModel::isNodeList)
-                .collect(toList());
+        List<PropertyMetaModel> attributes = allPropertyMetaModels.stream().filter(PropertyMetaModel::isAttribute).filter(PropertyMetaModel::isSingular).collect(toList());
+        List<PropertyMetaModel> subNodes = allPropertyMetaModels.stream().filter(PropertyMetaModel::isNode).filter(PropertyMetaModel::isSingular).collect(toList());
+        List<PropertyMetaModel> subLists = allPropertyMetaModels.stream().filter(PropertyMetaModel::isNodeList).collect(toList());
         if (outputNodeType)
             builder.append(System.lineSeparator() + indent(level) + name + "(Type=" + metaModel.getTypeName() + "): ");
-        else builder.append(System.lineSeparator() + indent(level) + name + ": ");
+        else
+            builder.append(System.lineSeparator() + indent(level) + name + ": ");
         level++;
         for (PropertyMetaModel a : attributes) {
-            builder.append(System.lineSeparator() + indent(level) + a.getName() + ": "
-                    + escapeValue(a.getValue(node).toString()));
+            builder.append(System.lineSeparator() + indent(level) + a.getName() + ": " + escapeValue(a.getValue(node).toString()));
         }
         for (PropertyMetaModel sn : subNodes) {
             Node nd = (Node) sn.getValue(node);
-            if (nd != null) output(nd, sn.getName(), level, builder);
+            if (nd != null)
+                output(nd, sn.getName(), level, builder);
         }
         for (PropertyMetaModel sl : subLists) {
             NodeList<? extends Node> nl = (NodeList<? extends Node>) sl.getValue(node);
@@ -95,15 +87,7 @@ private String indent(int level) {
     }
 
     private String escapeValue(String value) {
-        return "\""
-                + value.replace("\\", "\\\\")
-                        .replaceAll("\"", "\\\\\"")
-                        .replace("\n", "\\n")
-                        .replace("\r", "\\r")
-                        .replace("\f", "\\f")
-                        .replace("\b", "\\b")
-                        .replace("\t", "\\t")
-                + "\"";
+        return "\"" + value.replace("\\", "\\\\").replaceAll("\"", "\\\\\"").replace("\n", "\\n").replace("\r", "\\r").replace("\f", "\\f").replace("\b", "\\b").replace("\t", "\\t") + "\"";
     }
 
     public static void print(Node node) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmAttribute.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmAttribute.java
index 7618318bc7..2b684cef17 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmAttribute.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmAttribute.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.printer.concretesyntaxmodel;
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
-
 import com.github.javaparser.GeneratedJavaParserConstants;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.IntegerLiteralExpr;
@@ -53,32 +52,30 @@ public void prettyPrint(Node node, SourcePrinter printer) {
      * @param tokenText Operator's token text
      */
     public int getTokenType(Node node, String text, String tokenText) {
-        switch (property) {
+        switch(property) {
             case IDENTIFIER:
                 return GeneratedJavaParserConstants.IDENTIFIER;
-            case TYPE: {
-                String expectedImage = "\"" + text.toLowerCase() + "\"";
-                for (int i = 0; i < GeneratedJavaParserConstants.tokenImage.length; i++) {
-                    if (GeneratedJavaParserConstants.tokenImage[i].equals(expectedImage)) {
-                        return i;
+            case TYPE:
+                {
+                    String expectedImage = "\"" + text.toLowerCase() + "\"";
+                    for (int i = 0; i < GeneratedJavaParserConstants.tokenImage.length; i++) {
+                        if (GeneratedJavaParserConstants.tokenImage[i].equals(expectedImage)) {
+                            return i;
+                        }
                     }
+                    throw new RuntimeException(f("Attribute '%s' does not corresponding to any expected value. Text: %s", property.camelCaseName(), text));
                 }
-                throw new RuntimeException(f(
-                        "Attribute '%s' does not corresponding to any expected value. Text: %s",
-                        property.camelCaseName(), text));
-            }
             case KEYWORD:
-            case OPERATOR: {
-                String expectedImage = "\"" + tokenText.toLowerCase() + "\"";
-                for (int i = 0; i < GeneratedJavaParserConstants.tokenImage.length; i++) {
-                    if (GeneratedJavaParserConstants.tokenImage[i].equals(expectedImage)) {
-                        return i;
+            case OPERATOR:
+                {
+                    String expectedImage = "\"" + tokenText.toLowerCase() + "\"";
+                    for (int i = 0; i < GeneratedJavaParserConstants.tokenImage.length; i++) {
+                        if (GeneratedJavaParserConstants.tokenImage[i].equals(expectedImage)) {
+                            return i;
+                        }
                     }
+                    throw new RuntimeException(f("Attribute '%s' does not corresponding to any expected value. Text: %s", property.camelCaseName(), tokenText));
                 }
-                throw new RuntimeException(f(
-                        "Attribute '%s' does not corresponding to any expected value. Text: %s",
-                        property.camelCaseName(), tokenText));
-            }
             case VALUE:
                 if (node instanceof IntegerLiteralExpr) {
                     return GeneratedJavaParserConstants.INTEGER_LITERAL;
@@ -86,8 +83,7 @@ public int getTokenType(Node node, String text, String tokenText) {
             case NAME:
                 return GeneratedJavaParserConstants.IDENTIFIER;
         }
-        throw new UnsupportedOperationException(
-                "getTokenType does not know how to handle property " + property + " with text: " + text);
+        throw new UnsupportedOperationException("getTokenType does not know how to handle property " + property + " with text: " + text);
     }
 
     @Override
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmConditional.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmConditional.java
index a90a4c0783..b343e74d01 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmConditional.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmConditional.java
@@ -61,6 +61,7 @@ public CsmElement getElseElement() {
     }
 
     public enum Condition {
+
         IS_EMPTY {
 
             @Override
@@ -68,43 +69,42 @@ boolean evaluate(Node node, ObservableProperty property) {
                 NodeList<? extends Node> value = property.getValueAsMultipleReference(node);
                 return value == null || value.isEmpty();
             }
-        },
-        IS_NOT_EMPTY {
+        }
+        , IS_NOT_EMPTY {
 
             @Override
             boolean evaluate(Node node, ObservableProperty property) {
                 NodeList<? extends Node> value = property.getValueAsMultipleReference(node);
                 return value != null && !value.isEmpty();
             }
-        },
-        IS_PRESENT {
+        }
+        , IS_PRESENT {
 
             @Override
             boolean evaluate(Node node, ObservableProperty property) {
                 return !property.isNullOrNotPresent(node);
             }
-        },
-        FLAG {
+        }
+        , FLAG {
 
             @Override
             boolean evaluate(Node node, ObservableProperty property) {
                 return property.getValueAsBooleanAttribute(node);
             }
-        };
+        }
+        ;
 
         abstract boolean evaluate(Node node, ObservableProperty property);
     }
 
-    public CsmConditional(
-            ObservableProperty property, Condition condition, CsmElement thenElement, CsmElement elseElement) {
+    public CsmConditional(ObservableProperty property, Condition condition, CsmElement thenElement, CsmElement elseElement) {
         this.properties = Arrays.asList(property);
         this.condition = condition;
         this.thenElement = thenElement;
         this.elseElement = elseElement;
     }
 
-    public CsmConditional(
-            List<ObservableProperty> properties, Condition condition, CsmElement thenElement, CsmElement elseElement) {
+    public CsmConditional(List<ObservableProperty> properties, Condition condition, CsmElement thenElement, CsmElement elseElement) {
         if (properties.size() < 1) {
             throw new IllegalArgumentException();
         }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmElement.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmElement.java
index 181f120ce8..c4d2d5a82d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmElement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmElement.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.TokenTypes.eolTokenKind;
 import static com.github.javaparser.TokenTypes.spaceTokenKind;
-
 import com.github.javaparser.GeneratedJavaParserConstants;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.jml.expr.JmlMultiCompareExpr;
@@ -89,24 +88,15 @@ static CsmElement token(int tokenType) {
         return new CsmToken(tokenType);
     }
 
-    static CsmElement conditional(
-            ObservableProperty property, CsmConditional.Condition condition, CsmElement thenElement) {
+    static CsmElement conditional(ObservableProperty property, CsmConditional.Condition condition, CsmElement thenElement) {
         return new CsmConditional(property, condition, thenElement);
     }
 
-    static CsmElement conditional(
-            ObservableProperty property,
-            CsmConditional.Condition condition,
-            CsmElement thenElement,
-            CsmElement elseElement) {
+    static CsmElement conditional(ObservableProperty property, CsmConditional.Condition condition, CsmElement thenElement, CsmElement elseElement) {
         return new CsmConditional(property, condition, thenElement, elseElement);
     }
 
-    static CsmElement conditional(
-            List<ObservableProperty> properties,
-            CsmConditional.Condition condition,
-            CsmElement thenElement,
-            CsmElement elseElement) {
+    static CsmElement conditional(List<ObservableProperty> properties, CsmConditional.Condition condition, CsmElement thenElement, CsmElement elseElement) {
         return new CsmConditional(properties, condition, thenElement, elseElement);
     }
 
@@ -146,17 +136,11 @@ static CsmElement list(ObservableProperty property, CsmElement separator) {
         return new CsmList(property, CsmElement.none(), separator, new CsmNone(), new CsmNone());
     }
 
-    static CsmElement list(
-            ObservableProperty property, CsmElement separator, CsmElement preceeding, CsmElement following) {
+    static CsmElement list(ObservableProperty property, CsmElement separator, CsmElement preceeding, CsmElement following) {
         return new CsmList(property, none(), separator, preceeding, following);
     }
 
-    static CsmElement list(
-            ObservableProperty property,
-            CsmElement separatorPre,
-            CsmElement separatorPost,
-            CsmElement preceeding,
-            CsmElement following) {
+    static CsmElement list(ObservableProperty property, CsmElement separatorPre, CsmElement separatorPost, CsmElement preceeding, CsmElement following) {
         return new CsmList(property, separatorPre, separatorPost, preceeding, following);
     }
 
@@ -178,12 +162,7 @@ static CsmElement unindent() {
     }
 
     static CsmElement block(CsmElement content) {
-        return sequence(
-                token(GeneratedJavaParserConstants.LBRACE),
-                indent(),
-                content,
-                unindent(),
-                token(GeneratedJavaParserConstants.RBRACE));
+        return sequence(token(GeneratedJavaParserConstants.LBRACE), indent(), content, unindent(), token(GeneratedJavaParserConstants.RBRACE));
     }
 
     /*
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmList.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmList.java
index 6c0f502214..c0bccf6416 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmList.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmList.java
@@ -68,12 +68,7 @@ public CsmList(ObservableProperty property) {
         this(property, new CsmNone(), new CsmNone(), new CsmNone(), new CsmNone());
     }
 
-    public CsmList(
-            ObservableProperty property,
-            CsmElement separatorPre,
-            CsmElement separatorPost,
-            CsmElement preceeding,
-            CsmElement following) {
+    public CsmList(ObservableProperty property, CsmElement separatorPre, CsmElement separatorPost, CsmElement preceeding, CsmElement following) {
         this.property = property;
         this.separatorPre = separatorPre;
         this.separatorPost = separatorPost;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmMix.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmMix.java
index db5b80bf2f..f173958439 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmMix.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmMix.java
@@ -54,8 +54,10 @@ public void prettyPrint(Node node, SourcePrinter printer) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         CsmMix csmMix = (CsmMix) o;
         return elements != null ? elements.equals(csmMix.elements) : csmMix.elements == null;
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmNone.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmNone.java
index 46a14c7cd8..2316612fe9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmNone.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmNone.java
@@ -26,5 +26,6 @@
 public class CsmNone implements CsmElement {
 
     @Override
-    public void prettyPrint(Node node, SourcePrinter printer) {}
+    public void prettyPrint(Node node, SourcePrinter printer) {
+    }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmOrphanCommentsEnding.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmOrphanCommentsEnding.java
index 390ad20656..73268b6d68 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmOrphanCommentsEnding.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmOrphanCommentsEnding.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.printer.concretesyntaxmodel;
 
 import static com.github.javaparser.utils.PositionUtils.sortByBeginPosition;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.printer.SourcePrinter;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmToken.java b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmToken.java
index 35e2d94836..5422417421 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmToken.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/concretesyntaxmodel/CsmToken.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.TokenTypes.isEndOfLineToken;
 import static com.github.javaparser.TokenTypes.isWhitespaceButNotEndOfLine;
-
 import com.github.javaparser.GeneratedJavaParserConstants;
 import com.github.javaparser.TokenTypes;
 import com.github.javaparser.ast.Node;
@@ -82,11 +81,15 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         CsmToken csmToken = (CsmToken) o;
-        if (tokenType != csmToken.tokenType) return false;
-        if (content != null ? !content.equals(csmToken.content) : csmToken.content != null) return false;
+        if (tokenType != csmToken.tokenType)
+            return false;
+        if (content != null ? !content.equals(csmToken.content) : csmToken.content != null)
+            return false;
         return true;
     }
 
@@ -114,8 +117,6 @@ public boolean isNewLine() {
      */
     @Override
     public boolean isCorrespondingElement(TextElement textElement) {
-        return (textElement instanceof TokenTextElement)
-                && ((TokenTextElement) textElement).getTokenKind() == getTokenType()
-                && ((TokenTextElement) textElement).getText().equals(getContent());
+        return (textElement instanceof TokenTextElement) && ((TokenTextElement) textElement).getTokenKind() == getTokenType() && ((TokenTextElement) textElement).getText().equals(getContent());
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultConfigurationOption.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultConfigurationOption.java
index 4c9721e1c4..c81642d715 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultConfigurationOption.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultConfigurationOption.java
@@ -37,12 +37,14 @@ public DefaultConfigurationOption(ConfigOption configOption) {
 
     public DefaultConfigurationOption(ConfigOption configOption, Object value) {
         this.configOption = configOption;
-        if (value != null) value(value);
+        if (value != null)
+            value(value);
     }
 
     @Override
     public boolean equals(Object o) {
-        if (o == null || !(o instanceof DefaultConfigurationOption)) return false;
+        if (o == null || !(o instanceof DefaultConfigurationOption))
+            return false;
         DefaultConfigurationOption other = (DefaultConfigurationOption) o;
         return configOption.equals(other.configOption);
     }
@@ -61,8 +63,7 @@ public ConfigurationOption value(Object value) {
         this.currentValue = value;
         // verify the currentValue's type
         if (!(configOption.type.isAssignableFrom(value.getClass()))) {
-            throw new IllegalArgumentException(
-                    String.format("%s is not an instance of %s", value, configOption.type.getName()));
+            throw new IllegalArgumentException(String.format("%s is not an instance of %s", value, configOption.type.getName()));
         }
         return this;
     }
@@ -109,7 +110,6 @@ private <T extends Object> T cast() {
             throw new IllegalArgumentException(String.format("The option %s has no currentValue", configOption.name()));
         if (configOption.type.isAssignableFrom(currentValue.getClass()))
             return (T) configOption.type.cast(currentValue);
-        throw new IllegalArgumentException(
-                String.format("%s cannot be cast to %s", currentValue, configOption.type.getName()));
+        throw new IllegalArgumentException(String.format("%s cannot be cast to %s", currentValue, configOption.type.getName()));
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultPrinterConfiguration.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultPrinterConfiguration.java
index bfd297d0e3..ec9f012cdf 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultPrinterConfiguration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/DefaultPrinterConfiguration.java
@@ -139,21 +139,10 @@ <T> ConfigOption(Class<T> clazz, T value) {
 
     // contains all available options
     // an option contained in the set is considered as activated
-    private Set<ConfigurationOption> defaultOptions = new HashSet<>(Arrays.asList(
-            new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS, ConfigOption.PRINT_COMMENTS.defaultValue),
-            new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC, ConfigOption.PRINT_JAVADOC.defaultValue),
-            new DefaultConfigurationOption(
-                    ConfigOption.SPACE_AROUND_OPERATORS, ConfigOption.SPACE_AROUND_OPERATORS.defaultValue),
-            new DefaultConfigurationOption(
-                    ConfigOption.INDENT_CASE_IN_SWITCH, ConfigOption.INDENT_CASE_IN_SWITCH.defaultValue),
-            new DefaultConfigurationOption(
-                    ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY,
-                    ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY.defaultValue),
-            new DefaultConfigurationOption(
-                    ConfigOption.END_OF_LINE_CHARACTER, ConfigOption.END_OF_LINE_CHARACTER.defaultValue),
-            new DefaultConfigurationOption(ConfigOption.INDENTATION, ConfigOption.INDENTATION.defaultValue)));
+    private Set<ConfigurationOption> defaultOptions = new HashSet<>(Arrays.asList(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS, ConfigOption.PRINT_COMMENTS.defaultValue), new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC, ConfigOption.PRINT_JAVADOC.defaultValue), new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS, ConfigOption.SPACE_AROUND_OPERATORS.defaultValue), new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH, ConfigOption.INDENT_CASE_IN_SWITCH.defaultValue), new DefaultConfigurationOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY, ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY.defaultValue), new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER, ConfigOption.END_OF_LINE_CHARACTER.defaultValue), new DefaultConfigurationOption(ConfigOption.INDENTATION, ConfigOption.INDENTATION.defaultValue)));
 
-    public DefaultPrinterConfiguration() {}
+    public DefaultPrinterConfiguration() {
+    }
 
     /*
      * add the specified option if it does not exist or replace the existing option
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/PrettyPrinterConfiguration.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/PrettyPrinterConfiguration.java
index a1135dd954..3abdbd7b73 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/PrettyPrinterConfiguration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/PrettyPrinterConfiguration.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.printer.configuration;
 
 import static com.github.javaparser.utils.Utils.*;
-
 import com.github.javaparser.printer.PrettyPrinter;
 import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration.ConfigOption;
 import com.github.javaparser.printer.configuration.Indentation.IndentType;
@@ -51,10 +50,7 @@ public PrettyPrinterConfiguration() {
      * returns the indentation parameters
      */
     public Indentation getIndentation() {
-        return wrappedConfiguration
-                .get(new DefaultConfigurationOption(ConfigOption.INDENTATION))
-                .get()
-                .asValue();
+        return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.INDENTATION)).get().asValue();
     }
 
     public PrettyPrinterConfiguration setIndentation(Indentation indentation) {
@@ -136,51 +132,35 @@ public PrettyPrinterConfiguration setTabWidth(int tabWidth) {
     }
 
     public boolean isOrderImports() {
-        return wrappedConfiguration
-                .get(new DefaultConfigurationOption(ConfigOption.ORDER_IMPORTS))
-                .isPresent();
+        return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.ORDER_IMPORTS)).isPresent();
     }
 
     public boolean isPrintComments() {
-        return wrappedConfiguration
-                .get(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS))
-                .isPresent();
+        return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)).isPresent();
     }
 
     public boolean isIgnoreComments() {
-        return !wrappedConfiguration
-                .get(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS))
-                .isPresent();
+        return !wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)).isPresent();
     }
 
     public boolean isSpaceAroundOperators() {
-        return wrappedConfiguration
-                .get(new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS))
-                .isPresent();
+        return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS)).isPresent();
     }
 
     public boolean isPrintJavadoc() {
-        return wrappedConfiguration
-                .get(new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC))
-                .isPresent();
+        return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC)).isPresent();
     }
 
     public boolean isColumnAlignParameters() {
-        return wrappedConfiguration
-                .get(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_PARAMETERS))
-                .isPresent();
+        return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_PARAMETERS)).isPresent();
     }
 
     public boolean isColumnAlignFirstMethodChain() {
-        return wrappedConfiguration
-                .get(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN))
-                .isPresent();
+        return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN)).isPresent();
     }
 
     public boolean isIndentCaseInSwitch() {
-        return wrappedConfiguration
-                .get(new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH))
-                .isPresent();
+        return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH)).isPresent();
     }
 
     /**
@@ -188,9 +168,7 @@ public boolean isIndentCaseInSwitch() {
      * printed.
      */
     public PrettyPrinterConfiguration setPrintComments(boolean printComments) {
-        wrappedConfiguration = printComments
-                ? addOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS))
-                : removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS));
+        wrappedConfiguration = printComments ? addOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS)) : removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_COMMENTS));
         return this;
     }
 
@@ -198,9 +176,7 @@ public PrettyPrinterConfiguration setPrintComments(boolean printComments) {
      * When true, Javadoc will be printed.
      */
     public PrettyPrinterConfiguration setPrintJavadoc(boolean printJavadoc) {
-        wrappedConfiguration = printJavadoc
-                ? addOption(new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC))
-                : removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC));
+        wrappedConfiguration = printJavadoc ? addOption(new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC)) : removeOption(new DefaultConfigurationOption(ConfigOption.PRINT_JAVADOC));
         return this;
     }
 
@@ -208,38 +184,27 @@ public PrettyPrinterConfiguration setPrintJavadoc(boolean printJavadoc) {
      * Set if there should be spaces between operators
      */
     public PrettyPrinterConfiguration setSpaceAroundOperators(boolean spaceAroundOperators) {
-        wrappedConfiguration = spaceAroundOperators
-                ? addOption(new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS))
-                : removeOption(new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS));
+        wrappedConfiguration = spaceAroundOperators ? addOption(new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS)) : removeOption(new DefaultConfigurationOption(ConfigOption.SPACE_AROUND_OPERATORS));
         return this;
     }
 
     public PrettyPrinterConfiguration setColumnAlignParameters(boolean columnAlignParameters) {
-        wrappedConfiguration = columnAlignParameters
-                ? addOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_PARAMETERS))
-                : removeOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_PARAMETERS));
+        wrappedConfiguration = columnAlignParameters ? addOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_PARAMETERS)) : removeOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_PARAMETERS));
         return this;
     }
 
     public PrettyPrinterConfiguration setColumnAlignFirstMethodChain(boolean columnAlignFirstMethodChain) {
-        wrappedConfiguration = columnAlignFirstMethodChain
-                ? addOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN))
-                : removeOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN));
+        wrappedConfiguration = columnAlignFirstMethodChain ? addOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN)) : removeOption(new DefaultConfigurationOption(ConfigOption.COLUMN_ALIGN_FIRST_METHOD_CHAIN));
         return this;
     }
 
     public PrettyPrinterConfiguration setIndentCaseInSwitch(boolean indentInSwitch) {
-        wrappedConfiguration = indentInSwitch
-                ? addOption(new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH))
-                : removeOption(new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH));
+        wrappedConfiguration = indentInSwitch ? addOption(new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH)) : removeOption(new DefaultConfigurationOption(ConfigOption.INDENT_CASE_IN_SWITCH));
         return this;
     }
 
     public String getEndOfLineCharacter() {
-        return wrappedConfiguration
-                .get(new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER))
-                .get()
-                .asValue();
+        return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.END_OF_LINE_CHARACTER)).get().asValue();
     }
 
     /**
@@ -254,17 +219,12 @@ public PrettyPrinterConfiguration setEndOfLineCharacter(String endOfLineCharacte
      * When true, orders imports by alphabetically.
      */
     public PrettyPrinterConfiguration setOrderImports(boolean orderImports) {
-        wrappedConfiguration = orderImports
-                ? addOption(new DefaultConfigurationOption(ConfigOption.ORDER_IMPORTS))
-                : removeOption(new DefaultConfigurationOption(ConfigOption.ORDER_IMPORTS));
+        wrappedConfiguration = orderImports ? addOption(new DefaultConfigurationOption(ConfigOption.ORDER_IMPORTS)) : removeOption(new DefaultConfigurationOption(ConfigOption.ORDER_IMPORTS));
         return this;
     }
 
     public int getMaxEnumConstantsToAlignHorizontally() {
-        return wrappedConfiguration
-                .get(new DefaultConfigurationOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY))
-                .get()
-                .asInteger();
+        return wrappedConfiguration.get(new DefaultConfigurationOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY)).get().asInteger();
     }
 
     /**
@@ -291,8 +251,7 @@ public int getMaxEnumConstantsToAlignHorizontally() {
      * Set it to 1 or less to always align vertically.
      */
     public PrettyPrinterConfiguration setMaxEnumConstantsToAlignHorizontally(int maxEnumConstantsToAlignHorizontally) {
-        addOption(new DefaultConfigurationOption(
-                ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY, maxEnumConstantsToAlignHorizontally));
+        addOption(new DefaultConfigurationOption(ConfigOption.MAX_ENUM_CONSTANTS_TO_ALIGN_HORIZONTALLY, maxEnumConstantsToAlignHorizontally));
         return this;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/DefaultImportOrderingStrategy.java b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/DefaultImportOrderingStrategy.java
index 9de0b4071c..abc2defc76 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/DefaultImportOrderingStrategy.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/configuration/imports/DefaultImportOrderingStrategy.java
@@ -20,7 +20,6 @@
 package com.github.javaparser.printer.configuration.imports;
 
 import static java.util.Comparator.comparingInt;
-
 import com.github.javaparser.ast.ImportDeclaration;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.nodeTypes.NodeWithName;
@@ -36,8 +35,7 @@ public class DefaultImportOrderingStrategy implements ImportOrderingStrategy {
     @Override
     public List<NodeList<ImportDeclaration>> sortImports(NodeList<ImportDeclaration> nodes) {
         if (sortImportsAlphabetically) {
-            Comparator<ImportDeclaration> sortLogic = comparingInt((ImportDeclaration i) -> i.isStatic() ? 0 : 1)
-                    .thenComparing(NodeWithName::getNameAsString);
+            Comparator<ImportDeclaration> sortLogic = comparingInt((ImportDeclaration i) -> i.isStatic() ? 0 : 1).thenComparing(NodeWithName::getNameAsString);
             nodes.sort(sortLogic);
         }
         return Collections.singletonList(nodes);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Added.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Added.java
index 9110da75f4..a7ad0aa399 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Added.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Added.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -40,8 +40,10 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         Added added = (Added) o;
         return element.equals(added.element);
     }
@@ -90,8 +92,7 @@ public TextElement toTextElement() {
         if (element instanceof CsmToken) {
             return new TokenTextElement(((CsmToken) element).getTokenType(), ((CsmToken) element).getContent());
         }
-        throw new UnsupportedOperationException(
-                "Unsupported element type: " + element.getClass().getSimpleName());
+        throw new UnsupportedOperationException("Unsupported element type: " + element.getClass().getSimpleName());
     }
 
     /*
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ChildTextElement.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ChildTextElement.java
index b930daa1e3..526712d427 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ChildTextElement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ChildTextElement.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -61,8 +61,10 @@ NodeText getNodeTextForWrappedNode() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         ChildTextElement that = (ChildTextElement) o;
         return child.equals(that.child);
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DefaultLexicalPreservingPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DefaultLexicalPreservingPrinter.java
index 233f9b5bac..de8e8f67ee 100755
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DefaultLexicalPreservingPrinter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DefaultLexicalPreservingPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java
index 167735aaa2..bab6000be7 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -22,8 +22,6 @@
 
 import static com.github.javaparser.GeneratedJavaParserConstants.LBRACE;
 import static com.github.javaparser.GeneratedJavaParserConstants.RBRACE;
-import static com.github.javaparser.GeneratedJavaParserConstants.SPACE;
-
 import com.github.javaparser.GeneratedJavaParserConstants;
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.JavaToken.Kind;
@@ -40,8 +38,6 @@
 import com.github.javaparser.printer.concretesyntaxmodel.CsmUnindent;
 import com.github.javaparser.printer.lexicalpreservation.LexicalDifferenceCalculator.CsmChild;
 import java.util.*;
-import java.util.function.Predicate;
-import java.util.stream.IntStream;
 
 /**
  * A Difference should give me a sequence of elements I should find (to indicate the context) followed by a list of elements
@@ -51,8 +47,6 @@
  */
 public class Difference {
 
-    public static final int STANDARD_INDENTATION_SIZE = 4;
-
     private final NodeText nodeText;
 
     private final Node node;
@@ -84,55 +78,32 @@ public class Difference {
      * Returns the indentation used after the last line break
      */
     List<TextElement> processIndentation(List<TextElement> indentation, List<TextElement> prevElements) {
-        int eolIndex = lastIndexOfEol(prevElements);
+        TextElementList list = new TextElementList(prevElements);
+        int eolIndex = list.findLast(TextElement::isNewline);
         // Return "indentation" as is if no EOL element was found
-        if (eolIndex < 0) return indentation;
+        if (eolIndex < 0)
+            return indentation;
         // Find consecutive space characters after the EOL element
-        indentation =
-                takeWhile(prevElements.subList(eolIndex + 1, prevElements.size()), element -> element.isWhiteSpace());
+        indentation = TextElementList.of(list.subList(eolIndex + 1, list.size())).takeWhile(TextElement::isWhiteSpace);
         return indentation;
     }
 
-    /*
-     * returns only the elements that match the given predicate.
-     * takeWhile takes elements from the initial stream while the predicate holds true.
-     * Meaning that when an element is encountered that does not match the predicate, the rest of the list is discarded.
-     */
-    List<TextElement> takeWhile(List<TextElement> prevElements, Predicate<TextElement> predicate) {
-        List<TextElement> spaces = new ArrayList<>();
-        for (TextElement element : prevElements) {
-            if (predicate.test(element)) {
-                spaces.add(element);
-                continue;
-            }
-            break;
-        }
-        return spaces;
-    }
-
-    int lastIndexOfEol(List<TextElement> source) {
-        return IntStream.range(0, source.size())
-                .map(i -> source.size() - i - 1)
-                .filter(i -> source.get(i).isNewline())
-                .findFirst()
-                .orElse(-1);
-    }
-
     /*
      * Returns the position of the next element in the list starting from @{code fromIndex} which is a comment (Ignoring spaces)
      * or -1 if it's not a comment.
      */
     private int posOfNextComment(int fromIndex, List<TextElement> elements) {
-        if (!isValidIndex(fromIndex, elements)) return -1;
-        ArrayIterator<TextElement> iterator = new ArrayIterator<>(elements, fromIndex);
-        // search for the next consecutive space characters
+        TextElementList list = new TextElementList(elements);
+        if (!list.isValidIndex(fromIndex))
+            return -1;
+        TextElementIterator iterator = list.iterator(fromIndex);
         while (iterator.hasNext()) {
             TextElement element = iterator.next();
             if (element.isSpaceOrTab()) {
                 continue;
             }
             if (element.isComment()) {
-                return iterator.index();
+                return iterator.currentIndex();
             }
             break;
         }
@@ -150,44 +121,16 @@ private boolean isFollowedByComment(int fromIndex, List<TextElement> elements) {
      * Removes all elements in the list starting from @{code fromIndex}) ending to @{code toIndex})
      */
     private void removeElements(int fromIndex, int toIndex, List<TextElement> elements) {
-        if (!(isValidIndex(fromIndex, elements) && isValidIndex(toIndex, elements) && fromIndex <= toIndex)) return;
-        ListIterator<TextElement> iterator = elements.listIterator(fromIndex);
-        // removing elements
-        int count = fromIndex;
-        while (iterator.hasNext() && count <= toIndex) {
+        TextElementList list = new TextElementList(elements);
+        TextElementIterator iterator = list.iterator(fromIndex);
+        for (int i = fromIndex; i <= toIndex && iterator.hasNext(); i++) {
             iterator.next();
             iterator.remove();
-            count++;
         }
     }
 
-    private boolean isValidIndex(int index, List<?> elements) {
-        return index >= 0 && index <= elements.size();
-    }
-
-    /*
-     * Returns the position of the last new line character or -1 if there is no eol in the specified list of TextElement
-     */
-    int lastIndexOfEolWithoutGPT(List<TextElement> source) {
-        ListIterator<TextElement> listIterator = source.listIterator(source.size());
-        int lastIndex = source.size() - 1;
-        while (listIterator.hasPrevious()) {
-            TextElement elem = listIterator.previous();
-            if (elem.isNewline()) {
-                return lastIndex;
-            }
-            lastIndex--;
-        }
-        return -1;
-    }
-
     private List<TextElement> indentationBlock() {
-        List<TextElement> res = new LinkedList<>();
-        res.add(new TokenTextElement(SPACE));
-        res.add(new TokenTextElement(SPACE));
-        res.add(new TokenTextElement(SPACE));
-        res.add(new TokenTextElement(SPACE));
-        return res;
+        return IndentationCalculator.createIndentationBlock();
     }
 
     private boolean isAfterLBrace(NodeText nodeText, int nodeTextIndex) {
@@ -224,14 +167,11 @@ private int considerRemovingIndentation(NodeText nodeText, int nodeTextIndex) {
     }
 
     private int considerIndentation(NodeText nodeText, int nodeTextIndex, int numberOfCharactersToPreserve) {
-        EnforcingIndentationContext enforcingIndentationContext =
-                defineEnforcingIndentationContext(nodeText, nodeTextIndex);
+        EnforcingIndentationContext enforcingIndentationContext = defineEnforcingIndentationContext(nodeText, nodeTextIndex);
         // the next position in the list (by default the current position)
         int res = nodeTextIndex;
         if (enforcingIndentationContext.extraCharacters > 0) {
-            int extraCharacters = enforcingIndentationContext.extraCharacters > numberOfCharactersToPreserve
-                    ? enforcingIndentationContext.extraCharacters - numberOfCharactersToPreserve
-                    : 0;
+            int extraCharacters = enforcingIndentationContext.extraCharacters > numberOfCharactersToPreserve ? enforcingIndentationContext.extraCharacters - numberOfCharactersToPreserve : 0;
             res = removeExtraCharacters(nodeText, enforcingIndentationContext.start, extraCharacters);
             // The next position must take into account the indentation
             res = extraCharacters > 0 ? res + numberOfCharactersToPreserve : res;
@@ -243,17 +183,11 @@ private int considerIndentation(NodeText nodeText, int nodeTextIndex, int number
     }
 
     private boolean isEnforcingIndentationActivable(RemovedGroup removedGroup) {
-        return (isLastElement(diffElements, diffIndex)
-                        || !(nextDiffElement(diffElements, diffIndex).isAdded()))
-                && originalIndex < originalElements.size()
-                && !removedGroup.isACompleteLine();
+        return (isLastElement(diffElements, diffIndex) || !(nextDiffElement(diffElements, diffIndex).isAdded())) && originalIndex < originalElements.size() && !removedGroup.isACompleteLine();
     }
 
     private boolean isRemovingIndentationActivable(RemovedGroup removedGroup) {
-        return (isLastElement(diffElements, diffIndex)
-                        || !(nextDiffElement(diffElements, diffIndex).isAdded()))
-                && originalIndex < originalElements.size()
-                && removedGroup.isACompleteLine();
+        return (isLastElement(diffElements, diffIndex) || !(nextDiffElement(diffElements, diffIndex).isAdded())) && originalIndex < originalElements.size() && removedGroup.isACompleteLine();
     }
 
     private boolean isLastElement(List<?> list, int index) {
@@ -308,36 +242,8 @@ private int removeExtraCharacters(NodeText nodeText, int nodeTextIndex, int extr
      * The number of consecutive whitespace (or tab) characters
      */
     private EnforcingIndentationContext defineEnforcingIndentationContext(NodeText nodeText, int startIndex) {
-        EnforcingIndentationContext ctx = new EnforcingIndentationContext(startIndex);
-        // compute space before startIndex value
-        if (startIndex < nodeText.numberOfElements() && startIndex > 0) {
-            // at this stage startIndex points to the first element before the deleted one
-            for (int i = startIndex - 1; i >= 0 && i < nodeText.numberOfElements(); i--) {
-                if (nodeText.getTextElement(i).isNewline()) {
-                    break;
-                }
-                if (!isSpaceOrTabElement(nodeText, i)) {
-                    ctx = new EnforcingIndentationContext(startIndex);
-                    break;
-                }
-                ctx.start = i;
-                ctx.extraCharacters++;
-            }
-        }
-        // compute space after the deleted element
-        if (startIndex < nodeText.numberOfElements() && isSpaceOrTabElement(nodeText, startIndex)) {
-            //			int startingFromIndex = startIndex == 0 ? startIndex : startIndex + 1;
-            for (int i = startIndex; i >= 0 && i < nodeText.numberOfElements(); i++) {
-                if (nodeText.getTextElement(i).isNewline()) {
-                    break;
-                }
-                if (!isSpaceOrTabElement(nodeText, i)) {
-                    break;
-                }
-                ctx.extraCharacters++;
-            }
-        }
-        return ctx;
+        IndentationCalculator.EnforcingContext ctx = IndentationCalculator.analyzeEnforcingContext(nodeText, startIndex);
+        return new EnforcingIndentationContext(ctx.getStartIndex(), ctx.getExtraCharacters());
     }
 
     /*
@@ -386,20 +292,12 @@ void apply() {
                     boolean originalElementIsChild = originalElement instanceof ChildTextElement;
                     boolean originalElementIsToken = originalElement instanceof TokenTextElement;
                     if (diffElement.isKept()) {
-                        applyKeptDiffElement(
-                                (Kept) diffElement, originalElement, originalElementIsChild, originalElementIsToken);
+                        applyKeptDiffElement((Kept) diffElement, originalElement, originalElementIsChild, originalElementIsToken);
                     } else if (diffElement.isRemoved()) {
                         Removed removed = (Removed) diffElement;
-                        applyRemovedDiffElement(
-                                removedGroups.get(removed),
-                                removed,
-                                originalElement,
-                                originalElementIsChild,
-                                originalElementIsToken);
+                        applyRemovedDiffElement(removedGroups.get(removed), removed, originalElement, originalElementIsChild, originalElementIsToken);
                     } else {
-                        throw new UnsupportedOperationException("Unable to apply operations from "
-                                + diffElement.getClass().getSimpleName() + " to "
-                                + originalElement.getClass().getSimpleName());
+                        throw new UnsupportedOperationException("Unable to apply operations from " + diffElement.getClass().getSimpleName() + " to " + originalElement.getClass().getSimpleName());
                     }
                 }
             }
@@ -413,8 +311,7 @@ private boolean applyLeftOverOriginalElements() {
             if (originalElement.isWhiteSpaceOrComment()) {
                 originalIndex++;
             } else {
-                throw new UnsupportedOperationException(
-                        "NodeText: " + nodeText + ". Difference: " + this + " " + originalElement);
+                throw new UnsupportedOperationException("NodeText: " + nodeText + ". Difference: " + this + " " + originalElement);
             }
             isLeftOverElement = true;
         }
@@ -484,9 +381,7 @@ private Map<Integer, List<Removed>> groupConsecutiveRemovedElements() {
                 if (firstElement == null) {
                     firstElement = i;
                 }
-                removedElementsMap
-                        .computeIfAbsent(firstElement, key -> new ArrayList<>())
-                        .add((Removed) diffElement);
+                removedElementsMap.computeIfAbsent(firstElement, key -> new ArrayList<>()).add((Removed) diffElement);
             } else {
                 firstElement = null;
             }
@@ -494,21 +389,14 @@ private Map<Integer, List<Removed>> groupConsecutiveRemovedElements() {
         return removedElementsMap;
     }
 
-    private void applyRemovedDiffElement(
-            RemovedGroup removedGroup,
-            Removed removed,
-            TextElement originalElement,
-            boolean originalElementIsChild,
-            boolean originalElementIsToken) {
+    private void applyRemovedDiffElement(RemovedGroup removedGroup, Removed removed, TextElement originalElement, boolean originalElementIsChild, boolean originalElementIsToken) {
         if (removed.isChild() && originalElementIsChild) {
             ChildTextElement originalElementChild = (ChildTextElement) originalElement;
             if (originalElementChild.isComment()) {
                 // We expected to remove a proper node but we found a comment in between.
                 // If the comment is associated to the node we want to remove we remove it as well, otherwise we keep it
                 Comment comment = (Comment) originalElementChild.getChild();
-                if (!comment.isOrphan()
-                        && comment.getCommentedNode().isPresent()
-                        && comment.getCommentedNode().get().equals(removed.getChild())) {
+                if (!comment.isOrphan() && comment.getCommentedNode().isPresent() && comment.getCommentedNode().get().equals(removed.getChild())) {
                     nodeText.removeElement(originalIndex);
                 } else {
                     originalIndex++;
@@ -530,12 +418,9 @@ private void applyRemovedDiffElement(
                     // The token corresponding to the annotation is the first element of the annotation node
                     // and it is also the first element of the parent node (MethodDeclaration),
                     // so the previous indentation is defined in the parent node of the method declaration.
-                    if (!parentNodeText.getElements().isEmpty()
-                            && parentNode.getParentNode().isPresent()
-                            && parentNodeText.getTextElement(0).equals(nodeText.getTextElement(originalIndex))) {
+                    if (!parentNodeText.getElements().isEmpty() && parentNode.getParentNode().isPresent() && parentNodeText.getTextElement(0).equals(nodeText.getTextElement(originalIndex))) {
                         startingNodeForFindingIndentation = parentNode;
-                        parentNodeText = LexicalPreservingPrinter.getOrCreateNodeText(
-                                parentNode.getParentNode().get());
+                        parentNodeText = LexicalPreservingPrinter.getOrCreateNodeText(parentNode.getParentNode().get());
                     }
                     indentationTokens = LexicalPreservingPrinter.findIndentation(startingNodeForFindingIndentation);
                 }
@@ -551,14 +436,12 @@ private void applyRemovedDiffElement(
                 }
                 // If in front we have one space and before also we had space let's drop one space
                 if (originalElements.size() > originalIndex && originalIndex > 0) {
-                    if (originalElements.get(originalIndex).isWhiteSpace()
-                            && originalElements.get(originalIndex - 1).isWhiteSpace()) {
+                    if (originalElements.get(originalIndex).isWhiteSpace() && originalElements.get(originalIndex - 1).isWhiteSpace()) {
                         // However we do not want to do that when we are about to adding or removing elements
                         // The intention is not very clear maybe it should clarify this with examples!
                         // Are we to understand that we can only do this if there is a single modification to process
                         // OR or if the next change is to keep the element
-                        if ((diffIndex + 1) == diffElements.size()
-                                || (diffElements.get(diffIndex + 1).isKept())) {
+                        if ((diffIndex + 1) == diffElements.size() || (diffElements.get(diffIndex + 1).isKept())) {
                             originalElements.remove(originalIndex--);
                         }
                     }
@@ -582,8 +465,7 @@ private void applyRemovedDiffElement(
                     // the same line as a method declaration.
                     if (originalIndex == 0 && !indentationTokens.isEmpty() && !isInlined(nodeText, originalIndex)) {
                         for (TextElement indentationToken : indentationTokens) {
-                            parentNodeText.removeElement(
-                                    parentNodeText.findElement(indentationToken.and(indentationToken.matchByRange())));
+                            parentNodeText.removeElement(parentNodeText.findElement(indentationToken.and(indentationToken.matchByRange())));
                         }
                     }
                 }
@@ -595,23 +477,13 @@ private void applyRemovedDiffElement(
             if (isRemovingIndentationActivable(removedGroup)) {
                 originalIndex = considerRemovingIndentation(nodeText, originalIndex);
             }
-        } else if (removed.isToken()
-                && originalElementIsToken
-                && ( // handle EOLs separately as their token kind might not be equal. This is because the
-                // 'removed'
-                // element always has the current operating system's EOL as type
-                removed.getTokenType() == ((TokenTextElement) originalElement).getTokenKind()
-                        || (((TokenTextElement) originalElement)
-                                        .getToken()
-                                        .getCategory()
-                                        .isEndOfLine()
-                                && removed.isNewLine()))) {
+        } else if (removed.isToken() && originalElementIsToken && (// handle EOLs separately as their token kind might not be equal. This is because the
+        // 'removed'
+        // element always has the current operating system's EOL as type
+        removed.getTokenType() == ((TokenTextElement) originalElement).getTokenKind() || (((TokenTextElement) originalElement).getToken().getCategory().isEndOfLine() && removed.isNewLine()))) {
             nodeText.removeElement(originalIndex);
             diffIndex++;
-        } else if ((removed.isWhiteSpaceNotEol()
-                        || removed.getElement() instanceof CsmIndent
-                        || removed.getElement() instanceof CsmUnindent)
-                && originalElement.isSpaceOrTab()) {
+        } else if ((removed.isWhiteSpaceNotEol() || removed.getElement() instanceof CsmIndent || removed.getElement() instanceof CsmUnindent) && originalElement.isSpaceOrTab()) {
             // remove the current space
             nodeText.removeElement(originalIndex);
         } else if (originalElementIsToken && originalElement.isWhiteSpaceOrComment()) {
@@ -630,9 +502,7 @@ private void applyRemovedDiffElement(
             } else {
                 throw new UnsupportedOperationException("removed " + removed.getElement() + " vs " + originalElement);
             }
-        } else if (removed.isWhiteSpace()
-                || removed.getElement() instanceof CsmIndent
-                || removed.getElement() instanceof CsmUnindent) {
+        } else if (removed.isWhiteSpace() || removed.getElement() instanceof CsmIndent || removed.getElement() instanceof CsmUnindent) {
             diffIndex++;
         } else if (originalElement.isWhiteSpace()) {
             originalIndex++;
@@ -665,10 +535,7 @@ private void cleanTheLineOfLeftOverSpace(RemovedGroup removedGroup, Removed remo
         }
         // we dont want to remove the indentation if the last removed element is a newline
         // because in this case we are trying to remove the indentation of the next child element
-        if (!removedGroup.isProcessed()
-                && removedGroup.isLastElement(removed)
-                && removedGroup.isACompleteLine()
-                && !removed.isNewLine()) {
+        if (!removedGroup.isProcessed() && removedGroup.isLastElement(removed) && removedGroup.isACompleteLine() && !removed.isNewLine()) {
             Integer lastElementIndex = removedGroup.getLastElementIndex();
             Optional<Integer> indentation = removedGroup.getIndentation();
             if (indentation.isPresent() && !isReplaced(lastElementIndex)) {
@@ -676,8 +543,7 @@ private void cleanTheLineOfLeftOverSpace(RemovedGroup removedGroup, Removed remo
                     if (originalElements.get(originalIndex).isSpaceOrTab()) {
                         // If the current element is a space, remove it
                         nodeText.removeElement(originalIndex);
-                    } else if (originalIndex >= 1
-                            && originalElements.get(originalIndex - 1).isSpaceOrTab()) {
+                    } else if (originalIndex >= 1 && originalElements.get(originalIndex - 1).isSpaceOrTab()) {
                         // If the current element is not a space itself we remove the space in front of (before) it
                         nodeText.removeElement(originalIndex - 1);
                         originalIndex--;
@@ -697,8 +563,7 @@ private void cleanTheLineOfLeftOverSpace(RemovedGroup removedGroup, Removed remo
     // note:
     // increment originalIndex if we want to keep the original element
     // increment diffIndex if we want to skip the diff element
-    private void applyKeptDiffElement(
-            Kept kept, TextElement originalElement, boolean originalElementIsChild, boolean originalElementIsToken) {
+    private void applyKeptDiffElement(Kept kept, TextElement originalElement, boolean originalElementIsChild, boolean originalElementIsToken) {
         if (originalElement.isComment()) {
             originalIndex++;
         } else if (kept.isChild() && ((CsmChild) kept.getElement()).getChild() instanceof Comment) {
@@ -736,8 +601,7 @@ private void applyKeptDiffElement(
                 // positioning on the next token
                 originalIndex++;
             } else if ((originalElement.isIdentifier() || originalElement.isKeyword()) && isArrayType(kept)) {
-                int tokenToSkip =
-                        getIndexToNextTokenElementInArrayType((TokenTextElement) originalElement, getArrayLevel(kept));
+                int tokenToSkip = getIndexToNextTokenElementInArrayType((TokenTextElement) originalElement, getArrayLevel(kept));
                 diffIndex++;
                 originalIndex += tokenToSkip;
                 originalIndex++;
@@ -771,8 +635,7 @@ private void applyKeptDiffElement(
                 // see issue 2351
                 originalIndex++;
             } else {
-                throw new UnsupportedOperationException(
-                        "Csm token " + kept.getElement() + " NodeText TOKEN " + originalTextToken);
+                throw new UnsupportedOperationException("Csm token " + kept.getElement() + " NodeText TOKEN " + originalTextToken);
             }
         } else if (kept.isToken() && originalElementIsChild) {
             diffIndex++;
@@ -805,17 +668,18 @@ private int getArrayLevel(DifferenceElement element) {
      */
     private boolean isArrayType(DifferenceElement element) {
         CsmElement csmElem = element.getElement();
-        return csmElem instanceof LexicalDifferenceCalculator.CsmChild
-                && ((LexicalDifferenceCalculator.CsmChild) csmElem).getChild() instanceof ArrayType;
+        return csmElem instanceof LexicalDifferenceCalculator.CsmChild && ((LexicalDifferenceCalculator.CsmChild) csmElem).getChild() instanceof ArrayType;
     }
 
     /*
      * Returns true if the DifferenceElement is a CsmChild which represents a type with fully qualified name
      */
     private boolean isTypeWithFullyQualifiedName(DifferenceElement element) {
-        if (!element.isChild()) return false;
+        if (!element.isChild())
+            return false;
         CsmChild child = (CsmChild) element.getElement();
-        if (!ClassOrInterfaceType.class.isAssignableFrom(child.getChild().getClass())) return false;
+        if (!ClassOrInterfaceType.class.isAssignableFrom(child.getChild().getClass()))
+            return false;
         return ((ClassOrInterfaceType) child.getChild()).getScope().isPresent();
     }
 
@@ -823,9 +687,11 @@ private boolean isTypeWithFullyQualifiedName(DifferenceElement element) {
      * Returns true if the DifferenceElement is a CsmChild with type arguments
      */
     private boolean isNodeWithTypeArguments(DifferenceElement element) {
-        if (!element.isChild()) return false;
+        if (!element.isChild())
+            return false;
         CsmChild child = (CsmChild) element.getElement();
-        if (!NodeWithTypeArguments.class.isAssignableFrom(child.getChild().getClass())) return false;
+        if (!NodeWithTypeArguments.class.isAssignableFrom(child.getChild().getClass()))
+            return false;
         Optional<NodeList<Type>> typeArgs = ((NodeWithTypeArguments) child.getChild()).getTypeArguments();
         return typeArgs.isPresent() && typeArgs.get().size() > 0;
     }
@@ -838,17 +704,18 @@ private int getIndexToNextTokenElement(TokenTextElement element, DifferenceEleme
         // number of token to skip
         int step = 0;
         // verify if the DifferenceElement is a ClassOrInterfaceType with a fully qualified name
-        if (!isTypeWithFullyQualifiedName(kept)) return 0;
+        if (!isTypeWithFullyQualifiedName(kept))
+            return 0;
         CsmChild child = (CsmChild) kept.getElement();
         // split the type fully qualified node name to an array of tokens
-        String[] parts =
-                ((ClassOrInterfaceType) child.getChild()).getNameWithScope().split("\\.");
+        String[] parts = ((ClassOrInterfaceType) child.getChild()).getNameWithScope().split("\\.");
         JavaToken token = element.getToken();
         for (String part : parts) {
             if (part.equals(token.asString())) {
                 // get 'dot' token
                 token = token.getNextToken().get();
-                if (!".".equals(token.asString())) break;
+                if (!".".equals(token.asString()))
+                    break;
                 // get the next part
                 token = token.getNextToken().get();
                 step += 2;
@@ -880,20 +747,24 @@ private int getIndexToNextTokenElement(TokenTextElement element, int nestedDiamo
         // number of token to skip
         int step = 0;
         Optional<JavaToken> next = element.getToken().getNextToken();
-        if (!next.isPresent()) return step;
+        if (!next.isPresent())
+            return step;
         // because there is a token, first we need to increment the number of token to skip
         step++;
         // manage nested diamond operators by incrementing the level on LT token and decrementing on GT
         JavaToken nextToken = next.get();
         Kind kind = Kind.valueOf(nextToken.getKind());
         if (isDiamondOperator(kind)) {
-            if (Kind.GT.equals(kind)) nestedDiamondOperator--;
-            else nestedDiamondOperator++;
+            if (Kind.GT.equals(kind))
+                nestedDiamondOperator--;
+            else
+                nestedDiamondOperator++;
         }
         // manage the fact where the first token is not a diamond operator but a whitespace
         // and the end of the token sequence to skip
         // for example in this declaration List <String> a;
-        if (nestedDiamondOperator == 0 && !nextToken.getCategory().isWhitespace()) return step;
+        if (nestedDiamondOperator == 0 && !nextToken.getCategory().isWhitespace())
+            return step;
         // recursively analyze token to skip
         return step += getIndexToNextTokenElement(new TokenTextElement(nextToken), nestedDiamondOperator);
     }
@@ -905,19 +776,22 @@ private int getIndexToNextTokenElementInArrayType(TokenTextElement element, int
         // number of token to skip
         int step = 0;
         Optional<JavaToken> next = element.getToken().getNextToken();
-        if (!next.isPresent()) return step;
+        if (!next.isPresent())
+            return step;
         // because there is a token, first we need to increment the number of token to skip
         step++;
         // manage array Level by decrementing the level on right bracket token
         JavaToken nextToken = next.get();
         Kind kind = Kind.valueOf(nextToken.getKind());
         if (isBracket(kind)) {
-            if (Kind.RBRACKET.equals(kind)) arrayLevel--;
+            if (Kind.RBRACKET.equals(kind))
+                arrayLevel--;
         }
         // manage the fact where the first token is not a diamond operator but a whitespace
         // and the end of the token sequence to skip
         // for example in this declaration int [] a;
-        if (arrayLevel == 0 && !nextToken.getCategory().isWhitespace()) return step;
+        if (arrayLevel == 0 && !nextToken.getCategory().isWhitespace())
+            return step;
         // recursively analyze token to skip
         return step += getIndexToNextTokenElementInArrayType(new TokenTextElement(nextToken), arrayLevel);
     }
@@ -947,13 +821,13 @@ private boolean nextIsRightBrace(int index) {
     }
 
     private void addIndent() {
-        for (int i = 0; i < STANDARD_INDENTATION_SIZE; i++) {
+        for (int i = 0; i < IndentationConstants.STANDARD_INDENTATION_SIZE; i++) {
             indentation.add(new TokenTextElement(GeneratedJavaParserConstants.SPACE));
         }
     }
 
     private void removeIndent() {
-        for (int i = 0; i < STANDARD_INDENTATION_SIZE && !indentation.isEmpty(); i++) {
+        for (int i = 0; i < IndentationConstants.STANDARD_INDENTATION_SIZE && !indentation.isEmpty(); i++) {
             indentation.remove(indentation.size() - 1);
         }
     }
@@ -973,16 +847,12 @@ private void applyAddedDiffElement(Added added) {
         }
         TextElement addedTextElement = added.toTextElement();
         boolean used = false;
-        boolean isPreviousElementNewline =
-                (originalIndex > 0) && originalElements.get(originalIndex - 1).isNewline();
+        boolean isPreviousElementNewline = (originalIndex > 0) && originalElements.get(originalIndex - 1).isNewline();
         if (isPreviousElementNewline) {
-            List<TextElement> elements =
-                    processIndentation(indentation, originalElements.subList(0, originalIndex - 1));
+            List<TextElement> elements = processIndentation(indentation, originalElements.subList(0, originalIndex - 1));
             boolean nextIsRightBrace = nextIsRightBrace(originalIndex);
             for (TextElement e : elements) {
-                if (!nextIsRightBrace
-                        && e instanceof TokenTextElement
-                        && originalElements.get(originalIndex).isToken(((TokenTextElement) e).getTokenKind())) {
+                if (!nextIsRightBrace && e instanceof TokenTextElement && originalElements.get(originalIndex).isToken(((TokenTextElement) e).getTokenKind())) {
                     originalIndex++;
                 } else {
                     nodeText.addElement(originalIndex++, e);
@@ -1016,19 +886,11 @@ private void applyAddedDiffElement(Added added) {
             // Handling trailing comments
             boolean sufficientTokensRemainToSkip = nodeText.numberOfElements() > originalIndex + 2;
             boolean currentIsAComment = nodeText.getTextElement(originalIndex).isComment();
-            boolean previousIsAComment = originalIndex > 0
-                    && nodeText.getTextElement(originalIndex - 1).isComment();
+            boolean previousIsAComment = originalIndex > 0 && nodeText.getTextElement(originalIndex - 1).isComment();
             boolean currentIsNewline = nodeText.getTextElement(originalIndex).isNewline();
             boolean isFirstElement = originalIndex == 0;
-            boolean previousIsWhiteSpace = originalIndex > 0
-                    && nodeText.getTextElement(originalIndex - 1).isWhiteSpace();
-            boolean commentIsBeforeAddedElement = currentIsAComment
-                    && addedTextElement.getRange().isPresent()
-                    && nodeText.getTextElement(originalIndex)
-                            .getRange()
-                            .map(range ->
-                                    range.isBefore(addedTextElement.getRange().get()))
-                            .orElse(false);
+            boolean previousIsWhiteSpace = originalIndex > 0 && nodeText.getTextElement(originalIndex - 1).isWhiteSpace();
+            boolean commentIsBeforeAddedElement = currentIsAComment && addedTextElement.getRange().isPresent() && nodeText.getTextElement(originalIndex).getRange().map(range -> range.isBefore(addedTextElement.getRange().get())).orElse(false);
             if (sufficientTokensRemainToSkip && currentIsAComment && commentIsBeforeAddedElement) {
                 // Need to get behind the comment:
                 // FIXME: Why 2? This comment and the next newline?
@@ -1090,100 +952,23 @@ private void applyAddedDiffElement(Added added) {
         diffIndex++;
     }
 
-    /*
-     * A list iterator which provides a method to know the current positioning
-     */
-    public static class ArrayIterator<T> implements ListIterator<T> {
-
-        ListIterator<T> iterator;
-
-        public ArrayIterator(List<T> elements) {
-            this(elements, 0);
-        }
-
-        public ArrayIterator(List<T> elements, int index) {
-            this.iterator = elements.listIterator(index);
-        }
-
-        @Override
-        public boolean hasNext() {
-            return iterator.hasNext();
-        }
-
-        @Override
-        public T next() {
-            return iterator.next();
-        }
-
-        @Override
-        public boolean hasPrevious() {
-            return iterator.hasPrevious();
-        }
-
-        @Override
-        public T previous() {
-            return iterator.previous();
-        }
-
-        @Override
-        public int nextIndex() {
-            return iterator.nextIndex();
-        }
-
-        @Override
-        public int previousIndex() {
-            return iterator.previousIndex();
-        }
-
-        /*
-         * Returns the current index in the underlying list
-         */
-        public int index() {
-            return iterator.nextIndex() - 1;
-        }
-
-        @Override
-        public void remove() {
-            iterator.remove();
-            ;
-        }
-
-        @Override
-        public void set(T e) {
-            iterator.set(e);
-        }
-
-        @Override
-        public void add(T e) {
-            iterator.add(e);
-            ;
-        }
-    }
-
     /*
      * Returns true if the next element in the list is an added element of type CsmUnindent
      */
     private boolean isFollowedByUnindent(List<DifferenceElement> diffElements, int diffIndex) {
         int nextIndexValue = diffIndex + 1;
-        return (nextIndexValue) < diffElements.size()
-                && diffElements.get(nextIndexValue).isAdded()
-                && diffElements.get(nextIndexValue).getElement() instanceof CsmUnindent;
+        return (nextIndexValue) < diffElements.size() && diffElements.get(nextIndexValue).isAdded() && diffElements.get(nextIndexValue).getElement() instanceof CsmUnindent;
     }
 
-    private int adjustIndentation(
-            List<TextElement> indentation, NodeText nodeText, int nodeTextIndex, boolean followedByUnindent) {
-        List<TextElement> indentationAdj =
-                processIndentation(indentation, nodeText.getElements().subList(0, nodeTextIndex - 1));
-        if (nodeTextIndex < nodeText.numberOfElements()
-                && nodeText.getTextElement(nodeTextIndex).isToken(RBRACE)) {
-            indentationAdj = indentationAdj.subList(
-                    0, indentationAdj.size() - Math.min(STANDARD_INDENTATION_SIZE, indentationAdj.size()));
+    private int adjustIndentation(List<TextElement> indentation, NodeText nodeText, int nodeTextIndex, boolean followedByUnindent) {
+        List<TextElement> indentationAdj = processIndentation(indentation, nodeText.getElements().subList(0, nodeTextIndex - 1));
+        if (nodeTextIndex < nodeText.numberOfElements() && nodeText.getTextElement(nodeTextIndex).isToken(RBRACE)) {
+            indentationAdj = indentationAdj.subList(0, indentationAdj.size() - Math.min(IndentationConstants.STANDARD_INDENTATION_SIZE, indentationAdj.size()));
         } else if (followedByUnindent) {
-            indentationAdj = indentationAdj.subList(0, Math.max(0, indentationAdj.size() - STANDARD_INDENTATION_SIZE));
+            indentationAdj = indentationAdj.subList(0, Math.max(0, indentationAdj.size() - IndentationConstants.STANDARD_INDENTATION_SIZE));
         }
         for (TextElement e : indentationAdj) {
-            if ((nodeTextIndex < nodeText.numberOfElements())
-                    && nodeText.getTextElement(nodeTextIndex).isSpaceOrTab()) {
+            if ((nodeTextIndex < nodeText.numberOfElements()) && nodeText.getTextElement(nodeTextIndex).isSpaceOrTab()) {
                 nodeTextIndex++;
             } else {
                 nodeText.getElements().add(nodeTextIndex++, e);
@@ -1199,18 +984,14 @@ private int adjustIndentation(
      * Returns true if the current <code>Added</code> element is preceded by a <code>Removed</code> element.
      */
     private boolean isAReplacement(int diffIndex) {
-        return (diffIndex > 0)
-                && diffElements.get(diffIndex).isAdded()
-                && diffElements.get(diffIndex - 1).isRemoved();
+        return (diffIndex > 0) && diffElements.get(diffIndex).isAdded() && diffElements.get(diffIndex - 1).isRemoved();
     }
 
     /*
      * Returns true if the current <code>Removed</code> element is followed by a <code>Added</code> element.
      */
     private boolean isReplaced(int diffIndex) {
-        return (diffIndex < diffElements.size() - 1)
-                && diffElements.get(diffIndex + 1).isAdded()
-                && diffElements.get(diffIndex).isRemoved();
+        return (diffIndex < diffElements.size() - 1) && diffElements.get(diffIndex + 1).isAdded() && diffElements.get(diffIndex).isRemoved();
     }
 
     @Override
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElement.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElement.java
index 33f28eae34..6241c4b556 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElement.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculator.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculator.java
index 0b803087f1..aae3ca91b2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -46,20 +46,14 @@ public static class ChildPositionInfo {
 
         @Override
         public boolean equals(Object other) {
-            if (other == null || !(other instanceof ChildPositionInfo)) return false;
+            if (other == null || !(other instanceof ChildPositionInfo))
+                return false;
             ChildPositionInfo cpi = (ChildPositionInfo) other;
             // verify that the node content and the position are equal
             // because we can have nodes with the same content but in different lines
             // in this case we consider that nodes are not equals
             // If the nodes have no declared position they are considered equal.
-            return this.node.equals(cpi.node)
-                    && (this.node.hasRange() == false && cpi.node.hasRange() == false
-                            || (this.node.hasRange()
-                                    && cpi.node.hasRange()
-                                    && this.node
-                                            .getRange()
-                                            .get()
-                                            .contains(cpi.node.getRange().get())));
+            return this.node.equals(cpi.node) && (this.node.hasRange() == false && cpi.node.hasRange() == false || (this.node.hasRange() && cpi.node.hasRange() && this.node.getRange().get().contains(cpi.node.getRange().get())));
         }
 
         @Override
@@ -84,8 +78,7 @@ static boolean matching(CsmElement a, CsmElement b) {
             if (b instanceof CsmUnindent) {
                 return false;
             }
-            throw new UnsupportedOperationException(
-                    a.getClass().getSimpleName() + " " + b.getClass().getSimpleName());
+            throw new UnsupportedOperationException(a.getClass().getSimpleName() + " " + b.getClass().getSimpleName());
         }
         if (a instanceof CsmToken) {
             if (b instanceof CsmToken) {
@@ -106,8 +99,7 @@ static boolean matching(CsmElement a, CsmElement b) {
             if (b instanceof CsmUnindent) {
                 return false;
             }
-            throw new UnsupportedOperationException(
-                    a.getClass().getSimpleName() + " " + b.getClass().getSimpleName());
+            throw new UnsupportedOperationException(a.getClass().getSimpleName() + " " + b.getClass().getSimpleName());
         }
         if (a instanceof CsmIndent) {
             return b instanceof CsmIndent;
@@ -115,8 +107,7 @@ static boolean matching(CsmElement a, CsmElement b) {
         if (a instanceof CsmUnindent) {
             return b instanceof CsmUnindent;
         }
-        throw new UnsupportedOperationException(
-                a.getClass().getSimpleName() + " " + b.getClass().getSimpleName());
+        throw new UnsupportedOperationException(a.getClass().getSimpleName() + " " + b.getClass().getSimpleName());
     }
 
     /**
@@ -144,8 +135,7 @@ private boolean replacement(CsmElement a, CsmElement b) {
             if (b instanceof CsmToken) {
                 return false;
             }
-            throw new UnsupportedOperationException(
-                    a.getClass().getSimpleName() + " " + b.getClass().getSimpleName());
+            throw new UnsupportedOperationException(a.getClass().getSimpleName() + " " + b.getClass().getSimpleName());
         }
         if (a instanceof CsmToken) {
             if (b instanceof CsmToken) {
@@ -157,15 +147,13 @@ private boolean replacement(CsmElement a, CsmElement b) {
                 return false;
             }
         }
-        throw new UnsupportedOperationException(
-                a.getClass().getSimpleName() + " " + b.getClass().getSimpleName());
+        throw new UnsupportedOperationException(a.getClass().getSimpleName() + " " + b.getClass().getSimpleName());
     }
 
     /**
      * Find the positions of all the given children.
      */
-    private List<ChildPositionInfo> findChildrenPositions(
-            LexicalDifferenceCalculator.CalculatedSyntaxModel calculatedSyntaxModel) {
+    private List<ChildPositionInfo> findChildrenPositions(LexicalDifferenceCalculator.CalculatedSyntaxModel calculatedSyntaxModel) {
         List<ChildPositionInfo> positions = new ArrayList<>();
         for (int i = 0; i < calculatedSyntaxModel.elements.size(); i++) {
             CsmElement element = calculatedSyntaxModel.elements.get(i);
@@ -180,9 +168,7 @@ private List<ChildPositionInfo> findChildrenPositions(
      * Calculate the Difference between two CalculatedSyntaxModel elements, determining which elements were kept,
      * which were added and which were removed.
      */
-    List<DifferenceElement> calculate(
-            LexicalDifferenceCalculator.CalculatedSyntaxModel original,
-            LexicalDifferenceCalculator.CalculatedSyntaxModel after) {
+    List<DifferenceElement> calculate(LexicalDifferenceCalculator.CalculatedSyntaxModel original, LexicalDifferenceCalculator.CalculatedSyntaxModel after) {
         // For performance reasons we use the positions of matching children
         // to guide the calculation of the difference
         //
@@ -215,19 +201,9 @@ List<DifferenceElement> calculate(
             // search the position of the node "child" in the original list of cms element
             final int currentPosOfNextChildInOriginal = posOfNextChildInOriginal;
             final int currentPosOfNextChildInAfter = posOfNextChildInAfter;
-            posOfNextChildInOriginal = childrenInOriginal.stream()
-                    .filter(i -> i.equals(child))
-                    .map(i -> i.position)
-                    .filter(position -> position > currentPosOfNextChildInOriginal)
-                    .findFirst()
-                    .orElse(posOfNextChildInOriginal);
+            posOfNextChildInOriginal = childrenInOriginal.stream().filter(i -> i.equals(child)).map(i -> i.position).filter(position -> position > currentPosOfNextChildInOriginal).findFirst().orElse(posOfNextChildInOriginal);
             // search the position of the node "child" in the modified list of cms element
-            posOfNextChildInAfter = childrenInAfter.stream()
-                    .filter(i -> i.equals(child))
-                    .map(i -> i.position)
-                    .filter(position -> position > currentPosOfNextChildInAfter)
-                    .findFirst()
-                    .orElse(posOfNextChildInAfter);
+            posOfNextChildInAfter = childrenInAfter.stream().filter(i -> i.equals(child)).map(i -> i.position).filter(position -> position > currentPosOfNextChildInAfter).findFirst().orElse(posOfNextChildInAfter);
             // Imagine that the common elements has been moved, for example in the case where the parameters of a method
             // are reversed
             // In this case the afterIndex will be greater than the position of the child in
@@ -242,12 +218,8 @@ List<DifferenceElement> calculate(
             // modification but the previous position in the list was that of element 'a'.
             if (originalIndex < posOfNextChildInOriginal || afterIndex < posOfNextChildInAfter) {
                 // defines the sublist of elements located before the common element
-                CalculatedSyntaxModel originalSub = originalIndex < posOfNextChildInOriginal
-                        ? original.sub(originalIndex, posOfNextChildInOriginal)
-                        : new CalculatedSyntaxModel(Collections.EMPTY_LIST);
-                CalculatedSyntaxModel afterSub = afterIndex < posOfNextChildInAfter
-                        ? after.sub(afterIndex, posOfNextChildInAfter)
-                        : new CalculatedSyntaxModel(Collections.EMPTY_LIST);
+                CalculatedSyntaxModel originalSub = originalIndex < posOfNextChildInOriginal ? original.sub(originalIndex, posOfNextChildInOriginal) : new CalculatedSyntaxModel(Collections.EMPTY_LIST);
+                CalculatedSyntaxModel afterSub = afterIndex < posOfNextChildInAfter ? after.sub(afterIndex, posOfNextChildInAfter) : new CalculatedSyntaxModel(Collections.EMPTY_LIST);
                 elements.addAll(calculateImpl(originalSub, afterSub));
             }
             if (afterIndex <= posOfNextChildInAfter) {
@@ -262,12 +234,8 @@ List<DifferenceElement> calculate(
             afterIndex = afterIndex <= posOfNextChildInAfter ? posOfNextChildInAfter + 1 : afterIndex;
         }
         if (originalIndex < original.elements.size() || afterIndex < after.elements.size()) {
-            CalculatedSyntaxModel originalSub = originalIndex < original.elements.size()
-                    ? original.sub(originalIndex, original.elements.size())
-                    : new CalculatedSyntaxModel(Collections.EMPTY_LIST);
-            CalculatedSyntaxModel afterSub = afterIndex < after.elements.size()
-                    ? after.sub(afterIndex, after.elements.size())
-                    : new CalculatedSyntaxModel(Collections.EMPTY_LIST);
+            CalculatedSyntaxModel originalSub = originalIndex < original.elements.size() ? original.sub(originalIndex, original.elements.size()) : new CalculatedSyntaxModel(Collections.EMPTY_LIST);
+            CalculatedSyntaxModel afterSub = afterIndex < after.elements.size() ? after.sub(afterIndex, after.elements.size()) : new CalculatedSyntaxModel(Collections.EMPTY_LIST);
             elements.addAll(calculateImpl(originalSub, afterSub));
         }
         return elements;
@@ -291,9 +259,7 @@ private int considerRemoval(CsmElement removedElement, int originalIndex, List<D
         boolean dealtWith = false;
         if (removedElement instanceof CsmChild) {
             CsmChild removedChild = (CsmChild) removedElement;
-            if (removedChild.getChild() instanceof Type
-                    && removedChild.getChild().getParentNode().isPresent()
-                    && removedChild.getChild().getParentNode().get() instanceof VariableDeclarator) {
+            if (removedChild.getChild() instanceof Type && removedChild.getChild().getParentNode().isPresent() && removedChild.getChild().getParentNode().get() instanceof VariableDeclarator) {
                 NodeText nodeTextForChild = LexicalPreservingPrinter.getOrCreateNodeText(removedChild.getChild());
                 considerRemoval(nodeTextForChild, elements);
                 originalIndex++;
@@ -307,9 +273,7 @@ private int considerRemoval(CsmElement removedElement, int originalIndex, List<D
         return originalIndex;
     }
 
-    private List<DifferenceElement> calculateImpl(
-            LexicalDifferenceCalculator.CalculatedSyntaxModel original,
-            LexicalDifferenceCalculator.CalculatedSyntaxModel after) {
+    private List<DifferenceElement> calculateImpl(LexicalDifferenceCalculator.CalculatedSyntaxModel original, LexicalDifferenceCalculator.CalculatedSyntaxModel after) {
         String key = original.hashCode() + "-" + after.hashCode();
         if (cache.containsKey(key)) {
             return cache.get(key);
@@ -319,9 +283,7 @@ private List<DifferenceElement> calculateImpl(
         return result;
     }
 
-    private List<DifferenceElement> calculateImpl2(
-            LexicalDifferenceCalculator.CalculatedSyntaxModel original,
-            LexicalDifferenceCalculator.CalculatedSyntaxModel after) {
+    private List<DifferenceElement> calculateImpl2(LexicalDifferenceCalculator.CalculatedSyntaxModel original, LexicalDifferenceCalculator.CalculatedSyntaxModel after) {
         // This list will hold the final differences between the two models.
         List<DifferenceElement> elements = new LinkedList<>();
         // Pointers to traverse both sequences (before and after).
@@ -366,8 +328,7 @@ private List<DifferenceElement> calculateImpl2(
                 } else {
                     // We can try to remove the element or add it and look which one leads to the lower difference
                     // Try hypothesis A: treat "nextAfter" as an addition
-                    List<DifferenceElement> addingElements =
-                            calculate(original.from(originalIndex), after.from(afterIndex + 1));
+                    List<DifferenceElement> addingElements = calculate(original.from(originalIndex), after.from(afterIndex + 1));
                     long costAddingElements = cost(addingElements);
                     // Try hypothesis B: treat "nextOriginal" as a removal
                     List<DifferenceElement> removingElements = null;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/IndentationCalculator.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/IndentationCalculator.java
new file mode 100755
index 0000000000..d5b577a6c0
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/IndentationCalculator.java
@@ -0,0 +1,358 @@
+/*
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.printer.lexicalpreservation;
+
+import static com.github.javaparser.printer.lexicalpreservation.IndentationConstants.STANDARD_INDENTATION_SIZE;
+import com.github.javaparser.GeneratedJavaParserConstants;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Provides stateless utility methods for indentation calculations and analysis.
+ *
+ * This class contains pure functions that compute indentation-related values
+ * without maintaining any state. All methods are static and can be used
+ * independently without creating an instance.
+ *
+ * Typical operations include:
+ * - Computing indentation from preceding elements
+ * - Analyzing indentation context for enforcement
+ * - Creating standard indentation blocks
+ * - Extracting indentation from token sequences
+ *
+ * @see IndentationContext for stateful indentation management
+ */
+public final class IndentationCalculator {
+
+    /**
+     * Private constructor to prevent instantiation.
+     * This is a utility class with only static methods.
+     */
+    private IndentationCalculator() {
+        throw new AssertionError("IndentationCalculator is a utility class and should not be instantiated");
+    }
+
+    /**
+     * Computes the indentation that should be used based on the elements preceding
+     * the current position. This analyzes the elements to find the last newline
+     * and extracts all whitespace characters that follow it.
+     *
+     * This method is used when we need to match existing indentation in the source code.
+     *
+     * @param precedingElements elements before the current position
+     * @return list of indentation elements (spaces/tabs) after the last newline, or empty list if no newline found
+     */
+    public static List<TextElement> computeFromPrecedingElements(List<TextElement> precedingElements) {
+        int eolIndex = findLastNewlineIndex(precedingElements);
+        // No newline found, return empty indentation
+        if (eolIndex < 0) {
+            return Collections.emptyList();
+        }
+        // Extract whitespace elements after the newline
+        List<TextElement> result = new ArrayList<>();
+        for (int i = eolIndex + 1; i < precedingElements.size(); i++) {
+            TextElement element = precedingElements.get(i);
+            if (element.isSpaceOrTab()) {
+                result.add(element);
+            } else {
+                // Stop at first non-whitespace
+                break;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Extracts the indentation portion from a list of elements.
+     *
+     * This method differs from computeFromPrecedingElements because it doesn't look for
+     * a newline first - it assumes the list represents tokens after a newline and simply
+     * extracts all leading whitespace.
+     *
+     * This is useful when we have already collected preceding tokens and want to
+     * extract just the indentation part.
+     *
+     * @param precedingTokens tokens that precede the position
+     * @return list of indentation elements (leading whitespace only)
+     */
+    public static List<TextElement> extractIndentationFromTokens(List<TextElement> precedingTokens) {
+        List<TextElement> indentation = new ArrayList<>();
+        for (TextElement element : precedingTokens) {
+            if (element.isSpaceOrTab()) {
+                indentation.add(element);
+            } else {
+                // Stop at first non-whitespace
+                break;
+            }
+        }
+        return indentation;
+    }
+
+    /**
+     * Creates a single indentation block of STANDARD_INDENTATION_SIZE spaces.
+     * This is used when we need to add one level of indentation temporarily.
+     *
+     * @return list containing STANDARD_INDENTATION_SIZE space elements
+     */
+    public static List<TextElement> createIndentationBlock() {
+        List<TextElement> block = new ArrayList<>(STANDARD_INDENTATION_SIZE);
+        for (int i = 0; i < STANDARD_INDENTATION_SIZE; i++) {
+            block.add(new TokenTextElement(GeneratedJavaParserConstants.SPACE, " "));
+        }
+        return block;
+    }
+
+    /**
+     * Analyzes the indentation enforcement context at a given position in the node text.
+     *
+     * <p><b>Context and Purpose:</b></p>
+     * This method is primarily used by the {@link Difference} class during AST modification
+     * to determine if excess whitespace should be removed after deleting elements. When a node
+     * is removed from the AST, surrounding whitespace may need to be adjusted to maintain
+     * proper formatting.
+     *
+     * <p><b>Algorithm Overview:</b></p>
+     * The algorithm performs a two-phase scan to identify excess whitespace:
+     * <ol>
+     *   <li><b>Backward Scan:</b> Looks backward from the given index to find contiguous
+     *       whitespace characters, stopping at either a newline or a non-whitespace element.</li>
+     *   <li><b>Forward Scan:</b> If the current position contains whitespace, scans forward
+     *       to count additional contiguous whitespace characters.</li>
+     * </ol>
+     *
+     * <p><b>Examples:</b></p>
+     * <pre>
+     * Example 1 - Whitespace between elements after deletion:
+     *   Before: "public class A { int foo; }"
+     *   After deletion of "int foo;": "public class A { [space][space] }"
+     *   analyzeEnforcingContext(nodeText, firstSpaceIndex) returns:
+     *     - startIndex: index of first space
+     *     - extraCharacters: 2 (both spaces should be considered for removal)
+     *
+     * Example 2 - Indentation after newline:
+     *   Structure: "[newline][space][space][space][space]public"
+     *   analyzeEnforcingContext(nodeText, middleSpaceIndex) returns:
+     *     - startIndex: index of first space after newline
+     *     - extraCharacters: 4 (all indentation spaces)
+     *
+     * Example 3 - Non-whitespace interrupts sequence:
+     *   Structure: "public[space][space]"
+     *   analyzeEnforcingContext(nodeText, firstSpaceIndex) returns:
+     *     - startIndex: index of first space (reset due to "public")
+     *     - extraCharacters: 2 (spaces after "public")
+     * </pre>
+     *
+     * <p><b>Important Behavior:</b></p>
+     * When a non-whitespace element is encountered during the backward scan, the context
+     * is reset (start becomes the current index, extraCharacters becomes 0), but the forward
+     * scan still executes if the current position is whitespace. This allows the method to
+     * identify and count trailing spaces after non-whitespace elements.
+     *
+     * @param nodeText the node text being modified
+     * @param index position to analyze (typically points to a position after a deletion)
+     * @return context containing the start index and count of excess whitespace characters
+     */
+    public static EnforcingContext analyzeEnforcingContext(NodeText nodeText, int index) {
+        // Guard against invalid indices
+        if (index < 0 || index >= nodeText.numberOfElements()) {
+            return new EnforcingContext(index, 0);
+        }
+        // Starting position of whitespace sequence to potentially remove
+        int start = index;
+        // Total count of excess whitespace characters
+        int extraCharacters = 0;
+        // ========== PHASE 1: BACKWARD SCAN ==========
+        // Scan backward from the position to identify preceding whitespace.
+        // This determines if we're at the beginning of a line (after newline) or
+        // if there are spaces that should be counted as part of the enforcement context.
+        if (index < nodeText.numberOfElements() && index > 0) {
+            for (int i = index - 1; i >= 0; i--) {
+                // Stop at newline - we've found the line boundary
+                if (nodeText.getTextElement(i).isNewline()) {
+                    break;
+                }
+                // If we encounter a non-whitespace element:
+                // Reset the context because we're not at the beginning of a line.
+                // However, we still need to scan forward to count any trailing spaces.
+                if (!nodeText.getTextElement(i).isSpaceOrTab()) {
+                    // Reset: we'll only count forward from current position
+                    start = index;
+                    extraCharacters = 0;
+                    break;
+                }
+                // Found whitespace - expand the sequence backward
+                // Update start to this earlier position
+                start = i;
+                // Count this whitespace character
+                extraCharacters++;
+            }
+        }
+        // ========== PHASE 2: FORWARD SCAN ==========
+        // Scan forward from the current position to count additional whitespace.
+        // This phase ALWAYS executes if the current position is whitespace,
+        // even if we reset the context during the backward scan.
+        //
+        // Example scenario where this matters:
+        //   "public[space][space]" - backward scan finds "public" and resets,
+        //   but we still need to count the 2 trailing spaces.
+        if (index < nodeText.numberOfElements() && nodeText.getTextElement(index).isSpaceOrTab()) {
+            for (int i = index; i < nodeText.numberOfElements(); i++) {
+                // Stop at newline - end of current line
+                if (nodeText.getTextElement(i).isNewline()) {
+                    break;
+                }
+                // Stop at non-whitespace - end of whitespace sequence
+                if (!nodeText.getTextElement(i).isSpaceOrTab()) {
+                    break;
+                }
+                // Count this whitespace character
+                extraCharacters++;
+            }
+        }
+        return new EnforcingContext(start, extraCharacters);
+    }
+
+    /**
+     * Removes excess indentation characters from the node text.
+     *
+     * This method modifies the provided NodeText by removing a specified number
+     * of elements starting from the given index.
+     *
+     * @param nodeText the node text to modify
+     * @param startIndex where to start removing
+     * @param count how many characters to remove
+     * @return the new index position after removal
+     */
+    public static int removeExcessIndentation(NodeText nodeText, int startIndex, int count) {
+        int removed = 0;
+        while (startIndex >= 0 && startIndex < nodeText.numberOfElements() && removed < count) {
+            nodeText.removeElement(startIndex);
+            removed++;
+        }
+        return startIndex;
+    }
+
+    /**
+     * Applies indentation enforcement at the specified position, preserving
+     * the specified number of characters.
+     *
+     * This is the main enforcement method that:
+     * 1. Analyzes the context to determine extra whitespace
+     * 2. Calculates how much to remove based on charactersToPreserve
+     * 3. Removes the excess
+     * 4. Returns the adjusted index
+     *
+     * @param nodeText the node text to modify
+     * @param index current position
+     * @param charactersToPreserve how many indentation characters to keep
+     * @return the new index position after enforcement
+     */
+    public static int enforceIndentation(NodeText nodeText, int index, int charactersToPreserve) {
+        EnforcingContext ctx = analyzeEnforcingContext(nodeText, index);
+        if (!ctx.hasExtraCharacters()) {
+            return index;
+        }
+        int toRemove = ctx.getExtraCharacters() > charactersToPreserve ? ctx.getExtraCharacters() - charactersToPreserve : 0;
+        int newIndex = removeExcessIndentation(nodeText, ctx.getStartIndex(), toRemove);
+        // Adjust for preserved characters
+        return toRemove > 0 ? newIndex + charactersToPreserve : newIndex;
+    }
+
+    /**
+     * Finds the index of the last newline element in the list.
+     *
+     * @param elements list to search
+     * @return index of last newline, or -1 if not found
+     */
+    private static int findLastNewlineIndex(List<TextElement> elements) {
+        for (int i = elements.size() - 1; i >= 0; i--) {
+            if (elements.get(i).isNewline()) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Context information for enforcing indentation.
+     * Contains the starting position and the number of extra characters to remove.
+     *
+     * This is an immutable value object returned by analyzeEnforcingContext.
+     */
+    public static class EnforcingContext {
+
+        private final int startIndex;
+
+        private final int extraCharacters;
+
+        public EnforcingContext(int startIndex, int extraCharacters) {
+            this.startIndex = startIndex;
+            this.extraCharacters = extraCharacters;
+        }
+
+        /**
+         * Returns the starting index of the whitespace sequence to potentially remove.
+         *
+         * @return the start index
+         */
+        public int getStartIndex() {
+            return startIndex;
+        }
+
+        /**
+         * Returns the total number of extra whitespace characters found.
+         *
+         * @return count of extra characters
+         */
+        public int getExtraCharacters() {
+            return extraCharacters;
+        }
+
+        /**
+         * Returns whether there are any extra characters to remove.
+         *
+         * @return true if extraCharacters > 0
+         */
+        public boolean hasExtraCharacters() {
+            return extraCharacters > 0;
+        }
+
+        @Override
+        public String toString() {
+            return "EnforcingContext{startIndex=" + startIndex + ", extraCharacters=" + extraCharacters + "}";
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o)
+                return true;
+            if (o == null || getClass() != o.getClass())
+                return false;
+            EnforcingContext that = (EnforcingContext) o;
+            return startIndex == that.startIndex && extraCharacters == that.extraCharacters;
+        }
+
+        @Override
+        public int hashCode() {
+            return 31 * startIndex + extraCharacters;
+        }
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/IndentationConstants.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/IndentationConstants.java
new file mode 100755
index 0000000000..ef7d7872b2
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/IndentationConstants.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.printer.lexicalpreservation;
+
+/**
+ * Constants related to indentation management in lexical preservation.
+ *
+ * This class centralizes all indentation-related constants to avoid duplication
+ * and ensure consistency across IndentationContext and IndentationCalculator.
+ */
+public final class IndentationConstants {
+
+    /**
+     * Standard indentation size in spaces.
+     * This is the number of spaces added or removed when increasing/decreasing indentation.
+     */
+    public static final int STANDARD_INDENTATION_SIZE = 4;
+
+    /**
+     * Private constructor to prevent instantiation.
+     * This is a constants class and should not be instantiated.
+     */
+    private IndentationConstants() {
+        throw new AssertionError("IndentationConstants is a constants class and should not be instantiated");
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/IndentationContext.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/IndentationContext.java
new file mode 100755
index 0000000000..a0bf7c7562
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/IndentationContext.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.printer.lexicalpreservation;
+
+import static com.github.javaparser.printer.lexicalpreservation.IndentationConstants.STANDARD_INDENTATION_SIZE;
+import com.github.javaparser.GeneratedJavaParserConstants;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Maintains the current indentation state during lexical preservation operations.
+ *
+ * This class encapsulates a mutable list of indentation elements (spaces/tabs)
+ * that represents the current indentation level. It provides methods to
+ * increase/decrease indentation and query the current state.
+ *
+ * Instances of this class are typically created at the start of a difference
+ * application and maintained throughout the process.
+ */
+public class IndentationContext {
+
+    /**
+     * Current indentation represented as a mutable list of TextElements.
+     * Typically contains space or tab tokens.
+     */
+    private final List<TextElement> elements;
+
+    /**
+     * Creates a new IndentationContext with empty indentation.
+     */
+    public IndentationContext() {
+        this.elements = new ArrayList<>();
+    }
+
+    /**
+     * Creates a new IndentationContext with the specified initial indentation.
+     * The provided list is copied to prevent external modifications.
+     *
+     * @param initialIndentation the initial indentation elements (will be copied)
+     */
+    public IndentationContext(List<TextElement> initialIndentation) {
+        this.elements = new ArrayList<>(initialIndentation);
+    }
+
+    /**
+     * Increases indentation by one level.
+     * Adds STANDARD_INDENTATION_SIZE space characters to the current indentation.
+     */
+    public void increase() {
+        for (int i = 0; i < STANDARD_INDENTATION_SIZE; i++) {
+            elements.add(new TokenTextElement(GeneratedJavaParserConstants.SPACE, " "));
+        }
+    }
+
+    /**
+     * Decreases indentation by one level.
+     * Removes up to STANDARD_INDENTATION_SIZE characters from the end of the current indentation.
+     * Does nothing if the current indentation has fewer elements than STANDARD_INDENTATION_SIZE.
+     */
+    public void decrease() {
+        for (int i = 0; i < STANDARD_INDENTATION_SIZE && !elements.isEmpty(); i++) {
+            elements.remove(elements.size() - 1);
+        }
+    }
+
+    /**
+     * Returns a copy of the current indentation elements.
+     * The returned list is unmodifiable to prevent accidental modifications.
+     *
+     * @return unmodifiable view of current indentation elements
+     */
+    public List<TextElement> getCurrent() {
+        return Collections.unmodifiableList(new ArrayList<>(elements));
+    }
+
+    /**
+     * Returns the number of indentation characters currently stored.
+     *
+     * @return count of indentation elements
+     */
+    public int size() {
+        return elements.size();
+    }
+
+    /**
+     * Clears all indentation, resetting to zero indentation.
+     */
+    public void clear() {
+        elements.clear();
+    }
+
+    /**
+     * Replaces the current indentation with the specified elements.
+     * The provided list is copied to prevent external modifications.
+     *
+     * @param newIndentation the new indentation elements (will be copied)
+     */
+    public void set(List<TextElement> newIndentation) {
+        elements.clear();
+        elements.addAll(newIndentation);
+    }
+
+    @Override
+    public String toString() {
+        return "IndentationContext{size=" + elements.size() + ", elements=" + elements + "}";
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        IndentationContext that = (IndentationContext) o;
+        return elements.equals(that.elements);
+    }
+
+    @Override
+    public int hashCode() {
+        return elements.hashCode();
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/IndexTrackingIterator.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/IndexTrackingIterator.java
new file mode 100755
index 0000000000..a5a3f9bf77
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/IndexTrackingIterator.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.printer.lexicalpreservation;
+
+import java.util.List;
+import java.util.ListIterator;
+
+/**
+ * A generic iterator that tracks the index of the current element.
+ *
+ * <p>This iterator wraps a standard {@link ListIterator} and maintains
+ * the index of the most recently read element, which can be accessed via
+ * {@link #currentIndex()}.
+ *
+ * <p>This class provides a generic implementation that can be used with any
+ * type of list elements. It correctly handles bidirectional iteration by
+ * tracking the current index internally.
+ *
+ * <p>This iterator is particularly useful for operations that need to know
+ * the position of elements during iteration, such as calculating
+ * correspondences between lists or tracking modifications.
+ *
+ * @param <T> the type of elements in the list
+ * @since 3.28.0
+ */
+public class IndexTrackingIterator<T> implements ListIterator<T> {
+
+    private final ListIterator<T> delegate;
+
+    private int currentIndex;
+
+    /**
+     * Creates an iterator starting at the beginning of the list.
+     *
+     * @param elements the list to iterate over
+     */
+    public IndexTrackingIterator(List<T> elements) {
+        this(elements, 0);
+    }
+
+    /**
+     * Creates an iterator starting at the specified index.
+     * The current index is initialized to -1, indicating that no element
+     * has been read yet.
+     *
+     * @param elements the list to iterate over
+     * @param fromIndex the starting index (cursor position)
+     * @throws IndexOutOfBoundsException if fromIndex is out of range
+     */
+    public IndexTrackingIterator(List<T> elements, int fromIndex) {
+        this.delegate = elements.listIterator(fromIndex);
+        // No element read yet
+        this.currentIndex = -1;
+    }
+
+    /**
+     * Returns the index of the element that was returned by the most recent call
+     * to {@link #next()} or {@link #previous()}.
+     *
+     * <p>This method can be called multiple times without side effects - it will
+     * always return the same value until the next call to {@link #next()},
+     * {@link #previous()}, or {@link #remove()}.
+     *
+     * <p><b>Important:</b> If neither {@link #next()} nor {@link #previous()} has
+     * been called yet, or if {@link #remove()} was called after the last call to
+     * {@link #next()} or {@link #previous()}, this method returns -1.
+     *
+     * <p><b>Note:</b> In the legacy {@code ArrayIterator} class, this method was
+     * named {@code index()}. It has been renamed to {@code currentIndex()} for
+     * better clarity and consistency.
+     *
+     * @return the index of the current element, or -1 if no element has been read
+     *         or the current element was removed
+     */
+    public int currentIndex() {
+        return currentIndex;
+    }
+
+    // === LISTITERATOR METHODS WITH INDEX TRACKING ===
+    @Override
+    public boolean hasNext() {
+        return delegate.hasNext();
+    }
+
+    @Override
+    public T next() {
+        T result = delegate.next();
+        // After next(), previousIndex() points to the element we just read
+        currentIndex = delegate.previousIndex();
+        return result;
+    }
+
+    @Override
+    public boolean hasPrevious() {
+        return delegate.hasPrevious();
+    }
+
+    @Override
+    public T previous() {
+        T result = delegate.previous();
+        // After previous(), nextIndex() points to the element we just read
+        currentIndex = delegate.nextIndex();
+        return result;
+    }
+
+    @Override
+    public int nextIndex() {
+        return delegate.nextIndex();
+    }
+
+    @Override
+    public int previousIndex() {
+        return delegate.previousIndex();
+    }
+
+    @Override
+    public void remove() {
+        delegate.remove();
+        // After remove, there is no current element
+        currentIndex = -1;
+    }
+
+    @Override
+    public void set(T element) {
+        delegate.set(element);
+        // Current index doesn't change when replacing an element
+    }
+
+    @Override
+    public void add(T element) {
+        delegate.add(element);
+        // After add(), the added element becomes the current element
+        currentIndex = delegate.previousIndex();
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Kept.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Kept.java
index 47e80befe4..dce7180ad2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Kept.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Kept.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -42,8 +42,10 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         Kept kept = (Kept) o;
         return element.equals(kept.element);
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculator.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculator.java
index 8ca20ac47d..239fd9a3db 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -74,8 +74,10 @@ public int hashCode() {
         }
 
         public boolean equals(Object other) {
-            if (other == null) return false;
-            if (!(other instanceof CalculatedSyntaxModel)) return false;
+            if (other == null)
+                return false;
+            if (!(other instanceof CalculatedSyntaxModel))
+                return false;
             return elements.equals(other);
         }
     }
@@ -102,8 +104,7 @@ public void prettyPrint(Node node, SourcePrinter printer) {
          */
         @Override
         public boolean isCorrespondingElement(TextElement textElement) {
-            return (textElement instanceof ChildTextElement)
-                    && ((ChildTextElement) textElement).getChild() == getChild();
+            return (textElement instanceof ChildTextElement) && ((ChildTextElement) textElement).getChild() == getChild();
         }
 
         @Override
@@ -113,8 +114,10 @@ public String toString() {
 
         @Override
         public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
+            if (this == o)
+                return true;
+            if (o == null || getClass() != o.getClass())
+                return false;
             CsmChild csmChild = (CsmChild) o;
             return child.equals(csmChild.child);
         }
@@ -125,23 +128,19 @@ public int hashCode() {
         }
     }
 
-    List<DifferenceElement> calculateListRemovalDifference(
-            ObservableProperty observableProperty, NodeList<?> nodeList, int index) {
+    List<DifferenceElement> calculateListRemovalDifference(ObservableProperty observableProperty, NodeList<?> nodeList, int index) {
         Node container = nodeList.getParentNodeForChildren();
         CsmElement element = ConcreteSyntaxModel.forClass(container.getClass());
         CalculatedSyntaxModel original = calculatedSyntaxModelForNode(element, container);
-        CalculatedSyntaxModel after =
-                calculatedSyntaxModelAfterListRemoval(element, observableProperty, nodeList, index);
+        CalculatedSyntaxModel after = calculatedSyntaxModelAfterListRemoval(element, observableProperty, nodeList, index);
         return new DifferenceElementCalculator().calculate(original, after);
     }
 
-    List<DifferenceElement> calculateListAdditionDifference(
-            ObservableProperty observableProperty, NodeList<?> nodeList, int index, Node nodeAdded) {
+    List<DifferenceElement> calculateListAdditionDifference(ObservableProperty observableProperty, NodeList<?> nodeList, int index, Node nodeAdded) {
         Node container = nodeList.getParentNodeForChildren();
         CsmElement element = ConcreteSyntaxModel.forClass(container.getClass());
         CalculatedSyntaxModel original = calculatedSyntaxModelForNode(element, container);
-        CalculatedSyntaxModel after =
-                calculatedSyntaxModelAfterListAddition(element, observableProperty, nodeList, index, nodeAdded);
+        CalculatedSyntaxModel after = calculatedSyntaxModelAfterListAddition(element, observableProperty, nodeList, index, nodeAdded);
         List<DifferenceElement> differenceElements = new DifferenceElementCalculator().calculate(original, after);
         // Set the line separator character tokens
         LineSeparator lineSeparator = container.getLineEndingStyleOrDefault(LineSeparator.SYSTEM);
@@ -167,25 +166,21 @@ private CsmElement getNewLineToken(LineSeparator lineSeparator) {
         return CsmElement.newline(lineSeparator);
     }
 
-    List<DifferenceElement> calculateListReplacementDifference(
-            ObservableProperty observableProperty, NodeList<?> nodeList, int index, Node newValue) {
+    List<DifferenceElement> calculateListReplacementDifference(ObservableProperty observableProperty, NodeList<?> nodeList, int index, Node newValue) {
         Node container = nodeList.getParentNodeForChildren();
         CsmElement element = ConcreteSyntaxModel.forClass(container.getClass());
         CalculatedSyntaxModel original = calculatedSyntaxModelForNode(element, container);
-        CalculatedSyntaxModel after =
-                calculatedSyntaxModelAfterListReplacement(element, observableProperty, nodeList, index, newValue);
+        CalculatedSyntaxModel after = calculatedSyntaxModelAfterListReplacement(element, observableProperty, nodeList, index, newValue);
         return new DifferenceElementCalculator().calculate(original, after);
     }
 
-    void calculatePropertyChange(
-            NodeText nodeText, Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
+    void calculatePropertyChange(NodeText nodeText, Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
         if (nodeText == null) {
             throw new NullPointerException();
         }
         CsmElement element = ConcreteSyntaxModel.forClass(observedNode.getClass());
         CalculatedSyntaxModel original = calculatedSyntaxModelForNode(element, observedNode);
-        CalculatedSyntaxModel after =
-                calculatedSyntaxModelAfterPropertyChange(element, observedNode, property, oldValue, newValue);
+        CalculatedSyntaxModel after = calculatedSyntaxModelAfterPropertyChange(element, observedNode, property, oldValue, newValue);
         List<DifferenceElement> differenceElements = new DifferenceElementCalculator().calculate(original, after);
         Difference difference = new Difference(differenceElements, nodeText, observedNode);
         difference.apply();
@@ -211,8 +206,7 @@ private void calculatedSyntaxModelForNode(CsmElement csm, Node node, List<CsmEle
         } else if (csm instanceof CsmSingleReference) {
             CsmSingleReference csmSingleReference = (CsmSingleReference) csm;
             Node child;
-            if (change instanceof PropertyChange
-                    && ((PropertyChange) change).getProperty() == csmSingleReference.getProperty()) {
+            if (change instanceof PropertyChange && ((PropertyChange) change).getProperty() == csmSingleReference.getProperty()) {
                 child = (Node) ((PropertyChange) change).getNewValue();
                 if (node instanceof LambdaExpr && child instanceof ExpressionStmt) {
                     // Same edge-case as in DefaultPrettyPrinterVisitor.visit(LambdaExpr, Void)
@@ -239,8 +233,7 @@ private void calculatedSyntaxModelForNode(CsmElement csm, Node node, List<CsmEle
                     Optional<?> optional = (Optional<?>) rawValue;
                     if (optional.isPresent()) {
                         if (!(optional.get() instanceof NodeList)) {
-                            throw new IllegalStateException("Expected NodeList, found "
-                                    + optional.get().getClass().getCanonicalName());
+                            throw new IllegalStateException("Expected NodeList, found " + optional.get().getClass().getCanonicalName());
                         }
                         nodeList = (NodeList<?>) optional.get();
                     } else {
@@ -248,8 +241,7 @@ private void calculatedSyntaxModelForNode(CsmElement csm, Node node, List<CsmEle
                     }
                 } else {
                     if (!(rawValue instanceof NodeList)) {
-                        throw new IllegalStateException("Expected NodeList, found "
-                                + rawValue.getClass().getCanonicalName());
+                        throw new IllegalStateException("Expected NodeList, found " + rawValue.getClass().getCanonicalName());
                     }
                     nodeList = (NodeList<?>) rawValue;
                 }
@@ -280,8 +272,7 @@ private void calculatedSyntaxModelForNode(CsmElement csm, Node node, List<CsmEle
                             Modifier modifier = (Modifier) value;
                             elements.add(new CsmToken(toToken(modifier)));
                         } else {
-                            throw new UnsupportedOperationException("Not supported value found: "
-                                    + it.next().getClass().getSimpleName());
+                            throw new UnsupportedOperationException("Not supported value found: " + it.next().getClass().getSimpleName());
                         }
                         if (it.hasNext()) {
                             calculatedSyntaxModelForNode(csmList.getSeparatorPost(), node, elements, change);
@@ -317,13 +308,9 @@ private void calculatedSyntaxModelForNode(CsmElement csm, Node node, List<CsmEle
             // If the given change is a PropertyChange, the returned model should
             // contain the new value, otherwise the original/current value should be used.
             if (change instanceof PropertyChange) {
-                elements.add(new CsmToken(
-                        GeneratedJavaParserConstants.STRING_LITERAL,
-                        "\"" + ((PropertyChange) change).getNewValue() + "\""));
+                elements.add(new CsmToken(GeneratedJavaParserConstants.STRING_LITERAL, "\"" + ((PropertyChange) change).getNewValue() + "\""));
             } else {
-                elements.add(new CsmToken(
-                        GeneratedJavaParserConstants.STRING_LITERAL,
-                        "\"" + ((StringLiteralExpr) node).getValue() + "\""));
+                elements.add(new CsmToken(GeneratedJavaParserConstants.STRING_LITERAL, "\"" + ((StringLiteralExpr) node).getValue() + "\""));
             }
         } else if ((csm instanceof CsmString) && (node instanceof TextBlockLiteralExpr)) {
             // Per https://openjdk.java.net/jeps/378#1--Line-terminators, any 'CRLF' and 'CR' are turned into 'LF'
@@ -331,21 +318,15 @@ private void calculatedSyntaxModelForNode(CsmElement csm, Node node, List<CsmEle
             String eol = node.getLineEndingStyle().toString();
             // FIXME: csm should be CsmTextBlock -- See also #2677
             if (change instanceof PropertyChange) {
-                elements.add(new CsmToken(
-                        GeneratedJavaParserConstants.TEXT_BLOCK_LITERAL,
-                        "\"\"\"" + eol + ((PropertyChange) change).getNewValue() + "\"\"\""));
+                elements.add(new CsmToken(GeneratedJavaParserConstants.TEXT_BLOCK_LITERAL, "\"\"\"" + eol + ((PropertyChange) change).getNewValue() + "\"\"\""));
             } else {
-                elements.add(new CsmToken(
-                        GeneratedJavaParserConstants.TEXT_BLOCK_LITERAL,
-                        "\"\"\"" + eol + ((TextBlockLiteralExpr) node).getValue() + "\"\"\""));
+                elements.add(new CsmToken(GeneratedJavaParserConstants.TEXT_BLOCK_LITERAL, "\"\"\"" + eol + ((TextBlockLiteralExpr) node).getValue() + "\"\"\""));
             }
         } else if ((csm instanceof CsmChar) && (node instanceof CharLiteralExpr)) {
             if (change instanceof PropertyChange) {
-                elements.add(new CsmToken(
-                        GeneratedJavaParserConstants.CHAR, "'" + ((PropertyChange) change).getNewValue() + "'"));
+                elements.add(new CsmToken(GeneratedJavaParserConstants.CHAR, "'" + ((PropertyChange) change).getNewValue() + "'"));
             } else {
-                elements.add(new CsmToken(
-                        GeneratedJavaParserConstants.CHAR, "'" + ((CharLiteralExpr) node).getValue() + "'"));
+                elements.add(new CsmToken(GeneratedJavaParserConstants.CHAR, "'" + ((CharLiteralExpr) node).getValue() + "'"));
             }
         } else if (csm instanceof CsmMix) {
             CsmMix csmMix = (CsmMix) csm;
@@ -355,123 +336,118 @@ private void calculatedSyntaxModelForNode(CsmElement csm, Node node, List<CsmEle
         } else if (csm instanceof CsmChild) {
             elements.add(csm);
         } else {
-            throw new UnsupportedOperationException(
-                    "Not supported element type: " + csm.getClass().getSimpleName() + " " + csm);
+            throw new UnsupportedOperationException("Not supported element type: " + csm.getClass().getSimpleName() + " " + csm);
         }
     }
 
     public static int toToken(Modifier modifier) {
-        if (modifier.getKeyword() instanceof Modifier.DefaultKeyword dk) {
-            switch (dk) {
-                case DEFAULT:
-                    break;
-                case PUBLIC:
-                    return GeneratedJavaParserConstants.PUBLIC;
-                case PRIVATE:
-                    return GeneratedJavaParserConstants.PRIVATE;
-                case PROTECTED:
-                    return GeneratedJavaParserConstants.PROTECTED;
-                case STATIC:
-                    return GeneratedJavaParserConstants.STATIC;
-                case FINAL:
-                    return GeneratedJavaParserConstants.FINAL;
-                case ABSTRACT:
-                    return GeneratedJavaParserConstants.ABSTRACT;
-                case TRANSIENT:
-                    return GeneratedJavaParserConstants.TRANSIENT;
-                case SYNCHRONIZED:
-                    return GeneratedJavaParserConstants.SYNCHRONIZED;
-                case VOLATILE:
-                    return GeneratedJavaParserConstants.VOLATILE;
-                case NATIVE:
-                    return GeneratedJavaParserConstants.NATIVE;
-                case STRICTFP:
-                    return GeneratedJavaParserConstants.STRICTFP;
-                case TRANSITIVE:
-                    return GeneratedJavaParserConstants.TRANSITIVE;
-                case SEALED:
-                    return GeneratedJavaParserConstants.SEALED;
-                case NON_SEALED:
-                    return GeneratedJavaParserConstants.NON_SEALED;
-                case JML_PACKAGE:
-                    return GeneratedJavaParserConstants.SPEC_PACKAGE;
-                case JML_PURE:
-                    return GeneratedJavaParserConstants.PURE;
-                case JML_STRICTLY_PURE:
-                    return GeneratedJavaParserConstants.STRICTLY_PURE;
-                case JML_HELPER:
-                    return GeneratedJavaParserConstants.HELPER;
-                case JML_INSTANCE:
-                    return GeneratedJavaParserConstants.INSTANCE;
-                case JML_NULLABLE_BY_DEFAULT:
-                    return GeneratedJavaParserConstants.NULLABLE_BY_DEFAULT;
-                case JML_NON_NULL:
-                    return GeneratedJavaParserConstants.NON_NULL;
-                case JML_NULLABLE:
-                    return GeneratedJavaParserConstants.NULLABLE;
-                case JML_GHOST:
-                    return GeneratedJavaParserConstants.GHOST;
-                case JML_MODEL:
-                    return GeneratedJavaParserConstants.MODEL;
-                case JML_SPEC_PUBLIC:
-                    return GeneratedJavaParserConstants.SPEC_PACKAGE;
-                case JML_SPEC_PACKAGE:
-                    return GeneratedJavaParserConstants.SPEC_PACKAGE;
-                case JML_SPEC_PROTECTED:
-                    return GeneratedJavaParserConstants.SPEC_PROTECTED;
-                case JML_SPEC_PRIVATE:
-                    return GeneratedJavaParserConstants.SPEC_PRIVATE;
-                case JML_NO_STATE:
-                    return GeneratedJavaParserConstants.NO_STATE;
-                case JML_TWO_STATE:
-                    break;
-                case JML_NON_NULL_BY_DEFAULT:
-                    break;
-                case JML_NON_NULL_ELEMENTS:
-                    break;
-                case JML_UNPARSABLE_MODIFIERS:
-                    break;
-                case JML_CODE_BIGINT_MATH:
-                    break;
-                case JML_CODE_JAVA_MATH:
-                    break;
-                case JML_CODE_SAFE_MATH:
-                    break;
-                case JML_CODE:
-                    break;
-                case JML_OT_PEER:
-                    break;
-                case JML_OT_REP:
-                    break;
-                case JML_OT_READ_ONLY:
-                    break;
-            }
-        }
-        throw new UnsupportedOperationException(
-                "Not supported keyword" + modifier.getKeyword().name());
+        return switch((Modifier.DefaultKeyword) modifier.getKeyword()) {
+            case DEFAULT ->
+                GeneratedJavaParserConstants.DEFAULT;
+            case PUBLIC ->
+                GeneratedJavaParserConstants.PUBLIC;
+            case PRIVATE ->
+                GeneratedJavaParserConstants.PRIVATE;
+            case PROTECTED ->
+                GeneratedJavaParserConstants.PROTECTED;
+            case STATIC ->
+                GeneratedJavaParserConstants.STATIC;
+            case FINAL ->
+                GeneratedJavaParserConstants.FINAL;
+            case ABSTRACT ->
+                GeneratedJavaParserConstants.ABSTRACT;
+            case TRANSIENT ->
+                GeneratedJavaParserConstants.TRANSIENT;
+            case SYNCHRONIZED ->
+                GeneratedJavaParserConstants.SYNCHRONIZED;
+            case VOLATILE ->
+                GeneratedJavaParserConstants.VOLATILE;
+            case NATIVE ->
+                GeneratedJavaParserConstants.NATIVE;
+            case STRICTFP ->
+                GeneratedJavaParserConstants.STRICTFP;
+            case TRANSITIVE ->
+                GeneratedJavaParserConstants.TRANSITIVE;
+            case SEALED ->
+                GeneratedJavaParserConstants.SEALED;
+            case NON_SEALED ->
+                GeneratedJavaParserConstants.NON_SEALED;
+            case JML_PACKAGE ->
+                GeneratedJavaParserConstants.PACKAGE;
+            case JML_PURE ->
+                GeneratedJavaParserConstants.PURE;
+            case JML_STRICTLY_PURE ->
+                GeneratedJavaParserConstants.STRICTLY_PURE;
+            case JML_HELPER ->
+                GeneratedJavaParserConstants.HELPER;
+            case JML_INSTANCE ->
+                GeneratedJavaParserConstants.INSTANCE;
+            case JML_NULLABLE_BY_DEFAULT ->
+                GeneratedJavaParserConstants.NULLABLE_BY_DEFAULT;
+            case JML_NON_NULL ->
+                GeneratedJavaParserConstants.NON_NULL;
+            case JML_NULLABLE ->
+                GeneratedJavaParserConstants.NULLABLE;
+            case JML_GHOST ->
+                GeneratedJavaParserConstants.GHOST;
+            case JML_MODEL ->
+                GeneratedJavaParserConstants.MODEL;
+            case JML_SPEC_PUBLIC ->
+                GeneratedJavaParserConstants.SPEC_PUBLIC;
+            case JML_SPEC_PACKAGE ->
+                GeneratedJavaParserConstants.SPEC_PACKAGE;
+            case JML_SPEC_PROTECTED ->
+                GeneratedJavaParserConstants.SPEC_PROTECTED;
+            case JML_SPEC_PRIVATE ->
+                GeneratedJavaParserConstants.SPEC_PRIVATE;
+            case JML_NO_STATE ->
+                GeneratedJavaParserConstants.NO_STATE;
+            case JML_TWO_STATE ->
+                GeneratedJavaParserConstants.TWO_STATE;
+            case JML_NON_NULL_BY_DEFAULT ->
+                GeneratedJavaParserConstants.NON_NULL_BY_DEFAULT;
+            case JML_CODE_BIGINT_MATH ->
+                GeneratedJavaParserConstants.CODE_BIGINT_MATH;
+            case JML_CODE_JAVA_MATH ->
+                GeneratedJavaParserConstants.CODE_JAVA_MATH;
+            case JML_CODE_SAFE_MATH ->
+                GeneratedJavaParserConstants.CODE_SAFE_MATH;
+            case JML_SPEC_BIGINT_MATH ->
+                GeneratedJavaParserConstants.SPEC_BIGINT_MATH;
+            case JML_SPEC_JAVA_MATH ->
+                GeneratedJavaParserConstants.SPEC_JAVA_MATH;
+            case JML_SPEC_SAFE_MATH ->
+                GeneratedJavaParserConstants.SPEC_SAFE_MATH;
+            case JML_CODE ->
+                GeneratedJavaParserConstants.CODE;
+            case JML_OT_PEER ->
+                GeneratedJavaParserConstants.PEER;
+            case JML_OT_REP ->
+                GeneratedJavaParserConstants.REP;
+            case JML_OT_READ_ONLY ->
+                GeneratedJavaParserConstants.READ_ONLY;
+            default ->
+                throw new UnsupportedOperationException("Not supported keyword" + modifier.getKeyword().name());
+        };
     }
 
     // /
     // / Methods that calculate CalculatedSyntaxModel
     // /
     // Visible for testing
-    CalculatedSyntaxModel calculatedSyntaxModelAfterPropertyChange(
-            Node node, ObservableProperty property, Object oldValue, Object newValue) {
-        return calculatedSyntaxModelAfterPropertyChange(
-                ConcreteSyntaxModel.forClass(node.getClass()), node, property, oldValue, newValue);
+    CalculatedSyntaxModel calculatedSyntaxModelAfterPropertyChange(Node node, ObservableProperty property, Object oldValue, Object newValue) {
+        return calculatedSyntaxModelAfterPropertyChange(ConcreteSyntaxModel.forClass(node.getClass()), node, property, oldValue, newValue);
     }
 
     // Visible for testing
-    CalculatedSyntaxModel calculatedSyntaxModelAfterPropertyChange(
-            CsmElement csm, Node node, ObservableProperty property, Object oldValue, Object newValue) {
+    CalculatedSyntaxModel calculatedSyntaxModelAfterPropertyChange(CsmElement csm, Node node, ObservableProperty property, Object oldValue, Object newValue) {
         List<CsmElement> elements = new LinkedList<>();
         calculatedSyntaxModelForNode(csm, node, elements, new PropertyChange(property, oldValue, newValue));
         return new CalculatedSyntaxModel(elements);
     }
 
     // Visible for testing
-    CalculatedSyntaxModel calculatedSyntaxModelAfterListRemoval(
-            CsmElement csm, ObservableProperty observableProperty, NodeList<?> nodeList, int index) {
+    CalculatedSyntaxModel calculatedSyntaxModelAfterListRemoval(CsmElement csm, ObservableProperty observableProperty, NodeList<?> nodeList, int index) {
         List<CsmElement> elements = new LinkedList<>();
         Node container = nodeList.getParentNodeForChildren();
         calculatedSyntaxModelForNode(csm, container, elements, new ListRemovalChange(observableProperty, index));
@@ -479,48 +455,40 @@ CalculatedSyntaxModel calculatedSyntaxModelAfterListRemoval(
     }
 
     // Visible for testing
-    CalculatedSyntaxModel calculatedSyntaxModelAfterListAddition(
-            CsmElement csm, ObservableProperty observableProperty, NodeList<?> nodeList, int index, Node nodeAdded) {
+    CalculatedSyntaxModel calculatedSyntaxModelAfterListAddition(CsmElement csm, ObservableProperty observableProperty, NodeList<?> nodeList, int index, Node nodeAdded) {
         List<CsmElement> elements = new LinkedList<>();
         Node container = nodeList.getParentNodeForChildren();
-        calculatedSyntaxModelForNode(
-                csm, container, elements, new ListAdditionChange(observableProperty, index, nodeAdded));
+        calculatedSyntaxModelForNode(csm, container, elements, new ListAdditionChange(observableProperty, index, nodeAdded));
         return new CalculatedSyntaxModel(elements);
     }
 
     // Visible for testing
-    CalculatedSyntaxModel calculatedSyntaxModelAfterListAddition(
-            Node container, ObservableProperty observableProperty, int index, Node nodeAdded) {
+    CalculatedSyntaxModel calculatedSyntaxModelAfterListAddition(Node container, ObservableProperty observableProperty, int index, Node nodeAdded) {
         CsmElement csm = ConcreteSyntaxModel.forClass(container.getClass());
         Object rawValue = observableProperty.getRawValue(container);
         if (!(rawValue instanceof NodeList)) {
-            throw new IllegalStateException(
-                    "Expected NodeList, found " + rawValue.getClass().getCanonicalName());
+            throw new IllegalStateException("Expected NodeList, found " + rawValue.getClass().getCanonicalName());
         }
         NodeList<?> nodeList = (NodeList<?>) rawValue;
         return calculatedSyntaxModelAfterListAddition(csm, observableProperty, nodeList, index, nodeAdded);
     }
 
     // Visible for testing
-    CalculatedSyntaxModel calculatedSyntaxModelAfterListRemoval(
-            Node container, ObservableProperty observableProperty, int index) {
+    CalculatedSyntaxModel calculatedSyntaxModelAfterListRemoval(Node container, ObservableProperty observableProperty, int index) {
         CsmElement csm = ConcreteSyntaxModel.forClass(container.getClass());
         Object rawValue = observableProperty.getRawValue(container);
         if (!(rawValue instanceof NodeList)) {
-            throw new IllegalStateException(
-                    "Expected NodeList, found " + rawValue.getClass().getCanonicalName());
+            throw new IllegalStateException("Expected NodeList, found " + rawValue.getClass().getCanonicalName());
         }
         NodeList<?> nodeList = (NodeList<?>) rawValue;
         return calculatedSyntaxModelAfterListRemoval(csm, observableProperty, nodeList, index);
     }
 
     // Visible for testing
-    private CalculatedSyntaxModel calculatedSyntaxModelAfterListReplacement(
-            CsmElement csm, ObservableProperty observableProperty, NodeList<?> nodeList, int index, Node newValue) {
+    private CalculatedSyntaxModel calculatedSyntaxModelAfterListReplacement(CsmElement csm, ObservableProperty observableProperty, NodeList<?> nodeList, int index, Node newValue) {
         List<CsmElement> elements = new LinkedList<>();
         Node container = nodeList.getParentNodeForChildren();
-        calculatedSyntaxModelForNode(
-                csm, container, elements, new ListReplacementChange(observableProperty, index, newValue));
+        calculatedSyntaxModelForNode(csm, container, elements, new ListReplacementChange(observableProperty, index, newValue));
         return new CalculatedSyntaxModel(elements);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinter.java
index b5e4842849..447bfaf4a8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinter.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinter.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -26,7 +26,6 @@
 import static com.github.javaparser.utils.Utils.decapitalize;
 import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.toList;
-
 import com.github.javaparser.JavaToken;
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.DataKey;
@@ -35,6 +34,7 @@
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.body.VariableDeclarator;
 import com.github.javaparser.ast.comments.*;
+import com.github.javaparser.ast.key.IgnoreLexPrinting;
 import com.github.javaparser.ast.nodeTypes.NodeWithVariables;
 import com.github.javaparser.ast.observer.AstObserver;
 import com.github.javaparser.ast.observer.ObservableProperty;
@@ -86,7 +86,8 @@ public class LexicalPreservingPrinter {
     /**
      * The nodetext for a node is stored in the node's data field. This is the key to set and retrieve it.
      */
-    public static final DataKey<NodeText> NODE_TEXT_DATA = new DataKey<NodeText>() {};
+    public static final DataKey<NodeText> NODE_TEXT_DATA = new DataKey<NodeText>() {
+    };
 
     private static final LexicalDifferenceCalculator LEXICAL_DIFFERENCE_CALCULATOR = new LexicalDifferenceCalculator();
 
@@ -139,8 +140,7 @@ private static AstObserver createObserver() {
     private static class Observer extends PropagatingAstObserver {
 
         @Override
-        public void concretePropertyChange(
-                Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
+        public void concretePropertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
             if (oldValue == newValue) {
                 // Not really a change, ignore
                 return;
@@ -148,17 +148,30 @@ public void concretePropertyChange(
             if (property == ObservableProperty.RANGE || property == ObservableProperty.COMMENTED_NODE) {
                 return;
             }
+            // Handle node replacements with TokenOwnerDetector
+            if (oldValue instanceof Node && newValue instanceof Node) {
+                Node oldNode = (Node) oldValue;
+                Node newNode = (Node) newValue;
+                // Find the actual token owner
+                Node tokenOwner = TokenOwnerDetector.findTokenOwner(oldNode);
+                // Check if we need to regenerate the token owner instead of just the parent
+                if (TokenOwnerDetector.needsRegeneration(observedNode, tokenOwner, oldNode)) {
+                    NodeText tokenOwnerText = getOrCreateNodeText(tokenOwner);
+                    if (tokenOwnerText != null) {
+                        // Regenerate the token owner's NodeText instead of the observed node
+                        LEXICAL_DIFFERENCE_CALCULATOR.calculatePropertyChange(tokenOwnerText, tokenOwner, property, oldValue, newValue);
+                        // Early exit - we've handled the change
+                        return;
+                    }
+                }
+            }
             if (property == ObservableProperty.COMMENT) {
                 Optional<Node> parentNode = observedNode.getParentNode();
-                NodeText nodeText = parentNode
-                        .map(parent -> getOrCreateNodeText(parentNode.get()))
-                        .orElseGet(() -> getOrCreateNodeText(observedNode));
+                NodeText nodeText = parentNode.map(parent -> getOrCreateNodeText(parentNode.get())).orElseGet(() -> getOrCreateNodeText(observedNode));
                 if (oldValue == null) {
                     // this case corresponds to the addition of a comment
                     // Find the position of the comment node and put in front of it the [...]
-                    int // Find the position of the comment node and put in front of it the [...]
-                            //
-                            index = parentNode.isPresent() ? nodeText.findChild(observedNode) : 0;
+                    int index = parentNode.isPresent() ? nodeText.findChild(observedNode) : 0;
                     /* Add the same indentation to the comment as the previous node
                      * for example if we want to add a comment on the body of the method declaration :
                      * Actual code
@@ -179,21 +192,31 @@ public void concretePropertyChange(
                      * }
                      * }
                      */
-                    fixIndentOfAddedNode(nodeText, index - 1);
+                    // Extract the existing indentation of the line where we'll insert the comment
+                    List<TextElement> precedingElements = nodeText.getElements().subList(0, index);
+                    List<TextElement> existingIndent = IndentationCalculator.computeFromPrecedingElements(precedingElements);
+                    // Insert the comment (WITHOUT adding indentation before, we'll add it after the EOL)
                     LineSeparator lineSeparator = observedNode.getLineEndingStyleOrDefault(LineSeparator.SYSTEM);
                     for (TokenTextElement element : makeCommentTokens((Comment) newValue)) {
                         nodeText.addElement(index++, element);
                     }
+                    // Insert EOL
                     nodeText.addToken(index, eolTokenKind(lineSeparator), lineSeparator.asRawString());
-                    // code indentation after inserting an eol token may be wrong
+                    index++;
+                    // Restore the indentation for the node that follows
+                    for (TextElement indentElement : existingIndent) {
+                        if (indentElement instanceof TokenTextElement) {
+                            TokenTextElement tokenElement = (TokenTextElement) indentElement;
+                            nodeText.addElement(index++, new TokenTextElement(tokenElement.getTokenKind(), tokenElement.getText()));
+                        }
+                    }
                 } else if (newValue == null) {
                     // this case corresponds to a deletion of a comment
                     if (oldValue instanceof Comment) {
                         if (((Comment) oldValue).isOrphan()) {
                             nodeText = getOrCreateNodeText(observedNode);
                         }
-                        Pair<Integer, Integer> indexAndCount =
-                                getIndexAndCountOfCommentTokens((Comment) oldValue, nodeText);
+                        Pair<Integer, Integer> indexAndCount = getIndexAndCountOfCommentTokens((Comment) oldValue, nodeText);
                         int index = indexAndCount.a;
                         for (int i = 0; i < indexAndCount.b; i++) {
                             nodeText.removeElement(index);
@@ -201,17 +224,15 @@ public void concretePropertyChange(
                         if (isCompleteLine(nodeText.getElements(), index)) {
                             removeAllExtraCharacters(nodeText.getElements(), index);
                         } else {
-                            removeAllExtraCharactersStartingFrom(
-                                    nodeText.getElements().listIterator(index));
+                            removeAllExtraCharactersStartingFrom(nodeText.getElements().listIterator(index));
                         }
                     } else {
                         throw new UnsupportedOperationException("Trying to remove something that is not a comment!");
                     }
                 } else {
                     // this is a replacement of a comment
-                    List<TokenTextElement> matchingTokens =
-                            findTokenTextElementForComment((Comment) oldValue, nodeText);
-                    if (matchingTokens.size() != 1) {
+                    List<TokenTextElement> matchingTokens = findTokenTextElementForComment((Comment) oldValue, nodeText);
+                    if ((oldValue instanceof MarkdownComment && matchingTokens.isEmpty()) || (!(oldValue instanceof MarkdownComment) && matchingTokens.size() != 1)) {
                         throw new IllegalStateException("The matching comment to be replaced could not be found");
                     }
                     Comment newComment = (Comment) newValue;
@@ -234,14 +255,17 @@ public void concretePropertyChange(
         }
 
         private boolean isCompleteLine(List<TextElement> elements, int index) {
-            if (index <= 0 || index >= elements.size()) return false;
+            if (index <= 0 || index >= elements.size())
+                return false;
             boolean isCompleteLine = true;
             ListIterator<TextElement> iterator = elements.listIterator(index);
             // verify if elements after the index are only spaces or tabs
             while (iterator.hasNext()) {
                 TextElement textElement = iterator.next();
-                if (textElement.isNewline()) break;
-                if (textElement.isSpaceOrTab()) continue;
+                if (textElement.isNewline())
+                    break;
+                if (textElement.isSpaceOrTab())
+                    continue;
                 isCompleteLine = false;
                 break;
             }
@@ -249,15 +273,18 @@ private boolean isCompleteLine(List<TextElement> elements, int index) {
             iterator = elements.listIterator(index);
             while (iterator.hasPrevious() && isCompleteLine) {
                 TextElement textElement = iterator.previous();
-                if (textElement.isNewline()) break;
-                if (textElement.isSpaceOrTab()) continue;
+                if (textElement.isNewline())
+                    break;
+                if (textElement.isSpaceOrTab())
+                    continue;
                 isCompleteLine = false;
             }
             return isCompleteLine;
         }
 
         private void removeAllExtraCharacters(List<TextElement> elements, int index) {
-            if (index < 0 || index >= elements.size()) return;
+            if (index < 0 || index >= elements.size())
+                return;
             removeAllExtraCharactersStartingFrom(elements.listIterator(index));
             removeAllExtraCharactersBeforePosition(elements.listIterator(index));
         }
@@ -332,22 +359,18 @@ private List<TokenTextElement> convertMarkdownCommentContentToTokens(MarkdownCom
         private List<TokenTextElement> makeCommentTokens(Comment newComment) {
             List<TokenTextElement> tokens = new ArrayList<>();
             if (newComment.isJavadocComment()) {
-                TokenTextElement t = new TokenTextElement(
-                        JAVADOC_COMMENT, newComment.getHeader() + newComment.getContent() + newComment.getFooter());
+                TokenTextElement t = new TokenTextElement(JAVADOC_COMMENT, newComment.getHeader() + newComment.getContent() + newComment.getFooter());
                 tokens.add(t);
             } else if (newComment.isLineComment()) {
-                TokenTextElement t =
-                        new TokenTextElement(SINGLE_LINE_COMMENT, newComment.getHeader() + newComment.getContent());
+                TokenTextElement t = new TokenTextElement(SINGLE_LINE_COMMENT, newComment.getHeader() + newComment.getContent());
                 tokens.add(t);
             } else if (newComment.isBlockComment()) {
-                TokenTextElement t = new TokenTextElement(
-                        MULTI_LINE_COMMENT, newComment.getHeader() + newComment.getContent() + newComment.getFooter());
+                TokenTextElement t = new TokenTextElement(MULTI_LINE_COMMENT, newComment.getHeader() + newComment.getContent() + newComment.getFooter());
                 tokens.add(t);
             } else if (newComment.isMarkdownComment()) {
                 tokens.addAll(convertMarkdownCommentContentToTokens(newComment.asMarkdownComment()));
             } else {
-                throw new UnsupportedOperationException(
-                        "Unknown type of comment: " + newComment.getClass().getSimpleName());
+                throw new UnsupportedOperationException("Unknown type of comment: " + newComment.getClass().getSimpleName());
             }
             return tokens;
         }
@@ -356,15 +379,12 @@ private Pair<Integer, Integer> getIndexAndCountOfCommentTokens(Comment oldValue,
             List<TokenTextElement> matchingTokens = findTokenTextElementForComment(oldValue, nodeText);
             if (!matchingTokens.isEmpty()) {
                 TextElement matchingElement = matchingTokens.get(0);
-                return new Pair<>(
-                        nodeText.findElement(matchingElement.and(matchingElement.matchByRange())),
-                        matchingTokens.size());
+                return new Pair<>(nodeText.findElement(matchingElement.and(matchingElement.matchByRange())), matchingTokens.size());
             }
             // If no matching TokenTextElements were found, we try searching through ChildTextElements as well
             List<ChildTextElement> matchingChilds = findChildTextElementForComment(oldValue, nodeText);
             ChildTextElement matchingChild = matchingChilds.get(0);
-            return new Pair<>(
-                    nodeText.findElement(matchingChild.and(matchingChild.matchByRange())), matchingChilds.size());
+            return new Pair<>(nodeText.findElement(matchingChild.and(matchingChild.matchByRange())), matchingChilds.size());
         }
 
         /*
@@ -375,35 +395,17 @@ private List<ChildTextElement> findChildTextElementForComment(Comment oldValue,
             matchingChildElements = selectMatchingChildElements(oldValue, nodeText);
             if (matchingChildElements.size() > 1) {
                 // Duplicate child nodes found, refine the result
-                matchingChildElements = matchingChildElements.stream()
-                        .filter(t -> t.getChild().hasRange() && oldValue.hasRange())
-                        .filter(t -> t.getChild()
-                                        .getRange()
-                                        .get()
-                                        .equals(oldValue.getRange().get())
-                                || (t.getChild().getComment().isPresent()
-                                        && t.getChild().getComment().get().hasRange()
-                                        && t.getChild()
-                                                .getComment()
-                                                .get()
-                                                .getRange()
-                                                .get()
-                                                .equals(oldValue.getRange().get())))
-                        .collect(toList());
+                matchingChildElements = matchingChildElements.stream().filter(t -> t.getChild().hasRange() && oldValue.hasRange()).filter(t -> t.getChild().getRange().get().equals(oldValue.getRange().get()) || (t.getChild().getComment().isPresent() && t.getChild().getComment().get().hasRange() && t.getChild().getComment().get().getRange().get().equals(oldValue.getRange().get()))).collect(toList());
             }
             if (matchingChildElements.size() != 1) {
-                throw new IllegalStateException(
-                        "The matching child text element for the comment to be removed could not be found.");
+                throw new IllegalStateException("The matching child text element for the comment to be removed could not be found.");
             }
             return matchingChildElements;
         }
 
         private List<ChildTextElement> selectMatchingChildElements(Comment oldValue, NodeText nodeText) {
             List<ChildTextElement> result = new ArrayList<>();
-            List<ChildTextElement> childTextElements = nodeText.getElements().stream()
-                    .filter(e -> e.isChild())
-                    .map(c -> (ChildTextElement) c)
-                    .collect(toList());
+            List<ChildTextElement> childTextElements = nodeText.getElements().stream().filter(e -> e.isChild()).map(c -> (ChildTextElement) c).collect(toList());
             ListIterator<ChildTextElement> iterator = childTextElements.listIterator();
             while (iterator.hasNext()) {
                 ChildTextElement textElement = iterator.next();
@@ -412,8 +414,7 @@ private List<ChildTextElement> selectMatchingChildElements(Comment oldValue, Nod
                     continue;
                 }
                 Node node = textElement.getChild();
-                if (node.getComment().isPresent()
-                        && isSameComment(node.getComment().get(), oldValue)) {
+                if (node.getComment().isPresent() && isSameComment(node.getComment().get(), oldValue)) {
                     result.add(textElement);
                     continue;
                 }
@@ -428,17 +429,9 @@ private boolean isSameComment(Comment childValue, Comment oldValue) {
         private List<TokenTextElement> findTokenTextElementForComment(Comment oldValue, NodeText nodeText) {
             List<TokenTextElement> matchingTokens;
             if (oldValue instanceof TraditionalJavadocComment) {
-                matchingTokens = nodeText.getElements().stream()
-                        .filter(e -> e.isToken(JAVADOC_COMMENT))
-                        .map(e -> (TokenTextElement) e)
-                        .filter(t -> t.getText().equals(oldValue.asString()))
-                        .collect(toList());
+                matchingTokens = nodeText.getElements().stream().filter(e -> e.isToken(JAVADOC_COMMENT)).map(e -> (TokenTextElement) e).filter(t -> t.getText().equals(oldValue.asString())).collect(toList());
             } else if (oldValue instanceof BlockComment) {
-                matchingTokens = nodeText.getElements().stream()
-                        .filter(e -> e.isToken(MULTI_LINE_COMMENT))
-                        .map(e -> (TokenTextElement) e)
-                        .filter(t -> t.getText().equals(oldValue.asString()))
-                        .collect(toList());
+                matchingTokens = nodeText.getElements().stream().filter(e -> e.isToken(MULTI_LINE_COMMENT)).map(e -> (TokenTextElement) e).filter(t -> t.getText().equals(oldValue.asString())).collect(toList());
             } else if (oldValue instanceof MarkdownComment) {
                 // Because a MarkdownComment consists of a sequence of tokens (as opposed to the other comment types
                 // which consist of a single token), all the tokens making up the MarkdownComment need to be found to
@@ -463,9 +456,7 @@ private List<TokenTextElement> findTokenTextElementForComment(Comment oldValue,
                                 sb.append(((TokenTextElement) elem).getText());
                             }
                             if (sb.toString().equals(oldContent)) {
-                                matchingTokens.addAll(maybeMatchingTokens.stream()
-                                        .map(e -> (TokenTextElement) e)
-                                        .collect(toList()));
+                                matchingTokens.addAll(maybeMatchingTokens.stream().map(e -> (TokenTextElement) e).collect(toList()));
                                 // Clear and continue, since multiple markdown comments may have the same content
                                 maybeMatchingTokens.clear();
                                 inMatch = false;
@@ -474,8 +465,7 @@ private List<TokenTextElement> findTokenTextElementForComment(Comment oldValue,
                                 inMatch = false;
                             }
                         }
-                    } else if (textElement.isToken(SINGLE_LINE_COMMENT)
-                            && oldContent.startsWith(((TokenTextElement) textElement).getText())) {
+                    } else if (textElement.isToken(SINGLE_LINE_COMMENT) && oldContent.startsWith(((TokenTextElement) textElement).getText())) {
                         // Found a line comment that matches the first line of the markdown comment, so start looking
                         // for the rest of the comment.
                         maybeMatchingTokens.add(textElement);
@@ -483,22 +473,11 @@ private List<TokenTextElement> findTokenTextElementForComment(Comment oldValue,
                     }
                 }
             } else {
-                matchingTokens = nodeText.getElements().stream()
-                        .filter(e -> e.isToken(SINGLE_LINE_COMMENT))
-                        .map(e -> (TokenTextElement) e)
-                        .filter(t -> t.getText().trim().equals((oldValue.asString()).trim()))
-                        .collect(toList());
+                matchingTokens = nodeText.getElements().stream().filter(e -> e.isToken(SINGLE_LINE_COMMENT)).map(e -> (TokenTextElement) e).filter(t -> t.getText().trim().equals((oldValue.asString()).trim())).collect(toList());
             }
             // To check that a comment matches in the list of tokens, if exists the range must be always checked,
             // as comments with the same content may exist on different lines.
-            return matchingTokens.stream()
-                    .filter(t -> (!t.getToken().hasRange() && !oldValue.hasRange())
-                            || (t.getToken().hasRange()
-                                    && oldValue.hasRange()
-                                    && oldValue.getRange()
-                                            .get()
-                                            .contains(t.getToken().getRange().get())))
-                    .collect(toList());
+            return matchingTokens.stream().filter(t -> (!t.getToken().hasRange() && !oldValue.hasRange()) || (t.getToken().hasRange() && oldValue.hasRange() && oldValue.getRange().get().contains(t.getToken().getRange().get()))).collect(toList());
         }
 
         /**
@@ -513,61 +492,53 @@ private void fixIndentOfAddedNode(NodeText nodeText, int index) {
             if (index <= 0) {
                 return;
             }
-            TextElement currentSpaceCandidate = null;
+            // finds the existing indentation
+            List<TextElement> existingIndent = IndentationCalculator.computeFromPrecedingElements(nodeText.getElements().subList(0, index + 1));
+            if (existingIndent.isEmpty()) {
+                return;
+            }
+            // Find the last newline before index
+            int lastNewlineIndex = -1;
             for (int i = index; i >= 0; i--) {
-                TextElement spaceCandidate = nodeText.getTextElement(i);
-                if (spaceCandidate.isSpaceOrTab()) {
-                    // save the current indentation char
-                    currentSpaceCandidate = nodeText.getTextElement(i);
-                }
-                if (!spaceCandidate.isSpaceOrTab()) {
-                    if (spaceCandidate.isNewline() && i != index) {
-                        int numberOfIndentationCharacters = index - i;
-                        for (int j = 0; j < numberOfIndentationCharacters; j++) {
-                            if (currentSpaceCandidate != null) {
-                                // use the current (or last) indentation character
-                                nodeText.addElement(
-                                        index,
-                                        new TokenTextElement(
-                                                JavaToken.Kind.SPACE.getKind(), currentSpaceCandidate.expand()));
-                            } else {
-                                // use the default indentation character
-                                nodeText.addElement(index, new TokenTextElement(JavaToken.Kind.SPACE.getKind()));
-                            }
-                        }
-                    }
+                if (nodeText.getTextElement(i).isNewline()) {
+                    lastNewlineIndex = i;
                     break;
                 }
             }
+            // If there is no newline or if the newline is just before the index, do nothing.
+            if (lastNewlineIndex == -1 || lastNewlineIndex == index - 1) {
+                return;
+            }
+            // Apply the computed indentation
+            // The indentation elements are inserted at the given index.
+            for (TextElement indentElement : existingIndent) {
+                if (indentElement instanceof TokenTextElement) {
+                    TokenTextElement tokenElement = (TokenTextElement) indentElement;
+                    nodeText.addElement(index, new TokenTextElement(tokenElement.getTokenKind(), tokenElement.getText()));
+                }
+            }
         }
 
         @Override
-        public void concreteListChange(
-                NodeList<?> changedList, ListChangeType type, int index, Node nodeAddedOrRemoved) {
+        public void concreteListChange(NodeList<?> changedList, ListChangeType type, int index, Node nodeAddedOrRemoved) {
             NodeText nodeText = getOrCreateNodeText(changedList.getParentNodeForChildren());
             final List<DifferenceElement> differenceElements;
             if (type == AstObserver.ListChangeType.REMOVAL) {
-                differenceElements = LEXICAL_DIFFERENCE_CALCULATOR.calculateListRemovalDifference(
-                        findNodeListName(changedList), changedList, index);
+                differenceElements = LEXICAL_DIFFERENCE_CALCULATOR.calculateListRemovalDifference(findNodeListName(changedList), changedList, index);
             } else if (type == AstObserver.ListChangeType.ADDITION) {
-                differenceElements = LEXICAL_DIFFERENCE_CALCULATOR.calculateListAdditionDifference(
-                        findNodeListName(changedList), changedList, index, nodeAddedOrRemoved);
+                differenceElements = LEXICAL_DIFFERENCE_CALCULATOR.calculateListAdditionDifference(findNodeListName(changedList), changedList, index, nodeAddedOrRemoved);
             } else {
                 throw new UnsupportedOperationException("Unknown change type: " + type);
             }
-            Difference difference =
-                    new Difference(differenceElements, nodeText, changedList.getParentNodeForChildren());
+            Difference difference = new Difference(differenceElements, nodeText, changedList.getParentNodeForChildren());
             difference.apply();
         }
 
         @Override
         public void concreteListReplacement(NodeList<?> changedList, int index, Node oldValue, Node newValue) {
             NodeText nodeText = getOrCreateNodeText(changedList.getParentNodeForChildren());
-            List<DifferenceElement> differenceElements =
-                    LEXICAL_DIFFERENCE_CALCULATOR.calculateListReplacementDifference(
-                            findNodeListName(changedList), changedList, index, newValue);
-            Difference difference =
-                    new Difference(differenceElements, nodeText, changedList.getParentNodeForChildren());
+            List<DifferenceElement> differenceElements = LEXICAL_DIFFERENCE_CALCULATOR.calculateListReplacementDifference(findNodeListName(changedList), changedList, index, newValue);
+            Difference difference = new Difference(differenceElements, nodeText, changedList.getParentNodeForChildren());
             difference.apply();
         }
     }
@@ -592,10 +563,8 @@ private static void storeInitialText(Node root) {
         // range of interest and ignore all other branches
         root.getTokenRange().ifPresent(rootTokenRange -> {
             for (JavaToken token : rootTokenRange) {
-                Range tokenRange =
-                        token.getRange().orElseThrow(() -> new RuntimeException("Token without range: " + token));
-                Node owner = root.findByRange(tokenRange)
-                        .orElseThrow(() -> new RuntimeException("Token without node owning it: " + token));
+                Range tokenRange = token.getRange().orElseThrow(() -> new RuntimeException("Token without range: " + token));
+                Node owner = root.findByRange(tokenRange).orElseThrow(() -> new RuntimeException("Token without node owning it: " + token));
                 if (!tokensByNode.containsKey(owner)) {
                     tokensByNode.put(owner, new LinkedList<>());
                 }
@@ -640,8 +609,7 @@ private static void storeInitialTextForOneNode(Node node, List<JavaToken> nodeTo
             elements.add(new Pair<>(token.getRange().get(), new TokenTextElement(token)));
         }
         elements.sort(comparing(e -> e.a.begin));
-        node.setData(
-                NODE_TEXT_DATA, new NodeText(elements.stream().map(p -> p.b).collect(toList())));
+        node.setData(NODE_TEXT_DATA, new NodeText(elements.stream().map(p -> p.b).collect(toList())));
     }
 
     //
@@ -661,9 +629,7 @@ private static Iterator<TokenTextElement> tokensPreceeding(final Node node) {
             }
             return new TextElementIteratorsFactory.EmptyIterator<TokenTextElement>();
         }
-        return new TextElementIteratorsFactory.CascadingIterator<>(
-                TextElementIteratorsFactory.partialReverseIterator(parentNodeText, index - 1),
-                () -> tokensPreceeding(node.getParentNode().get()));
+        return new TextElementIteratorsFactory.CascadingIterator<>(TextElementIteratorsFactory.partialReverseIterator(parentNodeText, index - 1), () -> tokensPreceeding(node.getParentNode().get()));
     }
 
     //
@@ -697,15 +663,12 @@ private static void prettyPrintingTextNode(Node node, NodeText nodeText) {
         }
         if (node instanceof TraditionalJavadocComment) {
             Comment comment = (TraditionalJavadocComment) node;
-            nodeText.addToken(
-                    JAVADOC_COMMENT,
-                    comment.getHeader() + ((TraditionalJavadocComment) node).getContent() + comment.getFooter());
+            nodeText.addToken(JAVADOC_COMMENT, comment.getHeader() + ((TraditionalJavadocComment) node).getContent() + comment.getFooter());
             return;
         }
         if (node instanceof BlockComment) {
             Comment comment = (BlockComment) node;
-            nodeText.addToken(
-                    MULTI_LINE_COMMENT, comment.getHeader() + ((BlockComment) node).getContent() + comment.getFooter());
+            nodeText.addToken(MULTI_LINE_COMMENT, comment.getHeader() + ((BlockComment) node).getContent() + comment.getFooter());
             return;
         }
         if (node instanceof LineComment) {
@@ -715,9 +678,7 @@ private static void prettyPrintingTextNode(Node node, NodeText nodeText) {
         }
         if (node instanceof Modifier) {
             Modifier modifier = (Modifier) node;
-            nodeText.addToken(
-                    LexicalDifferenceCalculator.toToken(modifier),
-                    modifier.getKeyword().asString());
+            nodeText.addToken(LexicalDifferenceCalculator.toToken(modifier), modifier.getKeyword().asString());
             return;
         }
         interpret(node, ConcreteSyntaxModel.forClass(node.getClass()), nodeText);
@@ -727,36 +688,30 @@ private static void prettyPrintingTextNode(Node node, NodeText nodeText) {
      * TODO: Process CsmIndent and CsmUnindent before reaching this point
      */
     private static NodeText interpret(Node node, CsmElement csm, NodeText nodeText) {
-        LexicalDifferenceCalculator.CalculatedSyntaxModel calculatedSyntaxModel =
-                new LexicalDifferenceCalculator().calculatedSyntaxModelForNode(csm, node);
-        List<TextElement> indentation = findIndentation(node);
+        LexicalDifferenceCalculator.CalculatedSyntaxModel calculatedSyntaxModel = new LexicalDifferenceCalculator().calculatedSyntaxModelForNode(csm, node);
+        List<TextElement> initialIndentation = findIndentation(node);
+        IndentationContext indentationContext = new IndentationContext(initialIndentation);
         boolean pendingIndentation = false;
         // Add a comment and line separator if necessary
         node.getComment().ifPresent(comment -> {
             // new comment has no range so in this case we want to force the comment before the node
             if (!comment.hasRange()) {
                 LineSeparator lineSeparator = node.getLineEndingStyleOrDefault(LineSeparator.SYSTEM);
-                calculatedSyntaxModel.elements.add(
-                        0, new CsmToken(eolTokenKind(lineSeparator), lineSeparator.asRawString()));
+                calculatedSyntaxModel.elements.add(0, new CsmToken(eolTokenKind(lineSeparator), lineSeparator.asRawString()));
                 calculatedSyntaxModel.elements.add(0, new CsmChild(comment));
             }
         });
         for (CsmElement element : calculatedSyntaxModel.elements) {
             if (element instanceof CsmIndent) {
                 int indexCurrentElement = calculatedSyntaxModel.elements.indexOf(element);
-                if (calculatedSyntaxModel.elements.size() > indexCurrentElement
-                        && !(calculatedSyntaxModel.elements.get(indexCurrentElement + 1) instanceof CsmUnindent)) {
-                    for (int i = 0; i < Difference.STANDARD_INDENTATION_SIZE; i++) {
-                        indentation.add(new TokenTextElement(SPACE, " "));
-                    }
+                if (calculatedSyntaxModel.elements.size() > indexCurrentElement && !(calculatedSyntaxModel.elements.get(indexCurrentElement + 1) instanceof CsmUnindent)) {
+                    indentationContext.increase();
                 }
             } else if (element instanceof CsmUnindent) {
-                for (int i = 0; i < Difference.STANDARD_INDENTATION_SIZE && indentation.size() > 0; i++) {
-                    indentation.remove(indentation.size() - 1);
-                }
+                indentationContext.decrease();
             }
             if (pendingIndentation && !(element instanceof CsmToken && ((CsmToken) element).isNewLine())) {
-                indentation.forEach(nodeText::addElement);
+                indentationContext.getCurrent().forEach(nodeText::addElement);
             }
             pendingIndentation = false;
             if (element instanceof LexicalDifferenceCalculator.CsmChild) {
@@ -774,8 +729,7 @@ private static NodeText interpret(Node node, CsmElement csm, NodeText nodeText)
                 // Indentation should probably be dealt with before because an indentation has effects also on the
                 // following lines
                 if (!(element instanceof CsmIndent) && !(element instanceof CsmUnindent)) {
-                    throw new UnsupportedOperationException(
-                            "Unknown element type: " + element.getClass().getSimpleName());
+                    throw new UnsupportedOperationException("Unknown element type: " + element.getClass().getSimpleName());
                 }
             }
         }
@@ -783,15 +737,13 @@ private static NodeText interpret(Node node, CsmElement csm, NodeText nodeText)
         // so they have to be handled in a special way
         if (node instanceof VariableDeclarator) {
             VariableDeclarator variableDeclarator = (VariableDeclarator) node;
-            variableDeclarator.getParentNode().ifPresent(parent -> ((NodeWithVariables<?>) parent)
-                    .getMaximumCommonType()
-                    .ifPresent(mct -> {
-                        int extraArrayLevels = variableDeclarator.getType().getArrayLevel() - mct.getArrayLevel();
-                        for (int i = 0; i < extraArrayLevels; i++) {
-                            nodeText.addElement(new TokenTextElement(LBRACKET));
-                            nodeText.addElement(new TokenTextElement(RBRACKET));
-                        }
-                    }));
+            variableDeclarator.getParentNode().ifPresent(parent -> ((NodeWithVariables<?>) parent).getMaximumCommonType().ifPresent(mct -> {
+                int extraArrayLevels = variableDeclarator.getType().getArrayLevel() - mct.getArrayLevel();
+                for (int i = 0; i < extraArrayLevels; i++) {
+                    nodeText.addElement(new TokenTextElement(LBRACKET));
+                    nodeText.addElement(new TokenTextElement(RBRACKET));
+                }
+            }));
         }
         return nodeText;
     }
@@ -844,18 +796,14 @@ private static boolean isReturningOptionalNodeList(Method m) {
     private static ObservableProperty findNodeListName(NodeList<?> nodeList) {
         Node parent = nodeList.getParentNodeForChildren();
         for (Method m : parent.getClass().getMethods()) {
-            if (m.getAnnotation(com.github.javaparser.ast.key.IgnoreLexPrinting.class) != null) {
+            if (m.getDeclaredAnnotation(IgnoreLexPrinting.class) != null) {
                 continue;
             }
-            if (m.getParameterCount() == 0
-                    && m.getReturnType().getCanonicalName().equals(JAVAPARSER_AST_NODELIST)) {
+            if (m.getParameterCount() == 0 && m.getReturnType().getCanonicalName().equals(JAVAPARSER_AST_NODELIST)) {
                 try {
                     Object raw = m.invoke(parent);
                     if (!(raw instanceof NodeList)) {
-                        // TODO weigl fix on feature/key.
-                        continue;
-                        // throw new IllegalStateException(
-                        //        "Expected NodeList, found " + raw.getClass().getCanonicalName());
+                        throw new IllegalStateException("Expected NodeList, found " + raw.getClass().getCanonicalName());
                     }
                     NodeList<?> result = (NodeList<?>) raw;
                     if (result == nodeList) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingVisitor.java
index 46eeb36fe9..51f7301c99 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingVisitor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LookaheadIterator.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LookaheadIterator.java
index 0cece8c009..a3ab58bcc0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LookaheadIterator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/LookaheadIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/NodeText.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/NodeText.java
index 642ee82109..af983077ee 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/NodeText.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/NodeText.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -28,18 +28,28 @@
 /**
  * This contains the lexical information for a single node.
  * It is basically a list of tokens and children.
+ *
+ * <p>This class has been refactored to use {@link TextElementList} internally
+ * for better code reuse and maintainability, while preserving the exact same
+ * external API and behavior.
  */
 class NodeText {
 
-    private final List<TextElement> elements;
+    // Changed from List<TextElement> to TextElementList for internal optimization
+    private final TextElementList elements;
 
     public static final int NOT_FOUND = -1;
 
     //
     // Constructors
     //
+    /**
+     * Creates a NodeText wrapping the given list of elements.
+     *
+     * @param elements the list to wrap (will be wrapped in TextElementList)
+     */
     NodeText(List<TextElement> elements) {
-        this.elements = elements;
+        this.elements = new TextElementList(elements);
     }
 
     /**
@@ -56,14 +66,14 @@ class NodeText {
      * Add an element at the end.
      */
     void addElement(TextElement nodeTextElement) {
-        this.elements.add(nodeTextElement);
+        elements.insert(elements.size(), nodeTextElement);
     }
 
     /**
      * Add an element at the given position.
      */
     void addElement(int index, TextElement nodeTextElement) {
-        this.elements.add(index, nodeTextElement);
+        elements.insert(index, nodeTextElement);
     }
 
     void addChild(Node child) {
@@ -75,51 +85,95 @@ void addChild(int index, Node child) {
     }
 
     void addToken(int tokenKind, String text) {
-        elements.add(new TokenTextElement(tokenKind, text));
+        addElement(new TokenTextElement(tokenKind, text));
     }
 
     void addToken(int index, int tokenKind, String text) {
-        elements.add(index, new TokenTextElement(tokenKind, text));
+        addElement(index, new TokenTextElement(tokenKind, text));
     }
 
     //
     // Finding elements
     //
+    /**
+     * Finds the first element matching the given matcher.
+     *
+     * @param matcher the matcher to use
+     * @return the index of the first matching element
+     * @throws IllegalArgumentException if no matching element is found
+     */
     int findElement(TextElementMatcher matcher) {
         return findElement(matcher, 0);
     }
 
+    /**
+     * Finds the first element matching the given matcher, starting from the given index.
+     *
+     * @param matcher the matcher to use
+     * @param from the starting index (inclusive)
+     * @return the index of the first matching element
+     * @throws IllegalArgumentException if no matching element is found
+     */
     int findElement(TextElementMatcher matcher, int from) {
         int res = tryToFindElement(matcher, from);
         if (res == NOT_FOUND) {
-            throw new IllegalArgumentException(String.format(
-                    "I could not find child '%s' from position %d. Elements: %s", matcher, from, elements));
+            throw new IllegalArgumentException(String.format("I could not find child '%s' from position %d. Elements: %s", matcher, from, elements.toList()));
         }
         return res;
     }
 
+    /**
+     * Tries to find an element matching the given matcher, starting from the given index.
+     * Returns NOT_FOUND if no matching element is found.
+     *
+     * @param matcher the matcher to use
+     * @param from the starting index (inclusive)
+     * @return the index of the first matching element, or NOT_FOUND
+     */
     int tryToFindElement(TextElementMatcher matcher, int from) {
-        for (int i = from; i < elements.size(); i++) {
-            TextElement element = elements.get(i);
-            if (matcher.match(element)) {
-                return i;
-            }
-        }
-        return NOT_FOUND;
+        return elements.findNext(from, matcher::match);
     }
 
+    /**
+     * Finds the first occurrence of the given child node.
+     *
+     * @param child the child to find
+     * @return the index of the child
+     * @throws IllegalArgumentException if child is not found
+     */
     int findChild(Node child) {
         return findChild(child, 0);
     }
 
+    /**
+     * Finds the first occurrence of the given child node, starting from the given index.
+     *
+     * @param child the child to find
+     * @param from the starting index (inclusive)
+     * @return the index of the child
+     * @throws IllegalArgumentException if child is not found
+     */
     int findChild(Node child, int from) {
         return findElement(TextElementMatchers.byNode(child), from);
     }
 
+    /**
+     * Tries to find the first occurrence of the given child node.
+     *
+     * @param child the child to find
+     * @return the index of the child, or NOT_FOUND
+     */
     int tryToFindChild(Node child) {
         return tryToFindChild(child, 0);
     }
 
+    /**
+     * Tries to find the first occurrence of the given child node, starting from the given index.
+     *
+     * @param child the child to find
+     * @param from the starting index (inclusive)
+     * @return the index of the child, or NOT_FOUND
+     */
     int tryToFindChild(Node child, int from) {
         return tryToFindElement(TextElementMatchers.byNode(child), from);
     }
@@ -127,29 +181,43 @@ int tryToFindChild(Node child, int from) {
     //
     // Removing single elements
     //
+    /**
+     * Removes the first element matching the given matcher.
+     * Optionally removes following whitespace.
+     *
+     * @param matcher the matcher to use
+     * @param potentiallyFollowingWhitespace if true, removes following whitespace element
+     * @throws IllegalArgumentException if no matching element is found
+     * @throws UnsupportedOperationException if whitespace removal is requested but no element follows
+     */
     public void remove(TextElementMatcher matcher, boolean potentiallyFollowingWhitespace) {
-        int i = 0;
-        for (TextElement e : elements) {
-            if (matcher.match(e)) {
-                elements.remove(e);
-                if (potentiallyFollowingWhitespace) {
-                    if (i < elements.size()) {
-                        if (elements.get(i).isWhiteSpace()) {
-                            elements.remove(i);
-                        }
-                    } else {
-                        throw new UnsupportedOperationException("There is no element to remove!");
-                    }
+        // Find the matching element using our optimized search
+        int index = tryToFindElement(matcher, 0);
+        if (index == NOT_FOUND) {
+            throw new IllegalArgumentException("No matching element found");
+        }
+        // Remove the element
+        elements.remove(index);
+        // Optionally remove following whitespace
+        if (potentiallyFollowingWhitespace) {
+            if (index < elements.size()) {
+                if (elements.get(index).isWhiteSpace()) {
+                    elements.remove(index);
                 }
-                return;
+            } else {
+                throw new UnsupportedOperationException("There is no element to remove!");
             }
         }
-        throw new IllegalArgumentException();
     }
 
     //
     // Removing sequences
     //
+    /**
+     * Removes the element at the given index.
+     *
+     * @param index the index of the element to remove
+     */
     void removeElement(int index) {
         elements.remove(index);
     }
@@ -157,47 +225,85 @@ void removeElement(int index) {
     //
     // Replacing elements
     //
+    /**
+     * Replaces the element at the position matched by the given matcher
+     * with the given new element.
+     *
+     * @param position the matcher to find the element to replace
+     * @param newElement the new element
+     * @throws IllegalArgumentException if no matching element is found
+     */
     void replace(TextElementMatcher position, TextElement newElement) {
         int index = findElement(position, 0);
         elements.remove(index);
-        elements.add(index, newElement);
+        elements.insert(index, newElement);
     }
 
+    /**
+     * Replaces the element at the position matched by the given matcher
+     * with the given collection of new elements.
+     *
+     * @param position the matcher to find the element to replace
+     * @param newElements the new elements
+     * @throws IllegalArgumentException if no matching element is found
+     */
     void replace(TextElementMatcher position, Collection<? extends TextElement> newElements) {
         int index = findElement(position, 0);
         elements.remove(index);
-        elements.addAll(index, newElements);
+        elements.insertAll(index, (List<TextElement>) newElements);
     }
 
     //
     // Other methods
     //
     /**
-     * Generate the corresponding string.
+     * Generate the corresponding string by expanding all elements.
+     *
+     * @return the expanded string representation
      */
     String expand() {
-        StringBuffer sb = new StringBuffer();
-        elements.forEach(e -> sb.append(e.expand()));
+        StringBuilder sb = new StringBuilder();
+        // Use the underlying list's forEach for efficiency
+        elements.toList().forEach(e -> sb.append(e.expand()));
         return sb.toString();
     }
 
-    // Visible for testing
+    /**
+     * Returns the number of elements.
+     * Visible for testing.
+     *
+     * @return the number of elements
+     */
     int numberOfElements() {
         return elements.size();
     }
 
-    // Visible for testing
+    /**
+     * Returns the element at the given index.
+     * Visible for testing.
+     *
+     * @param index the index
+     * @return the element at that index
+     */
     TextElement getTextElement(int index) {
         return elements.get(index);
     }
 
-    // Visible for testing
+    /**
+     * Returns the underlying list of elements.
+     * Visible for testing.
+     *
+     * <p><b>IMPORTANT:</b> This returns the internal mutable list.
+     * External modifications will affect this NodeText.
+     *
+     * @return the list of elements (mutable)
+     */
     List<TextElement> getElements() {
-        return elements;
+        return elements.toMutableList();
     }
 
     @Override
     public String toString() {
-        return "NodeText{" + elements + '}';
+        return "NodeText{" + elements.toList() + '}';
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PeekingIterator.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PeekingIterator.java
index 42c0a1e2ce..b68a7818fa 100755
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PeekingIterator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PeekingIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -196,7 +196,8 @@ public int nextIndex() {
      * Returns -1 if the listiterator is at the beginning of the list.
      */
     public int currentIndex() {
-        if (!hasPrevious()) return previousIndex();
+        if (!hasPrevious())
+            return previousIndex();
         return nextIndex() - 1;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PhantomNodeLogic.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PhantomNodeLogic.java
index 6e8a2605a0..f6bf8a5dc0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PhantomNodeLogic.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PhantomNodeLogic.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -21,7 +21,6 @@
 package com.github.javaparser.printer.lexicalpreservation;
 
 import static java.util.Collections.synchronizedMap;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.observer.AstObserver;
 import com.github.javaparser.ast.observer.AstObserverAdapter;
@@ -55,15 +54,7 @@ static boolean isPhantomNode(Node node) {
         if (node instanceof UnknownType) {
             return true;
         }
-        boolean res = (node.getParentNode().isPresent()
-                        && node.getParentNode().get().hasRange()
-                        && node.hasRange()
-                        && !node.getParentNode()
-                                .get()
-                                .getRange()
-                                .get()
-                                .contains(node.getRange().get())
-                || inPhantomNode(node, LEVELS_TO_EXPLORE));
+        boolean res = (node.getParentNode().isPresent() && node.getParentNode().get().hasRange() && node.hasRange() && !node.getParentNode().get().getRange().get().contains(node.getRange().get()) || inPhantomNode(node, LEVELS_TO_EXPLORE));
         isPhantomNodeCache.put(node, res);
         node.register(cacheCleaner);
         return res;
@@ -73,9 +64,7 @@ static boolean isPhantomNode(Node node) {
      * A node contained in a phantom node is also a phantom node. We limit how many levels up we check just for performance reasons.
      */
     private static boolean inPhantomNode(Node node, int levels) {
-        return node.getParentNode().isPresent()
-                && (isPhantomNode(node.getParentNode().get())
-                        || inPhantomNode(node.getParentNode().get(), levels - 1));
+        return node.getParentNode().isPresent() && (isPhantomNode(node.getParentNode().get()) || inPhantomNode(node.getParentNode().get(), levels - 1));
     }
 
     /**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PrintableTextElement.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PrintableTextElement.java
index 944438d5af..3a3377ef34 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PrintableTextElement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/PrintableTextElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Removed.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Removed.java
index 6b40c43fe0..795f655a5f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Removed.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Removed.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -40,8 +40,10 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         Removed removed = (Removed) o;
         return element.equals(removed.element);
     }
@@ -61,8 +63,7 @@ public Node getChild() {
             LexicalDifferenceCalculator.CsmChild csmChild = (LexicalDifferenceCalculator.CsmChild) element;
             return csmChild.getChild();
         }
-        throw new IllegalStateException(
-                "Removed is not a " + LexicalDifferenceCalculator.CsmChild.class.getSimpleName());
+        throw new IllegalStateException("Removed is not a " + LexicalDifferenceCalculator.CsmChild.class.getSimpleName());
     }
 
     public int getTokenType() {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/RemovedGroup.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/RemovedGroup.java
index 4e9afb0bde..a1998e66db 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/RemovedGroup.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/RemovedGroup.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -35,12 +35,13 @@
 /**
  * This class represents a group of {@link Removed} elements.
  * The {@link Removed} elements are ideally consecutive for the methods in this class to work correctly.
- * <p>
+ *
  * This class consists of methods that calculate information to better handle the difference application for the
  * containing {@link Removed} elements.
  *
- * @author ThLeu
  * @see Iterable
+ *
+ * @author ThLeu
  */
 final class RemovedGroup implements Iterable<Removed> {
 
@@ -65,7 +66,7 @@ private RemovedGroup(Integer firstElementIndex, List<Removed> removedList) {
      * Factory method to create a RemovedGroup which consists of consecutive Removed elements
      *
      * @param firstElementIndex the difference index at which the RemovedGroup starts
-     * @param removedList       list of the consecutive Removed elements
+     * @param removedList list of the consecutive Removed elements
      * @return a RemovedGroup object
      * @throws IllegalArgumentException if the firstElementIndex is null or the removedList is empty or null
      */
@@ -90,9 +91,7 @@ final boolean isProcessed() {
     }
 
     private List<Integer> getIndicesBeingRemoved() {
-        return IntStream.range(firstElementIndex, firstElementIndex + removedList.size())
-                .boxed()
-                .collect(Collectors.toList());
+        return IntStream.range(firstElementIndex, firstElementIndex + removedList.size()).boxed().collect(Collectors.toList());
     }
 
     /**
@@ -144,27 +143,21 @@ final boolean isLastElement(Removed element) {
      * @return true if the RemovedGroup equates to a complete line
      */
     final boolean isACompleteLine() {
-        return hasOnlyWhitespace(getFirstElement(), hasOnlyWhitespaceInFrontFunction)
-                && hasOnlyWhitespace(getLastElement(), hasOnlyWhitespaceBehindFunction);
+        return hasOnlyWhitespace(getFirstElement(), hasOnlyWhitespaceInFrontFunction) && hasOnlyWhitespace(getLastElement(), hasOnlyWhitespaceBehindFunction);
     }
 
-    private final Function<JavaToken, Boolean> hasOnlyWhitespaceJavaTokenInFrontFunction =
-            begin -> hasOnlyWhiteSpaceForTokenFunction(begin, token -> token.getPreviousToken());
+    private final Function<JavaToken, Boolean> hasOnlyWhitespaceJavaTokenInFrontFunction = begin -> hasOnlyWhiteSpaceForTokenFunction(begin, token -> token.getPreviousToken());
 
-    private final Function<JavaToken, Boolean> hasOnlyWhitespaceJavaTokenBehindFunction =
-            end -> hasOnlyWhiteSpaceForTokenFunction(end, token -> token.getNextToken());
+    private final Function<JavaToken, Boolean> hasOnlyWhitespaceJavaTokenBehindFunction = end -> hasOnlyWhiteSpaceForTokenFunction(end, token -> token.getNextToken());
 
-    private final Function<TokenRange, Boolean> hasOnlyWhitespaceInFrontFunction =
-            tokenRange -> hasOnlyWhitespaceJavaTokenInFrontFunction.apply(tokenRange.getBegin());
+    private final Function<TokenRange, Boolean> hasOnlyWhitespaceInFrontFunction = tokenRange -> hasOnlyWhitespaceJavaTokenInFrontFunction.apply(tokenRange.getBegin());
 
-    private final Function<TokenRange, Boolean> hasOnlyWhitespaceBehindFunction =
-            tokenRange -> hasOnlyWhitespaceJavaTokenBehindFunction.apply(tokenRange.getEnd());
+    private final Function<TokenRange, Boolean> hasOnlyWhitespaceBehindFunction = tokenRange -> hasOnlyWhitespaceJavaTokenBehindFunction.apply(tokenRange.getEnd());
 
     private boolean hasOnlyWhitespace(Removed startElement, Function<TokenRange, Boolean> hasOnlyWhitespaceFunction) {
         boolean hasOnlyWhitespace = false;
         if (startElement.isChild()) {
-            LexicalDifferenceCalculator.CsmChild csmChild =
-                    (LexicalDifferenceCalculator.CsmChild) startElement.getElement();
+            LexicalDifferenceCalculator.CsmChild csmChild = (LexicalDifferenceCalculator.CsmChild) startElement.getElement();
             Node child = csmChild.getChild();
             Optional<TokenRange> tokenRange = child.getTokenRange();
             if (tokenRange.isPresent()) {
@@ -179,8 +172,7 @@ private boolean hasOnlyWhitespace(Removed startElement, Function<TokenRange, Boo
         return hasOnlyWhitespace;
     }
 
-    private boolean hasOnlyWhiteSpaceForTokenFunction(
-            JavaToken token, Function<JavaToken, Optional<JavaToken>> tokenFunction) {
+    private boolean hasOnlyWhiteSpaceForTokenFunction(JavaToken token, Function<JavaToken, Optional<JavaToken>> tokenFunction) {
         Optional<JavaToken> tokenResult = tokenFunction.apply(token);
         if (tokenResult.isPresent()) {
             if (TokenTypes.isWhitespaceButNotEndOfLine(tokenResult.get().getKind())) {
@@ -201,7 +193,7 @@ private boolean hasOnlyWhiteSpaceForTokenFunction(
      * It is therefore necessary to avoid taking this element into account so we're looking for the first element that isn't a line break..
      * For example
      * class Foo {
-     * int x;
+     *     int x;
      * }
      * If there is something else than whitespace in front this element, Optional.empty() is returned.
      *
@@ -214,21 +206,19 @@ final Optional<Integer> getIndentation() {
         Iterator it = iterator();
         while (it.hasNext()) {
             firstElement = (Removed) it.next();
-            if (firstElement.isNewLine()) continue;
+            if (firstElement.isNewLine())
+                continue;
             break;
         }
         if (firstElement.isChild()) {
-            LexicalDifferenceCalculator.CsmChild csmChild =
-                    (LexicalDifferenceCalculator.CsmChild) firstElement.getElement();
+            LexicalDifferenceCalculator.CsmChild csmChild = (LexicalDifferenceCalculator.CsmChild) firstElement.getElement();
             Node child = csmChild.getChild();
             Optional<TokenRange> tokenRange = child.getTokenRange();
             if (tokenRange.isPresent()) {
                 JavaToken begin = tokenRange.get().getBegin();
                 if (hasOnlyWhitespaceJavaTokenInFrontFunction.apply(begin)) {
                     Optional<JavaToken> previousToken = begin.getPreviousToken();
-                    while (previousToken.isPresent()
-                            && (TokenTypes.isWhitespaceButNotEndOfLine(
-                                    previousToken.get().getKind()))) {
+                    while (previousToken.isPresent() && (TokenTypes.isWhitespaceButNotEndOfLine(previousToken.get().getKind()))) {
                         indentation++;
                         previousToken = previousToken.get().getPreviousToken();
                     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Reshuffled.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Reshuffled.java
index 4d8669fe55..6b96370855 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Reshuffled.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Reshuffled.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -48,10 +48,13 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         Reshuffled that = (Reshuffled) o;
-        if (!previousOrder.equals(that.previousOrder)) return false;
+        if (!previousOrder.equals(that.previousOrder))
+            return false;
         return nextOrder.equals(that.nextOrder);
     }
 
@@ -105,9 +108,7 @@ public DifferenceElement replaceEolTokens(CsmElement lineSeparator) {
      * Replaces all eol tokens in the list by the specified line separator token
      */
     private List<CsmElement> replaceTokens(List<CsmElement> elements, CsmElement lineSeparator) {
-        return elements.stream()
-                .map(element -> isNewLineToken(element) ? lineSeparator : element)
-                .collect(Collectors.toList());
+        return elements.stream().map(element -> isNewLineToken(element) ? lineSeparator : element).collect(Collectors.toList());
     }
 
     /*
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ReshuffledDiffElementExtractor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ReshuffledDiffElementExtractor.java
index d2deffa021..c953050cc6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ReshuffledDiffElementExtractor.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/ReshuffledDiffElementExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -22,7 +22,6 @@
 import com.github.javaparser.printer.concretesyntaxmodel.CsmElement;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmMix;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmToken;
-import com.github.javaparser.printer.lexicalpreservation.Difference.ArrayIterator;
 import java.util.*;
 
 public class ReshuffledDiffElementExtractor {
@@ -30,11 +29,8 @@ public class ReshuffledDiffElementExtractor {
     private final NodeText nodeText;
 
     private enum MatchClassification {
-        ALL(1),
-        PREVIOUS_AND_SAME(2),
-        NEXT_AND_SAME(3),
-        SAME_ONLY(4),
-        ALMOST(5);
+
+        ALL(1), PREVIOUS_AND_SAME(2), NEXT_AND_SAME(3), SAME_ONLY(4), ALMOST(5);
 
         private final int priority;
 
@@ -56,7 +52,7 @@ private ReshuffledDiffElementExtractor(NodeText nodeText) {
     }
 
     public void extract(List<DifferenceElement> diffElements) {
-        ArrayIterator<DifferenceElement> iterator = new ArrayIterator<>(diffElements);
+        IndexTrackingIterator<DifferenceElement> iterator = new IndexTrackingIterator<>(diffElements);
         while (iterator.hasNext()) {
             DifferenceElement diffElement = iterator.next();
             if (diffElement instanceof Reshuffled) {
@@ -65,25 +61,18 @@ public void extract(List<DifferenceElement> diffElements) {
                 CsmMix elementsFromPreviousOrder = reshuffled.getPreviousOrder();
                 CsmMix elementsFromNextOrder = reshuffled.getNextOrder();
                 // This contains indexes from elementsFromNextOrder to indexes from elementsFromPreviousOrder
-                Map<Integer, Integer> correspondanceBetweenNextOrderAndPreviousOrder =
-                        getCorrespondanceBetweenNextOrderAndPreviousOrder(
-                                elementsFromPreviousOrder, elementsFromNextOrder);
+                Map<Integer, Integer> correspondanceBetweenNextOrderAndPreviousOrder = getCorrespondanceBetweenNextOrderAndPreviousOrder(elementsFromPreviousOrder, elementsFromNextOrder);
                 // We now find out which Node Text elements corresponds to the elements in the original CSM
-                List<Integer> nodeTextIndexOfPreviousElements =
-                        findIndexOfCorrespondingNodeTextElement(elementsFromPreviousOrder.getElements(), nodeText);
-                PeekingIterator<Integer> nodeTextIndexOfPreviousElementsIterator =
-                        new PeekingIterator<>(nodeTextIndexOfPreviousElements);
+                List<Integer> nodeTextIndexOfPreviousElements = findIndexOfCorrespondingNodeTextElement(elementsFromPreviousOrder.getElements(), nodeText);
+                PeekingIterator<Integer> nodeTextIndexOfPreviousElementsIterator = new PeekingIterator<>(nodeTextIndexOfPreviousElements);
                 Map<Integer, Integer> nodeTextIndexToPreviousCSMIndex = new HashMap<>();
                 while (nodeTextIndexOfPreviousElementsIterator.hasNext()) {
                     int value = nodeTextIndexOfPreviousElementsIterator.next();
                     if (value != -1) {
-                        nodeTextIndexToPreviousCSMIndex.put(
-                                value, nodeTextIndexOfPreviousElementsIterator.currentIndex());
+                        nodeTextIndexToPreviousCSMIndex.put(value, nodeTextIndexOfPreviousElementsIterator.currentIndex());
                     }
                 }
-                int lastNodeTextIndex = nodeTextIndexOfPreviousElements.stream()
-                        .max(Integer::compareTo)
-                        .orElse(-1);
+                int lastNodeTextIndex = nodeTextIndexOfPreviousElements.stream().max(Integer::compareTo).orElse(-1);
                 // Elements to be added at the end
                 List<CsmElement> elementsToBeAddedAtTheEnd = new LinkedList<>();
                 List<CsmElement> nextOrderElements = elementsFromNextOrder.getElements();
@@ -98,12 +87,9 @@ public void extract(List<DifferenceElement> diffElements) {
                             if (correspondanceBetweenNextOrderAndPreviousOrder.containsKey(nj)) {
                                 originalCsmIndex = correspondanceBetweenNextOrderAndPreviousOrder.get(nj);
                                 if (!elementsToAddBeforeGivenOriginalCSMElement.containsKey(originalCsmIndex)) {
-                                    elementsToAddBeforeGivenOriginalCSMElement.put(
-                                            originalCsmIndex, new LinkedList<>());
+                                    elementsToAddBeforeGivenOriginalCSMElement.put(originalCsmIndex, new LinkedList<>());
                                 }
-                                elementsToAddBeforeGivenOriginalCSMElement
-                                        .get(originalCsmIndex)
-                                        .add(nextOrderElements.get(ni));
+                                elementsToAddBeforeGivenOriginalCSMElement.get(originalCsmIndex).add(nextOrderElements.get(ni));
                             }
                         }
                         // it does not preceed anything, so it goes at the end
@@ -126,15 +112,12 @@ public void extract(List<DifferenceElement> diffElements) {
                         if (nodeTextIndexToPreviousCSMIndex.containsKey(ntIndex)) {
                             int indexOfOriginalCSMElement = nodeTextIndexToPreviousCSMIndex.get(ntIndex);
                             if (elementsToAddBeforeGivenOriginalCSMElement.containsKey(indexOfOriginalCSMElement)) {
-                                for (CsmElement elementToAdd :
-                                        elementsToAddBeforeGivenOriginalCSMElement.get(indexOfOriginalCSMElement)) {
+                                for (CsmElement elementToAdd : elementsToAddBeforeGivenOriginalCSMElement.get(indexOfOriginalCSMElement)) {
                                     iterator.add(new Added(elementToAdd));
                                 }
                             }
-                            CsmElement originalCSMElement =
-                                    elementsFromPreviousOrder.getElements().get(indexOfOriginalCSMElement);
-                            boolean toBeKept = correspondanceBetweenNextOrderAndPreviousOrder.containsValue(
-                                    indexOfOriginalCSMElement);
+                            CsmElement originalCSMElement = elementsFromPreviousOrder.getElements().get(indexOfOriginalCSMElement);
+                            boolean toBeKept = correspondanceBetweenNextOrderAndPreviousOrder.containsValue(indexOfOriginalCSMElement);
                             if (toBeKept) {
                                 iterator.add(new Kept(originalCSMElement));
                             } else {
@@ -167,24 +150,17 @@ public void extract(List<DifferenceElement> diffElements) {
      * case the search for the next element of the list L1 must start from the
      * position of the last element kept {@code syncNextIndex}.
      */
-    private Map<Integer, Integer> getCorrespondanceBetweenNextOrderAndPreviousOrder(
-            CsmMix elementsFromPreviousOrder, CsmMix elementsFromNextOrder) {
+    private Map<Integer, Integer> getCorrespondanceBetweenNextOrderAndPreviousOrder(CsmMix elementsFromPreviousOrder, CsmMix elementsFromNextOrder) {
         Map<Integer, Integer> correspondanceBetweenNextOrderAndPreviousOrder = new HashMap<>();
-        ArrayIterator<CsmElement> previousOrderElementsIterator =
-                new ArrayIterator<>(elementsFromPreviousOrder.getElements());
+        IndexTrackingIterator<CsmElement> previousOrderElementsIterator = new IndexTrackingIterator<>(elementsFromPreviousOrder.getElements());
         int syncNextIndex = 0;
         while (previousOrderElementsIterator.hasNext()) {
             CsmElement pe = previousOrderElementsIterator.next();
-            ArrayIterator<CsmElement> nextOrderElementsIterator =
-                    new ArrayIterator<>(elementsFromNextOrder.getElements(), syncNextIndex);
+            IndexTrackingIterator<CsmElement> nextOrderElementsIterator = new IndexTrackingIterator<>(elementsFromNextOrder.getElements(), syncNextIndex);
             while (nextOrderElementsIterator.hasNext()) {
                 CsmElement ne = nextOrderElementsIterator.next();
-                if (!correspondanceBetweenNextOrderAndPreviousOrder
-                                .values()
-                                .contains(previousOrderElementsIterator.index())
-                        && DifferenceElementCalculator.matching(ne, pe)) {
-                    correspondanceBetweenNextOrderAndPreviousOrder.put(
-                            nextOrderElementsIterator.index(), previousOrderElementsIterator.index());
+                if (!correspondanceBetweenNextOrderAndPreviousOrder.values().contains(previousOrderElementsIterator.currentIndex()) && DifferenceElementCalculator.matching(ne, pe)) {
+                    correspondanceBetweenNextOrderAndPreviousOrder.put(nextOrderElementsIterator.currentIndex(), previousOrderElementsIterator.currentIndex());
                     // set the position to start on the next {@code nextOrderElementsIterator} iteration
                     syncNextIndex = nextOrderElementsIterator.nextIndex();
                     break;
@@ -213,20 +189,17 @@ private List<Integer> findIndexOfCorrespondingNodeTextElement(List<CsmElement> e
                         boolean hasSamePreviousElement = false;
                         if (!isFirstIterationOnNodeTextElements && !isFirstIterationOnCsmElements) {
                             TextElement previousTextElement = nodeText.getTextElement(currentTextElementIndex - 1);
-                            hasSamePreviousElement =
-                                    elements.get(previousCsmElementIndex).isCorrespondingElement(previousTextElement);
+                            hasSamePreviousElement = elements.get(previousCsmElementIndex).isCorrespondingElement(previousTextElement);
                         }
                         boolean hasSameNextElement = false;
                         if (csmElementListIterator.hasNext()) {
                             TextElement nextTextElement = nodeTextListIterator.peek();
-                            hasSameNextElement = elements.get(csmElementListIterator.nextIndex())
-                                    .isCorrespondingElement(nextTextElement);
+                            hasSameNextElement = elements.get(csmElementListIterator.nextIndex()).isCorrespondingElement(nextTextElement);
                         }
                         if (hasSamePreviousElement && hasSameNextElement) {
                             potentialMatches.putIfAbsent(MatchClassification.ALL, currentTextElementIndex);
                         } else if (hasSamePreviousElement) {
-                            potentialMatches.putIfAbsent(
-                                    MatchClassification.PREVIOUS_AND_SAME, currentTextElementIndex);
+                            potentialMatches.putIfAbsent(MatchClassification.PREVIOUS_AND_SAME, currentTextElementIndex);
                         } else if (hasSameNextElement) {
                             potentialMatches.putIfAbsent(MatchClassification.NEXT_AND_SAME, currentTextElementIndex);
                         } else {
@@ -238,8 +211,7 @@ private List<Integer> findIndexOfCorrespondingNodeTextElement(List<CsmElement> e
                 }
             }
             // Prioritize the matches from best to worst
-            Optional<MatchClassification> bestMatchKey =
-                    potentialMatches.keySet().stream().min(Comparator.comparing(MatchClassification::getPriority));
+            Optional<MatchClassification> bestMatchKey = potentialMatches.keySet().stream().min(Comparator.comparing(MatchClassification::getPriority));
             if (bestMatchKey.isPresent()) {
                 correspondingIndices.add(potentialMatches.get(bestMatchKey.get()));
             } else {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElement.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElement.java
index 06d7bfdfcc..f5d98fc98e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElement.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -32,9 +32,7 @@ public abstract class TextElement implements TextElementMatcher, PrintableTextEl
     abstract boolean isToken(int tokenKind);
 
     final boolean isCommentToken() {
-        return isToken(GeneratedJavaParserConstants.JAVADOC_COMMENT)
-                || isToken(GeneratedJavaParserConstants.SINGLE_LINE_COMMENT)
-                || isToken(GeneratedJavaParserConstants.MULTI_LINE_COMMENT);
+        return isToken(GeneratedJavaParserConstants.JAVADOC_COMMENT) || isToken(GeneratedJavaParserConstants.SINGLE_LINE_COMMENT) || isToken(GeneratedJavaParserConstants.MULTI_LINE_COMMENT);
     }
 
     @Override
@@ -85,9 +83,8 @@ public boolean isChild() {
      * @return TextElementMatcher that matches any TextElement with the same Range
      */
     TextElementMatcher matchByRange() {
-        return ( // We're missing range information. This may happen when a node is manually instantiated. Don't be too
-                // harsh on that:
-                TextElement textElement) ->
-                getRange().flatMap(r1 -> textElement.getRange().map(r1::equals)).orElse(true);
+        return (// We're missing range information. This may happen when a node is manually instantiated. Don't be too
+        // harsh on that:
+        TextElement textElement) -> getRange().flatMap(r1 -> textElement.getRange().map(r1::equals)).orElse(true);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementIterator.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementIterator.java
new file mode 100755
index 0000000000..9a37b172d3
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementIterator.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.printer.lexicalpreservation;
+
+import java.util.List;
+import java.util.ListIterator;
+
+/**
+ * Iterator that tracks its current position in a TextElement list.
+ *
+ * <p>Unlike standard {@link ListIterator}, this class provides direct access
+ * to the current index via {@link #currentIndex()}, which returns the index of
+ * the element that was returned by the most recent call to {@link #next()} or
+ * {@link #previous()}.
+ *
+ * <p>This iterator is a replacement for the internal {@code ArrayIterator} class,
+ * with clearer semantics and better naming. It correctly handles bidirectional
+ * iteration by maintaining the current index internally.
+ *
+ * @since 3.28.0
+ */
+public class TextElementIterator implements ListIterator<TextElement> {
+
+    private final ListIterator<TextElement> delegate;
+
+    private int currentIndex;
+
+    /**
+     * Creates an iterator starting at the specified index.
+     * The current index is initialized to -1, indicating that no element
+     * has been read yet.
+     *
+     * @param elements the list to iterate over
+     * @param fromIndex the starting index (cursor position)
+     * @throws IndexOutOfBoundsException if fromIndex is out of range
+     */
+    public TextElementIterator(List<TextElement> elements, int fromIndex) {
+        this.delegate = elements.listIterator(fromIndex);
+        // No element read yet
+        this.currentIndex = -1;
+    }
+
+    /**
+     * Returns the index of the element that was returned by the most recent call
+     * to {@link #next()} or {@link #previous()}.
+     *
+     * <p>This method can be called multiple times without side effects - it will
+     * always return the same value until the next call to {@link #next()},
+     * {@link #previous()}, or {@link #remove()}.
+     *
+     * <p><b>Important:</b> If neither {@link #next()} nor {@link #previous()} has
+     * been called yet, or if {@link #remove()} was called after the last call to
+     * {@link #next()} or {@link #previous()}, this method returns -1.
+     *
+     * @return the index of the current element, or -1 if no element has been read
+     *         or the current element was removed
+     */
+    public int currentIndex() {
+        return currentIndex;
+    }
+
+    // === LISTITERATOR METHODS WITH INDEX TRACKING ===
+    @Override
+    public boolean hasNext() {
+        return delegate.hasNext();
+    }
+
+    @Override
+    public TextElement next() {
+        TextElement result = delegate.next();
+        // After next(), previousIndex() points to the element we just read
+        currentIndex = delegate.previousIndex();
+        return result;
+    }
+
+    @Override
+    public boolean hasPrevious() {
+        return delegate.hasPrevious();
+    }
+
+    @Override
+    public TextElement previous() {
+        TextElement result = delegate.previous();
+        // After previous(), nextIndex() points to the element we just read
+        currentIndex = delegate.nextIndex();
+        return result;
+    }
+
+    @Override
+    public int nextIndex() {
+        return delegate.nextIndex();
+    }
+
+    @Override
+    public int previousIndex() {
+        return delegate.previousIndex();
+    }
+
+    @Override
+    public void remove() {
+        delegate.remove();
+        // After remove, there is no current element
+        currentIndex = -1;
+    }
+
+    @Override
+    public void set(TextElement element) {
+        delegate.set(element);
+        // Current index doesn't change when replacing an element
+    }
+
+    @Override
+    public void add(TextElement element) {
+        delegate.add(element);
+        // After add(), the added element becomes the current element
+        currentIndex = delegate.previousIndex();
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementIteratorsFactory.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementIteratorsFactory.java
index 1d4b8abedc..ea1a9a0310 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementIteratorsFactory.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementIteratorsFactory.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -123,7 +123,8 @@ public E next() {
         }
 
         @Override
-        public void remove() {}
+        public void remove() {
+        }
     }
 
     static class ComposedIterator<E> implements Iterator<E> {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementList.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementList.java
new file mode 100755
index 0000000000..b7e4e3b610
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementList.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.printer.lexicalpreservation;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Predicate;
+
+/**
+ * Default mutable implementation of {@link TextElementSequence}.
+ *
+ * <p>This class wraps an existing {@code List<TextElement>} without copying it.
+ * All mutations directly affect the underlying list.
+ *
+ * <p>The implementation provides optimized search operations and clear semantics
+ * for index-based manipulations required by lexical preservation operations.
+ *
+ * @since 3.28.0
+ */
+public class TextElementList implements TextElementSequence {
+
+    private final List<TextElement> elements;
+
+    /**
+     * Creates a wrapper around the given list.
+     * The list is NOT copied, mutations affect the original.
+     *
+     * @param elements the list to wrap
+     * @throws NullPointerException if elements is null
+     */
+    public TextElementList(List<TextElement> elements) {
+        this.elements = Objects.requireNonNull(elements, "elements cannot be null");
+    }
+
+    /**
+     * Creates a new TextElementList containing the given elements.
+     *
+     * @param elements varargs of elements
+     * @return a new list
+     */
+    public static TextElementList of(TextElement... elements) {
+        return new TextElementList(new ArrayList<>(Arrays.asList(elements)));
+    }
+
+    /**
+     * Creates a new TextElementList wrapping the given list.
+     *
+     * <p><b>IMPORTANT:</b> This method wraps the list directly without copying.
+     * Modifications to the TextElementList will affect the original list.
+     * Use {@link #copyOf(List)} if you need an independent copy.
+     *
+     * <p>This method is useful for chaining operations:
+     * <pre>{@code
+     * List<TextElement> result = TextElementList.of(list.subList(0, 10))
+     *     .takeWhile(TextElement::isSpaceOrTab);
+     * }</pre>
+     *
+     * @param elements the list to wrap (not copied)
+     * @return a new TextElementList wrapping the given list
+     * @throws NullPointerException if elements is null
+     */
+    public static TextElementList of(List<TextElement> elements) {
+        return new TextElementList(elements);
+    }
+
+    /**
+     * Creates an empty mutable TextElementList.
+     *
+     * @return an empty list
+     */
+    public static TextElementList empty() {
+        return new TextElementList(new ArrayList<>());
+    }
+
+    /**
+     * Creates a new TextElementList with a copy of the given list.
+     *
+     * @param elements the list to copy
+     * @return a new list with copied elements
+     * @throws NullPointerException if elements is null
+     */
+    public static TextElementList copyOf(List<TextElement> elements) {
+        return new TextElementList(new ArrayList<>(elements));
+    }
+
+    // === SEARCH BY PREDICATE ===
+    @Override
+    public int findFirst(Predicate<TextElement> predicate) {
+        Objects.requireNonNull(predicate, "predicate cannot be null");
+        for (int i = 0; i < elements.size(); i++) {
+            if (predicate.test(elements.get(i))) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    @Override
+    public int findLast(Predicate<TextElement> predicate) {
+        Objects.requireNonNull(predicate, "predicate cannot be null");
+        for (int i = elements.size() - 1; i >= 0; i--) {
+            if (predicate.test(elements.get(i))) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    @Override
+    public int findNext(int fromIndex, Predicate<TextElement> predicate) {
+        Objects.requireNonNull(predicate, "predicate cannot be null");
+        if (!isValidIndex(fromIndex)) {
+            return -1;
+        }
+        for (int i = fromIndex; i < elements.size(); i++) {
+            if (predicate.test(elements.get(i))) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    @Override
+    public int findPrevious(int fromIndex, Predicate<TextElement> predicate) {
+        Objects.requireNonNull(predicate, "predicate cannot be null");
+        if (fromIndex < 0 || fromIndex >= elements.size()) {
+            return -1;
+        }
+        for (int i = fromIndex; i >= 0; i--) {
+            if (predicate.test(elements.get(i))) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    // === FILTERING ===
+    @Override
+    public List<TextElement> takeWhile(Predicate<TextElement> predicate) {
+        Objects.requireNonNull(predicate, "predicate cannot be null");
+        List<TextElement> result = new ArrayList<>();
+        for (TextElement element : elements) {
+            if (!predicate.test(element)) {
+                break;
+            }
+            result.add(element);
+        }
+        return result;
+    }
+
+    @Override
+    public List<TextElement> subList(int fromIndex, int toIndex) {
+        return elements.subList(fromIndex, toIndex);
+    }
+
+    // === MUTATION ===
+    @Override
+    public void insert(int index, TextElement element) {
+        Objects.requireNonNull(element, "element cannot be null");
+        elements.add(index, element);
+    }
+
+    @Override
+    public void insertAll(int index, List<TextElement> elementsToInsert) {
+        Objects.requireNonNull(elementsToInsert, "elements cannot be null");
+        elements.addAll(index, elementsToInsert);
+    }
+
+    @Override
+    public void remove(int index) {
+        elements.remove(index);
+    }
+
+    @Override
+    public void removeRange(int fromIndex, int toIndex) {
+        if (!isValidIndex(fromIndex) || !isValidIndex(toIndex) || fromIndex > toIndex) {
+            throw new IndexOutOfBoundsException("Invalid range: [" + fromIndex + ", " + toIndex + "] for size " + elements.size());
+        }
+        // toIndex is inclusive, subList.clear() expects exclusive upper bound
+        elements.subList(fromIndex, toIndex + 1).clear();
+    }
+
+    // === ACCESS ===
+    @Override
+    public TextElement get(int index) {
+        return elements.get(index);
+    }
+
+    @Override
+    public boolean isValidIndex(int index) {
+        return index >= 0 && index < elements.size();
+    }
+
+    @Override
+    public int size() {
+        return elements.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return elements.isEmpty();
+    }
+
+    @Override
+    public List<TextElement> toList() {
+        return Collections.unmodifiableList(elements);
+    }
+
+    @Override
+    public List<TextElement> toMutableList() {
+        return elements;
+    }
+
+    // === MATCHING (TERMINAL OPERATIONS) ===
+    @Override
+    public boolean anyMatch(Predicate<TextElement> predicate) {
+        Objects.requireNonNull(predicate, "predicate cannot be null");
+        for (TextElement element : elements) {
+            if (predicate.test(element)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean allMatch(Predicate<TextElement> predicate) {
+        Objects.requireNonNull(predicate, "predicate cannot be null");
+        for (TextElement element : elements) {
+            if (!predicate.test(element)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public boolean noneMatch(Predicate<TextElement> predicate) {
+        Objects.requireNonNull(predicate, "predicate cannot be null");
+        return !anyMatch(predicate);
+    }
+
+    // === ITERATION ===
+    @Override
+    public TextElementIterator iterator(int fromIndex) {
+        return new TextElementIterator(elements, fromIndex);
+    }
+
+    @Override
+    public String toString() {
+        return "TextElementList{size=" + elements.size() + "}";
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (!(obj instanceof TextElementList))
+            return false;
+        TextElementList other = (TextElementList) obj;
+        return elements.equals(other.elements);
+    }
+
+    @Override
+    public int hashCode() {
+        return elements.hashCode();
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatcher.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatcher.java
index 696d998e70..20c05fdef2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatcher.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatcher.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatchers.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatchers.java
index 3a21ddac4c..fee837ff68 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatchers.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementMatchers.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementSequence.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementSequence.java
new file mode 100755
index 0000000000..6128d23f7b
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TextElementSequence.java
@@ -0,0 +1,351 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.printer.lexicalpreservation;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+/**
+ * Contract for a specialized sequence of TextElements with enhanced search
+ * and modification capabilities for lexical preservation operations.
+ *
+ * <p>Unlike standard {@link List}, this interface provides:
+ * <ul>
+ *   <li>Index-based search with predicates (findFirst, findLast, findNext, findPrevious)</li>
+ *   <li>Element-based search (indexOf, lastIndexOf with overloads)</li>
+ *   <li>Controlled mutations (insert, remove) where caller manages index adjustments</li>
+ * </ul>
+ *
+ * <p><b>Thread safety:</b> Implementations are not required to be thread-safe.
+ *
+ * <p><b>Index management:</b> Mutation operations modify the underlying list directly.
+ * Callers are responsible for tracking index changes after mutations.
+ *
+ * @since 3.28.0
+ */
+public interface TextElementSequence {
+
+    // === SEARCH BY PREDICATE ===
+    /**
+     * Finds the first index where the predicate matches, searching forward from index 0.
+     *
+     * @param predicate the condition to test
+     * @return the first matching index, or -1 if no match found
+     * @throws NullPointerException if predicate is null
+     */
+    int findFirst(Predicate<TextElement> predicate);
+
+    /**
+     * Finds the last index where the predicate matches, searching backward from the end.
+     *
+     * @param predicate the condition to test
+     * @return the last matching index, or -1 if no match found
+     * @throws NullPointerException if predicate is null
+     */
+    int findLast(Predicate<TextElement> predicate);
+
+    /**
+     * Finds the next index where the predicate matches, searching forward from fromIndex (inclusive).
+     *
+     * @param fromIndex the starting index (inclusive)
+     * @param predicate the condition to test
+     * @return the next matching index, or -1 if no match found
+     * @throws NullPointerException if predicate is null
+     */
+    int findNext(int fromIndex, Predicate<TextElement> predicate);
+
+    /**
+     * Finds the previous index where the predicate matches, searching backward from fromIndex (inclusive).
+     *
+     * @param fromIndex the starting index (inclusive)
+     * @param predicate the condition to test
+     * @return the previous matching index, or -1 if no match found
+     * @throws NullPointerException if predicate is null
+     */
+    int findPrevious(int fromIndex, Predicate<TextElement> predicate);
+
+    // === MATCHING (TERMINAL OPERATIONS) ===
+    /**
+     * Tests whether any element in this sequence matches the given predicate.
+     *
+     * <p>This is a short-circuiting terminal operation: it stops as soon as
+     * a matching element is found and returns true immediately.
+     *
+     * <p>Examples:
+     * <pre>{@code
+     * // Check if list contains any comment
+     * boolean hasComment = list.anyMatch(TextElement::isComment);
+     *
+     * // Check if list contains any token with specific text
+     * boolean hasIdentifier = list.anyMatch(el ->
+     *     el instanceof TokenTextElement &&
+     *     ((TokenTextElement) el).getText().equals("myVar")
+     * );
+     * }</pre>
+     *
+     * @param predicate the predicate to test elements against
+     * @return true if any element matches the predicate, false otherwise
+     *         (returns false for empty sequences)
+     * @throws NullPointerException if predicate is null
+     */
+    boolean anyMatch(Predicate<TextElement> predicate);
+
+    /**
+     * Tests whether all elements in this sequence match the given predicate.
+     *
+     * <p>This is a short-circuiting terminal operation: it stops as soon as
+     * a non-matching element is found and returns false immediately.
+     *
+     * <p>Returns true for empty sequences (vacuous truth).
+     *
+     * <p>Examples:
+     * <pre>{@code
+     * // Check if all elements are whitespace
+     * boolean allWhitespace = list.allMatch(TextElement::isSpaceOrTab);
+     *
+     * // Check if all elements are comments
+     * boolean allComments = list.allMatch(TextElement::isComment);
+     * }</pre>
+     *
+     * @param predicate the predicate to test elements against
+     * @return true if all elements match the predicate (or sequence is empty),
+     *         false otherwise
+     * @throws NullPointerException if predicate is null
+     */
+    boolean allMatch(Predicate<TextElement> predicate);
+
+    /**
+     * Tests whether no elements in this sequence match the given predicate.
+     *
+     * <p>This is a short-circuiting terminal operation: it stops as soon as
+     * a matching element is found and returns false immediately.
+     *
+     * <p>Returns true for empty sequences.
+     *
+     * <p>Equivalent to {@code !anyMatch(predicate)}.
+     *
+     * <p>Examples:
+     * <pre>{@code
+     * // Check if list has no comments
+     * boolean noComments = list.noneMatch(TextElement::isComment);
+     *
+     * // Check if list has no newlines
+     * boolean noNewlines = list.noneMatch(TextElement::isNewline);
+     * }</pre>
+     *
+     * @param predicate the predicate to test elements against
+     * @return true if no elements match the predicate (or sequence is empty),
+     *         false otherwise
+     * @throws NullPointerException if predicate is null
+     */
+    boolean noneMatch(Predicate<TextElement> predicate);
+
+    // === SEARCH BY ELEMENT ===
+    /**
+     * Finds the first occurrence of the specified element.
+     * Equivalent to {@code findFirst(e -> Objects.equals(e, element))}.
+     *
+     * @param element the element to search for (may be null)
+     * @return the first occurrence index, or -1 if not found
+     */
+    default int indexOf(TextElement element) {
+        return findFirst(e -> Objects.equals(e, element));
+    }
+
+    /**
+     * Finds the last occurrence of the specified element.
+     * Equivalent to {@code findLast(e -> Objects.equals(e, element))}.
+     *
+     * @param element the element to search for (may be null)
+     * @return the last occurrence index, or -1 if not found
+     */
+    default int lastIndexOf(TextElement element) {
+        return findLast(e -> Objects.equals(e, element));
+    }
+
+    /**
+     * Finds the next occurrence of element starting from fromIndex (inclusive).
+     * Equivalent to {@code findNext(fromIndex, e -> Objects.equals(e, element))}.
+     *
+     * @param fromIndex the starting index (inclusive)
+     * @param element the element to search for (may be null)
+     * @return the next occurrence index, or -1 if not found
+     */
+    default int indexOf(int fromIndex, TextElement element) {
+        return findNext(fromIndex, e -> Objects.equals(e, element));
+    }
+
+    /**
+     * Finds the previous occurrence of element before fromIndex (inclusive).
+     * Equivalent to {@code findPrevious(fromIndex, e -> Objects.equals(e, element))}.
+     *
+     * @param fromIndex the starting index (inclusive)
+     * @param element the element to search for (may be null)
+     * @return the previous occurrence index, or -1 if not found
+     */
+    default int lastIndexOf(int fromIndex, TextElement element) {
+        return findPrevious(fromIndex, e -> Objects.equals(e, element));
+    }
+
+    // === FILTERING ===
+    /**
+     * Returns a new list containing elements from the start until the predicate fails.
+     * The returned list is independent of this sequence.
+     *
+     * @param predicate the condition to test
+     * @return a new list of matching elements
+     * @throws NullPointerException if predicate is null
+     */
+    List<TextElement> takeWhile(Predicate<TextElement> predicate);
+
+    /**
+     * Returns a sublist view [fromIndex, toIndex).
+     * The returned list is backed by this sequence, so changes affect both.
+     *
+     * @param fromIndex low endpoint (inclusive)
+     * @param toIndex high endpoint (exclusive)
+     * @return a sublist view
+     * @throws IndexOutOfBoundsException if indices are out of range
+     */
+    List<TextElement> subList(int fromIndex, int toIndex);
+
+    // === MUTATION ===
+    /**
+     * Inserts element at the specified index.
+     * <b>WARNING:</b> Caller must adjust subsequent indices manually.
+     *
+     * @param index position to insert at
+     * @param element element to insert
+     * @throws IndexOutOfBoundsException if index is out of range
+     * @throws NullPointerException if element is null
+     */
+    void insert(int index, TextElement element);
+
+    /**
+     * Inserts all elements at the specified index.
+     * <b>WARNING:</b> Caller must adjust subsequent indices manually.
+     *
+     * @param index position to insert at
+     * @param elements elements to insert
+     * @throws IndexOutOfBoundsException if index is out of range
+     * @throws NullPointerException if elements is null
+     */
+    void insertAll(int index, List<TextElement> elements);
+
+    /**
+     * Removes the element at the specified index.
+     * <b>WARNING:</b> Caller must adjust subsequent indices manually.
+     *
+     * @param index position to remove from
+     * @throws IndexOutOfBoundsException if index is out of range
+     */
+    void remove(int index);
+
+    /**
+     * Removes elements in range [fromIndex, toIndex] (inclusive on both ends).
+     * <b>WARNING:</b> Caller must adjust subsequent indices manually.
+     *
+     * @param fromIndex start of range (inclusive)
+     * @param toIndex end of range (inclusive)
+     * @throws IndexOutOfBoundsException if indices are out of range or fromIndex > toIndex
+     */
+    void removeRange(int fromIndex, int toIndex);
+
+    // === ACCESS ===
+    /**
+     * Returns the element at the specified index.
+     *
+     * @param index the index
+     * @return the element at that position
+     * @throws IndexOutOfBoundsException if index is out of range
+     */
+    TextElement get(int index);
+
+    /**
+     * Checks if the index is valid (0 <= index < size).
+     *
+     * @param index the index to check
+     * @return true if index is valid
+     */
+    boolean isValidIndex(int index);
+
+    /**
+     * Returns the number of elements in this sequence.
+     *
+     * @return the size
+     */
+    int size();
+
+    /**
+     * Checks if this sequence is empty.
+     *
+     * @return true if size is 0
+     */
+    boolean isEmpty();
+
+    /**
+     * Returns an unmodifiable view of the underlying list.
+     * Changes to the original list are visible in the returned view.
+     *
+     * @return an unmodifiable list view
+     */
+    List<TextElement> toList();
+
+    /**
+     * Returns the underlying mutable list.
+     *
+     * <p><b>WARNING:</b> This exposes the internal list directly.
+     * Modifications will affect this sequence.
+     *
+     * @return the mutable list
+     */
+    List<TextElement> toMutableList();
+
+    // === ITERATION ===
+    /**
+     * Returns an iterator starting at the specified index.
+     *
+     * @param fromIndex the starting position
+     * @return an iterator with position tracking
+     * @throws IndexOutOfBoundsException if fromIndex is out of range
+     */
+    TextElementIterator iterator(int fromIndex);
+
+    /**
+     * Returns an iterator starting at index 0.
+     *
+     * @return an iterator from the beginning
+     */
+    default TextElementIterator iterator() {
+        return iterator(0);
+    }
+
+    /**
+     * Returns a stream of elements for functional operations.
+     *
+     * @return a stream over the elements
+     */
+    default Stream<TextElement> stream() {
+        return toList().stream();
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TokenOwnerDetector.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TokenOwnerDetector.java
new file mode 100755
index 0000000000..69d3265f48
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TokenOwnerDetector.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.printer.lexicalpreservation;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.body.FieldDeclaration;
+import com.github.javaparser.ast.type.Type;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Detects which node actually owns the tokens for a given node in the AST.
+ *
+ * <p>This utility is essential for the LexicalPreservingPrinter because the token
+ * assignment algorithm assigns tokens based on position in the source code, not
+ * necessarily to the logical AST node.
+ *
+ * <p><b>Core Problem:</b> In JavaParser's AST, child nodes may appear in the source
+ * code <i>before</i> their parent node's position. The LPP assigns tokens to the
+ * <i>nearest enclosing node</i> whose range includes the token's position.
+ *
+ * <p><b>Example:</b> In {@code Set<Pair<String, String>> x;}, the tokens for
+ * {@code Pair<String, String>} are assigned to {@code VariableDeclarationExpr},
+ * not to the {@code Pair} type node. When replacing {@code Pair}, the LPP needs
+ * to know to regenerate {@code VariableDeclarationExpr}.
+ *
+ * <p><b>Implementation:</b> Uses the Strategy pattern with multiple detection
+ * strategies, each handling a specific category of nodes (Types, Annotations,
+ * Modifiers, etc.). Strategies are tried in priority order.
+ *
+ * @since 3.28.0
+ */
+class TokenOwnerDetector {
+
+    /**
+     * Strategy interface for detecting token owners.
+     *
+     * <p>Each strategy implementation checks if it applies to the given node,
+     * then searches for the token owner by walking up the AST.
+     */
+    @FunctionalInterface
+    interface DetectionStrategy {
+
+        /**
+         * Attempts to find the token owner for the given node.
+         *
+         * @param node the node to analyze
+         * @return the token owner if this strategy applies, empty otherwise
+         */
+        Optional<Node> detect(Node node);
+    }
+
+    /**
+     * Detection strategies in priority order.
+     *
+     * <p>Order matters: strategies are tried sequentially, first match wins.
+     * Most frequent cases are placed first for performance (early exit).
+     *
+     * <p>Priority rationale:
+     * <ol>
+     *   <li>TypeOwnerStrategy - Most common, critical for Issue #3365</li>
+     *   <li>AnnotationOwnerStrategy - Common in modern Java code</li>
+     *   <li>ModifierOwnerStrategy - Moderately common</li>
+     *   <li>TypeParameterOwnerStrategy - Less common (generics only)</li>
+     *   <li>NameInExpressionStrategy - Rare edge cases</li>
+     * </ol>
+     */
+    private static final List<DetectionStrategy> STRATEGIES = Arrays.asList(new TypeOwnerStrategy());
+
+    /**
+     * Finds the node that owns the tokens for the given node.
+     *
+     * <p>Algorithm:
+     * <ol>
+     *   <li>Try each detection strategy in priority order</li>
+     *   <li>Return the first non-null owner found</li>
+     *   <li>If no strategy applies, the node owns its own tokens</li>
+     * </ol>
+     *
+     * @param node the node to find the token owner for
+     * @return the node that owns the tokens, never null
+     * @throws IllegalArgumentException if node is null
+     */
+    static Node findTokenOwner(Node node) {
+        if (node == null) {
+            throw new IllegalArgumentException("node cannot be null");
+        }
+        // Try each strategy in order
+        for (DetectionStrategy strategy : STRATEGIES) {
+            Optional<Node> owner = strategy.detect(node);
+            if (owner.isPresent() && owner.get() != node) {
+                return owner.get();
+            }
+        }
+        // Default: node owns its own tokens
+        return node;
+    }
+
+    /**
+     * Determines if token owner regeneration is needed after a node replacement.
+     *
+     * <p><b>Context:</b> When a node is replaced in the AST (e.g., replacing {@code Pair}
+     * with {@code SimpleImmutableEntry} in Issue #3365), the LexicalPreservingPrinter's
+     * Observer notifies the change. However, the LPP only regenerates the NodeText for
+     * the immediate parent of the replaced node by default.
+     *
+     * <p><b>Problem:</b> If the tokens for the replaced node are actually owned by an
+     * ancestor further up the tree (as detected by {@link #findTokenOwner(Node)}), the
+     * LPP won't regenerate the correct NodeText, resulting in the change not appearing
+     * in the output.
+     *
+     * <p><b>Example where regeneration is needed:</b>
+     * <pre>{@code
+     * Set<Pair<String, String>> x;
+     *
+     * // When replacing Pair type:
+     * // - parent: TypeArguments (immediate parent of Pair)
+     * // - tokenOwner: VariableDeclarationExpr (owns the tokens)
+     * // - replacedNode: ClassOrInterfaceType (Pair)
+     *
+     * // Result: needsRegeneration = true (tokenOwner != parent)
+     * }</pre>
+     *
+     * <p><b>Example where regeneration is NOT needed:</b>
+     * <pre>{@code
+     * x = 5;
+     *
+     * // When replacing the literal 5:
+     * // - parent: AssignExpr (immediate parent of literal)
+     * // - tokenOwner: AssignExpr (same as parent)
+     * // - replacedNode: IntegerLiteralExpr (5)
+     *
+     * // Result: needsRegeneration = false (normal LPP handling works)
+     * }</pre>
+     *
+     * <p><b>Decision criteria:</b>
+     * <ol>
+     *   <li>If tokenOwner == parent: No regeneration needed (normal path)</li>
+     *   <li>If replacedNode is a Type: Regeneration needed (Issue #3365 case)</li>
+     *   <li>If replacedNode is inside a Type: Regeneration needed (nested case)</li>
+     *   <li>Otherwise: No regeneration needed</li>
+     * </ol>
+     *
+     * @param parent the immediate parent of the replaced node (where LPP would normally regenerate)
+     * @param tokenOwner the actual owner of the tokens (as detected by findTokenOwner)
+     * @param replacedNode the node being replaced in the AST
+     * @return true if the tokenOwner's NodeText should be regenerated, false if normal LPP handling is sufficient
+     */
+    static boolean needsRegeneration(Node parent, Node tokenOwner, Node replacedNode) {
+        // Case 1: Token owner is the same as the immediate parent
+        // This is the normal case where LPP's default behavior (regenerating the parent) works correctly.
+        // Example: x = 5; → replacing 5 in AssignExpr
+        if (tokenOwner.equals(parent)) {
+            return false;
+        }
+        // WORKAROUND: Multiple variable declarations share same type
+        if (tokenOwner instanceof FieldDeclaration) {
+            FieldDeclaration field = (FieldDeclaration) tokenOwner;
+            if (field.getVariables().size() > 1) {
+                // Let LPP handle it normally
+                return false;
+            }
+        }
+        // Case 2: Replaced node is directly a Type
+        // This is the most common case requiring special handling (Issue #3365).
+        // Types in declarations have their tokens owned by the declaration, not by the Type node itself.
+        // Example: Set<Pair<...>> x; → replacing Pair type
+        if (replacedNode instanceof Type) {
+            return true;
+        }
+        // Case 3: Replaced node is contained within a Type
+        // This handles nested cases where a node inside a type (e.g., type arguments) is replaced.
+        // We walk up from the replaced node to the parent, checking if we pass through a Type node.
+        // Example: Set<Pair<String, String>> → replacing "String" inside Pair's type arguments
+        Node current = replacedNode.getParentNode().orElse(null);
+        while (current != null && current != parent) {
+            if (current instanceof Type) {
+                // Found a Type node in the ancestry chain → regeneration needed
+                return true;
+            }
+            current = current.getParentNode().orElse(null);
+        }
+        // Case 4: None of the above
+        // The replaced node is not type-related and tokenOwner != parent.
+        // This is rare but possible (e.g., annotations, modifiers in some cases).
+        // Conservative approach: don't regenerate unless we're sure we need to.
+        // If this causes issues, we can add more cases (annotations, modifiers, etc.)
+        return false;
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TokenTextElement.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TokenTextElement.java
index d488b53392..364b0f8184 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TokenTextElement.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TokenTextElement.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -62,8 +62,10 @@ public JavaToken getToken() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         TokenTextElement that = (TokenTextElement) o;
         return token.equals(that.token);
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TypeOwnerStrategy.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TypeOwnerStrategy.java
new file mode 100755
index 0000000000..5023b59d5f
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/TypeOwnerStrategy.java
@@ -0,0 +1,325 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.printer.lexicalpreservation;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.body.*;
+import com.github.javaparser.ast.expr.*;
+import com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt;
+import com.github.javaparser.ast.stmt.ExpressionStmt;
+import com.github.javaparser.ast.type.Type;
+import com.github.javaparser.utils.Optionals;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Strategy for detecting token owners of Type nodes and their children.
+ *
+ * <p>This is the most complex strategy because types appear in many contexts:
+ * <ul>
+ *   <li>Variable declarations (local, field)</li>
+ *   <li>Method return types</li>
+ *   <li>Parameters</li>
+ *   <li>Extends/implements clauses</li>
+ *   <li>Cast expressions</li>
+ *   <li>Instanceof expressions</li>
+ *   <li>Type parameters and bounds</li>
+ * </ul>
+ *
+ * <p>This strategy is critical for fixing Issue #3365 where nested generic types
+ * (e.g., {@code Set<Pair<String, String>>}) were not properly updated by the LPP.
+ */
+class TypeOwnerStrategy implements TokenOwnerDetector.DetectionStrategy {
+
+    @Override
+    public Optional<Node> detect(Node node) {
+        // Check if this strategy applies
+        Type type = findTypeNode(node);
+        if (type == null) {
+            return Optional.empty();
+        }
+        // Find the owner
+        Node owner = findTypeOwner(type);
+        return Optional.ofNullable(owner);
+    }
+
+    /**
+     * Finds the Type node for the given node.
+     * Returns the node itself if it's a Type, or searches ancestors.
+     *
+     * @param node the node to analyze
+     * @return the Type node, or null if not found or not in a type context
+     */
+    private Type findTypeNode(Node node) {
+        if (node instanceof Type) {
+            return (Type) node;
+        }
+        // Search ancestors, but stop at boundaries
+        Node current = node;
+        while (current != null) {
+            if (current instanceof Type) {
+                return (Type) current;
+            }
+            // Stop at boundaries that indicate we're not in a type context
+            if (current instanceof BodyDeclaration || current instanceof ExpressionStmt) {
+                return null;
+            }
+            current = current.getParentNode().orElse(null);
+        }
+        return null;
+    }
+
+    /**
+     * Finds the declaration that owns the tokens for the given type.
+     *
+     * <p>Algorithm: Walk up the AST from the type, checking each parent
+     * against known contexts where types appear. Return the first matching
+     * declaration.
+     *
+     * @param type the type node (never null)
+     * @return the token owner, or the type itself if no owner found
+     */
+    private Node findTypeOwner(Type type) {
+        Node current = type;
+        while (current != null) {
+            Node parent = current.getParentNode().orElse(null);
+            if (parent == null) {
+                break;
+            }
+            final Node currentNode = current;
+            // Check each context using Optional chaining for clean code
+            Optional<Node> owner = Optionals.or(() -> checkVariableContext(parent, currentNode), () -> checkParameterContext(parent, currentNode), () -> checkMethodContext(parent, currentNode), () -> checkClassContext(parent, currentNode), () -> checkExpressionContext(parent, currentNode), () -> checkStatementContext(parent, currentNode));
+            if (owner.isPresent()) {
+                return owner.get();
+            }
+            current = parent;
+        }
+        // Fallback: type owns its own tokens
+        return type;
+    }
+
+    // ========================================================================
+    // CONTEXT CHECKERS
+    // Each method checks if the parent is a specific context that owns tokens
+    // ========================================================================
+    /**
+     * Checks variable declaration contexts: local variables, fields, enum constants.
+     *
+     * @param parent the potential owner
+     * @param current the current node in the walk
+     * @return the owner if this context applies
+     */
+    private Optional<Node> checkVariableContext(Node parent, Node current) {
+        // Local variable declaration
+        if (parent instanceof VariableDeclarationExpr) {
+            return Optional.of(parent);
+        }
+        // Field declaration
+        if (parent instanceof FieldDeclaration) {
+            return Optional.of(parent);
+        }
+        // Enum constant declaration
+        if (parent instanceof EnumConstantDeclaration) {
+            return Optional.of(parent);
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Checks parameter contexts: method parameters, receiver parameters.
+     *
+     * @param parent the potential owner
+     * @param current the current node in the walk
+     * @return the owner if this context applies
+     */
+    private Optional<Node> checkParameterContext(Node parent, Node current) {
+        // Method/constructor parameter
+        if (parent instanceof Parameter) {
+            return Optional.of(parent);
+        }
+        // Receiver parameter (e.g., void method(MyClass MyClass.this))
+        if (parent instanceof ReceiverParameter) {
+            return Optional.of(parent);
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Checks method/constructor contexts: return types, constructor declarations.
+     *
+     * @param parent the potential owner
+     * @param current the current node in the walk
+     * @return the owner if this context applies
+     */
+    private Optional<Node> checkMethodContext(Node parent, Node current) {
+        // Method return type
+        if (parent instanceof MethodDeclaration) {
+            MethodDeclaration method = (MethodDeclaration) parent;
+            // Verify that current is actually the return type (not a parameter type)
+            if (current.equals(method.getType()) || isAncestorOf(method.getType(), current)) {
+                return Optional.of(parent);
+            }
+        }
+        // Annotation member declaration
+        if (parent instanceof AnnotationMemberDeclaration) {
+            AnnotationMemberDeclaration member = (AnnotationMemberDeclaration) parent;
+            if (current.equals(member.getType()) || isAncestorOf(member.getType(), current)) {
+                return Optional.of(parent);
+            }
+        }
+        // Constructor declaration
+        if (parent instanceof ConstructorDeclaration) {
+            return Optional.of(parent);
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Checks class/interface contexts: extends, implements, permits clauses.
+     *
+     * @param parent the potential owner
+     * @param current the current node in the walk
+     * @return the owner if this context applies
+     */
+    private Optional<Node> checkClassContext(Node parent, Node current) {
+        // Class or interface declaration
+        if (parent instanceof ClassOrInterfaceDeclaration) {
+            ClassOrInterfaceDeclaration classDecl = (ClassOrInterfaceDeclaration) parent;
+            // Check extends clause
+            if (isInTypeList(classDecl.getExtendedTypes(), current)) {
+                return Optional.of(parent);
+            }
+            // Check implements clause
+            if (isInTypeList(classDecl.getImplementedTypes(), current)) {
+                return Optional.of(parent);
+            }
+            // Check permits clause (sealed classes - Java 17+)
+            if (isInTypeList(classDecl.getPermittedTypes(), current)) {
+                return Optional.of(parent);
+            }
+        }
+        // Record declaration (Java 14+)
+        if (parent instanceof RecordDeclaration) {
+            RecordDeclaration recordDecl = (RecordDeclaration) parent;
+            // Check implements clause
+            if (isInTypeList(recordDecl.getImplementedTypes(), current)) {
+                return Optional.of(parent);
+            }
+        }
+        // Enum declaration
+        if (parent instanceof EnumDeclaration) {
+            EnumDeclaration enumDecl = (EnumDeclaration) parent;
+            // Check implements clause
+            if (isInTypeList(enumDecl.getImplementedTypes(), current)) {
+                return Optional.of(parent);
+            }
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Checks expression contexts: cast, instanceof, record pattern.
+     *
+     * @param parent the potential owner
+     * @param current the current node in the walk
+     * @return the owner if this context applies
+     */
+    private Optional<Node> checkExpressionContext(Node parent, Node current) {
+        // Cast expression: (String) obj
+        if (parent instanceof CastExpr) {
+            CastExpr cast = (CastExpr) parent;
+            // Verify current is the cast type
+            if (current.equals(cast.getType()) || isAncestorOf(cast.getType(), current)) {
+                // The cast expression itself owns the type tokens
+                return Optional.of(parent);
+            }
+        }
+        // Instanceof expression: obj instanceof String
+        if (parent instanceof InstanceOfExpr) {
+            InstanceOfExpr instanceOf = (InstanceOfExpr) parent;
+            // Verify current is the type being checked
+            if (current.equals(instanceOf.getType()) || isAncestorOf(instanceOf.getType(), current)) {
+                // The instanceof expression owns the type tokens
+                return Optional.of(parent);
+            }
+        }
+        // Record pattern expression
+        if (parent instanceof RecordPatternExpr) {
+            RecordPatternExpr pattern = (RecordPatternExpr) parent;
+            if (current.equals(pattern.getType()) || isAncestorOf(pattern.getType(), current)) {
+                return Optional.of(parent);
+            }
+        }
+        return Optional.empty();
+    }
+
+    /**
+     * Checks statement contexts: explicit constructor invocations.
+     *
+     * @param parent the potential owner
+     * @param current the current node in the walk
+     * @return the owner if this context applies
+     */
+    private Optional<Node> checkStatementContext(Node parent, Node current) {
+        // Explicit constructor invocation: this(...), super(...)
+        if (parent instanceof ExplicitConstructorInvocationStmt) {
+            return Optional.of(parent);
+        }
+        return Optional.empty();
+    }
+
+    // ========================================================================
+    // UTILITY METHODS
+    // ========================================================================
+    /**
+     * Checks if a node is contained in a list of types (extends, implements, permits).
+     *
+     * @param types the list of types to check
+     * @param node the node to search for
+     * @return true if node is in the list or is a descendant of a type in the list
+     */
+    private boolean isInTypeList(List<? extends Type> types, Node node) {
+        for (Type type : types) {
+            if (type.equals(node) || isAncestorOf(type, node)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Checks if potentialAncestor is actually an ancestor of node.
+     *
+     * @param potentialAncestor the potential ancestor
+     * @param node the node to check
+     * @return true if potentialAncestor is an ancestor of node
+     */
+    private boolean isAncestorOf(Node potentialAncestor, Node node) {
+        Node current = node.getParentNode().orElse(null);
+        while (current != null) {
+            if (current.equals(potentialAncestor)) {
+                return true;
+            }
+            current = current.getParentNode().orElse(null);
+        }
+        return false;
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/Change.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/Change.java
index 79e6e98259..812fbb2232 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/Change.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/Change.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -31,7 +31,7 @@
 public interface Change {
 
     default boolean evaluate(CsmConditional csmConditional, Node node) {
-        switch (csmConditional.getCondition()) {
+        switch(csmConditional.getCondition()) {
             case FLAG:
                 return csmConditional.getProperties().stream().anyMatch(p -> (Boolean) getValue(p, node));
             case IS_NOT_EMPTY:
@@ -39,11 +39,9 @@ default boolean evaluate(CsmConditional csmConditional, Node node) {
             case IS_EMPTY:
                 return Utils.valueIsNullOrEmpty(getValue(csmConditional.getProperty(), node));
             case IS_PRESENT:
-                return !Utils.valueIsNullOrEmptyStringOrOptional(getValue(csmConditional.getProperty(), node))
-                        && !isEvaluatedOnDerivedProperty(csmConditional.getProperty());
+                return !Utils.valueIsNullOrEmptyStringOrOptional(getValue(csmConditional.getProperty(), node)) && !isEvaluatedOnDerivedProperty(csmConditional.getProperty());
             default:
-                throw new UnsupportedOperationException(
-                        "" + csmConditional.getProperty() + " " + csmConditional.getCondition());
+                throw new UnsupportedOperationException("" + csmConditional.getProperty() + " " + csmConditional.getCondition());
         }
     }
 
@@ -98,8 +96,7 @@ default boolean isEvaluatedOnDerivedProperty(ObservableProperty property) {
          * field but the validation condition must not be checked.
          * Be careful because NoChange property must not affect this evaluation.
          */
-        return currentProperty != null
-                && (property.isDerived() && property.name().endsWith(currentProperty.name()));
+        return currentProperty != null && (property.isDerived() && property.name().endsWith(currentProperty.name()));
     }
 
     /*
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListAdditionChange.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListAdditionChange.java
index c9d5f59fe7..087b8a84dd 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListAdditionChange.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListAdditionChange.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -51,8 +51,7 @@ public Object getValue(ObservableProperty property, Node node) {
                 currentRawValue = optional.orElse(null);
             }
             if (!(currentRawValue instanceof NodeList)) {
-                throw new IllegalStateException(
-                        "Expected NodeList, found " + currentRawValue.getClass().getCanonicalName());
+                throw new IllegalStateException("Expected NodeList, found " + currentRawValue.getClass().getCanonicalName());
             }
             NodeList<Node> currentNodeList = (NodeList<Node>) currentRawValue;
             // Note: When adding to a node list children get assigned the list's parent, thus we must set the list's
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListRemovalChange.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListRemovalChange.java
index 4562806b88..9ebdf76902 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListRemovalChange.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListRemovalChange.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -49,8 +49,7 @@ public Object getValue(ObservableProperty property, Node node) {
                 currentRawValue = optional.orElse(null);
             }
             if (!(currentRawValue instanceof NodeList)) {
-                throw new IllegalStateException(
-                        "Expected NodeList, found " + currentRawValue.getClass().getCanonicalName());
+                throw new IllegalStateException("Expected NodeList, found " + currentRawValue.getClass().getCanonicalName());
             }
             NodeList<Node> currentNodeList = (NodeList<Node>) currentRawValue;
             // Note: When adding to a node list children get assigned the list's parent, thus we must set the list's
@@ -65,9 +64,7 @@ public Object getValue(ObservableProperty property, Node node) {
             // which deletes the relationship between a node and its parent node.
             // This relationship is necessary to reinforce indentation, for example when
             // deleting a node, as indentation can be carried by the parent node.
-            currentNodeList.stream()
-                    .filter(n -> !isSameNode(currentNodeList.get(index), n))
-                    .forEach(selectedNode -> newNodeList.add(selectedNode));
+            currentNodeList.stream().filter(n -> !isSameNode(currentNodeList.get(index), n)).forEach(selectedNode -> newNodeList.add(selectedNode));
             return newNodeList;
         }
         return new NoChange().getValue(property, node);
@@ -78,10 +75,7 @@ private boolean isSameNode(Node n1, Node n2) {
     }
 
     private boolean isSameRange(Node n1, Node n2) {
-        return (!n1.hasRange() && !n2.hasRange())
-                || (n1.hasRange()
-                        && n2.hasRange()
-                        && isSameRange(n1.getRange().get(), n2.getRange().get()));
+        return (!n1.hasRange() && !n2.hasRange()) || (n1.hasRange() && n2.hasRange() && isSameRange(n1.getRange().get(), n2.getRange().get()));
     }
 
     private boolean isSameRange(Range r1, Range r2) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListReplacementChange.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListReplacementChange.java
index afbf5a35d9..1789b9b479 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListReplacementChange.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/ListReplacementChange.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -51,8 +51,7 @@ public Object getValue(ObservableProperty property, Node node) {
                 currentRawValue = optional.orElse(null);
             }
             if (!(currentRawValue instanceof NodeList)) {
-                throw new IllegalStateException(
-                        "Expected NodeList, found " + currentRawValue.getClass().getCanonicalName());
+                throw new IllegalStateException("Expected NodeList, found " + currentRawValue.getClass().getCanonicalName());
             }
             NodeList<Node> currentNodeList = (NodeList<Node>) currentRawValue;
             // Note: When adding to a node list children get assigned the list's parent, thus we must set the list's
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/NoChange.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/NoChange.java
index a60c7eb4ee..441673fc9a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/NoChange.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/NoChange.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/PropertyChange.java b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/PropertyChange.java
index 3fa75ed307..689d69de62 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/PropertyChange.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/changes/PropertyChange.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-core/src/main/java/com/github/javaparser/quality/NotNull.java b/javaparser-core/src/main/java/com/github/javaparser/quality/NotNull.java
index 9723ec726b..a2ff0e2c8c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/quality/NotNull.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/quality/NotNull.java
@@ -26,4 +26,5 @@
 @Documented
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.SOURCE)
-public @interface NotNull {}
+public @interface NotNull {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/quality/Nullable.java b/javaparser-core/src/main/java/com/github/javaparser/quality/Nullable.java
index 7fcf1968a7..6a10d8bf59 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/quality/Nullable.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/quality/Nullable.java
@@ -26,4 +26,5 @@
 @Documented
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.SOURCE)
-public @interface Nullable {}
+public @interface Nullable {
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/Context.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/Context.java
index 2aafae0b7b..504dbfc16d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/Context.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/Context.java
@@ -109,8 +109,7 @@ default SymbolReference<ResolvedTypeDeclaration> solveType(String name) {
      *
      * @return The declaration associated with the given type name.
      */
-    default SymbolReference<ResolvedTypeDeclaration> solveType(
-            String name, @Nullable List<ResolvedType> typeArguments) {
+    default SymbolReference<ResolvedTypeDeclaration> solveType(String name, @Nullable List<ResolvedType> typeArguments) {
         // Default to solving within the parent context.
         return solveTypeInParentContext(name, typeArguments);
     }
@@ -139,8 +138,7 @@ default SymbolReference<ResolvedTypeDeclaration> solveTypeInParentContext(String
      *
      * @return The declaration associated with the given type name.
      */
-    default SymbolReference<ResolvedTypeDeclaration> solveTypeInParentContext(
-            String name, @Nullable List<ResolvedType> typeArguments) {
+    default SymbolReference<ResolvedTypeDeclaration> solveTypeInParentContext(String name, @Nullable List<ResolvedType> typeArguments) {
         Optional<Context> optionalParentContext = getParent();
         if (!optionalParentContext.isPresent()) {
             return SymbolReference.unsolved();
@@ -268,10 +266,7 @@ default Optional<VariableDeclarator> localVariableDeclarationInScope(String name
         // First check if the variable is directly declared within this context.
         Node wrappedNode = getWrappedNode();
         Context parentContext = getParent().get();
-        Optional<VariableDeclarator> localResolutionResults =
-                parentContext.localVariablesExposedToChild(wrappedNode).stream()
-                        .filter(vd -> vd.getNameAsString().equals(name))
-                        .findFirst();
+        Optional<VariableDeclarator> localResolutionResults = parentContext.localVariablesExposedToChild(wrappedNode).stream().filter(vd -> vd.getNameAsString().equals(name)).findFirst();
         if (localResolutionResults.isPresent()) {
             return localResolutionResults;
         }
@@ -286,9 +281,7 @@ default Optional<Parameter> parameterDeclarationInScope(String name) {
         // First check if the parameter is directly declared within this context.
         Node wrappedNode = getWrappedNode();
         Context parentContext = getParent().get();
-        Optional<Parameter> localResolutionResults = parentContext.parametersExposedToChild(wrappedNode).stream()
-                .filter(vd -> vd.getNameAsString().equals(name))
-                .findFirst();
+        Optional<Parameter> localResolutionResults = parentContext.parametersExposedToChild(wrappedNode).stream().filter(vd -> vd.getNameAsString().equals(name)).findFirst();
         if (localResolutionResults.isPresent()) {
             return localResolutionResults;
         }
@@ -324,10 +317,7 @@ default Optional<TypePatternExpr> typePatternExprInScope(String name) {
         // FIXME: If there are multiple patterns, throw an error?
         // First check if the pattern is directly declared within this context.
         Node wrappedNode = getWrappedNode();
-        Optional<TypePatternExpr> localResolutionResults =
-                parentContext.typePatternExprsExposedToChild(wrappedNode).stream()
-                        .filter(vd -> vd.getNameAsString().equals(name))
-                        .findFirst();
+        Optional<TypePatternExpr> localResolutionResults = parentContext.typePatternExprsExposedToChild(wrappedNode).stream().filter(vd -> vd.getNameAsString().equals(name)).findFirst();
         if (localResolutionResults.isPresent()) {
             return localResolutionResults;
         }
@@ -342,10 +332,7 @@ default Optional<ResolvedFieldDeclaration> fieldDeclarationInScope(String name)
         Context parentContext = getParent().get();
         // First check if the parameter is directly declared within this context.
         Node wrappedNode = getWrappedNode();
-        Optional<ResolvedFieldDeclaration> localResolutionResults =
-                parentContext.fieldsExposedToChild(wrappedNode).stream()
-                        .filter(vd -> vd.getName().equals(name))
-                        .findFirst();
+        Optional<ResolvedFieldDeclaration> localResolutionResults = parentContext.fieldsExposedToChild(wrappedNode).stream().filter(vd -> vd.getName().equals(name)).findFirst();
         if (localResolutionResults.isPresent()) {
             return localResolutionResults;
         }
@@ -365,14 +352,12 @@ default SymbolReference<ResolvedConstructorDeclaration> solveConstructor(List<Re
     /**
      * We find the method declaration which is the best match for the given name and list of typeParametersValues.
      */
-    default SymbolReference<ResolvedMethodDeclaration> solveMethod(
-            String name, List<ResolvedType> argumentsTypes, boolean staticOnly) {
+    default SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes, boolean staticOnly) {
         // Default to solving within the parent context.
         return solveMethodInParentContext(name, argumentsTypes, staticOnly);
     }
 
-    default SymbolReference<ResolvedMethodDeclaration> solveMethodInParentContext(
-            String name, List<ResolvedType> argumentsTypes, boolean staticOnly) {
+    default SymbolReference<ResolvedMethodDeclaration> solveMethodInParentContext(String name, List<ResolvedType> argumentsTypes, boolean staticOnly) {
         Optional<Context> optionalParentContext = getParent();
         if (!optionalParentContext.isPresent()) {
             return SymbolReference.unsolved();
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/MethodUsage.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/MethodUsage.java
index 4b06008d3d..d1907db2bb 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/MethodUsage.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/MethodUsage.java
@@ -55,28 +55,14 @@ public MethodUsage(ResolvedMethodDeclaration declaration) {
     }
 
     public MethodUsage(ResolvedMethodDeclaration declaration, List<ResolvedType> paramTypes, ResolvedType returnType) {
-        this(
-                declaration,
-                paramTypes,
-                returnType,
-                declaration.getSpecifiedExceptions(),
-                ResolvedTypeParametersMap.empty());
+        this(declaration, paramTypes, returnType, declaration.getSpecifiedExceptions(), ResolvedTypeParametersMap.empty());
     }
 
-    public MethodUsage(
-            ResolvedMethodDeclaration declaration,
-            List<ResolvedType> paramTypes,
-            ResolvedType returnType,
-            List<ResolvedType> exceptionTypes) {
+    public MethodUsage(ResolvedMethodDeclaration declaration, List<ResolvedType> paramTypes, ResolvedType returnType, List<ResolvedType> exceptionTypes) {
         this(declaration, paramTypes, returnType, exceptionTypes, ResolvedTypeParametersMap.empty());
     }
 
-    private MethodUsage(
-            ResolvedMethodDeclaration declaration,
-            List<ResolvedType> paramTypes,
-            ResolvedType returnType,
-            List<ResolvedType> exceptionTypes,
-            ResolvedTypeParametersMap typeParametersMap) {
+    private MethodUsage(ResolvedMethodDeclaration declaration, List<ResolvedType> paramTypes, ResolvedType returnType, List<ResolvedType> exceptionTypes, ResolvedTypeParametersMap typeParametersMap) {
         this.declaration = declaration;
         this.paramTypes = paramTypes;
         this.returnType = returnType;
@@ -159,12 +145,7 @@ public MethodUsage replaceTypeParameter(ResolvedTypeParameterDeclaration typePar
             throw new IllegalArgumentException();
         }
         // TODO if the method declaration has a type param with that name ignore this call
-        MethodUsage res = new MethodUsage(
-                declaration,
-                paramTypes,
-                returnType,
-                exceptionTypes,
-                typeParametersMap.toBuilder().setValue(typeParameter, type).build());
+        MethodUsage res = new MethodUsage(declaration, paramTypes, returnType, exceptionTypes, typeParametersMap.toBuilder().setValue(typeParameter, type).build());
         Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes = new HashMap<>();
         for (int i = 0; i < paramTypes.size(); i++) {
             ResolvedType originalParamType = paramTypes.get(i);
@@ -274,7 +255,6 @@ public boolean isSubSignature(MethodUsage otherMethodUsage) {
      * d1 does not have the same signature as d2 (§8.4.2), and R1 = |R2|.
      */
     public boolean isReturnTypeSubstituable(MethodUsage otherMethodUsage) {
-        return getDeclaration()
-                .isReturnTypeSubstituable(otherMethodUsage.getDeclaration().getReturnType());
+        return getDeclaration().isReturnTypeSubstituable(otherMethodUsage.getDeclaration().getReturnType());
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/Navigator.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/Navigator.java
index bd52ece53a..39f23a883d 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/Navigator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/Navigator.java
@@ -52,13 +52,8 @@ public static ClassOrInterfaceDeclaration demandClass(CompilationUnit cu, String
         return cd;
     }
 
-    public static ClassOrInterfaceDeclaration demandClassOrInterface(
-            CompilationUnit compilationUnit, String qualifiedName) {
-        return findType(compilationUnit, qualifiedName)
-                .map(res -> res.toClassOrInterfaceDeclaration()
-                        .orElseThrow(() -> new IllegalStateException("Type is not a class or an interface, it is "
-                                + res.getClass().getCanonicalName())))
-                .orElseThrow(() -> new IllegalStateException("No type named '" + qualifiedName + "'found"));
+    public static ClassOrInterfaceDeclaration demandClassOrInterface(CompilationUnit compilationUnit, String qualifiedName) {
+        return findType(compilationUnit, qualifiedName).map(res -> res.toClassOrInterfaceDeclaration().orElseThrow(() -> new IllegalStateException("Type is not a class or an interface, it is " + res.getClass().getCanonicalName()))).orElseThrow(() -> new IllegalStateException("No type named '" + qualifiedName + "'found"));
     }
 
     /**
@@ -147,9 +142,7 @@ public static <N extends Node> N demandNodeOfGivenClass(Node node, Class<N> claz
     }
 
     public static Node demandParentNode(Node node) {
-        return node.getParentNode()
-                .orElseThrow(() -> new IllegalStateException(
-                        "Parent not found, the node does not appear to be inserted in a correct AST"));
+        return node.getParentNode().orElseThrow(() -> new IllegalStateException("Parent not found, the node does not appear to be inserted in a correct AST"));
     }
 
     /**
@@ -231,9 +224,7 @@ public static Optional<TypeDeclaration<?>> findType(CompilationUnit cu, String q
             return Optional.empty();
         }
         final String typeName = getOuterTypeName(qualifiedName);
-        Optional<TypeDeclaration<?>> type = cu.getTypes().stream()
-                .filter((t) -> t.getName().getId().equals(typeName))
-                .findFirst();
+        Optional<TypeDeclaration<?>> type = cu.getTypes().stream().filter((t) -> t.getName().getId().equals(typeName)).findFirst();
         final String innerTypeName = getInnerTypeName(qualifiedName);
         if (type.isPresent() && !innerTypeName.isEmpty()) {
             return findType(type.get(), innerTypeName);
@@ -251,8 +242,7 @@ public static Optional<TypeDeclaration<?>> findType(TypeDeclaration<?> td, Strin
         final String typeName = getOuterTypeName(qualifiedName);
         Optional<TypeDeclaration<?>> type = Optional.empty();
         for (Node n : td.getMembers()) {
-            if (n instanceof TypeDeclaration
-                    && ((TypeDeclaration<?>) n).getName().getId().equals(typeName)) {
+            if (n instanceof TypeDeclaration && ((TypeDeclaration<?>) n).getName().getId().equals(typeName)) {
                 type = Optional.of((TypeDeclaration<?>) n);
                 break;
             }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/Solver.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/Solver.java
index f6e1a2c87f..31aa80d0f6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/Solver.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/Solver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -57,8 +57,7 @@ public interface Solver {
      * <p>
      * It should contain its own private fields but not inherited private fields.
      */
-    SymbolReference<? extends ResolvedValueDeclaration> solveSymbolInType(
-            ResolvedTypeDeclaration typeDeclaration, String name);
+    SymbolReference<? extends ResolvedValueDeclaration> solveSymbolInType(ResolvedTypeDeclaration typeDeclaration, String name);
 
     /**
      * Try to solve a symbol just in the declaration, it does not delegate to the container.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/TypeSolver.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/TypeSolver.java
index 51bbd50d7b..c6b58c80f0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/TypeSolver.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/TypeSolver.java
@@ -73,12 +73,10 @@ default ResolvedReferenceTypeDeclaration solveType(String name) throws UnsolvedS
         throw new UnsolvedSymbolException(name, this.toString());
     }
 
-    SymbolReference<ResolvedReferenceTypeDeclaration> tryToSolveTypeInModule(
-            String qualifiedModuleName, String simpleTypeName);
+    SymbolReference<ResolvedReferenceTypeDeclaration> tryToSolveTypeInModule(String qualifiedModuleName, String simpleTypeName);
 
     default ResolvedReferenceTypeDeclaration solveTypeInModule(String qualifiedModuleName, String simpleTypeName) {
-        SymbolReference<ResolvedReferenceTypeDeclaration> ref =
-                tryToSolveTypeInModule(qualifiedModuleName, simpleTypeName);
+        SymbolReference<ResolvedReferenceTypeDeclaration> ref = tryToSolveTypeInModule(qualifiedModuleName, simpleTypeName);
         if (ref.isSolved()) {
             return ref.getCorrespondingDeclaration();
         }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/UnsolvedSymbolException.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/UnsolvedSymbolException.java
index 49392b3be8..e8667a82e2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/UnsolvedSymbolException.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/UnsolvedSymbolException.java
@@ -69,7 +69,6 @@ public String getName() {
 
     @Override
     public String toString() {
-        return "UnsolvedSymbolException{" + "context='" + context + "'" + ", name='" + name + "'" + ", cause='" + cause
-                + "'" + "}";
+        return "UnsolvedSymbolException{" + "context='" + context + "'" + ", name='" + name + "'" + ", cause='" + cause + "'" + "}";
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedClassDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedClassDeclaration.java
index 7f055b0f75..cb5e61f5a9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedClassDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedClassDeclaration.java
@@ -32,8 +32,7 @@
  *
  * @author Federico Tomassetti
  */
-public interface ResolvedClassDeclaration
-        extends ResolvedReferenceTypeDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier {
+public interface ResolvedClassDeclaration extends ResolvedReferenceTypeDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier {
 
     /**
      * This method should always return true.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedEnumDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedEnumDeclaration.java
index 43f4bcecfc..1d49d1cb21 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedEnumDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedEnumDeclaration.java
@@ -46,9 +46,6 @@ default boolean hasEnumConstant(String name) {
     }
 
     default ResolvedEnumConstantDeclaration getEnumConstant(final String name) {
-        return getEnumConstants().stream()
-                .filter(c -> c.getName().equals(name))
-                .findFirst()
-                .orElseThrow(() -> new IllegalArgumentException("No constant named " + name));
+        return getEnumConstants().stream().filter(c -> c.getName().equals(name)).findFirst().orElseThrow(() -> new IllegalArgumentException("No constant named " + name));
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedInterfaceDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedInterfaceDeclaration.java
index 4fdd9515b4..7a47684c4c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedInterfaceDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedInterfaceDeclaration.java
@@ -29,8 +29,7 @@
  *
  * @author Federico Tomassetti
  */
-public interface ResolvedInterfaceDeclaration
-        extends ResolvedReferenceTypeDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier {
+public interface ResolvedInterfaceDeclaration extends ResolvedReferenceTypeDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier {
 
     @Override
     default boolean isInterface() {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedMethodLikeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedMethodLikeDeclaration.java
index 68dea521ea..c37a388337 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedMethodLikeDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedMethodLikeDeclaration.java
@@ -31,8 +31,7 @@
  *
  * @author Federico Tomassetti
  */
-public interface ResolvedMethodLikeDeclaration
-        extends ResolvedDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier {
+public interface ResolvedMethodLikeDeclaration extends ResolvedDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier {
 
     /**
      * The package name of the declaring type.
@@ -103,8 +102,7 @@ default String getQualifiedSignature() {
      */
     default ResolvedParameterDeclaration getLastParam() {
         if (getNumberOfParams() == 0) {
-            throw new UnsupportedOperationException(
-                    "This method has no typeParametersValues, therefore it has no a last parameter");
+            throw new UnsupportedOperationException("This method has no typeParametersValues, therefore it has no a last parameter");
         }
         return getParam(getNumberOfParams() - 1);
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedRecordDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedRecordDeclaration.java
index 3f27df4a5a..af667bd5f1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedRecordDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedRecordDeclaration.java
@@ -33,8 +33,7 @@
  * @author Federico Tomassetti
  * @author Johannes Coetzee
  */
-public interface ResolvedRecordDeclaration
-        extends ResolvedReferenceTypeDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier {
+public interface ResolvedRecordDeclaration extends ResolvedReferenceTypeDeclaration, ResolvedTypeParametrizable, HasAccessSpecifier {
 
     @Override
     default boolean isRecord() {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclaration.java
index 0613db74f1..75d0b82603 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclaration.java
@@ -114,8 +114,7 @@ default List<ResolvedReferenceType> getAllAncestors() {
      * if A inherits from B, and B inherits from C and implements D, and C inherits from E
      * Apply the specified traversal
      */
-    default List<ResolvedReferenceType> getAllAncestors(
-            Function<ResolvedReferenceTypeDeclaration, List<ResolvedReferenceType>> traverser) {
+    default List<ResolvedReferenceType> getAllAncestors(Function<ResolvedReferenceTypeDeclaration, List<ResolvedReferenceType>> traverser) {
         return traverser.apply(this);
     }
 
@@ -152,16 +151,14 @@ default List<ResolvedReferenceType> getAllAncestors(
             ancestors.addAll(queuedAncestors);
             while (!queuedAncestors.isEmpty()) {
                 ResolvedReferenceType queuedAncestor = queuedAncestors.removeFirst();
-                queuedAncestor.getTypeDeclaration().ifPresent(rtd -> new LinkedHashSet<>(
-                                queuedAncestor.getDirectAncestors())
-                        .stream().forEach(ancestor -> {
-                            // add this ancestor to the queue (for a deferred search)
-                            queuedAncestors.add(ancestor);
-                            // add this ancestor to the list of ancestors
-                            if (!ancestors.contains(ancestor)) {
-                                ancestors.add(ancestor);
-                            }
-                        }));
+                queuedAncestor.getTypeDeclaration().ifPresent(rtd -> new LinkedHashSet<>(queuedAncestor.getDirectAncestors()).stream().forEach(ancestor -> {
+                    // add this ancestor to the queue (for a deferred search)
+                    queuedAncestors.add(ancestor);
+                    // add this ancestor to the list of ancestors
+                    if (!ancestors.contains(ancestor)) {
+                        ancestors.add(ancestor);
+                    }
+                }));
             }
         }
         return ancestors;
@@ -182,9 +179,7 @@ default List<ResolvedReferenceType> getAllAncestors(
      * Bar I should get a FieldDeclaration with type String.
      */
     default ResolvedFieldDeclaration getField(String name) {
-        Optional<ResolvedFieldDeclaration> field = this.getAllFields().stream()
-                .filter(f -> f.getName().equals(name))
-                .findFirst();
+        Optional<ResolvedFieldDeclaration> field = this.getAllFields().stream().filter(f -> f.getName().equals(name)).findFirst();
         if (field.isPresent()) {
             return field.get();
         }
@@ -195,9 +190,7 @@ default ResolvedFieldDeclaration getField(String name) {
      * Consider only field or inherited field which is not private.
      */
     default ResolvedFieldDeclaration getVisibleField(String name) {
-        Optional<ResolvedFieldDeclaration> field = getVisibleFields().stream()
-                .filter(f -> f.getName().equals(name))
-                .findFirst();
+        Optional<ResolvedFieldDeclaration> field = getVisibleFields().stream().filter(f -> f.getName().equals(name)).findFirst();
         if (field.isPresent()) {
             return field.get();
         }
@@ -227,9 +220,7 @@ default boolean hasVisibleField(String name) {
      * Return a list of all fields declared and the inherited ones which are not private.
      */
     default List<ResolvedFieldDeclaration> getVisibleFields() {
-        return getAllFields().stream()
-                .filter(f -> f.declaringType().equals(this) || f.accessSpecifier() != AccessSpecifier.PRIVATE)
-                .collect(Collectors.toList());
+        return getAllFields().stream().filter(f -> f.declaringType().equals(this) || f.accessSpecifier() != AccessSpecifier.PRIVATE).collect(Collectors.toList());
     }
 
     /**
@@ -250,9 +241,7 @@ default List<ResolvedFieldDeclaration> getAllStaticFields() {
      * Return a list of all the fields declared in this type.
      */
     default List<ResolvedFieldDeclaration> getDeclaredFields() {
-        return getAllFields().stream()
-                .filter(it -> it.declaringType().getQualifiedName().equals(getQualifiedName()))
-                .collect(Collectors.toList());
+        return getAllFields().stream().filter(it -> it.declaringType().getQualifiedName().equals(getQualifiedName())).collect(Collectors.toList());
     }
 
     // /
@@ -309,14 +298,7 @@ default boolean hasAnnotation(String qualifiedName) {
         if (hasDirectlyAnnotation(qualifiedName)) {
             return true;
         }
-        return isClass()
-                && getAllAncestors().stream()
-                        .filter(it -> it.asReferenceType().getTypeDeclaration().isPresent())
-                        .filter(it ->
-                                it.asReferenceType().getTypeDeclaration().get().isClass())
-                        .map(it -> it.asReferenceType().getTypeDeclaration().get())
-                        .anyMatch(rrtd ->
-                                rrtd.hasDirectlyAnnotation(qualifiedName) && rrtd.isInheritedAnnotation(qualifiedName));
+        return isClass() && getAllAncestors().stream().filter(it -> it.asReferenceType().getTypeDeclaration().isPresent()).filter(it -> it.asReferenceType().getTypeDeclaration().get().isClass()).map(it -> it.asReferenceType().getTypeDeclaration().get()).anyMatch(rrtd -> rrtd.hasDirectlyAnnotation(qualifiedName) && rrtd.isInheritedAnnotation(qualifiedName));
     }
 
     /**
@@ -331,17 +313,14 @@ default boolean isInheritedAnnotation(String name) {
      * Returns the resolved annotation corresponding to the specified name and declared in this type declaration.
      */
     default Optional<ResolvedAnnotationDeclaration> getDeclaredAnnotation(String name) {
-        return getDeclaredAnnotations().stream()
-                .filter(annotation -> annotation.getQualifiedName().endsWith(name))
-                .findFirst();
+        return getDeclaredAnnotations().stream().filter(annotation -> annotation.getQualifiedName().endsWith(name)).findFirst();
     }
 
     /**
      * Return a collection of all annotations declared in this type declaration.
      */
     default Set<ResolvedAnnotationDeclaration> getDeclaredAnnotations() {
-        throw new UnsupportedOperationException(
-                "Getting declared annotation is not supproted on this type " + this.getName());
+        throw new UnsupportedOperationException("Getting declared annotation is not supproted on this type " + this.getName());
     }
 
     /**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeDeclaration.java
index f329527012..68d6e4bd6a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeDeclaration.java
@@ -40,8 +40,7 @@ public interface ResolvedTypeDeclaration extends ResolvedDeclaration {
      * Get the list of types defined inside the current type.
      */
     default Set<ResolvedReferenceTypeDeclaration> internalTypes() {
-        throw new UnsupportedOperationException(
-                "InternalTypes not available for " + this.getClass().getCanonicalName());
+        throw new UnsupportedOperationException("InternalTypes not available for " + this.getClass().getCanonicalName());
     }
 
     /**
@@ -49,9 +48,7 @@ default Set<ResolvedReferenceTypeDeclaration> internalTypes() {
      * (Does not include internal types inside internal types).
      */
     default ResolvedReferenceTypeDeclaration getInternalType(String name) {
-        Optional<ResolvedReferenceTypeDeclaration> type = this.internalTypes().stream()
-                .filter(f -> f.getName().equals(name))
-                .findFirst();
+        Optional<ResolvedReferenceTypeDeclaration> type = this.internalTypes().stream().filter(f -> f.getName().equals(name)).findFirst();
         return type.orElseThrow(() -> new UnsolvedSymbolException("Internal type not found: " + name));
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclaration.java
index f5ddddd7d6..95089c7d17 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclaration.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclaration.java
@@ -328,10 +328,13 @@ public String toString() {
 
         @Override
         public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
+            if (this == o)
+                return true;
+            if (o == null || getClass() != o.getClass())
+                return false;
             Bound bound = (Bound) o;
-            if (extendsBound != bound.extendsBound) return false;
+            if (extendsBound != bound.extendsBound)
+                return false;
             return type != null ? type.equals(bound.type) : bound.type == null;
         }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/ConstructorResolutionLogic.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/ConstructorResolutionLogic.java
index 4464cae51a..b322e43647 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/ConstructorResolutionLogic.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/ConstructorResolutionLogic.java
@@ -38,8 +38,7 @@
  */
 public class ConstructorResolutionLogic {
 
-    private static List<ResolvedType> groupVariadicParamValues(
-            List<ResolvedType> argumentsTypes, int startVariadic, ResolvedType variadicType) {
+    private static List<ResolvedType> groupVariadicParamValues(List<ResolvedType> argumentsTypes, int startVariadic, ResolvedType variadicType) {
         List<ResolvedType> res = new ArrayList<>(argumentsTypes.subList(0, startVariadic));
         List<ResolvedType> variadicValues = argumentsTypes.subList(startVariadic, argumentsTypes.size());
         if (variadicValues.isEmpty()) {
@@ -60,16 +59,11 @@ private static ResolvedType findCommonType(List<ResolvedType> variadicValues) {
         return variadicValues.get(0);
     }
 
-    public static boolean isApplicable(
-            ResolvedConstructorDeclaration constructor, List<ResolvedType> argumentsTypes, TypeSolver typeSolver) {
+    public static boolean isApplicable(ResolvedConstructorDeclaration constructor, List<ResolvedType> argumentsTypes, TypeSolver typeSolver) {
         return isApplicable(constructor, argumentsTypes, typeSolver, false);
     }
 
-    private static boolean isApplicable(
-            ResolvedConstructorDeclaration constructor,
-            List<ResolvedType> argumentsTypes,
-            TypeSolver typeSolver,
-            boolean withWildcardTolerance) {
+    private static boolean isApplicable(ResolvedConstructorDeclaration constructor, List<ResolvedType> argumentsTypes, TypeSolver typeSolver, boolean withWildcardTolerance) {
         if (constructor.hasVariadicParameter()) {
             int pos = constructor.getNumberOfParams() - 1;
             if (constructor.getNumberOfParams() == argumentsTypes.size()) {
@@ -81,15 +75,10 @@ private static boolean isApplicable(
                         expectedType = MethodResolutionLogic.replaceTypeParam(expectedType, tp, typeSolver);
                     }
                     if (!expectedType.isAssignableBy(actualType)) {
-                        if (actualType.isArray()
-                                && expectedType.isAssignableBy(
-                                        actualType.asArrayType().getComponentType())) {
+                        if (actualType.isArray() && expectedType.isAssignableBy(actualType.asArrayType().getComponentType())) {
                             argumentsTypes.set(pos, actualType.asArrayType().getComponentType());
                         } else {
-                            argumentsTypes = groupVariadicParamValues(
-                                    argumentsTypes,
-                                    pos,
-                                    constructor.getLastParam().getType());
+                            argumentsTypes = groupVariadicParamValues(argumentsTypes, pos, constructor.getLastParam().getType());
                         }
                     }
                 }
@@ -98,8 +87,7 @@ private static boolean isApplicable(
                 if (pos > argumentsTypes.size()) {
                     return false;
                 }
-                argumentsTypes = groupVariadicParamValues(
-                        argumentsTypes, pos, constructor.getLastParam().getType());
+                argumentsTypes = groupVariadicParamValues(argumentsTypes, pos, constructor.getLastParam().getType());
             }
         }
         if (constructor.getNumberOfParams() != argumentsTypes.size()) {
@@ -110,24 +98,19 @@ private static boolean isApplicable(
         for (int i = 0; i < constructor.getNumberOfParams(); i++) {
             ResolvedType expectedType = constructor.getParam(i).getType();
             ResolvedType actualType = argumentsTypes.get(i);
-            if ((expectedType.isTypeVariable() && !(expectedType.isWildcard()))
-                    && expectedType.asTypeParameter().declaredOnMethod()) {
+            if ((expectedType.isTypeVariable() && !(expectedType.isWildcard())) && expectedType.asTypeParameter().declaredOnMethod()) {
                 matchedParameters.put(expectedType.asTypeParameter().getName(), actualType);
                 continue;
             }
-            boolean isAssignableWithoutSubstitution = expectedType.isAssignableBy(actualType)
-                    || (constructor.getParam(i).isVariadic()
-                            && new ResolvedArrayType(expectedType).isAssignableBy(actualType));
+            boolean isAssignableWithoutSubstitution = expectedType.isAssignableBy(actualType) || (constructor.getParam(i).isVariadic() && new ResolvedArrayType(expectedType).isAssignableBy(actualType));
             if (!isAssignableWithoutSubstitution && expectedType.isReferenceType() && actualType.isReferenceType()) {
-                isAssignableWithoutSubstitution = MethodResolutionLogic.isAssignableMatchTypeParameters(
-                        expectedType.asReferenceType(), actualType.asReferenceType(), matchedParameters);
+                isAssignableWithoutSubstitution = MethodResolutionLogic.isAssignableMatchTypeParameters(expectedType.asReferenceType(), actualType.asReferenceType(), matchedParameters);
             }
             if (!isAssignableWithoutSubstitution) {
                 for (ResolvedTypeParameterDeclaration tp : constructor.getTypeParameters()) {
                     expectedType = MethodResolutionLogic.replaceTypeParam(expectedType, tp, typeSolver);
                 }
-                for (ResolvedTypeParameterDeclaration tp :
-                        constructor.declaringType().getTypeParameters()) {
+                for (ResolvedTypeParameterDeclaration tp : constructor.declaringType().getTypeParameters()) {
                     expectedType = MethodResolutionLogic.replaceTypeParam(expectedType, tp, typeSolver);
                 }
                 if (!expectedType.isAssignableBy(actualType)) {
@@ -153,26 +136,16 @@ private static boolean isApplicable(
      * @param typeSolver
      * @return
      */
-    public static SymbolReference<ResolvedConstructorDeclaration> findMostApplicable(
-            List<ResolvedConstructorDeclaration> constructors,
-            List<ResolvedType> argumentsTypes,
-            TypeSolver typeSolver) {
-        SymbolReference<ResolvedConstructorDeclaration> res =
-                findMostApplicable(constructors, argumentsTypes, typeSolver, false);
+    public static SymbolReference<ResolvedConstructorDeclaration> findMostApplicable(List<ResolvedConstructorDeclaration> constructors, List<ResolvedType> argumentsTypes, TypeSolver typeSolver) {
+        SymbolReference<ResolvedConstructorDeclaration> res = findMostApplicable(constructors, argumentsTypes, typeSolver, false);
         if (res.isSolved()) {
             return res;
         }
         return findMostApplicable(constructors, argumentsTypes, typeSolver, true);
     }
 
-    public static SymbolReference<ResolvedConstructorDeclaration> findMostApplicable(
-            List<ResolvedConstructorDeclaration> constructors,
-            List<ResolvedType> argumentsTypes,
-            TypeSolver typeSolver,
-            boolean wildcardTolerance) {
-        List<ResolvedConstructorDeclaration> applicableConstructors = constructors.stream()
-                .filter((m) -> isApplicable(m, argumentsTypes, typeSolver, wildcardTolerance))
-                .collect(Collectors.toList());
+    public static SymbolReference<ResolvedConstructorDeclaration> findMostApplicable(List<ResolvedConstructorDeclaration> constructors, List<ResolvedType> argumentsTypes, TypeSolver typeSolver, boolean wildcardTolerance) {
+        List<ResolvedConstructorDeclaration> applicableConstructors = constructors.stream().filter((m) -> isApplicable(m, argumentsTypes, typeSolver, wildcardTolerance)).collect(Collectors.toList());
         if (applicableConstructors.isEmpty()) {
             return SymbolReference.unsolved();
         }
@@ -190,10 +163,7 @@ public static SymbolReference<ResolvedConstructorDeclaration> findMostApplicable
                 possibleAmbiguity = false;
                 winningCandidate = other;
             } else {
-                if (winningCandidate
-                        .declaringType()
-                        .getQualifiedName()
-                        .equals(other.declaringType().getQualifiedName())) {
+                if (winningCandidate.declaringType().getQualifiedName().equals(other.declaringType().getQualifiedName())) {
                     possibleAmbiguity = true;
                 } else {
                     // we expect the methods to be ordered such that inherited methods are later in the list
@@ -205,9 +175,7 @@ public static SymbolReference<ResolvedConstructorDeclaration> findMostApplicable
                     if (MethodResolutionLogic.isExactMatch(other, argumentsTypes)) {
                         winningCandidate = other;
                     } else {
-                        throw new MethodAmbiguityException(
-                                "Ambiguous constructor call: cannot find a most applicable constructor: "
-                                        + winningCandidate + ", " + other);
+                        throw new MethodAmbiguityException("Ambiguous constructor call: cannot find a most applicable constructor: " + winningCandidate + ", " + other);
                     }
                 }
             }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/FunctionalInterfaceLogic.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/FunctionalInterfaceLogic.java
index 6db2df71c1..27d8698c82 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/FunctionalInterfaceLogic.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/FunctionalInterfaceLogic.java
@@ -44,8 +44,7 @@ private FunctionalInterfaceLogic() {
      * Get the functional method defined by the type, if any.
      */
     public static Optional<MethodUsage> getFunctionalMethod(ResolvedType type) {
-        Optional<ResolvedReferenceTypeDeclaration> optionalTypeDeclaration =
-                type.asReferenceType().getTypeDeclaration();
+        Optional<ResolvedReferenceTypeDeclaration> optionalTypeDeclaration = type.asReferenceType().getTypeDeclaration();
         if (!optionalTypeDeclaration.isPresent()) {
             return Optional.empty();
         }
@@ -63,11 +62,8 @@ public static Optional<MethodUsage> getFunctionalMethod(ResolvedReferenceTypeDec
         // We need to find all abstract methods
         // Remove methods inherited by Object:
         Set<MethodUsage> // Remove methods inherited by Object:
-                // Consider the case of Comparator which define equals. It would be considered a functional method.
-                methods = typeDeclaration.getAllMethods().stream()
-                        .filter(m -> m.getDeclaration().isAbstract())
-                        .filter(m -> !isPublicMemberOfObject(m))
-                        .collect(Collectors.toSet());
+        // Consider the case of Comparator which define equals. It would be considered a functional method.
+        methods = typeDeclaration.getAllMethods().stream().filter(m -> m.getDeclaration().isAbstract()).filter(m -> !isPublicMemberOfObject(m)).collect(Collectors.toSet());
         // TODO a functional interface can have multiple subsignature method with a return-type-substitutable
         // see https://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.8
         if (methods.size() == 0) {
@@ -77,9 +73,7 @@ public static Optional<MethodUsage> getFunctionalMethod(ResolvedReferenceTypeDec
         MethodUsage methodUsage = iterator.next();
         while (iterator.hasNext()) {
             MethodUsage otherMethodUsage = iterator.next();
-            if (!(methodUsage.isSameSignature(otherMethodUsage)
-                    || methodUsage.isSubSignature(otherMethodUsage)
-                    || otherMethodUsage.isSubSignature(methodUsage))) {
+            if (!(methodUsage.isSameSignature(otherMethodUsage) || methodUsage.isSubSignature(otherMethodUsage) || otherMethodUsage.isSubSignature(methodUsage))) {
                 methodUsage = null;
                 break;
             }
@@ -93,10 +87,8 @@ public static Optional<MethodUsage> getFunctionalMethod(ResolvedReferenceTypeDec
 
     public static boolean isFunctionalInterfaceType(ResolvedType type) {
         if (type.isReferenceType()) {
-            Optional<ResolvedReferenceTypeDeclaration> optionalTypeDeclaration =
-                    type.asReferenceType().getTypeDeclaration();
-            if (optionalTypeDeclaration.isPresent()
-                    && optionalTypeDeclaration.get().hasAnnotation(JAVA_LANG_FUNCTIONAL_INTERFACE)) {
+            Optional<ResolvedReferenceTypeDeclaration> optionalTypeDeclaration = type.asReferenceType().getTypeDeclaration();
+            if (optionalTypeDeclaration.isPresent() && optionalTypeDeclaration.get().hasAnnotation(JAVA_LANG_FUNCTIONAL_INTERFACE)) {
                 return true;
             }
         }
@@ -104,24 +96,14 @@ public static boolean isFunctionalInterfaceType(ResolvedType type) {
     }
 
     private static String getSignature(Method m) {
-        return String.format(
-                "%s(%s)",
-                m.getName(),
-                String.join(
-                        ", ",
-                        Arrays.stream(m.getParameters())
-                                .map(p -> toSignature(p))
-                                .collect(Collectors.toList())));
+        return String.format("%s(%s)", m.getName(), String.join(", ", Arrays.stream(m.getParameters()).map(p -> toSignature(p)).collect(Collectors.toList())));
     }
 
     private static String toSignature(Parameter p) {
         return p.getType().getCanonicalName();
     }
 
-    private static List<String> OBJECT_PUBLIC_METHODS_SIGNATURES = Arrays.stream(Object.class.getDeclaredMethods())
-            .filter(m -> Modifier.isPublic(m.getModifiers()))
-            .map(method -> getSignature(method))
-            .collect(Collectors.toList());
+    private static List<String> OBJECT_PUBLIC_METHODS_SIGNATURES = Arrays.stream(Object.class.getDeclaredMethods()).filter(m -> Modifier.isPublic(m.getModifiers())).map(method -> getSignature(method)).collect(Collectors.toList());
 
     private static boolean isPublicMemberOfObject(MethodUsage m) {
         return OBJECT_PUBLIC_METHODS_SIGNATURES.contains(m.getDeclaration().getSignature());
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceContext.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceContext.java
index 019da54f6e..cee16a5fa4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceContext.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceContext.java
@@ -48,8 +48,7 @@ public InferenceContext(TypeSolver typeSolver) {
 
     private InferenceVariableType inferenceVariableTypeForTp(ResolvedTypeParameterDeclaration tp) {
         if (!inferenceVariableTypeMap.containsKey(tp.getName())) {
-            InferenceVariableType inferenceVariableType =
-                    new InferenceVariableType(nextInferenceVariableId++, typeSolver);
+            InferenceVariableType inferenceVariableType = new InferenceVariableType(nextInferenceVariableId++, typeSolver);
             inferenceVariableTypes.add(inferenceVariableType);
             inferenceVariableType.setCorrespondingTp(tp);
             inferenceVariableTypeMap.put(tp.getName(), inferenceVariableType);
@@ -81,23 +80,11 @@ private void registerCorrespondance(ResolvedType formalType, ResolvedType actual
                 // Interfaces do not extend the class Object,
                 // which means that if the formal parameter is of type Object,
                 // all types can match including the actual type.
-                List<ResolvedType> correspondingFormalType = "java.lang.Object".equals(formalParamTypeQName)
-                        ? Stream.concat(
-                                        new ArrayList<ResolvedType>(Arrays.asList(actualType)).stream(),
-                                        ancestors.stream()
-                                                .map(ancestor -> ancestor.asReferenceType())
-                                                .collect(Collectors.toList())
-                                                .stream())
-                                .collect(Collectors.toList())
-                        : ancestors.stream()
-                                .filter((a) -> a.getQualifiedName().equals(formalParamTypeQName))
-                                .collect(Collectors.toList());
+                List<ResolvedType> correspondingFormalType = "java.lang.Object".equals(formalParamTypeQName) ? Stream.concat(new ArrayList<ResolvedType>(Arrays.asList(actualType)).stream(), ancestors.stream().map(ancestor -> ancestor.asReferenceType()).collect(Collectors.toList()).stream()).collect(Collectors.toList()) : ancestors.stream().filter((a) -> a.getQualifiedName().equals(formalParamTypeQName)).collect(Collectors.toList());
                 if (correspondingFormalType.isEmpty()) {
                     ancestors = formalTypeAsReference.getAllAncestors();
                     final String actualParamTypeQname = actualTypeAsReference.getQualifiedName();
-                    List<ResolvedType> correspondingActualType = ancestors.stream()
-                            .filter(a -> a.getQualifiedName().equals(actualParamTypeQname))
-                            .collect(Collectors.toList());
+                    List<ResolvedType> correspondingActualType = ancestors.stream().filter(a -> a.getQualifiedName().equals(actualParamTypeQname)).collect(Collectors.toList());
                     if (correspondingActualType.isEmpty()) {
                         throw new ConflictingGenericTypesException(formalType, actualType);
                     }
@@ -112,9 +99,7 @@ private void registerCorrespondance(ResolvedType formalType, ResolvedType actual
                     } else {
                         int i = 0;
                         for (ResolvedType formalTypeParameter : formalTypeAsReference.typeParametersValues()) {
-                            registerCorrespondance(
-                                    formalTypeParameter,
-                                    actualTypeAsReference.typeParametersValues().get(i));
+                            registerCorrespondance(formalTypeParameter, actualTypeAsReference.typeParametersValues().get(i));
                             i++;
                         }
                     }
@@ -130,18 +115,13 @@ private void registerCorrespondance(ResolvedType formalType, ResolvedType actual
         } else if (actualType.equals(formalType)) {
             // nothing to do
         } else if (actualType.isArray() && formalType.isArray()) {
-            registerCorrespondance(
-                    formalType.asArrayType().getComponentType(),
-                    actualType.asArrayType().getComponentType());
+            registerCorrespondance(formalType.asArrayType().getComponentType(), actualType.asArrayType().getComponentType());
         } else if (formalType.isWildcard()) {
             // nothing to do
-            if ((actualType instanceof InferenceVariableType)
-                    && formalType.asWildcard().isBounded()) {
-                ((InferenceVariableType) actualType)
-                        .registerEquivalentType(formalType.asWildcard().getBoundedType());
+            if ((actualType instanceof InferenceVariableType) && formalType.asWildcard().isBounded()) {
+                ((InferenceVariableType) actualType).registerEquivalentType(formalType.asWildcard().getBoundedType());
                 if (formalType.asWildcard().getBoundedType() instanceof InferenceVariableType) {
-                    ((InferenceVariableType) formalType.asWildcard().getBoundedType())
-                            .registerEquivalentType(actualType);
+                    ((InferenceVariableType) formalType.asWildcard().getBoundedType()).registerEquivalentType(actualType);
                 }
             }
             if (actualType.isWildcard()) {
@@ -149,11 +129,9 @@ private void registerCorrespondance(ResolvedType formalType, ResolvedType actual
                 ResolvedWildcard actualWildcard = actualType.asWildcard();
                 if (formalWildcard.isBounded() && formalWildcard.getBoundedType() instanceof InferenceVariableType) {
                     if (formalWildcard.isSuper() && actualWildcard.isSuper()) {
-                        ((InferenceVariableType) formalType.asWildcard().getBoundedType())
-                                .registerEquivalentType(actualWildcard.getBoundedType());
+                        ((InferenceVariableType) formalType.asWildcard().getBoundedType()).registerEquivalentType(actualWildcard.getBoundedType());
                     } else if (formalWildcard.isExtends() && actualWildcard.isExtends()) {
-                        ((InferenceVariableType) formalType.asWildcard().getBoundedType())
-                                .registerEquivalentType(actualWildcard.getBoundedType());
+                        ((InferenceVariableType) formalType.asWildcard().getBoundedType()).registerEquivalentType(actualWildcard.getBoundedType());
                     }
                 }
             }
@@ -177,15 +155,13 @@ private void registerCorrespondance(ResolvedType formalType, ResolvedType actual
             if (formalType.isPrimitive()) {
                 // nothing to do
             } else {
-                ResolvedReferenceTypeDeclaration resolvedTypedeclaration =
-                        typeSolver.solveType(actualType.asPrimitive().getBoxTypeQName());
+                ResolvedReferenceTypeDeclaration resolvedTypedeclaration = typeSolver.solveType(actualType.asPrimitive().getBoxTypeQName());
                 registerCorrespondance(formalType, new ReferenceTypeImpl(resolvedTypedeclaration));
             }
         } else if (actualType.isReferenceType()) {
             if (formalType.isPrimitive()) {
                 if (formalType.asPrimitive().getBoxTypeQName().equals(actualType.describe())) {
-                    ResolvedReferenceTypeDeclaration resolvedTypedeclaration =
-                            typeSolver.solveType(formalType.asPrimitive().getBoxTypeQName());
+                    ResolvedReferenceTypeDeclaration resolvedTypedeclaration = typeSolver.solveType(formalType.asPrimitive().getBoxTypeQName());
                     registerCorrespondance(new ReferenceTypeImpl(resolvedTypedeclaration), actualType);
                 } else {
                     // nothing to do
@@ -208,12 +184,10 @@ private void registerCorrespondance(ResolvedType formalType, ResolvedType actual
     private ResolvedType placeInferenceVariables(ResolvedType type) {
         if (type.isWildcard()) {
             if (type.asWildcard().isExtends()) {
-                return ResolvedWildcard.extendsBound(
-                        placeInferenceVariables(type.asWildcard().getBoundedType()));
+                return ResolvedWildcard.extendsBound(placeInferenceVariables(type.asWildcard().getBoundedType()));
             }
             if (type.asWildcard().isSuper()) {
-                return ResolvedWildcard.superBound(
-                        placeInferenceVariables(type.asWildcard().getBoundedType()));
+                return ResolvedWildcard.superBound(placeInferenceVariables(type.asWildcard().getBoundedType()));
             }
             return type;
         }
@@ -224,15 +198,13 @@ private ResolvedType placeInferenceVariables(ResolvedType type) {
             return type.asReferenceType().transformTypeParameters(tp -> placeInferenceVariables(tp));
         }
         if (type.isArray()) {
-            return new ResolvedArrayType(
-                    placeInferenceVariables(type.asArrayType().getComponentType()));
+            return new ResolvedArrayType(placeInferenceVariables(type.asArrayType().getComponentType()));
         }
         if (type.isNull() || type.isPrimitive() || type.isVoid()) {
             return type;
         }
         if (type.isConstraint()) {
-            return ResolvedLambdaConstraintType.bound(
-                    placeInferenceVariables(type.asConstraintType().getBound()));
+            return ResolvedLambdaConstraintType.bound(placeInferenceVariables(type.asConstraintType().getBound()));
         }
         if (type instanceof InferenceVariableType) {
             return type;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceVariableType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceVariableType.java
index c342e4bc2a..082d026a1e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceVariableType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/InferenceVariableType.java
@@ -61,8 +61,10 @@ public void registerEquivalentType(ResolvedType type) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof InferenceVariableType)) return false;
+        if (this == o)
+            return true;
+        if (!(o instanceof InferenceVariableType))
+            return false;
         InferenceVariableType that = (InferenceVariableType) o;
         return id == that.id;
     }
@@ -89,21 +91,16 @@ public boolean isAssignableBy(ResolvedType other) {
         throw new UnsupportedOperationException();
     }
 
-    private Set<ResolvedType> concreteEquivalentTypesAlsoIndirectly(
-            Set<InferenceVariableType> considered, InferenceVariableType inferenceVariableType) {
+    private Set<ResolvedType> concreteEquivalentTypesAlsoIndirectly(Set<InferenceVariableType> considered, InferenceVariableType inferenceVariableType) {
         considered.add(inferenceVariableType);
         Set<ResolvedType> result = new HashSet<>();
-        result.addAll(inferenceVariableType.equivalentTypes.stream()
-                .filter(t -> !t.isTypeVariable() && !(t instanceof InferenceVariableType))
-                .collect(Collectors.toSet()));
-        inferenceVariableType.equivalentTypes.stream()
-                .filter(t -> t instanceof InferenceVariableType)
-                .forEach(t -> {
-                    InferenceVariableType ivt = (InferenceVariableType) t;
-                    if (!considered.contains(ivt)) {
-                        result.addAll(concreteEquivalentTypesAlsoIndirectly(considered, ivt));
-                    }
-                });
+        result.addAll(inferenceVariableType.equivalentTypes.stream().filter(t -> !t.isTypeVariable() && !(t instanceof InferenceVariableType)).collect(Collectors.toSet()));
+        inferenceVariableType.equivalentTypes.stream().filter(t -> t instanceof InferenceVariableType).forEach(t -> {
+            InferenceVariableType ivt = (InferenceVariableType) t;
+            if (!considered.contains(ivt)) {
+                result.addAll(concreteEquivalentTypesAlsoIndirectly(considered, ivt));
+            }
+        });
         return result;
     }
 
@@ -118,9 +115,7 @@ public ResolvedType equivalentType() {
         if (concreteEquivalent.size() == 1) {
             return concreteEquivalent.iterator().next();
         }
-        Set<ResolvedType> notTypeVariables = equivalentTypes.stream()
-                .filter(t -> !t.isTypeVariable() && !hasInferenceVariables(t))
-                .collect(Collectors.toSet());
+        Set<ResolvedType> notTypeVariables = equivalentTypes.stream().filter(t -> !t.isTypeVariable() && !hasInferenceVariables(t)).collect(Collectors.toSet());
         if (notTypeVariables.size() == 1) {
             return notTypeVariables.iterator().next();
         }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionCapability.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionCapability.java
index d4a3d9d794..cbdf13c65e 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionCapability.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionCapability.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -27,6 +27,5 @@
 
 public interface MethodResolutionCapability {
 
-    SymbolReference<ResolvedMethodDeclaration> solveMethod(
-            String name, List<ResolvedType> argumentsTypes, boolean staticOnly);
+    SymbolReference<ResolvedMethodDeclaration> solveMethod(String name, List<ResolvedType> argumentsTypes, boolean staticOnly);
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionLogic.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionLogic.java
index f90f9b8313..ca1de400db 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionLogic.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/logic/MethodResolutionLogic.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -41,8 +41,7 @@ public class MethodResolutionLogic {
 
     private static String JAVA_LANG_OBJECT = Object.class.getCanonicalName();
 
-    private static List<ResolvedType> groupVariadicParamValues(
-            List<ResolvedType> argumentsTypes, int startVariadic, ResolvedType variadicType) {
+    private static List<ResolvedType> groupVariadicParamValues(List<ResolvedType> argumentsTypes, int startVariadic, ResolvedType variadicType) {
         List<ResolvedType> res = new ArrayList<>(argumentsTypes.subList(0, startVariadic));
         List<ResolvedType> variadicValues = argumentsTypes.subList(startVariadic, argumentsTypes.size());
         if (variadicValues.isEmpty()) {
@@ -63,13 +62,11 @@ private static ResolvedType findCommonType(List<ResolvedType> variadicValues) {
         return variadicValues.get(0);
     }
 
-    public static boolean isApplicable(
-            ResolvedMethodDeclaration method, String name, List<ResolvedType> argumentsTypes, TypeSolver typeSolver) {
+    public static boolean isApplicable(ResolvedMethodDeclaration method, String name, List<ResolvedType> argumentsTypes, TypeSolver typeSolver) {
         return isApplicable(method, name, argumentsTypes, typeSolver, false);
     }
 
-    private static boolean isConflictingLambdaType(
-            LambdaArgumentTypePlaceholder lambdaPlaceholder, ResolvedType expectedType) {
+    private static boolean isConflictingLambdaType(LambdaArgumentTypePlaceholder lambdaPlaceholder, ResolvedType expectedType) {
         // TODO: It might be possible to use the resolved type variable here, but that would either require
         //  a type parameters map to be passed in, or the type variable to be resolved here which could lead
         //  to duplicated work or maybe infinite recursion.
@@ -81,9 +78,7 @@ private static boolean isConflictingLambdaType(
             MethodUsage functionalInterface = maybeFunctionalInterface.get();
             // If the lambda expression does not have the same number of parameters as the functional interface
             // method, the lambda cannot implement that interface.
-            if (lambdaPlaceholder.getParameterCount().isPresent()
-                    && functionalInterface.getNoParams()
-                            != lambdaPlaceholder.getParameterCount().get()) {
+            if (lambdaPlaceholder.getParameterCount().isPresent() && functionalInterface.getNoParams() != lambdaPlaceholder.getParameterCount().get()) {
                 return true;
             }
             // If the lambda method has a block body then:
@@ -92,8 +87,7 @@ private static boolean isConflictingLambdaType(
             //   2. If the block contains an empty return statement, or no return statement, the lambda can only
             //      implement void methods.
             if (lambdaPlaceholder.bodyBlockHasExplicitNonVoidReturn().isPresent()) {
-                boolean lambdaReturnIsVoid =
-                        !lambdaPlaceholder.bodyBlockHasExplicitNonVoidReturn().get();
+                boolean lambdaReturnIsVoid = !lambdaPlaceholder.bodyBlockHasExplicitNonVoidReturn().get();
                 if (lambdaReturnIsVoid && !functionalInterface.returnType().isVoid()) {
                     return true;
                 }
@@ -114,12 +108,7 @@ private static boolean isConflictingLambdaType(
      *
      * @see {@link MethodResolutionLogic#isApplicable(MethodUsage, String, List, TypeSolver)}
      */
-    private static boolean isApplicable(
-            ResolvedMethodDeclaration methodDeclaration,
-            String needleName,
-            List<ResolvedType> needleArgumentTypes,
-            TypeSolver typeSolver,
-            boolean withWildcardTolerance) {
+    private static boolean isApplicable(ResolvedMethodDeclaration methodDeclaration, String needleName, List<ResolvedType> needleArgumentTypes, TypeSolver typeSolver, boolean withWildcardTolerance) {
         if (!methodDeclaration.getName().equals(needleName)) {
             return false;
         }
@@ -133,8 +122,7 @@ private static boolean isApplicable(
         // The index of the final argument passed (on the method usage).
         int countOfNeedleArgumentsPassed = needleArgumentTypes.size();
         boolean methodIsDeclaredWithVariadicParameter = methodDeclaration.hasVariadicParameter();
-        if (!methodIsDeclaredWithVariadicParameter
-                && (countOfNeedleArgumentsPassed != countOfMethodParametersDeclared)) {
+        if (!methodIsDeclaredWithVariadicParameter && (countOfNeedleArgumentsPassed != countOfMethodParametersDeclared)) {
             // If it is not variadic, and the number of parameters/arguments are unequal -- this is not a match.
             return false;
         }
@@ -148,8 +136,7 @@ private static boolean isApplicable(
             // If the method declaration we're considering has a variadic parameter,
             // attempt to convert the given list of arguments to fit this pattern
             // e.g. foo(String s, String... s2) {} --- consider the first argument, then group the remainder as an array
-            ResolvedType expectedVariadicParameterType =
-                    methodDeclaration.getLastParam().getType();
+            ResolvedType expectedVariadicParameterType = methodDeclaration.getLastParam().getType();
             for (ResolvedTypeParameterDeclaration tp : methodDeclaration.getTypeParameters()) {
                 expectedVariadicParameterType = replaceTypeParam(expectedVariadicParameterType, tp, typeSolver);
             }
@@ -158,26 +145,20 @@ private static boolean isApplicable(
                 // array.
                 // Confirm all of these grouped "trailing" arguments have the required type -- if not, this is not a
                 // valid type. (Maybe this is also done later..?)
-                for (int variadicArgumentIndex = countOfMethodParametersDeclared;
-                        variadicArgumentIndex < countOfNeedleArgumentsPassed;
-                        variadicArgumentIndex++) {
+                for (int variadicArgumentIndex = countOfMethodParametersDeclared; variadicArgumentIndex < countOfNeedleArgumentsPassed; variadicArgumentIndex++) {
                     ResolvedType currentArgumentType = needleArgumentTypes.get(variadicArgumentIndex);
-                    ResolvedType variadicComponentType =
-                            expectedVariadicParameterType.asArrayType().getComponentType();
-                    boolean argumentIsAssignableToVariadicComponentType =
-                            variadicComponentType.isAssignableBy(currentArgumentType);
+                    ResolvedType variadicComponentType = expectedVariadicParameterType.asArrayType().getComponentType();
+                    boolean argumentIsAssignableToVariadicComponentType = variadicComponentType.isAssignableBy(currentArgumentType);
                     // Check boxing/unboxing for varargs
                     if (!argumentIsAssignableToVariadicComponentType) {
-                        argumentIsAssignableToVariadicComponentType = isBoxingCompatibleWithTypeSolver(
-                                variadicComponentType, currentArgumentType, typeSolver);
+                        argumentIsAssignableToVariadicComponentType = isBoxingCompatibleWithTypeSolver(variadicComponentType, currentArgumentType, typeSolver);
                     }
                     if (!argumentIsAssignableToVariadicComponentType) {
                         return false;
                     }
                 }
             }
-            needleArgumentTypes = groupTrailingArgumentsIntoArray(
-                    methodDeclaration, needleArgumentTypes, expectedVariadicParameterType);
+            needleArgumentTypes = groupTrailingArgumentsIntoArray(methodDeclaration, needleArgumentTypes, expectedVariadicParameterType);
         }
         // The index of the final argument passed (on the method usage).
         int countOfNeedleArgumentsPassedAfterGrouping = needleArgumentTypes.size();
@@ -191,13 +172,10 @@ private static boolean isApplicable(
         for (int i = 0; i < countOfMethodParametersDeclared; i++) {
             ResolvedType expectedDeclaredType = methodDeclaration.getParam(i).getType();
             ResolvedType actualArgumentType = needleArgumentTypes.get(i);
-            if (actualArgumentType instanceof LambdaArgumentTypePlaceholder
-                    && isConflictingLambdaType(
-                            (LambdaArgumentTypePlaceholder) actualArgumentType, expectedDeclaredType)) {
+            if (actualArgumentType instanceof LambdaArgumentTypePlaceholder && isConflictingLambdaType((LambdaArgumentTypePlaceholder) actualArgumentType, expectedDeclaredType)) {
                 return false;
             }
-            if ((expectedDeclaredType.isTypeVariable() && !(expectedDeclaredType.isWildcard()))
-                    && expectedDeclaredType.asTypeParameter().declaredOnMethod()) {
+            if ((expectedDeclaredType.isTypeVariable() && !(expectedDeclaredType.isWildcard())) && expectedDeclaredType.asTypeParameter().declaredOnMethod()) {
                 matchedParameters.put(expectedDeclaredType.asTypeParameter().getName(), actualArgumentType);
                 continue;
             }
@@ -207,22 +185,12 @@ && isConflictingLambdaType(
             // The method call expression String.format("%d", new int[] {1})
             // must refer to the method String.format(String, Object...)
             // even if an array of primitive type cannot be assigned to an array of Object
-            if (methodDeclaration.getParam(i).isVariadic()
-                    && (i == countOfMethodParametersDeclared - 1)
-                    && isArrayOfObject(expectedDeclaredType)
-                    && actualArgumentType.isArray()) {
+            if (methodDeclaration.getParam(i).isVariadic() && (i == countOfMethodParametersDeclared - 1) && isArrayOfObject(expectedDeclaredType) && actualArgumentType.isArray()) {
                 continue;
             }
-            boolean isAssignableWithoutSubstitution = expectedDeclaredType.isAssignableBy(actualArgumentType)
-                    || (methodDeclaration.getParam(i).isVariadic()
-                            && convertToVariadicParameter(expectedDeclaredType).isAssignableBy(actualArgumentType));
-            if (!isAssignableWithoutSubstitution
-                    && expectedDeclaredType.isReferenceType()
-                    && actualArgumentType.isReferenceType()) {
-                isAssignableWithoutSubstitution = isAssignableMatchTypeParameters(
-                        expectedDeclaredType.asReferenceType(),
-                        actualArgumentType.asReferenceType(),
-                        matchedParameters);
+            boolean isAssignableWithoutSubstitution = expectedDeclaredType.isAssignableBy(actualArgumentType) || (methodDeclaration.getParam(i).isVariadic() && convertToVariadicParameter(expectedDeclaredType).isAssignableBy(actualArgumentType));
+            if (!isAssignableWithoutSubstitution && expectedDeclaredType.isReferenceType() && actualArgumentType.isReferenceType()) {
+                isAssignableWithoutSubstitution = isAssignableMatchTypeParameters(expectedDeclaredType.asReferenceType(), actualArgumentType.asReferenceType(), matchedParameters);
             }
             if (!isAssignableWithoutSubstitution) {
                 List<ResolvedTypeParameterDeclaration> typeParameters = methodDeclaration.getTypeParameters();
@@ -236,9 +204,7 @@ && isArrayOfObject(expectedDeclaredType)
                         // This parameter is compatible via boxing/unboxing
                         continue;
                     }
-                    if (actualArgumentType.isWildcard()
-                            && withWildcardTolerance
-                            && !expectedDeclaredType.isPrimitive()) {
+                    if (actualArgumentType.isWildcard() && withWildcardTolerance && !expectedDeclaredType.isPrimitive()) {
                         needForWildCardTolerance = true;
                         continue;
                     }
@@ -247,16 +213,7 @@ && isArrayOfObject(expectedDeclaredType)
                     // for example LambdaConstraintType{bound=TypeVariable {ReflectionTypeParameter{typeVariable=T}}},
                     // LambdaConstraintType{bound=TypeVariable {ReflectionTypeParameter{typeVariable=U}}}
                     // we want to keep this method for future resolution
-                    if (actualArgumentType.isConstraint()
-                            && withWildcardTolerance
-                            && (actualArgumentType.asConstraintType().getBound().isTypeVariable()
-                                    || (!actualArgumentType
-                                                    .asConstraintType()
-                                                    .getBound()
-                                                    .isTypeVariable()
-                                            && expectedDeclaredType.isAssignableBy(actualArgumentType
-                                                    .asConstraintType()
-                                                    .getBound())))) {
+                    if (actualArgumentType.isConstraint() && withWildcardTolerance && (actualArgumentType.asConstraintType().getBound().isTypeVariable() || (!actualArgumentType.asConstraintType().getBound().isTypeVariable() && expectedDeclaredType.isAssignableBy(actualArgumentType.asConstraintType().getBound())))) {
                         needForWildCardTolerance = true;
                         continue;
                     }
@@ -273,9 +230,7 @@ && isArrayOfObject(expectedDeclaredType)
     }
 
     private static boolean isArrayOfObject(ResolvedType type) {
-        return type.isArray()
-                && type.asArrayType().getComponentType().isReferenceType()
-                && type.asArrayType().getComponentType().asReferenceType().isJavaLangObject();
+        return type.isArray() && type.asArrayType().getComponentType().isReferenceType() && type.asArrayType().getComponentType().asReferenceType().isJavaLangObject();
     }
 
     private static ResolvedArrayType convertToVariadicParameter(ResolvedType type) {
@@ -293,10 +248,7 @@ private static int getLastParameterIndex(int countOfMethodParametersDeclared) {
         return Math.max(0, countOfMethodParametersDeclared - 1);
     }
 
-    private static List<ResolvedType> groupTrailingArgumentsIntoArray(
-            ResolvedMethodDeclaration methodDeclaration,
-            List<ResolvedType> needleArgumentTypes,
-            ResolvedType expectedVariadicParameterType) {
+    private static List<ResolvedType> groupTrailingArgumentsIntoArray(ResolvedMethodDeclaration methodDeclaration, List<ResolvedType> needleArgumentTypes, ResolvedType expectedVariadicParameterType) {
         // The index of the final method parameter (on the method declaration).
         int countOfMethodParametersDeclared = methodDeclaration.getNumberOfParams();
         int lastMethodParameterIndex = getLastParameterIndex(countOfMethodParametersDeclared);
@@ -306,25 +258,17 @@ private static List<ResolvedType> groupTrailingArgumentsIntoArray(
         if (countOfNeedleArgumentsPassed > countOfMethodParametersDeclared) {
             // If it is variadic, and we have an "excess" of arguments, group the "trailing" arguments into an array.
             // Here we are sure that all of these grouped "trailing" arguments have the required type
-            needleArgumentTypes = groupVariadicParamValues(
-                    needleArgumentTypes,
-                    lastMethodParameterIndex,
-                    methodDeclaration.getLastParam().getType());
+            needleArgumentTypes = groupVariadicParamValues(needleArgumentTypes, lastMethodParameterIndex, methodDeclaration.getLastParam().getType());
         }
         if (countOfNeedleArgumentsPassed == (countOfMethodParametersDeclared - 1)) {
             // If it is variadic and we are short of **exactly one** parameter, this is a match.
             // Note that omitting the variadic parameter is treated as an empty array
             //  (thus being short of only 1 argument is fine, but being short of 2 or more is not).
             // thus group the "empty" value into an empty array...
-            needleArgumentTypes = groupVariadicParamValues(
-                    needleArgumentTypes,
-                    lastMethodParameterIndex,
-                    methodDeclaration.getLastParam().getType());
+            needleArgumentTypes = groupVariadicParamValues(needleArgumentTypes, lastMethodParameterIndex, methodDeclaration.getLastParam().getType());
         } else if (countOfNeedleArgumentsPassed == countOfMethodParametersDeclared) {
             ResolvedType actualArgumentType = needleArgumentTypes.get(lastNeedleArgumentIndex);
-            boolean finalArgumentIsArray = actualArgumentType.isArray()
-                    && expectedVariadicParameterType.isAssignableBy(
-                            actualArgumentType.asArrayType().getComponentType());
+            boolean finalArgumentIsArray = actualArgumentType.isArray() && expectedVariadicParameterType.isAssignableBy(actualArgumentType.asArrayType().getComponentType());
             if (finalArgumentIsArray) {
                 // Treat as an array of values -- in which case the expected parameter type is the common type of this
                 // array.
@@ -333,10 +277,7 @@ private static List<ResolvedType> groupTrailingArgumentsIntoArray(
             } else {
                 // Treat as a single value -- in which case, the expected parameter type is the same as the single
                 // value.
-                needleArgumentTypes = groupVariadicParamValues(
-                        needleArgumentTypes,
-                        lastMethodParameterIndex,
-                        methodDeclaration.getLastParam().getType());
+                needleArgumentTypes = groupVariadicParamValues(needleArgumentTypes, lastMethodParameterIndex, methodDeclaration.getLastParam().getType());
             }
         } else {
             // Should be unreachable.
@@ -344,17 +285,12 @@ private static List<ResolvedType> groupTrailingArgumentsIntoArray(
         return needleArgumentTypes;
     }
 
-    public static boolean isAssignableMatchTypeParameters(
-            ResolvedType expected, ResolvedType actual, Map<String, ResolvedType> matchedParameters) {
+    public static boolean isAssignableMatchTypeParameters(ResolvedType expected, ResolvedType actual, Map<String, ResolvedType> matchedParameters) {
         if (expected.isReferenceType() && actual.isReferenceType()) {
-            return isAssignableMatchTypeParameters(
-                    expected.asReferenceType(), actual.asReferenceType(), matchedParameters);
+            return isAssignableMatchTypeParameters(expected.asReferenceType(), actual.asReferenceType(), matchedParameters);
         }
         if (expected.isReferenceType() && ResolvedPrimitiveType.isBoxType(expected) && actual.isPrimitive()) {
-            ResolvedPrimitiveType expectedType = ResolvedPrimitiveType.byBoxTypeQName(
-                            expected.asReferenceType().getQualifiedName())
-                    .get()
-                    .asPrimitive();
+            ResolvedPrimitiveType expectedType = ResolvedPrimitiveType.byBoxTypeQName(expected.asReferenceType().getQualifiedName()).get().asPrimitive();
             return expected.isAssignableBy(actual);
         }
         if (expected.isTypeVariable()) {
@@ -365,12 +301,10 @@ public static boolean isAssignableMatchTypeParameters(
             matchedParameters.put(expected.asArrayType().getComponentType().toString(), actual);
             return true;
         }
-        throw new UnsupportedOperationException(
-                expected.getClass().getCanonicalName() + " " + actual.getClass().getCanonicalName());
+        throw new UnsupportedOperationException(expected.getClass().getCanonicalName() + " " + actual.getClass().getCanonicalName());
     }
 
-    public static boolean isAssignableMatchTypeParameters(
-            ResolvedReferenceType expected, ResolvedReferenceType actual, Map<String, ResolvedType> matchedParameters) {
+    public static boolean isAssignableMatchTypeParameters(ResolvedReferenceType expected, ResolvedReferenceType actual, Map<String, ResolvedType> matchedParameters) {
         if (actual.getQualifiedName().equals(expected.getQualifiedName())) {
             return isAssignableMatchTypeParametersMatchingQName(expected, actual, matchedParameters);
         } else {
@@ -384,13 +318,11 @@ public static boolean isAssignableMatchTypeParameters(
         return false;
     }
 
-    private static boolean isAssignableMatchTypeParametersMatchingQName(
-            ResolvedReferenceType expected, ResolvedReferenceType actual, Map<String, ResolvedType> matchedParameters) {
+    private static boolean isAssignableMatchTypeParametersMatchingQName(ResolvedReferenceType expected, ResolvedReferenceType actual, Map<String, ResolvedType> matchedParameters) {
         if (!expected.getQualifiedName().equals(actual.getQualifiedName())) {
             return false;
         }
-        if (expected.typeParametersValues().size()
-                != actual.typeParametersValues().size()) {
+        if (expected.typeParametersValues().size() != actual.typeParametersValues().size()) {
             throw new UnsupportedOperationException();
             // return true;
         }
@@ -414,8 +346,7 @@ private static boolean isAssignableMatchTypeParametersMatchingQName(
             }
             if (expectedParam.isTypeVariable()) {
                 String expectedParamName = expectedParam.asTypeParameter().getName();
-                if (!actualParam.isTypeVariable()
-                        || !actualParam.asTypeParameter().getName().equals(expectedParamName)) {
+                if (!actualParam.isTypeVariable() || !actualParam.asTypeParameter().getName().equals(expectedParamName)) {
                     return matchTypeVariable(expectedParam.asTypeVariable(), actualParam, matchedParameters);
                 }
                 // actualParam is a TypeVariable and actualParam has the same name as expectedParamName
@@ -436,13 +367,9 @@ private static boolean isAssignableMatchTypeParametersMatchingQName(
                         return true;
                     }
                     if (actualParam.isTypeVariable()) {
-                        return matchTypeVariable(
-                                actualParam.asTypeVariable(),
-                                expectedParam.asWildcard().getBoundedType(),
-                                matchedParameters);
+                        return matchTypeVariable(actualParam.asTypeVariable(), expectedParam.asWildcard().getBoundedType(), matchedParameters);
                     }
-                    return isAssignableMatchTypeParameters(
-                            expectedParam.asWildcard().getBoundedType(), actualParam, matchedParameters);
+                    return isAssignableMatchTypeParameters(expectedParam.asWildcard().getBoundedType(), actualParam, matchedParameters);
                 }
                 // TODO verify super bound
                 return true;
@@ -452,8 +379,7 @@ private static boolean isAssignableMatchTypeParametersMatchingQName(
         return true;
     }
 
-    private static boolean matchTypeVariable(
-            ResolvedTypeVariable typeVariable, ResolvedType type, Map<String, ResolvedType> matchedParameters) {
+    private static boolean matchTypeVariable(ResolvedTypeVariable typeVariable, ResolvedType type, Map<String, ResolvedType> matchedParameters) {
         String typeParameterName = typeVariable.asTypeParameter().getName();
         if (matchedParameters.containsKey(typeParameterName)) {
             ResolvedType matchedParameter = matchedParameters.get(typeParameterName);
@@ -472,8 +398,7 @@ private static boolean matchTypeVariable(
         return true;
     }
 
-    public static ResolvedType replaceTypeParam(
-            ResolvedType type, ResolvedTypeParameterDeclaration tp, TypeSolver typeSolver) {
+    public static ResolvedType replaceTypeParam(ResolvedType type, ResolvedTypeParameterDeclaration tp, TypeSolver typeSolver) {
         if (type.isTypeVariable() || type.isWildcard()) {
             if (type.describe().equals(tp.getName())) {
                 List<ResolvedTypeParameterDeclaration.Bound> bounds = tp.getBounds();
@@ -495,12 +420,10 @@ public static ResolvedType replaceTypeParam(
         }
         if (type.isReferenceType()) {
             ResolvedReferenceType result = type.asReferenceType();
-            result = result.transformTypeParameters(typeParam -> replaceTypeParam(typeParam, tp, typeSolver))
-                    .asReferenceType();
+            result = result.transformTypeParameters(typeParam -> replaceTypeParam(typeParam, tp, typeSolver)).asReferenceType();
             return result;
         }
-        throw new UnsupportedOperationException("Replacing " + type + ", param " + tp + " with "
-                + type.getClass().getCanonicalName());
+        throw new UnsupportedOperationException("Replacing " + type + ", param " + tp + " with " + type.getClass().getCanonicalName());
     }
 
     /**
@@ -520,11 +443,7 @@ public static ResolvedType replaceTypeParam(
      *      }
      * @see {@link MethodResolutionLogic#isApplicable(ResolvedMethodDeclaration, String, List, TypeSolver, boolean)}
      */
-    public static boolean isApplicable(
-            MethodUsage methodUsage,
-            String needleName,
-            List<ResolvedType> needleParameterTypes,
-            TypeSolver typeSolver) {
+    public static boolean isApplicable(MethodUsage methodUsage, String needleName, List<ResolvedType> needleParameterTypes, TypeSolver typeSolver) {
         if (!methodUsage.getName().equals(needleName)) {
             return false;
         }
@@ -553,8 +472,7 @@ public static boolean isApplicable(
         // The index of the final argument passed (on the method usage).
         int needleParameterCount = needleParameterTypes.size();
         // TODO: Does the method usage have a declaration at this point..?
-        boolean methodIsDeclaredWithVariadicParameter =
-                methodUsage.getDeclaration().hasVariadicParameter();
+        boolean methodIsDeclaredWithVariadicParameter = methodUsage.getDeclaration().hasVariadicParameter();
         // If the counts do not match and the method is not variadic, this is not a match.
         if (!methodIsDeclaredWithVariadicParameter && !(needleParameterCount == countOfMethodUsageArgumentsPassed)) {
             return false;
@@ -563,8 +481,7 @@ public static boolean isApplicable(
         // parameters
         // allow you to omit the vararg, which would allow a difference of one, but a difference in count of 2 or more
         // is not a match.
-        if (!(needleParameterCount == countOfMethodUsageArgumentsPassed)
-                && needleParameterCount < lastMethodUsageArgumentIndex) {
+        if (!(needleParameterCount == countOfMethodUsageArgumentsPassed) && needleParameterCount < lastMethodUsageArgumentIndex) {
             return false;
         }
         // Iterate over the arguments given to the method, and compare their types against the given method's declared
@@ -586,8 +503,7 @@ public static boolean isApplicable(
                 // assignable by stringArray}
                 // Example: {@code void test(String[]... s) {}} and {@code test(stringArrayArray)} -- {@code String[]...
                 // is assignable by stringArrayArray}
-                boolean argumentIsArray = (needleParameterCount == countOfMethodUsageArgumentsPassed)
-                        && expectedArgumentType.isAssignableBy(actualArgumentType);
+                boolean argumentIsArray = (needleParameterCount == countOfMethodUsageArgumentsPassed) && expectedArgumentType.isAssignableBy(actualArgumentType);
                 if (!argumentIsArray) {
                     // Get the component type of the declared parameter type.
                     expectedArgumentType = expectedArgumentType.asArrayType().getComponentType();
@@ -595,16 +511,14 @@ public static boolean isApplicable(
             }
             // Consider type parameters directly on the method declaration, and ALSO on the enclosing type (e.g. a
             // class)
-            List<ResolvedTypeParameterDeclaration> typeParameters =
-                    methodUsage.getDeclaration().getTypeParameters();
+            List<ResolvedTypeParameterDeclaration> typeParameters = methodUsage.getDeclaration().getTypeParameters();
             typeParameters.addAll(methodUsage.declaringType().getTypeParameters());
             ResolvedType expectedTypeWithoutSubstitutions = expectedArgumentType;
             ResolvedType expectedTypeWithInference = expectedArgumentType;
             Map<ResolvedTypeParameterDeclaration, ResolvedType> derivedValues = new HashMap<>();
             // For each declared parameter, infer the types that will replace generics (type parameters)
             for (int j = 0; j < countOfMethodUsageArgumentsPassed; j++) {
-                ResolvedParameterDeclaration parameter =
-                        methodUsage.getDeclaration().getParam(j);
+                ResolvedParameterDeclaration parameter = methodUsage.getDeclaration().getParam(j);
                 ResolvedType parameterType = parameter.getType();
                 if (parameter.isVariadic()) {
                     // Don't continue if a vararg parameter is reached and there are no arguments left
@@ -624,23 +538,17 @@ public static boolean isApplicable(
                 if (tp.getBounds().isEmpty()) {
                     // expectedArgumentType = expectedArgumentType.replaceTypeVariables(tp.getName(), new
                     // ReferenceTypeUsageImpl(typeSolver.solveType(JAVA_LANG_OBJECT), typeSolver));
-                    expectedArgumentType = expectedArgumentType.replaceTypeVariables(
-                            tp,
-                            ResolvedWildcard.extendsBound(
-                                    new ReferenceTypeImpl(typeSolver.solveType(JAVA_LANG_OBJECT))));
+                    expectedArgumentType = expectedArgumentType.replaceTypeVariables(tp, ResolvedWildcard.extendsBound(new ReferenceTypeImpl(typeSolver.solveType(JAVA_LANG_OBJECT))));
                 } else if (tp.getBounds().size() == 1) {
-                    ResolvedTypeParameterDeclaration.Bound bound =
-                            tp.getBounds().get(0);
+                    ResolvedTypeParameterDeclaration.Bound bound = tp.getBounds().get(0);
                     if (bound.isExtends()) {
                         // expectedArgumentType = expectedArgumentType.replaceTypeVariables(tp.getName(),
                         // bound.getType());
-                        expectedArgumentType = expectedArgumentType.replaceTypeVariables(
-                                tp, ResolvedWildcard.extendsBound(bound.getType()));
+                        expectedArgumentType = expectedArgumentType.replaceTypeVariables(tp, ResolvedWildcard.extendsBound(bound.getType()));
                     } else {
                         // expectedArgumentType = expectedArgumentType.replaceTypeVariables(tp.getName(), new
                         // ReferenceTypeUsageImpl(typeSolver.solveType(JAVA_LANG_OBJECT), typeSolver));
-                        expectedArgumentType = expectedArgumentType.replaceTypeVariables(
-                                tp, ResolvedWildcard.superBound(bound.getType()));
+                        expectedArgumentType = expectedArgumentType.replaceTypeVariables(tp, ResolvedWildcard.superBound(bound.getType()));
                     }
                 } else {
                     throw new UnsupportedOperationException();
@@ -650,17 +558,13 @@ public static boolean isApplicable(
             ResolvedType expectedTypeWithSubstitutions = expectedTypeWithoutSubstitutions;
             for (ResolvedTypeParameterDeclaration tp : typeParameters) {
                 if (tp.getBounds().isEmpty()) {
-                    expectedTypeWithSubstitutions = expectedTypeWithSubstitutions.replaceTypeVariables(
-                            tp, new ReferenceTypeImpl(typeSolver.solveType(JAVA_LANG_OBJECT)));
+                    expectedTypeWithSubstitutions = expectedTypeWithSubstitutions.replaceTypeVariables(tp, new ReferenceTypeImpl(typeSolver.solveType(JAVA_LANG_OBJECT)));
                 } else if (tp.getBounds().size() == 1) {
-                    ResolvedTypeParameterDeclaration.Bound bound =
-                            tp.getBounds().get(0);
+                    ResolvedTypeParameterDeclaration.Bound bound = tp.getBounds().get(0);
                     if (bound.isExtends()) {
-                        expectedTypeWithSubstitutions =
-                                expectedTypeWithSubstitutions.replaceTypeVariables(tp, bound.getType());
+                        expectedTypeWithSubstitutions = expectedTypeWithSubstitutions.replaceTypeVariables(tp, bound.getType());
                     } else {
-                        expectedTypeWithSubstitutions = expectedTypeWithSubstitutions.replaceTypeVariables(
-                                tp, new ReferenceTypeImpl(typeSolver.solveType(JAVA_LANG_OBJECT)));
+                        expectedTypeWithSubstitutions = expectedTypeWithSubstitutions.replaceTypeVariables(tp, new ReferenceTypeImpl(typeSolver.solveType(JAVA_LANG_OBJECT)));
                     }
                 } else {
                     throw new UnsupportedOperationException();
@@ -673,10 +577,7 @@ public static boolean isApplicable(
             // 2. Type substitutions with bounds
             // 3. Type inference
             // 4. Boxing/unboxing conversions (especially important for varargs)
-            boolean isApplicable = expectedArgumentType.isAssignableBy(actualArgumentType)
-                    || expectedTypeWithSubstitutions.isAssignableBy(actualArgumentType)
-                    || expectedTypeWithInference.isAssignableBy(actualArgumentType)
-                    || expectedTypeWithoutSubstitutions.isAssignableBy(actualArgumentType);
+            boolean isApplicable = expectedArgumentType.isAssignableBy(actualArgumentType) || expectedTypeWithSubstitutions.isAssignableBy(actualArgumentType) || expectedTypeWithInference.isAssignableBy(actualArgumentType) || expectedTypeWithoutSubstitutions.isAssignableBy(actualArgumentType);
             // If none of the above checks passed, check if the types
             // are compatible through boxing or unboxing conversion.
             // This is particularly important for varargs methods where primitive arguments
@@ -692,12 +593,7 @@ public static boolean isApplicable(
             //   Should succeed via unboxing conversion
             if (!isApplicable) {
                 // Check boxing/unboxing compatibility with all type variations
-                isApplicable = isBoxingCompatibleWithTypeSolver(expectedArgumentType, actualArgumentType, typeSolver)
-                        || isBoxingCompatibleWithTypeSolver(
-                                expectedTypeWithSubstitutions, actualArgumentType, typeSolver)
-                        || isBoxingCompatibleWithTypeSolver(expectedTypeWithInference, actualArgumentType, typeSolver)
-                        || isBoxingCompatibleWithTypeSolver(
-                                expectedTypeWithoutSubstitutions, actualArgumentType, typeSolver);
+                isApplicable = isBoxingCompatibleWithTypeSolver(expectedArgumentType, actualArgumentType, typeSolver) || isBoxingCompatibleWithTypeSolver(expectedTypeWithSubstitutions, actualArgumentType, typeSolver) || isBoxingCompatibleWithTypeSolver(expectedTypeWithInference, actualArgumentType, typeSolver) || isBoxingCompatibleWithTypeSolver(expectedTypeWithoutSubstitutions, actualArgumentType, typeSolver);
             }
             if (!isApplicable) {
                 return false;
@@ -711,8 +607,7 @@ public static boolean isApplicable(
      * Checks if a primitive type can be boxed to a reference type (or vice versa).
      * Also handles array types for variadic parameters and wildcards.
      */
-    private static boolean isBoxingCompatibleWithTypeSolver(
-            ResolvedType expectedType, ResolvedType actualType, TypeSolver typeSolver) {
+    private static boolean isBoxingCompatibleWithTypeSolver(ResolvedType expectedType, ResolvedType actualType, TypeSolver typeSolver) {
         // Handle null types
         if (expectedType == null || actualType == null) {
             return false;
@@ -791,8 +686,7 @@ private static boolean isBoxingCompatibleWithTypeSolver(
         // Constraint types (e.g., LambdaConstraintType)
         if (actualType.isConstraint()) {
             // Check compatibility with the constraint bound
-            return isBoxingCompatibleWithTypeSolver(
-                    expectedType, actualType.asConstraintType().getBound(), typeSolver);
+            return isBoxingCompatibleWithTypeSolver(expectedType, actualType.asConstraintType().getBound(), typeSolver);
         }
         return false;
     }
@@ -891,8 +785,7 @@ private static MethodUsage substituteDeclaringTypeParameters(MethodUsage methodU
      * @param typeArgs the list of actual type arguments to substitute in
      * @return a new type with all matching type variables substituted
      */
-    private static ResolvedType substituteTypeVariables(
-            ResolvedType type, List<ResolvedTypeParameterDeclaration> typeParams, List<ResolvedType> typeArgs) {
+    private static ResolvedType substituteTypeVariables(ResolvedType type, List<ResolvedTypeParameterDeclaration> typeParams, List<ResolvedType> typeArgs) {
         // Case 1: Type is a type variable (e.g., T, E, K, V)
         // Replace it with the corresponding type argument from the declaring type
         if (type.isTypeVariable()) {
@@ -983,33 +876,19 @@ private static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtracto
     /**
      * @param methods we expect the methods to be ordered such that inherited methods are later in the list
      */
-    public static SymbolReference<ResolvedMethodDeclaration> findMostApplicable(
-            List<ResolvedMethodDeclaration> methods,
-            String name,
-            List<ResolvedType> argumentsTypes,
-            TypeSolver typeSolver) {
-        SymbolReference<ResolvedMethodDeclaration> res =
-                findMostApplicable(methods, name, argumentsTypes, typeSolver, false);
+    public static SymbolReference<ResolvedMethodDeclaration> findMostApplicable(List<ResolvedMethodDeclaration> methods, String name, List<ResolvedType> argumentsTypes, TypeSolver typeSolver) {
+        SymbolReference<ResolvedMethodDeclaration> res = findMostApplicable(methods, name, argumentsTypes, typeSolver, false);
         if (res.isSolved()) {
             return res;
         }
         return findMostApplicable(methods, name, argumentsTypes, typeSolver, true);
     }
 
-    public static SymbolReference<ResolvedMethodDeclaration> findMostApplicable(
-            List<ResolvedMethodDeclaration> methods,
-            String name,
-            List<ResolvedType> argumentsTypes,
-            TypeSolver typeSolver,
-            boolean wildcardTolerance) {
+    public static SymbolReference<ResolvedMethodDeclaration> findMostApplicable(List<ResolvedMethodDeclaration> methods, String name, List<ResolvedType> argumentsTypes, TypeSolver typeSolver, boolean wildcardTolerance) {
         // Only consider methods with a matching name
         // Filters out duplicate ResolvedMethodDeclaration by their signature.
         // Checks if ResolvedMethodDeclaration is applicable to argumentsTypes.
-        List<ResolvedMethodDeclaration> applicableMethods = methods.stream()
-                .filter(m -> m.getName().equals(name))
-                .filter(distinctByKey(ResolvedMethodDeclaration::getQualifiedSignature))
-                .filter((m) -> isApplicable(m, name, argumentsTypes, typeSolver, wildcardTolerance))
-                .collect(Collectors.toList());
+        List<ResolvedMethodDeclaration> applicableMethods = methods.stream().filter(m -> m.getName().equals(name)).filter(distinctByKey(ResolvedMethodDeclaration::getQualifiedSignature)).filter((m) -> isApplicable(m, name, argumentsTypes, typeSolver, wildcardTolerance)).collect(Collectors.toList());
         // If no applicable methods found, return as unsolved.
         if (applicableMethods.isEmpty()) {
             return SymbolReference.unsolved();
@@ -1074,10 +953,7 @@ public static SymbolReference<ResolvedMethodDeclaration> findMostApplicable(
                     winningCandidate = other;
                 } else if (!winningCandidate.isGeneric() && other.isGeneric()) {
                     // nothing to do at this stage winningCandidate is the winner
-                } else if (winningCandidate
-                        .declaringType()
-                        .getQualifiedName()
-                        .equals(other.declaringType().getQualifiedName())) {
+                } else if (winningCandidate.declaringType().getQualifiedName().equals(other.declaringType().getQualifiedName())) {
                     possibleAmbiguity = true;
                 } else {
                     // we expect the methods to be ordered such that inherited methods are later in the list
@@ -1090,8 +966,7 @@ public static SymbolReference<ResolvedMethodDeclaration> findMostApplicable(
                 if (isExactMatch(other, argumentsTypes)) {
                     winningCandidate = other;
                 } else {
-                    throw new MethodAmbiguityException("Ambiguous method call: cannot find a most applicable method: "
-                            + winningCandidate + ", " + other);
+                    throw new MethodAmbiguityException("Ambiguous method call: cannot find a most applicable method: " + winningCandidate + ", " + other);
                 }
             }
         }
@@ -1136,10 +1011,7 @@ public static ResolvedType getMethodUsageExplicitAndVariadicParameterType(Method
         return null;
     }
 
-    static boolean isMoreSpecific(
-            ResolvedMethodLikeDeclaration methodA,
-            ResolvedMethodLikeDeclaration methodB,
-            List<ResolvedType> argumentTypes) {
+    static boolean isMoreSpecific(ResolvedMethodLikeDeclaration methodA, ResolvedMethodLikeDeclaration methodB, List<ResolvedType> argumentTypes) {
         final boolean aVariadic = methodA.hasVariadicParameter();
         final boolean bVariadic = methodB.hasVariadicParameter();
         final int aNumberOfParams = methodA.getNumberOfParams();
@@ -1151,14 +1023,10 @@ static boolean isMoreSpecific(
         boolean isMethodAMoreSpecific = false;
         // If one method declaration has exactly the correct amount of parameters and is not variadic then it is always
         // preferred to a declaration that is variadic (and hence possibly also has a different amount of parameters).
-        if (!aVariadic
-                && aNumberOfParams == numberOfArgs
-                && (bVariadic && (bNumberOfParams != numberOfArgs || !isLastArgArray))) {
+        if (!aVariadic && aNumberOfParams == numberOfArgs && (bVariadic && (bNumberOfParams != numberOfArgs || !isLastArgArray))) {
             return true;
         }
-        if (!bVariadic
-                && bNumberOfParams == numberOfArgs
-                && (aVariadic && (aNumberOfParams != numberOfArgs || !isLastArgArray))) {
+        if (!bVariadic && bNumberOfParams == numberOfArgs && (aVariadic && (aNumberOfParams != numberOfArgs || !isLastArgArray))) {
             return false;
         }
         // If both methods are variadic but the calling method omits any varArgs, bump the omitted args to
@@ -1187,16 +1055,10 @@ static boolean isMoreSpecific(
             // The method call will call foo(long), as it requires a widening primitive conversion from int to long
             // instead of a boxing conversion from int to Integer. See JLS §15.12.2.
             // This is what we check here.
-            if (argType != null
-                    && paramTypeA.isPrimitive() == argType.isPrimitive()
-                    && paramTypeB.isPrimitive() != argType.isPrimitive()
-                    && paramTypeA.isAssignableBy(argType)) {
+            if (argType != null && paramTypeA.isPrimitive() == argType.isPrimitive() && paramTypeB.isPrimitive() != argType.isPrimitive() && paramTypeA.isAssignableBy(argType)) {
                 return true;
             }
-            if (argType != null
-                    && paramTypeB.isPrimitive() == argType.isPrimitive()
-                    && paramTypeA.isPrimitive() != argType.isPrimitive()
-                    && paramTypeB.isAssignableBy(argType)) {
+            if (argType != null && paramTypeB.isPrimitive() == argType.isPrimitive() && paramTypeA.isPrimitive() != argType.isPrimitive() && paramTypeB.isAssignableBy(argType)) {
                 return false;
                 // if paramA and paramB are not the last parameters
                 // and the type of paramA or paramB (which are not more specific at this stage) is java.lang.Object
@@ -1250,19 +1112,15 @@ static boolean isMoreSpecific(
     }
 
     private static boolean isJavaLangObject(ResolvedType paramType) {
-        return paramType.isReferenceType()
-                && paramType.asReferenceType().getQualifiedName().equals("java.lang.Object");
+        return paramType.isReferenceType() && paramType.asReferenceType().getQualifiedName().equals("java.lang.Object");
     }
 
     private static boolean isMoreSpecific(MethodUsage methodA, MethodUsage methodB, List<ResolvedType> argumentTypes) {
         return isMoreSpecific(methodA.getDeclaration(), methodB.getDeclaration(), argumentTypes);
     }
 
-    public static Optional<MethodUsage> findMostApplicableUsage(
-            List<MethodUsage> methods, String name, List<ResolvedType> argumentsTypes, TypeSolver typeSolver) {
-        List<MethodUsage> applicableMethods = methods.stream()
-                .filter((m) -> isApplicable(m, name, argumentsTypes, typeSolver))
-                .collect(Collectors.toList());
+    public static Optional<MethodUsage> findMostApplicableUsage(List<MethodUsage> methods, String name, List<ResolvedType> argumentsTypes, TypeSolver typeSolver) {
+        List<MethodUsage> applicableMethods = methods.stream().filter((m) -> isApplicable(m, name, argumentsTypes, typeSolver)).collect(Collectors.toList());
         if (applicableMethods.isEmpty()) {
             return Optional.empty();
         }
@@ -1277,15 +1135,9 @@ public static Optional<MethodUsage> findMostApplicableUsage(
             } else if (isMoreSpecific(other, winningCandidate, argumentsTypes)) {
                 winningCandidate = other;
             } else {
-                if (winningCandidate
-                        .declaringType()
-                        .getQualifiedName()
-                        .equals(other.declaringType().getQualifiedName())) {
+                if (winningCandidate.declaringType().getQualifiedName().equals(other.declaringType().getQualifiedName())) {
                     if (!areOverride(winningCandidate, other)) {
-                        throw new MethodAmbiguityException(
-                                "Ambiguous method call: cannot find a most applicable method: " + winningCandidate
-                                        + ", " + other + ". First declared in "
-                                        + winningCandidate.declaringType().getQualifiedName());
+                        throw new MethodAmbiguityException("Ambiguous method call: cannot find a most applicable method: " + winningCandidate + ", " + other + ". First declared in " + winningCandidate.declaringType().getQualifiedName());
                     }
                 } else {
                     // we expect the methods to be ordered such that inherited methods are later in the list
@@ -1304,35 +1156,26 @@ private static boolean areOverride(MethodUsage winningCandidate, MethodUsage oth
             return false;
         }
         for (int i = 0; i < winningCandidate.getNoParams(); i++) {
-            if (!winningCandidate
-                    .getParamTypes()
-                    .get(i)
-                    .equals(other.getParamTypes().get(i))) {
+            if (!winningCandidate.getParamTypes().get(i).equals(other.getParamTypes().get(i))) {
                 return false;
             }
         }
         return true;
     }
 
-    public static SymbolReference<ResolvedMethodDeclaration> solveMethodInType(
-            ResolvedTypeDeclaration typeDeclaration, String name, List<ResolvedType> argumentsTypes) {
+    public static SymbolReference<ResolvedMethodDeclaration> solveMethodInType(ResolvedTypeDeclaration typeDeclaration, String name, List<ResolvedType> argumentsTypes) {
         return solveMethodInType(typeDeclaration, name, argumentsTypes, false);
     }
 
     // TODO: Replace TypeDeclaration.solveMethod
-    public static SymbolReference<ResolvedMethodDeclaration> solveMethodInType(
-            ResolvedTypeDeclaration typeDeclaration,
-            String name,
-            List<ResolvedType> argumentsTypes,
-            boolean staticOnly) {
+    public static SymbolReference<ResolvedMethodDeclaration> solveMethodInType(ResolvedTypeDeclaration typeDeclaration, String name, List<ResolvedType> argumentsTypes, boolean staticOnly) {
         if (typeDeclaration instanceof MethodResolutionCapability) {
             return ((MethodResolutionCapability) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
         }
         throw new UnsupportedOperationException(typeDeclaration.getClass().getCanonicalName());
     }
 
-    public static void inferTypes(
-            ResolvedType source, ResolvedType target, Map<ResolvedTypeParameterDeclaration, ResolvedType> mappings) {
+    public static void inferTypes(ResolvedType source, ResolvedType target, Map<ResolvedTypeParameterDeclaration, ResolvedType> mappings) {
         if (source.equals(target)) {
             return;
         }
@@ -1342,10 +1185,7 @@ public static void inferTypes(
             if (sourceRefType.getQualifiedName().equals(targetRefType.getQualifiedName())) {
                 if (!sourceRefType.isRawType() && !targetRefType.isRawType()) {
                     for (int i = 0; i < sourceRefType.typeParametersValues().size(); i++) {
-                        inferTypes(
-                                sourceRefType.typeParametersValues().get(i),
-                                targetRefType.typeParametersValues().get(i),
-                                mappings);
+                        inferTypes(sourceRefType.typeParametersValues().get(i), targetRefType.typeParametersValues().get(i), mappings);
                     }
                 }
             }
@@ -1360,10 +1200,7 @@ public static void inferTypes(
         }
         if (source.isWildcard() && target.isWildcard()) {
             if (source.asWildcard().isBounded() && target.asWildcard().isBounded()) {
-                inferTypes(
-                        source.asWildcard().getBoundedType(),
-                        target.asWildcard().getBoundedType(),
-                        mappings);
+                inferTypes(source.asWildcard().getBoundedType(), target.asWildcard().getBoundedType(), mappings);
             }
             return;
         }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/LambdaArgumentTypePlaceholder.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/LambdaArgumentTypePlaceholder.java
index 86caed0e96..9a2cbc5ac2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/LambdaArgumentTypePlaceholder.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/LambdaArgumentTypePlaceholder.java
@@ -46,8 +46,7 @@ public LambdaArgumentTypePlaceholder(int pos) {
         this.bodyBlockHasExplicitNonVoidReturn = Optional.empty();
     }
 
-    public LambdaArgumentTypePlaceholder(
-            int pos, int parameterCount, Optional<Boolean> bodyBlockHasExplicitNonVoidReturn) {
+    public LambdaArgumentTypePlaceholder(int pos, int parameterCount, Optional<Boolean> bodyBlockHasExplicitNonVoidReturn) {
         this.pos = pos;
         this.parameterCount = Optional.of(parameterCount);
         this.bodyBlockHasExplicitNonVoidReturn = bodyBlockHasExplicitNonVoidReturn;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/SymbolReference.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/SymbolReference.java
index f1197436de..3df1af6bad 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/SymbolReference.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/SymbolReference.java
@@ -72,8 +72,7 @@ public static <S extends ResolvedDeclaration, S2 extends S> SymbolReference<S> u
      * @param <I> The Symbol Reference before adapting.
      * @param <O> The Symbol Reference after adapting.
      */
-    public static <I extends ResolvedDeclaration, O extends ResolvedDeclaration> SymbolReference<O> adapt(
-            SymbolReference<I> ref, Class<O> clazz) {
+    public static <I extends ResolvedDeclaration, O extends ResolvedDeclaration> SymbolReference<O> adapt(SymbolReference<I> ref, Class<O> clazz) {
         Optional<I> declaration = ref.getDeclaration();
         if (declaration.isPresent()) {
             I symbol = declaration.get();
@@ -103,9 +102,7 @@ public Optional<S> getDeclaration() {
      * The corresponding declaration. If not solve this throws UnsupportedOperationException.
      */
     public S getCorrespondingDeclaration() {
-        return getDeclaration()
-                .orElseThrow(() ->
-                        new UnsolvedSymbolException("Corresponding declaration not available for unsolved symbol."));
+        return getDeclaration().orElseThrow(() -> new UnsolvedSymbolException("Corresponding declaration not available for unsolved symbol."));
     }
 
     /**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/LazyType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/LazyType.java
index 37806651fa..fc045735be 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/LazyType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/LazyType.java
@@ -123,10 +123,7 @@ public String describe() {
     }
 
     @Override
-    public ResolvedType replaceTypeVariables(
-            ResolvedTypeParameterDeclaration tp,
-            ResolvedType replaced,
-            Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
+    public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tp, ResolvedType replaced, Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
         return getType().replaceTypeVariables(tp, replaced, inferredTypes);
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/NullType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/NullType.java
index 041458ae59..f9914939e9 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/NullType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/NullType.java
@@ -61,7 +61,6 @@ public boolean isTypeVariable() {
 
     @Override
     public boolean isAssignableBy(ResolvedType other) {
-        throw new UnsupportedOperationException(
-                "It does not make sense to assign a value to null, it can only be assigned");
+        throw new UnsupportedOperationException("It does not make sense to assign a value to null, it can only be assigned");
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/ReferenceTypeImpl.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/ReferenceTypeImpl.java
index 522acdd39d..ea86b0fbea 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/ReferenceTypeImpl.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/model/typesystem/ReferenceTypeImpl.java
@@ -42,21 +42,14 @@
  */
 public class ReferenceTypeImpl extends ResolvedReferenceType {
 
-    private static final String[] ASSIGNABLE_REFERENCE_TYPE = {
-        "java.lang.Object", "java.lang.Cloneable", "java.io.Serializable"
-    };
+    private static final String[] ASSIGNABLE_REFERENCE_TYPE = { "java.lang.Object", "java.lang.Cloneable", "java.io.Serializable" };
 
     public static ResolvedReferenceType undeterminedParameters(ResolvedReferenceTypeDeclaration typeDeclaration) {
-        return new ReferenceTypeImpl(
-                typeDeclaration,
-                typeDeclaration.getTypeParameters().stream()
-                        .map(ResolvedTypeVariable::new)
-                        .collect(Collectors.toList()));
+        return new ReferenceTypeImpl(typeDeclaration, typeDeclaration.getTypeParameters().stream().map(ResolvedTypeVariable::new).collect(Collectors.toList()));
     }
 
     @Override
-    protected ResolvedReferenceType create(
-            ResolvedReferenceTypeDeclaration typeDeclaration, List<ResolvedType> typeParametersCorrected) {
+    protected ResolvedReferenceType create(ResolvedReferenceTypeDeclaration typeDeclaration, List<ResolvedType> typeParametersCorrected) {
         return new ReferenceTypeImpl(typeDeclaration, typeParametersCorrected);
     }
 
@@ -96,11 +89,18 @@ public boolean isAssignableBy(ResolvedType other) {
                 return true;
             }
             // Check if 'other' can be boxed to match this type
-            if (isCorrespondingBoxingType(other.describe())) return true;
+            if (isCorrespondingBoxingType(other.describe()))
+                return true;
+            // KeY: Ask the typeDeclaration (e.g., \bigint) if it is assignable by int.
+            try {
+                if (this.typeDeclaration.isAssignableBy(other)) {
+                    return true;
+                }
+            } catch (UnsupportedOperationException e) {
+                // ignore
+            }
             // All numeric types extend Number
-            return other.isNumericType()
-                    && this.isReferenceType()
-                    && this.asReferenceType().getQualifiedName().equals(Number.class.getCanonicalName());
+            return other.isNumericType() && this.isReferenceType() && this.asReferenceType().getQualifiedName().equals(Number.class.getCanonicalName());
         }
         if (other instanceof LambdaArgumentTypePlaceholder) {
             return FunctionalInterfaceLogic.isFunctionalInterfaceType(this);
@@ -118,8 +118,7 @@ public boolean isAssignableBy(ResolvedType other) {
             return false;
         }
         if (other.isTypeVariable()) {
-            for (ResolvedTypeParameterDeclaration.Bound bound :
-                    other.asTypeVariable().asTypeParameter().getBounds()) {
+            for (ResolvedTypeParameterDeclaration.Bound bound : other.asTypeVariable().asTypeParameter().getBounds()) {
                 if (bound.isExtends()) {
                     if (this.isAssignableBy(bound.getType())) {
                         return true;
@@ -193,8 +192,7 @@ public ResolvedType transformTypeParameters(ResolvedTypeTransformer transformer)
             ResolvedType transformedTp = transformer.transform(tp);
             // Identity comparison on purpose
             if (transformedTp != tp) {
-                List<ResolvedType> typeParametersCorrected =
-                        result.asReferenceType().typeParametersValues();
+                List<ResolvedType> typeParametersCorrected = result.asReferenceType().typeParametersValues();
                 typeParametersCorrected.set(i, transformedTp);
                 result = create(typeDeclaration, typeParametersCorrected);
             }
@@ -212,13 +210,10 @@ public List<ResolvedReferenceType> getAllAncestors() {
     }
 
     @Override
-    public List<ResolvedReferenceType> getAllAncestors(
-            Function<ResolvedReferenceTypeDeclaration, List<ResolvedReferenceType>> traverser) {
+    public List<ResolvedReferenceType> getAllAncestors(Function<ResolvedReferenceTypeDeclaration, List<ResolvedReferenceType>> traverser) {
         // We need to go through the inheritance line and propagate the type parameters
         List<ResolvedReferenceType> ancestors = typeDeclaration.getAllAncestors(traverser);
-        ancestors = ancestors.stream()
-                .map(a -> typeParametersMap().replaceAll(a).asReferenceType())
-                .collect(Collectors.toList());
+        ancestors = ancestors.stream().map(a -> typeParametersMap().replaceAll(a).asReferenceType()).collect(Collectors.toList());
         return ancestors;
     }
 
@@ -226,19 +221,14 @@ public List<ResolvedReferenceType> getAllAncestors(
     public List<ResolvedReferenceType> getDirectAncestors() {
         // We need to go through the inheritance line and propagate the type parameters
         List<ResolvedReferenceType> ancestors = typeDeclaration.getAncestors();
-        ancestors = ancestors.stream()
-                .map(a -> typeParametersMap().replaceAll(a).asReferenceType())
-                .collect(Collectors.toList());
+        ancestors = ancestors.stream().map(a -> typeParametersMap().replaceAll(a).asReferenceType()).collect(Collectors.toList());
         // Conditionally re-insert java.lang.Object as an ancestor.
         if (this.getTypeDeclaration().isPresent()) {
-            ResolvedReferenceTypeDeclaration thisTypeDeclaration =
-                    this.getTypeDeclaration().get();
+            ResolvedReferenceTypeDeclaration thisTypeDeclaration = this.getTypeDeclaration().get();
             // The superclass of interfaces is always null
             if (thisTypeDeclaration.isClass()) {
-                Optional<ResolvedReferenceType> optionalSuperClass =
-                        thisTypeDeclaration.asClass().getSuperClass();
-                boolean superClassIsJavaLangObject = optionalSuperClass.isPresent()
-                        && optionalSuperClass.get().isJavaLangObject();
+                Optional<ResolvedReferenceType> optionalSuperClass = thisTypeDeclaration.asClass().getSuperClass();
+                boolean superClassIsJavaLangObject = optionalSuperClass.isPresent() && optionalSuperClass.get().isJavaLangObject();
                 boolean thisIsJavaLangObject = thisTypeDeclaration.asClass().isJavaLangObject();
                 if (superClassIsJavaLangObject && !thisIsJavaLangObject) {
                     ancestors.add(optionalSuperClass.get());
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/AssignableToPrimitive.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/AssignableToPrimitive.java
new file mode 100644
index 0000000000..c4259cdca3
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/AssignableToPrimitive.java
@@ -0,0 +1,10 @@
+package com.github.javaparser.resolution.types;
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (3/2/26)
+ */
+public interface AssignableToPrimitive {
+
+    boolean isAssignableToPrimitive(ResolvedPrimitiveType primitiveType);
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedArrayType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedArrayType.java
index c656d806a0..402f2bfb39 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedArrayType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedArrayType.java
@@ -41,10 +41,13 @@ public ResolvedArrayType(ResolvedType baseType) {
     // /
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         ResolvedArrayType that = (ResolvedArrayType) o;
-        if (!baseType.equals(that.baseType)) return false;
+        if (!baseType.equals(that.baseType))
+            return false;
         return true;
     }
 
@@ -92,10 +95,7 @@ boolean isAssignableBy(ResolvedType other) {
             }
             // An array of primitive type is not assignable by an array of boxed type nor the reverse
             // An array of primitive type cannot be assigned to an array of Object
-            if ((baseType.isPrimitive()
-                            && other.asArrayType().getComponentType().isReferenceType())
-                    || (baseType.isReferenceType()
-                            && other.asArrayType().getComponentType().isPrimitive())) {
+            if ((baseType.isPrimitive() && other.asArrayType().getComponentType().isReferenceType()) || (baseType.isReferenceType() && other.asArrayType().getComponentType().isPrimitive())) {
                 return false;
             }
             // An array can be assigned only to a variable of a compatible array type, or to
@@ -106,10 +106,7 @@ boolean isAssignableBy(ResolvedType other) {
     }
 
     @Override
-    public ResolvedType replaceTypeVariables(
-            ResolvedTypeParameterDeclaration tpToReplace,
-            ResolvedType replaced,
-            Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
+    public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tpToReplace, ResolvedType replaced, Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
         ResolvedType baseTypeReplaced = baseType.replaceTypeVariables(tpToReplace, replaced, inferredTypes);
         if (baseTypeReplaced == baseType) {
             return this;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedIntersectionType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedIntersectionType.java
index 6c523ee63b..56dfa7ef6c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedIntersectionType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedIntersectionType.java
@@ -35,16 +35,17 @@ public class ResolvedIntersectionType implements ResolvedType {
 
     public ResolvedIntersectionType(Collection<ResolvedType> elements) {
         if (elements.size() < 2) {
-            throw new IllegalArgumentException(
-                    "An intersection type should have at least two elements. This has " + elements.size());
+            throw new IllegalArgumentException("An intersection type should have at least two elements. This has " + elements.size());
         }
         this.elements = new LinkedList<>(elements);
     }
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         ResolvedIntersectionType that = (ResolvedIntersectionType) o;
         return new HashSet<>(elements).equals(new HashSet<>(that.elements));
     }
@@ -65,13 +66,8 @@ public boolean isAssignableBy(ResolvedType other) {
     }
 
     @Override
-    public ResolvedType replaceTypeVariables(
-            ResolvedTypeParameterDeclaration tp,
-            ResolvedType replaced,
-            Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
-        List<ResolvedType> elementsReplaced = elements.stream()
-                .map(e -> e.replaceTypeVariables(tp, replaced, inferredTypes))
-                .collect(Collectors.toList());
+    public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tp, ResolvedType replaced, Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
+        List<ResolvedType> elementsReplaced = elements.stream().map(e -> e.replaceTypeVariables(tp, replaced, inferredTypes)).collect(Collectors.toList());
         if (elementsReplaced.equals(elements)) {
             return this;
         }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedPrimitiveType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedPrimitiveType.java
index a0e505848b..354cdde940 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedPrimitiveType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedPrimitiveType.java
@@ -30,6 +30,7 @@
  * @author Federico Tomassetti
  */
 public enum ResolvedPrimitiveType implements ResolvedType {
+
     BYTE("byte", Byte.class, Collections.emptyList()),
     SHORT("short", Short.class, Collections.singletonList(BYTE)),
     CHAR("char", Character.class, Collections.emptyList()),
@@ -96,7 +97,7 @@ public static Optional<ResolvedType> byBoxTypeQName(String qName) {
      * Returns an array containing all numeric types
      */
     public static ResolvedPrimitiveType[] getNumericPrimitiveTypes() {
-        return new ResolvedPrimitiveType[] {BYTE, SHORT, INT, LONG, FLOAT, DOUBLE, CHAR};
+        return new ResolvedPrimitiveType[] { BYTE, SHORT, INT, LONG, FLOAT, DOUBLE, CHAR };
     }
 
     @Override
@@ -147,10 +148,13 @@ public boolean isAssignableBy(ResolvedType other) {
                     return true;
                 }
             }
+            // Hack for KeY: Allow to implement behavior for \bigint & co.
+            if (other.asReferenceType() instanceof AssignableToPrimitive atp) {
+                return atp.isAssignableToPrimitive(this);
+            }
             return false;
         }
-        return other.isConstraint()
-                && this.isAssignableBy(other.asConstraintType().getBound());
+        return other.isConstraint() && this.isAssignableBy(other.asConstraintType().getBound());
     }
 
     public String getBoxTypeQName() {
@@ -204,29 +208,17 @@ public static ResolvedType unp(ResolvedType type) {
         // conversion (§5.1.8).
         // The result is then promoted to a value of type int by a widening primitive conversion (§5.1.2) or an identity
         // conversion (§5.1.1).
-        if (isUnboxable
-                && type.asReferenceType().toUnboxedType().get().in(new ResolvedPrimitiveType[] {
-                    ResolvedPrimitiveType.BYTE,
-                    ResolvedPrimitiveType.SHORT,
-                    ResolvedPrimitiveType.CHAR,
-                    ResolvedPrimitiveType.INT
-                })) {
+        if (isUnboxable && type.asReferenceType().toUnboxedType().get().in(new ResolvedPrimitiveType[] { ResolvedPrimitiveType.BYTE, ResolvedPrimitiveType.SHORT, ResolvedPrimitiveType.CHAR, ResolvedPrimitiveType.INT })) {
             return ResolvedPrimitiveType.INT;
         }
         // Otherwise, if the operand is of compile-time type Long, Float, or Double, it is subjected to unboxing
         // conversion (§5.1.8).
-        if (isUnboxable
-                && type.asReferenceType().toUnboxedType().get().in(new ResolvedPrimitiveType[] {
-                    ResolvedPrimitiveType.LONG, ResolvedPrimitiveType.FLOAT, ResolvedPrimitiveType.DOUBLE
-                })) {
+        if (isUnboxable && type.asReferenceType().toUnboxedType().get().in(new ResolvedPrimitiveType[] { ResolvedPrimitiveType.LONG, ResolvedPrimitiveType.FLOAT, ResolvedPrimitiveType.DOUBLE })) {
             return type.asReferenceType().toUnboxedType().get();
         }
         // Otherwise, if the operand is of compile-time type byte, short, or char, it is promoted to a value of type int
         // by a widening primitive conversion (§5.1.2).
-        if (type.isPrimitive()
-                && type.asPrimitive().in(new ResolvedPrimitiveType[] {
-                    ResolvedPrimitiveType.BYTE, ResolvedPrimitiveType.CHAR, ResolvedPrimitiveType.SHORT
-                })) {
+        if (type.isPrimitive() && type.asPrimitive().in(new ResolvedPrimitiveType[] { ResolvedPrimitiveType.BYTE, ResolvedPrimitiveType.CHAR, ResolvedPrimitiveType.SHORT })) {
             return ResolvedPrimitiveType.INT;
         }
         // Otherwise, a unary numeric operand remains as is and is not converted.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedReferenceType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedReferenceType.java
index b4ee73ba40..a9dc49b2f6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedReferenceType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedReferenceType.java
@@ -42,8 +42,7 @@
  *
  * @author Federico Tomassetti
  */
-public abstract class ResolvedReferenceType
-        implements ResolvedType, ResolvedTypeParametrized, ResolvedTypeParameterValueProvider {
+public abstract class ResolvedReferenceType implements ResolvedType, ResolvedTypeParametrized, ResolvedTypeParameterValueProvider {
 
     protected static String JAVA_LANG_ENUM = java.lang.Enum.class.getCanonicalName();
 
@@ -73,16 +72,12 @@ public ResolvedReferenceType(ResolvedReferenceTypeDeclaration typeDeclaration, L
         if (typeDeclaration.isTypeParameter()) {
             throw new IllegalArgumentException("You should use only Classes, Interfaces and enums");
         }
-        if (typeArguments.size() > 0
-                && typeArguments.size() != typeDeclaration.getTypeParameters().size()) {
-            throw new IllegalArgumentException(String.format(
-                    "expected either zero type arguments or has many as defined in the declaration (%d). Found %d",
-                    typeDeclaration.getTypeParameters().size(), typeArguments.size()));
+        if (typeArguments.size() > 0 && typeArguments.size() != typeDeclaration.getTypeParameters().size()) {
+            throw new IllegalArgumentException(String.format("expected either zero type arguments or has many as defined in the declaration (%d). Found %d", typeDeclaration.getTypeParameters().size(), typeArguments.size()));
         }
         ResolvedTypeParametersMap.Builder typeParametersMapBuilder = new ResolvedTypeParametersMap.Builder();
         for (int i = 0; i < typeArguments.size(); i++) {
-            typeParametersMapBuilder.setValue(
-                    typeDeclaration.getTypeParameters().get(i), typeArguments.get(i));
+            typeParametersMapBuilder.setValue(typeDeclaration.getTypeParameters().get(i), typeArguments.get(i));
         }
         this.typeParametersMap = typeParametersMapBuilder.build();
         this.typeDeclaration = typeDeclaration;
@@ -93,17 +88,23 @@ public ResolvedReferenceType(ResolvedReferenceTypeDeclaration typeDeclaration, L
     //
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null) return false;
+        if (this == o)
+            return true;
+        if (o == null)
+            return false;
         if (o instanceof LazyType) {
             final LazyType lazyType = (LazyType) o;
-            if (!lazyType.isReferenceType()) return false;
+            if (!lazyType.isReferenceType())
+                return false;
             return this.equals(lazyType.asReferenceType());
         }
-        if (getClass() != o.getClass()) return false;
+        if (getClass() != o.getClass())
+            return false;
         ResolvedReferenceType that = (ResolvedReferenceType) o;
-        if (!typeDeclaration.equals(that.typeDeclaration)) return false;
-        if (!typeParametersMap.equals(that.typeParametersMap)) return false;
+        if (!typeDeclaration.equals(that.typeDeclaration))
+            return false;
+        if (!typeParametersMap.equals(that.typeParametersMap))
+            return false;
         return true;
     }
 
@@ -148,11 +149,7 @@ public String describe() {
         }
         if (!typeParametersMap().isEmpty()) {
             sb.append("<");
-            sb.append(String.join(
-                    ", ",
-                    typeDeclaration.getTypeParameters().stream()
-                            .map(tp -> typeParametersMap().getValue(tp).describe())
-                            .collect(Collectors.toList())));
+            sb.append(String.join(", ", typeDeclaration.getTypeParameters().stream().map(tp -> typeParametersMap().getValue(tp).describe()).collect(Collectors.toList())));
             sb.append(">");
         }
         return sb.toString();
@@ -167,10 +164,7 @@ public String describe() {
     public abstract ResolvedType transformTypeParameters(ResolvedTypeTransformer transformer);
 
     @Override
-    public ResolvedType replaceTypeVariables(
-            ResolvedTypeParameterDeclaration tpToReplace,
-            ResolvedType replaced,
-            Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
+    public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tpToReplace, ResolvedType replaced, Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
         if (replaced == null) {
             throw new IllegalArgumentException();
         }
@@ -184,8 +178,7 @@ public ResolvedType replaceTypeVariables(
             }
             // FIXME
             if (true) {
-                List<ResolvedType> typeParametersCorrected =
-                        result.asReferenceType().typeParametersValues();
+                List<ResolvedType> typeParametersCorrected = result.asReferenceType().typeParametersValues();
                 typeParametersCorrected.set(i, transformedTp);
                 result = create(typeDeclaration, typeParametersCorrected);
             }
@@ -236,8 +229,7 @@ public ResolvedType replaceTypeVariables(
      * This list should always include Object (unless this is a reference to Object).
      * The type typeParametersValues should be expressed in terms of this type typeParametersValues.
      */
-    public abstract List<ResolvedReferenceType> getAllAncestors(
-            Function<ResolvedReferenceTypeDeclaration, List<ResolvedReferenceType>> traverser);
+    public abstract List<ResolvedReferenceType> getAllAncestors(Function<ResolvedReferenceTypeDeclaration, List<ResolvedReferenceType>> traverser);
 
     /**
      * Return direct ancestors, that means the superclasses and interfaces implemented directly.
@@ -247,17 +239,11 @@ public abstract List<ResolvedReferenceType> getAllAncestors(
     public abstract List<ResolvedReferenceType> getDirectAncestors();
 
     public final List<ResolvedReferenceType> getAllInterfacesAncestors() {
-        return getAllAncestors().stream()
-                .filter(it -> it.getTypeDeclaration().isPresent())
-                .filter(it -> it.getTypeDeclaration().get().isInterface())
-                .collect(Collectors.toList());
+        return getAllAncestors().stream().filter(it -> it.getTypeDeclaration().isPresent()).filter(it -> it.getTypeDeclaration().get().isInterface()).collect(Collectors.toList());
     }
 
     public final List<ResolvedReferenceType> getAllClassesAncestors() {
-        return getAllAncestors().stream()
-                .filter(it -> it.getTypeDeclaration().isPresent())
-                .filter(it -> it.getTypeDeclaration().get().isClass())
-                .collect(Collectors.toList());
+        return getAllAncestors().stream().filter(it -> it.getTypeDeclaration().isPresent()).filter(it -> it.getTypeDeclaration().get().isClass()).collect(Collectors.toList());
     }
 
     // /
@@ -282,11 +268,7 @@ public Optional<ResolvedType> getGenericParameterByName(String name) {
      * The list can be empty for raw types.
      */
     public List<ResolvedType> typeParametersValues() {
-        return this.typeParametersMap.isEmpty()
-                ? Collections.emptyList()
-                : typeDeclaration.getTypeParameters().stream()
-                        .map(tp -> typeParametersMap.getValue(tp))
-                        .collect(Collectors.toList());
+        return this.typeParametersMap.isEmpty() ? Collections.emptyList() : typeDeclaration.getTypeParameters().stream().map(tp -> typeParametersMap.getValue(tp)).collect(Collectors.toList());
     }
 
     /**
@@ -297,9 +279,7 @@ public List<Pair<ResolvedTypeParameterDeclaration, ResolvedType>> getTypeParamet
         List<Pair<ResolvedTypeParameterDeclaration, ResolvedType>> typeParametersMap = new ArrayList<>();
         if (!isRawType()) {
             for (int i = 0; i < typeDeclaration.getTypeParameters().size(); i++) {
-                typeParametersMap.add(new Pair<>(
-                        typeDeclaration.getTypeParameters().get(i),
-                        typeParametersValues().get(i)));
+                typeParametersMap.add(new Pair<>(typeDeclaration.getTypeParameters().get(i), typeParametersValues().get(i)));
             }
         }
         return typeParametersMap;
@@ -418,8 +398,7 @@ public List<ResolvedMethodDeclaration> getAllMethods() {
             return new ArrayList<>();
         }
         // Get the methods declared directly on this.
-        List<ResolvedMethodDeclaration> allMethods =
-                new LinkedList<>(this.getTypeDeclaration().get().getDeclaredMethods());
+        List<ResolvedMethodDeclaration> allMethods = new LinkedList<>(this.getTypeDeclaration().get().getDeclaredMethods());
         // Also get methods inherited from ancestors.
         getDirectAncestors().forEach(a -> allMethods.addAll(a.getAllMethods()));
         return allMethods;
@@ -430,32 +409,22 @@ public List<ResolvedMethodDeclaration> getAllMethods() {
      * type plus all declared fields which are not private.
      */
     public List<ResolvedFieldDeclaration> getAllFieldsVisibleToInheritors() {
-        List<ResolvedFieldDeclaration> res = new LinkedList<>(this.getDeclaredFields().stream()
-                .filter(f -> f.accessSpecifier() != AccessSpecifier.PRIVATE)
-                .collect(Collectors.toList()));
+        List<ResolvedFieldDeclaration> res = new LinkedList<>(this.getDeclaredFields().stream().filter(f -> f.accessSpecifier() != AccessSpecifier.PRIVATE).collect(Collectors.toList()));
         getDirectAncestors().forEach(a -> res.addAll(a.getAllFieldsVisibleToInheritors()));
         return res;
     }
 
     public List<ResolvedMethodDeclaration> getAllMethodsVisibleToInheritors() {
-        return this.getAllMethods().stream()
-                .filter(m -> m.accessSpecifier() != AccessSpecifier.PRIVATE)
-                .collect(Collectors.toList());
+        return this.getAllMethods().stream().filter(m -> m.accessSpecifier() != AccessSpecifier.PRIVATE).collect(Collectors.toList());
     }
 
     //
     // Protected methods
     //
-    protected abstract ResolvedReferenceType create(
-            ResolvedReferenceTypeDeclaration typeDeclaration, List<ResolvedType> typeParameters);
+    protected abstract ResolvedReferenceType create(ResolvedReferenceTypeDeclaration typeDeclaration, List<ResolvedType> typeParameters);
 
-    protected ResolvedReferenceType create(
-            ResolvedReferenceTypeDeclaration typeDeclaration, ResolvedTypeParametersMap typeParametersMap) {
-        return create(
-                typeDeclaration,
-                typeDeclaration.getTypeParameters().stream()
-                        .map(typeParametersMap::getValue)
-                        .collect(Collectors.toList()));
+    protected ResolvedReferenceType create(ResolvedReferenceTypeDeclaration typeDeclaration, ResolvedTypeParametersMap typeParametersMap) {
+        return create(typeDeclaration, typeDeclaration.getTypeParameters().stream().map(typeParametersMap::getValue).collect(Collectors.toList()));
     }
 
     protected abstract ResolvedReferenceType create(ResolvedReferenceTypeDeclaration typeDeclaration);
@@ -486,11 +455,9 @@ protected boolean compareConsideringTypeParameters(ResolvedReferenceType other)
                 if (!thisParam.equals(otherParam)) {
                     if (thisParam instanceof ResolvedWildcard) {
                         ResolvedWildcard thisParamAsWildcard = (ResolvedWildcard) thisParam;
-                        if (thisParamAsWildcard.isSuper()
-                                && otherParam.isAssignableBy(thisParamAsWildcard.getBoundedType())) {
+                        if (thisParamAsWildcard.isSuper() && otherParam.isAssignableBy(thisParamAsWildcard.getBoundedType())) {
                             // ok
-                        } else if (thisParamAsWildcard.isExtends()
-                                && thisParamAsWildcard.getBoundedType().isAssignableBy(otherParam)) {
+                        } else if (thisParamAsWildcard.isExtends() && thisParamAsWildcard.getBoundedType().isAssignableBy(otherParam)) {
                             // ok
                         } else if (!thisParamAsWildcard.isBounded()) {
                             // ok
@@ -503,27 +470,15 @@ protected boolean compareConsideringTypeParameters(ResolvedReferenceType other)
                             // extends Comparable<K>}
                             // we have to compare the type of the erased bound (in this example the type @{code
                             // Comparable}).
-                            List<ResolvedType> thisBounds =
-                                    thisParam.asTypeVariable().asTypeParameter().getBounds().stream()
-                                            .map(ResolvedTypeParameterDeclaration.Bound::getType)
-                                            .map(type -> type.erasure())
-                                            .collect(Collectors.toList());
-                            List<ResolvedType> otherBounds =
-                                    otherParam.asTypeVariable().asTypeParameter().getBounds().stream()
-                                            .map(ResolvedTypeParameterDeclaration.Bound::getType)
-                                            .map(type -> type.erasure())
-                                            .collect(Collectors.toList());
+                            List<ResolvedType> thisBounds = thisParam.asTypeVariable().asTypeParameter().getBounds().stream().map(ResolvedTypeParameterDeclaration.Bound::getType).map(type -> type.erasure()).collect(Collectors.toList());
+                            List<ResolvedType> otherBounds = otherParam.asTypeVariable().asTypeParameter().getBounds().stream().map(ResolvedTypeParameterDeclaration.Bound::getType).map(type -> type.erasure()).collect(Collectors.toList());
                             return thisBounds.size() == otherBounds.size() && otherBounds.containsAll(thisBounds);
                         }
-                        if (!(thisParam instanceof ResolvedTypeVariable)
-                                && otherParam instanceof ResolvedTypeVariable) {
-                            return compareConsideringVariableTypeParameters(
-                                    thisParam, (ResolvedTypeVariable) otherParam);
+                        if (!(thisParam instanceof ResolvedTypeVariable) && otherParam instanceof ResolvedTypeVariable) {
+                            return compareConsideringVariableTypeParameters(thisParam, (ResolvedTypeVariable) otherParam);
                         }
-                        if (thisParam instanceof ResolvedTypeVariable
-                                && !(otherParam instanceof ResolvedTypeVariable)) {
-                            return compareConsideringVariableTypeParameters(
-                                    otherParam, (ResolvedTypeVariable) thisParam);
+                        if (thisParam instanceof ResolvedTypeVariable && !(otherParam instanceof ResolvedTypeVariable)) {
+                            return compareConsideringVariableTypeParameters(otherParam, (ResolvedTypeVariable) thisParam);
                         }
                         return false;
                     }
@@ -537,19 +492,15 @@ protected boolean compareConsideringTypeParameters(ResolvedReferenceType other)
     //
     // Private methods
     //
-    private boolean compareConsideringVariableTypeParameters(
-            ResolvedType referenceType, ResolvedTypeVariable typeVariable) {
+    private boolean compareConsideringVariableTypeParameters(ResolvedType referenceType, ResolvedTypeVariable typeVariable) {
         // verify if the ResolvedTypeVariable has only one type variable and the bound is
         // not a reference type with a bound parameter
         // for example EnumSet<E> noneOf(Class<E> elementType)
         List<Bound> bounds = typeVariable.asTypeVariable().asTypeParameter().getBounds();
         if (bounds.size() == 1) {
             ResolvedType boundType = bounds.get(0).getType();
-            boolean hasTypeParameter = boundType.isReferenceType()
-                    && !boundType.asReferenceType().typeParametersMap.isEmpty();
-            return hasTypeParameter
-                    ? compareConsideringTypeParameters(boundType.asReferenceType())
-                    : boundType.isAssignableBy(referenceType);
+            boolean hasTypeParameter = boundType.isReferenceType() && !boundType.asReferenceType().typeParametersMap.isEmpty();
+            return hasTypeParameter ? compareConsideringTypeParameters(boundType.asReferenceType()) : boundType.isAssignableBy(referenceType);
         }
         return false;
     }
@@ -606,8 +557,7 @@ public boolean isJavaLangRecord() {
      * For example : Integer to int
      */
     public boolean isUnboxable() {
-        return Arrays.stream(ResolvedPrimitiveType.values())
-                .anyMatch(pt -> getQualifiedName().equals(pt.getBoxTypeQName()));
+        return Arrays.stream(ResolvedPrimitiveType.values()).anyMatch(pt -> getQualifiedName().equals(pt.getBoxTypeQName()));
     }
 
     /*
@@ -622,9 +572,7 @@ public boolean isUnboxableTo(ResolvedPrimitiveType primitiveType) {
      * Returns the optional corresponding primitive type
      */
     public Optional<ResolvedPrimitiveType> toUnboxedType() {
-        return Arrays.stream(ResolvedPrimitiveType.values())
-                .filter(pt -> this.asReferenceType().getQualifiedName().equals(pt.getBoxTypeQName()))
-                .findFirst();
+        return Arrays.stream(ResolvedPrimitiveType.values()).filter(pt -> this.asReferenceType().getQualifiedName().equals(pt.getBoxTypeQName())).findFirst();
     }
 
     // /
@@ -633,7 +581,8 @@ public Optional<ResolvedPrimitiveType> toUnboxedType() {
     // The erasure of a parameterized type (§4.5) G<T1,...,Tn> is |G|.
     @Override
     public ResolvedType erasure() {
-        if (!typeDeclaration.isGeneric()) return this;
+        if (!typeDeclaration.isGeneric())
+            return this;
         return create(typeDeclaration, erasureOfParamaters(typeParametersMap));
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedType.java
index 13d993971b..d05f50db6f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedType.java
@@ -177,10 +177,7 @@ default ResolvedUnionType asUnionType() {
      * By replacing these values I could also infer some type equivalence.
      * Those would be collected in the given map.
      */
-    default ResolvedType replaceTypeVariables(
-            ResolvedTypeParameterDeclaration tp,
-            ResolvedType replaced,
-            Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
+    default ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tp, ResolvedType replaced, Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
         return this;
     }
 
@@ -210,8 +207,7 @@ default boolean mention(List<ResolvedTypeParameterDeclaration> typeParameters) {
      * Returns true if the ResolvedType is a numeric
      */
     default boolean isNumericType() {
-        return Arrays.stream(ResolvedPrimitiveType.getNumericPrimitiveTypes())
-                .anyMatch(rpt -> rpt.isAssignableBy(this));
+        return Arrays.stream(ResolvedPrimitiveType.getNumericPrimitiveTypes()).anyMatch(rpt -> rpt.isAssignableBy(this));
     }
 
     // /
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedTypeVariable.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedTypeVariable.java
index 865def1838..d54e0d94f4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedTypeVariable.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedTypeVariable.java
@@ -50,12 +50,17 @@ public String qualifiedName() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         ResolvedTypeVariable that = (ResolvedTypeVariable) o;
-        if (!typeParameter.getName().equals(that.typeParameter.getName())) return false;
-        if (typeParameter.declaredOnType() != that.typeParameter.declaredOnType()) return false;
-        if (typeParameter.declaredOnMethod() != that.typeParameter.declaredOnMethod()) return false;
+        if (!typeParameter.getName().equals(that.typeParameter.getName()))
+            return false;
+        if (typeParameter.declaredOnType() != that.typeParameter.declaredOnType())
+            return false;
+        if (typeParameter.declaredOnMethod() != that.typeParameter.declaredOnMethod())
+            return false;
         return true;
     }
 
@@ -70,10 +75,7 @@ public boolean isArray() {
     }
 
     @Override
-    public ResolvedType replaceTypeVariables(
-            ResolvedTypeParameterDeclaration tpToBeReplaced,
-            ResolvedType replaced,
-            Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
+    public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tpToBeReplaced, ResolvedType replaced, Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
         if (tpToBeReplaced.getName().equals(this.typeParameter.getName())) {
             inferredTypes.put(this.asTypeParameter(), replaced);
             return replaced;
@@ -111,17 +113,8 @@ public boolean isAssignableBy(ResolvedType other) {
         if (other.isTypeVariable()) {
             // if we want to compare something like @{code C extends Comparable<C>} with @{code K extends Comparable<K>}
             // we have to compare the type of the bound. For the moment we are focusing solely on the first type.
-            if (typeParameter.hasBound()
-                    && other.asTypeVariable().asTypeParameter().hasBound()) {
-                return typeParameter
-                        .getBounds()
-                        .get(0)
-                        .getType()
-                        .isAssignableBy(other.asTypeVariable()
-                                .asTypeParameter()
-                                .getBounds()
-                                .get(0)
-                                .getType());
+            if (typeParameter.hasBound() && other.asTypeVariable().asTypeParameter().hasBound()) {
+                return typeParameter.getBounds().get(0).getType().isAssignableBy(other.asTypeVariable().asTypeParameter().getBounds().get(0).getType());
             }
             return describe().equals(other.describe());
         }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedUnionType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedUnionType.java
index 3b0d9f790d..69fcdb117a 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedUnionType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedUnionType.java
@@ -35,28 +35,26 @@ public class ResolvedUnionType implements ResolvedType {
 
     public ResolvedUnionType(List<ResolvedType> elements) {
         if (elements.size() < 2) {
-            throw new IllegalArgumentException(
-                    "An union type should have at least two elements. This has " + elements.size());
+            throw new IllegalArgumentException("An union type should have at least two elements. This has " + elements.size());
         }
         this.elements = new LinkedList<>(elements);
     }
 
     public Optional<ResolvedReferenceType> getCommonAncestor() {
-        Optional<List<ResolvedReferenceType>> reduce = elements.stream()
-                .map(ResolvedType::asReferenceType)
-                .map(rt -> rt.getAllAncestors(ResolvedReferenceTypeDeclaration.breadthFirstFunc))
-                .reduce((a, b) -> {
-                    ArrayList<ResolvedReferenceType> common = new ArrayList<>(a);
-                    common.retainAll(b);
-                    return common;
-                });
+        Optional<List<ResolvedReferenceType>> reduce = elements.stream().map(ResolvedType::asReferenceType).map(rt -> rt.getAllAncestors(ResolvedReferenceTypeDeclaration.breadthFirstFunc)).reduce((a, b) -> {
+            ArrayList<ResolvedReferenceType> common = new ArrayList<>(a);
+            common.retainAll(b);
+            return common;
+        });
         return reduce.orElse(new ArrayList<>()).stream().findFirst();
     }
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         ResolvedUnionType that = (ResolvedUnionType) o;
         return new HashSet<>(elements).equals(new HashSet<>(that.elements));
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedVoidType.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedVoidType.java
index e293723d64..aa972f82cb 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedVoidType.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedVoidType.java
@@ -29,7 +29,8 @@ public class ResolvedVoidType implements ResolvedType {
 
     public static final ResolvedType INSTANCE = new ResolvedVoidType();
 
-    private ResolvedVoidType() {}
+    private ResolvedVoidType() {
+    }
 
     @Override
     public String describe() {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedWildcard.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedWildcard.java
index 70aec83a0b..b67a7f0dd2 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedWildcard.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/ResolvedWildcard.java
@@ -78,11 +78,15 @@ public ResolvedWildcard asWildcard() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof ResolvedWildcard)) return false;
+        if (this == o)
+            return true;
+        if (!(o instanceof ResolvedWildcard))
+            return false;
         ResolvedWildcard that = (ResolvedWildcard) o;
-        if (boundedType != null ? !boundedType.equals(that.boundedType) : that.boundedType != null) return false;
-        if (type != that.type) return false;
+        if (boundedType != null ? !boundedType.equals(that.boundedType) : that.boundedType != null)
+            return false;
+        if (type != that.type)
+            return false;
         return true;
     }
 
@@ -143,10 +147,7 @@ public boolean isAssignableBy(ResolvedType other) {
     }
 
     @Override
-    public ResolvedType replaceTypeVariables(
-            ResolvedTypeParameterDeclaration tpToReplace,
-            ResolvedType replaced,
-            Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
+    public ResolvedType replaceTypeVariables(ResolvedTypeParameterDeclaration tpToReplace, ResolvedType replaced, Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes) {
         if (replaced == null) {
             throw new IllegalArgumentException();
         }
@@ -177,8 +178,8 @@ public boolean isLowerBounded() {
     }
 
     public enum BoundType {
-        SUPER,
-        EXTENDS
+
+        SUPER, EXTENDS
     }
 
     /*
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParameterValueProvider.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParameterValueProvider.java
index f7d7572501..7016fac90f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParameterValueProvider.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParameterValueProvider.java
@@ -49,10 +49,7 @@ default ResolvedType useThisTypeParametersOnTheGivenType(ResolvedType type) {
                     ResolvedType resolvedTypeParam = typeParam.get();
                     // Try to avoid an infinite loop when the type is a wildcard type bounded by a type variable like "?
                     // super T"
-                    if (resolvedTypeParam.isWildcard()
-                            && (!resolvedTypeParam.asWildcard().equals(ResolvedWildcard.UNBOUNDED)
-                                    && type.equals(
-                                            resolvedTypeParam.asWildcard().getBoundedType()))) {
+                    if (resolvedTypeParam.isWildcard() && (!resolvedTypeParam.asWildcard().equals(ResolvedWildcard.UNBOUNDED) && type.equals(resolvedTypeParam.asWildcard().getBoundedType()))) {
                         return type;
                     }
                     type = resolvedTypeParam;
@@ -61,11 +58,9 @@ default ResolvedType useThisTypeParametersOnTheGivenType(ResolvedType type) {
         }
         if (type.isWildcard() && type.asWildcard().isBounded()) {
             if (type.asWildcard().isExtends()) {
-                return ResolvedWildcard.extendsBound(
-                        useThisTypeParametersOnTheGivenType(type.asWildcard().getBoundedType()));
+                return ResolvedWildcard.extendsBound(useThisTypeParametersOnTheGivenType(type.asWildcard().getBoundedType()));
             }
-            return ResolvedWildcard.superBound(
-                    useThisTypeParametersOnTheGivenType(type.asWildcard().getBoundedType()));
+            return ResolvedWildcard.superBound(useThisTypeParametersOnTheGivenType(type.asWildcard().getBoundedType()));
         }
         if (type.isReferenceType()) {
             type = type.asReferenceType().transformTypeParameters(this::useThisTypeParametersOnTheGivenType);
diff --git a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametersMap.java b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametersMap.java
index 438da1e058..bcfea40fc1 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametersMap.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/resolution/types/parametrization/ResolvedTypeParametersMap.java
@@ -43,9 +43,7 @@ public Builder() {
             nameToDeclaration = new HashMap<>();
         }
 
-        private Builder(
-                Map<String, ResolvedType> nameToValue,
-                Map<String, ResolvedTypeParameterDeclaration> nameToDeclaration) {
+        private Builder(Map<String, ResolvedType> nameToValue, Map<String, ResolvedTypeParameterDeclaration> nameToDeclaration) {
             this.nameToValue = new HashMap<>();
             this.nameToValue.putAll(nameToValue);
             this.nameToDeclaration = new HashMap<>();
@@ -67,8 +65,10 @@ public Builder setValue(ResolvedTypeParameterDeclaration typeParameter, Resolved
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof ResolvedTypeParametersMap)) return false;
+        if (this == o)
+            return true;
+        if (!(o instanceof ResolvedTypeParametersMap))
+            return false;
         ResolvedTypeParametersMap that = (ResolvedTypeParametersMap) o;
         return nameToValue.equals(that.nameToValue) && nameToDeclaration.equals(that.nameToDeclaration);
     }
@@ -91,8 +91,7 @@ public static ResolvedTypeParametersMap empty() {
         return new Builder().build();
     }
 
-    private ResolvedTypeParametersMap(
-            Map<String, ResolvedType> nameToValue, Map<String, ResolvedTypeParameterDeclaration> nameToDeclaration) {
+    private ResolvedTypeParametersMap(Map<String, ResolvedType> nameToValue, Map<String, ResolvedTypeParameterDeclaration> nameToDeclaration) {
         this.nameToValue = new HashMap<>();
         this.nameToValue.putAll(nameToValue);
         this.nameToDeclaration = new HashMap<>();
@@ -133,8 +132,7 @@ public boolean isEmpty() {
     public ResolvedType replaceAll(ResolvedType type) {
         Map<ResolvedTypeParameterDeclaration, ResolvedType> inferredTypes = new HashMap<>();
         for (ResolvedTypeParameterDeclaration typeParameterDeclaration : this.nameToDeclaration.values()) {
-            type = type.replaceTypeVariables(
-                    typeParameterDeclaration, getValue(typeParameterDeclaration), inferredTypes);
+            type = type.replaceTypeVariables(typeParameterDeclaration, getValue(typeParameterDeclaration), inferredTypes);
         }
         return type;
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/CodeGenerationUtils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/CodeGenerationUtils.java
index 6404ee9bd1..81d49827d6 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/CodeGenerationUtils.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/CodeGenerationUtils.java
@@ -22,7 +22,6 @@
 
 import static com.github.javaparser.utils.Utils.capitalize;
 import static com.github.javaparser.utils.Utils.decapitalize;
-
 import java.io.File;
 import java.net.URISyntaxException;
 import java.nio.file.Path;
@@ -33,7 +32,8 @@
  */
 public final class CodeGenerationUtils {
 
-    private CodeGenerationUtils() {}
+    private CodeGenerationUtils() {
+    }
 
     public static String getterName(Class<?> type, String name) {
         if (name.startsWith("is") && boolean.class.equals(type)) {
@@ -131,8 +131,7 @@ public static Path packageAbsolutePath(Path root, String pkg) {
      */
     public static Path classLoaderRoot(Class<?> c) {
         try {
-            return Paths.get(
-                    c.getProtectionDomain().getCodeSource().getLocation().toURI());
+            return Paths.get(c.getProtectionDomain().getCodeSource().getLocation().toURI());
         } catch (URISyntaxException e) {
             throw new AssertionError("Bug in JavaParser, please report.", e);
         }
@@ -143,7 +142,7 @@ public static Path classLoaderRoot(Class<?> c) {
      * "target/(test-)classes", giving the directory containing the pom.xml.
      */
     public static Path mavenModuleRoot(Class<?> c) {
-        return classLoaderRoot(c).resolve(Paths.get("..", "..")).normalize();
+        return classLoaderRoot(c).resolve(Paths.get("..", "..", "..", "..")).normalize();
     }
 
     /**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/CollectionStrategy.java b/javaparser-core/src/main/java/com/github/javaparser/utils/CollectionStrategy.java
index fd5085f6e1..650bc3f3b8 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/CollectionStrategy.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/CollectionStrategy.java
@@ -47,8 +47,7 @@ default Optional<Path> getRoot(Path file) {
             final ParseResult<CompilationUnit> parseResult = javaParser.parse(file);
             if (parseResult.isSuccessful()) {
                 if (parseResult.getResult().isPresent()) {
-                    final Optional<CompilationUnit.Storage> storage =
-                            parseResult.getResult().flatMap(CompilationUnit::getStorage);
+                    final Optional<CompilationUnit.Storage> storage = parseResult.getResult().flatMap(CompilationUnit::getStorage);
                     if (storage.isPresent()) {
                         if ("module-info.java".equals(storage.get().getFileName())) {
                             // module-info.java is useless for finding the source root, since it can be placed in any
@@ -57,15 +56,12 @@ default Optional<Path> getRoot(Path file) {
                         }
                         return storage.map(CompilationUnit.Storage::getSourceRoot);
                     }
-                    Log.info(
-                            "Storage information not present -- an issue with providing a string rather than file reference?");
+                    Log.info("Storage information not present -- an issue with providing a string rather than file reference?");
                 }
                 Log.info("Parse result not present");
             }
             Log.info("Parsing was not successful.");
-            Log.info(
-                    "There were (%d) problems parsing file: %s",
-                    () -> parseResult.getProblems().size(), parseResult::getProblems);
+            Log.info("There were (%d) problems parsing file: %s", () -> parseResult.getProblems().size(), parseResult::getProblems);
         } catch (ParseProblemException e) {
             Log.info("Problem parsing file %s : %s", () -> file, () -> e.getLocalizedMessage());
         } catch (RuntimeException e) {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/LineSeparator.java b/javaparser-core/src/main/java/com/github/javaparser/utils/LineSeparator.java
index a226d632d4..b90ad14c57 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/LineSeparator.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/LineSeparator.java
@@ -46,10 +46,7 @@ public enum LineSeparator {
     /**
      * This line ending is set to whatever the host system's line separator is
      */
-    SYSTEM(
-            System.getProperty("line.separator"),
-            "SYSTEM : ("
-                    + System.getProperty("line.separator").replace("\r", "\\r").replace("\n", "\\n") + ")"),
+    SYSTEM(System.getProperty("line.separator"), "SYSTEM : (" + System.getProperty("line.separator").replace("\r", "\\r").replace("\n", "\\n") + ")"),
     /**
      * The ARBITRARY line ending can be used where we do not care about the line separator,
      * only that we use the same one consistently
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/Log.java b/javaparser-core/src/main/java/com/github/javaparser/utils/Log.java
index 04331acb25..94262e605f 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/Log.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/Log.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.utils;
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -66,7 +65,7 @@ public void error(Supplier<Throwable> throwableSupplier, Supplier<String> messag
 
         private void printStackTrace(Throwable throwable) {
             try (StringWriter sw = new StringWriter();
-                    PrintWriter pw = new PrintWriter(sw)) {
+                PrintWriter pw = new PrintWriter(sw)) {
                 throwable.printStackTrace(pw);
                 trace(sw::toString);
             } catch (IOException e) {
@@ -81,13 +80,16 @@ private void printStackTrace(Throwable throwable) {
     public static class SilentAdapter implements Adapter {
 
         @Override
-        public void info(Supplier<String> messageSupplier) {}
+        public void info(Supplier<String> messageSupplier) {
+        }
 
         @Override
-        public void trace(Supplier<String> messageSupplier) {}
+        public void trace(Supplier<String> messageSupplier) {
+        }
 
         @Override
-        public void error(Supplier<Throwable> throwableSupplier, Supplier<String> messageSupplier) {}
+        public void error(Supplier<Throwable> throwableSupplier, Supplier<String> messageSupplier) {
+        }
     }
 
     public interface Adapter {
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/Optionals.java b/javaparser-core/src/main/java/com/github/javaparser/utils/Optionals.java
new file mode 100755
index 0000000000..a426431748
--- /dev/null
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/Optionals.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package com.github.javaparser.utils;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+
+/**
+ * Utility methods for {@link Optional}, backporting Java 9+ operations to Java 8.
+ *
+ * <p>This class emulates {@code Optional.or()} chaining from Java 9+, allowing
+ * lazy evaluation of alternative Optional values.
+ *
+ * <p><b>Migration notice:</b> Remove this class when upgrading to Java 11+.
+ * Replace {@code Optionals.or()} calls with native {@code Optional.or()} chaining.
+ *
+ * @since 3.28.0
+ */
+public final class Optionals {
+
+    private Optionals() {
+        throw new AssertionError("Optionals is a utility class and should not be instantiated");
+    }
+
+    /**
+     * Returns the first present Optional from the given suppliers.
+     *
+     * <p>Emulates Java 9+ {@code Optional.or()} chaining with varargs support:
+     * <pre>{@code
+     * // Java 9+
+     * Optional<T> result = opt1.or(() -> opt2).or(() -> opt3);
+     *
+     * // Java 8 with Optionals
+     * Optional<T> result = Optionals.or(() -> opt1, () -> opt2, () -> opt3);
+     * }</pre>
+     *
+     * <p>Suppliers are evaluated lazily with short-circuit evaluation.
+     *
+     * @param <T> the type of the value
+     * @param suppliers suppliers of Optionals to evaluate in order
+     * @return the first present Optional, or empty if all are empty
+     */
+    @SafeVarargs
+    public static <T> Optional<T> or(Supplier<Optional<T>>... suppliers) {
+        for (Supplier<Optional<T>> supplier : suppliers) {
+            Optional<T> result = supplier.get();
+            if (result.isPresent()) {
+                return result;
+            }
+        }
+        return Optional.empty();
+    }
+}
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/Pair.java b/javaparser-core/src/main/java/com/github/javaparser/utils/Pair.java
index c5f7f90d8d..b41eb3ee5c 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/Pair.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/Pair.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.utils;
 
 import static com.github.javaparser.utils.CodeGenerationUtils.f;
-
 import java.util.Objects;
 
 /**
@@ -43,11 +42,15 @@ public Pair(A a, B b) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
         Pair<?, ?> pair = (Pair<?, ?>) o;
-        if (!Objects.equals(a, pair.a)) return false;
-        if (!Objects.equals(b, pair.b)) return false;
+        if (!Objects.equals(a, pair.a))
+            return false;
+        if (!Objects.equals(b, pair.b))
+            return false;
         return true;
     }
 
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/ParserCollectionStrategy.java b/javaparser-core/src/main/java/com/github/javaparser/utils/ParserCollectionStrategy.java
index 46ec901fb2..675011baa0 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/ParserCollectionStrategy.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/ParserCollectionStrategy.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.utils;
 
 import static java.nio.file.FileVisitResult.*;
-
 import com.github.javaparser.ParserConfiguration;
 import java.io.IOException;
 import java.nio.file.*;
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java
index 22da02c53b..720ef665ff 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.utils;
 
 import static java.lang.Integer.signum;
-
 import com.github.javaparser.Position;
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.Modifier;
@@ -111,10 +110,7 @@ private static Node firstNonAnnotationNode(Node node) {
         if (node instanceof ClassOrInterfaceDeclaration) {
             // Modifiers appear before the class name --
             ClassOrInterfaceDeclaration casted = (ClassOrInterfaceDeclaration) node;
-            Modifier earliestModifier = casted.getModifiers().stream()
-                    .filter(modifier -> modifier.hasRange())
-                    .min(Comparator.comparing(o -> o.getRange().get().begin))
-                    .orElse(null);
+            Modifier earliestModifier = casted.getModifiers().stream().filter(modifier -> modifier.hasRange()).min(Comparator.comparing(o -> o.getRange().get().begin)).orElse(null);
             if (earliestModifier == null) {
                 return casted.getName();
             }
@@ -123,10 +119,7 @@ private static Node firstNonAnnotationNode(Node node) {
         if (node instanceof MethodDeclaration) {
             // Modifiers appear before the class name --
             MethodDeclaration casted = (MethodDeclaration) node;
-            Modifier earliestModifier = casted.getModifiers().stream()
-                    .filter(modifier -> modifier.hasRange())
-                    .min(Comparator.comparing(o -> o.getRange().get().begin))
-                    .orElse(null);
+            Modifier earliestModifier = casted.getModifiers().stream().filter(modifier -> modifier.hasRange()).min(Comparator.comparing(o -> o.getRange().get().begin)).orElse(null);
             if (earliestModifier == null) {
                 return casted.getType();
             }
@@ -135,10 +128,7 @@ private static Node firstNonAnnotationNode(Node node) {
         if (node instanceof FieldDeclaration) {
             // Modifiers appear before the class name --
             FieldDeclaration casted = (FieldDeclaration) node;
-            Modifier earliestModifier = casted.getModifiers().stream()
-                    .filter(modifier -> modifier.hasRange())
-                    .min(Comparator.comparing(o -> o.getRange().get().begin))
-                    .orElse(null);
+            Modifier earliestModifier = casted.getModifiers().stream().filter(modifier -> modifier.hasRange()).min(Comparator.comparing(o -> o.getRange().get().begin)).orElse(null);
             if (earliestModifier == null) {
                 return casted.getVariable(0).getType();
             }
@@ -159,12 +149,10 @@ private static Node firstNonAnnotationNode(Node node) {
      */
     public static boolean nodeContains(Node container, Node other, boolean ignoringAnnotations) {
         if (!container.hasRange()) {
-            throw new IllegalArgumentException(
-                    "Cannot compare the positions of nodes if container node does not have a range.");
+            throw new IllegalArgumentException("Cannot compare the positions of nodes if container node does not have a range.");
         }
         if (!other.hasRange()) {
-            throw new IllegalArgumentException(
-                    "Cannot compare the positions of nodes if contained node does not have a range.");
+            throw new IllegalArgumentException("Cannot compare the positions of nodes if contained node does not have a range.");
         }
         // // FIXME: Not all nodes seem to have the compilation unit available?
         // if (!Objects.equals(container.findCompilationUnit(), other.findCompilationUnit())) {
@@ -187,10 +175,7 @@ public static boolean nodeContains(Node container, Node other, boolean ignoringA
         // If the node is contained, but it comes immediately after the annotations,
         // let's not consider it contained (i.e. it must be "strictly contained").
         Node nodeWithoutAnnotations = firstNonAnnotationNode(container);
-        Range rangeWithoutAnnotations = container
-                .getRange()
-                .get()
-                .withBegin(nodeWithoutAnnotations.getBegin().get());
+        Range rangeWithoutAnnotations = container.getRange().get().withBegin(nodeWithoutAnnotations.getBegin().get());
         return // .contains(other.getRange().get());
         rangeWithoutAnnotations.strictlyContains(other.getRange().get());
     }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/SourceRoot.java b/javaparser-core/src/main/java/com/github/javaparser/utils/SourceRoot.java
index 5e9fe26fb4..10dc6d7536 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/SourceRoot.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/SourceRoot.java
@@ -23,7 +23,6 @@
 import static com.github.javaparser.utils.CodeGenerationUtils.*;
 import static com.github.javaparser.utils.Utils.assertNotNull;
 import static java.nio.file.FileVisitResult.*;
-
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParseProblemException;
 import com.github.javaparser.ParseResult;
@@ -63,9 +62,8 @@ public class SourceRoot {
     public interface Callback {
 
         enum Result {
-            SAVE,
-            DONT_SAVE,
-            TERMINATE
+
+            SAVE, DONT_SAVE, TERMINATE
         }
 
         /**
@@ -84,8 +82,7 @@ enum Result {
 
     private Function<CompilationUnit, String> printer = new DefaultPrettyPrinter()::print;
 
-    private static final Pattern JAVA_IDENTIFIER =
-            Pattern.compile("\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*");
+    private static final Pattern JAVA_IDENTIFIER = Pattern.compile("\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*");
 
     /**
      * @param root the root directory of a set of source files. It corresponds to the root of the package structure of the
@@ -117,8 +114,7 @@ public SourceRoot(Path root, ParserConfiguration parserConfiguration) {
      *
      * @param startPackage files in this package and deeper are parsed. Pass "" to parse all files.
      */
-    public ParseResult<CompilationUnit> tryToParse(
-            String startPackage, String filename, ParserConfiguration configuration) throws IOException {
+    public ParseResult<CompilationUnit> tryToParse(String startPackage, String filename, ParserConfiguration configuration) throws IOException {
         assertNotNull(startPackage);
         assertNotNull(filename);
         final Path relativePath = fileInPackageRelativePath(startPackage, filename);
@@ -179,8 +175,7 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th
     boolean isSensibleDirectoryToEnter(Path dir) throws IOException {
         final String dirToEnter = dir.getFileName().toString();
         // Don't enter directories that cannot be packages.
-        final boolean directoryIsAValidJavaIdentifier =
-                JAVA_IDENTIFIER.matcher(dirToEnter).matches();
+        final boolean directoryIsAValidJavaIdentifier = JAVA_IDENTIFIER.matcher(dirToEnter).matches();
         // Don't enter directories that are hidden, assuming that people don't store source files in hidden directories.
         // But we can enter in root directory even if the root directory is not considered as a valid java identifier
         if (!root.equals(dir) && (Files.isHidden(dir) || !directoryIsAValidJavaIdentifier)) {
@@ -268,12 +263,11 @@ public CompilationUnit parse(String startPackage, String filename) {
         }
     }
 
-    private FileVisitResult callback(Path absolutePath, ParserConfiguration configuration, Callback callback)
-            throws IOException {
+    private FileVisitResult callback(Path absolutePath, ParserConfiguration configuration, Callback callback) throws IOException {
         Path localPath = root.relativize(absolutePath);
         Log.trace("Parsing %s", () -> localPath);
         ParseResult<CompilationUnit> result = new JavaParser(configuration).parse(absolutePath);
-        switch (callback.process(localPath, absolutePath, result)) {
+        switch(callback.process(localPath, absolutePath, result)) {
             case SAVE:
                 result.getResult().ifPresent(cu -> save(cu, absolutePath));
             case DONT_SAVE:
@@ -292,8 +286,7 @@ private FileVisitResult callback(Path absolutePath, ParserConfiguration configur
      * @param startPackage The package containing the file
      * @param filename The name of the file
      */
-    public SourceRoot parse(String startPackage, String filename, ParserConfiguration configuration, Callback callback)
-            throws IOException {
+    public SourceRoot parse(String startPackage, String filename, ParserConfiguration configuration, Callback callback) throws IOException {
         assertNotNull(startPackage);
         assertNotNull(filename);
         assertNotNull(configuration);
@@ -317,8 +310,7 @@ public SourceRoot parse(String startPackage, String filename, Callback callback)
      *
      * @param startPackage files in this package and deeper are parsed. Pass "" to parse all files.
      */
-    public SourceRoot parse(String startPackage, ParserConfiguration configuration, Callback callback)
-            throws IOException {
+    public SourceRoot parse(String startPackage, ParserConfiguration configuration, Callback callback) throws IOException {
         assertNotNull(startPackage);
         assertNotNull(configuration);
         assertNotNull(callback);
@@ -438,8 +430,7 @@ public SourceRoot add(CompilationUnit compilationUnit) {
         if (compilationUnit.getStorage().isPresent()) {
             final Path path = compilationUnit.getStorage().get().getPath();
             Log.trace("Adding new file %s", () -> path);
-            final ParseResult<CompilationUnit> parseResult =
-                    new ParseResult<>(compilationUnit, new ArrayList<>(), null);
+            final ParseResult<CompilationUnit> parseResult = new ParseResult<>(compilationUnit, new ArrayList<>(), null);
             cache.put(path, parseResult);
         } else {
             throw new AssertionError("Files added with this method should have their path set.");
@@ -511,9 +502,7 @@ Path resolvePath(Path newRoot, Path cachedPath) {
         if (newRoot == null || cachedPath == null) {
             throw new NullPointerException("newRoot/cachedPath must not be null");
         }
-        return cachedPath.isAbsolute()
-                ? cachedPath.normalize()
-                : newRoot.resolve(cachedPath).normalize();
+        return cachedPath.isAbsolute() ? cachedPath.normalize() : newRoot.resolve(cachedPath).normalize();
     }
 
     /**
@@ -551,10 +540,7 @@ public List<ParseResult<CompilationUnit>> getCache() {
      * added manually.
      */
     public List<CompilationUnit> getCompilationUnits() {
-        return cache.values().stream()
-                .filter(ParseResult::isSuccessful)
-                .map(p -> p.getResult().get())
-                .collect(Collectors.toList());
+        return cache.values().stream().filter(ParseResult::isSuccessful).map(p -> p.getResult().get()).collect(Collectors.toList());
     }
 
     /**
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/SourceZip.java b/javaparser-core/src/main/java/com/github/javaparser/utils/SourceZip.java
index 451a047373..c4052f7345 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/SourceZip.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/SourceZip.java
@@ -23,7 +23,6 @@
 import static com.github.javaparser.ParseStart.COMPILATION_UNIT;
 import static com.github.javaparser.Providers.provider;
 import static com.github.javaparser.utils.Utils.assertNotNull;
-
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParseResult;
 import com.github.javaparser.ParserConfiguration;
@@ -102,8 +101,7 @@ public SourceZip parse(Callback callback) throws IOException {
             for (ZipEntry entry : Collections.list(zipFile.entries())) {
                 if (!entry.isDirectory() && entry.getName().endsWith(".java")) {
                     Log.info("Parsing zip entry \"%s\"", () -> entry.getName());
-                    final ParseResult<CompilationUnit> result =
-                            javaParser.parse(COMPILATION_UNIT, provider(zipFile.getInputStream(entry)));
+                    final ParseResult<CompilationUnit> result = javaParser.parse(COMPILATION_UNIT, provider(zipFile.getInputStream(entry)));
                     callback.process(Paths.get(entry.getName()), result);
                 }
             }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/StringEscapeUtils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/StringEscapeUtils.java
index 10207a855a..295945de85 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/StringEscapeUtils.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/StringEscapeUtils.java
@@ -33,7 +33,8 @@
  */
 public final class StringEscapeUtils {
 
-    private StringEscapeUtils() {}
+    private StringEscapeUtils() {
+    }
 
     /**
      * <p>Escapes the characters in a {@code String} using Java String rules.</p>
@@ -79,28 +80,15 @@ public static String unescapeJavaTextBlock(final String input) {
     }
 
     // TODO do we need to integrate /s escape sequence because there is a compilation error?
-    private static final LookupTranslator JAVA_CTRL_CHARS_UNESCAPE = new LookupTranslator(
-            new String[][] {{"\\b", "\b"}, {"\\n", "\n"}, {"\\t", "\t"}, {"\\f", "\f"}, {"\\r", "\r"}});
+    private static final LookupTranslator JAVA_CTRL_CHARS_UNESCAPE = new LookupTranslator(new String[][] { { "\\b", "\b" }, { "\\n", "\n" }, { "\\t", "\t" }, { "\\f", "\f" }, { "\\r", "\r" } });
 
-    private static final LookupTranslator JAVA_CTRL_CHARS_ESCAPE = new LookupTranslator(
-            new String[][] {{"\b", "\\b"}, {"\n", "\\n"}, {"\t", "\\t"}, {"\f", "\\f"}, {"\r", "\\r"}});
+    private static final LookupTranslator JAVA_CTRL_CHARS_ESCAPE = new LookupTranslator(new String[][] { { "\b", "\\b" }, { "\n", "\\n" }, { "\t", "\\t" }, { "\f", "\\f" }, { "\r", "\\r" } });
 
-    private static final CharSequenceTranslator ESCAPE_JAVA = new AggregateTranslator(
-            new LookupTranslator(new String[][] {{"\"", "\\\""}, {"\\", "\\\\"}}), JAVA_CTRL_CHARS_ESCAPE);
+    private static final CharSequenceTranslator ESCAPE_JAVA = new AggregateTranslator(new LookupTranslator(new String[][] { { "\"", "\\\"" }, { "\\", "\\\\" } }), JAVA_CTRL_CHARS_ESCAPE);
 
-    private static final CharSequenceTranslator UNESCAPE_JAVA = new AggregateTranslator(
-            new OctalUnescaper(),
-            new UnicodeUnescaper(),
-            JAVA_CTRL_CHARS_UNESCAPE,
-            new LookupTranslator(new String[][] {{"\\\\", "\\"}, {"\\\"", "\""}, {"\\'", "'"}, {"\\", ""}}));
+    private static final CharSequenceTranslator UNESCAPE_JAVA = new AggregateTranslator(new OctalUnescaper(), new UnicodeUnescaper(), JAVA_CTRL_CHARS_UNESCAPE, new LookupTranslator(new String[][] { { "\\\\", "\\" }, { "\\\"", "\"" }, { "\\'", "'" }, { "\\", "" } }));
 
-    private static final CharSequenceTranslator UNESCAPE_JAVA_TEXT_BLOCK = new AggregateTranslator(
-            new OctalUnescaper(),
-            new UnicodeUnescaper(),
-            JAVA_CTRL_CHARS_UNESCAPE,
-            new LookupTranslator(
-                    new String[][] {{"\\\\", "\\"}, {"\\\"", "\""}, {"\\'", "'"}, {"\\", ""}, {"\\s", " "}, {"\\\n", ""}
-                    }));
+    private static final CharSequenceTranslator UNESCAPE_JAVA_TEXT_BLOCK = new AggregateTranslator(new OctalUnescaper(), new UnicodeUnescaper(), JAVA_CTRL_CHARS_UNESCAPE, new LookupTranslator(new String[][] { { "\\\\", "\\" }, { "\\\"", "\"" }, { "\\'", "'" }, { "\\", "" }, { "\\s", " " }, { "\\\n", "" } }));
 
     /**
      * Adapted from apache commons-lang3 project.
@@ -399,8 +387,7 @@ protected int translate(final CharSequence input, final int index, final Writer
                     }
                     return i + 4;
                 }
-                throw new IllegalArgumentException("Less than 4 hex digits in unicode value: '"
-                        + input.subSequence(index, input.length()) + "' due to end of CharSequence");
+                throw new IllegalArgumentException("Less than 4 hex digits in unicode value: '" + input.subSequence(index, input.length()) + "' due to end of CharSequence");
             }
             return 0;
         }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/TypeUtils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/TypeUtils.java
index a5a1a193cd..f0e38112cf 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/TypeUtils.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/TypeUtils.java
@@ -54,10 +54,7 @@ private static void appendDescriptor(final Class<?> clazz, final StringBuilder s
             String descriptor = getPrimitiveTypeDescriptor(currentClass);
             stringBuilder.append(descriptor);
         } else {
-            stringBuilder
-                    .append("L")
-                    .append(currentClass.getName().replace(".", "/"))
-                    .append(";");
+            stringBuilder.append("L").append(currentClass.getName().replace(".", "/")).append(";");
         }
     }
 
@@ -71,8 +68,6 @@ public static String getPrimitiveTypeDescriptor(final Class<?> clazz) {
             return prim.get().toDescriptor();
         }
         prim = Primitive.byBoxedTypeName(className);
-        return prim.map(pType -> pType.toDescriptor())
-                .orElseThrow(
-                        () -> new IllegalArgumentException(String.format("Unknown primitive type \"%s\"", className)));
+        return prim.map(pType -> pType.toDescriptor()).orElseThrow(() -> new IllegalArgumentException(String.format("Unknown primitive type \"%s\"", className)));
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/Utils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/Utils.java
index 123ec15046..9e39b4f9df 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/Utils.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/Utils.java
@@ -21,7 +21,6 @@
 package com.github.javaparser.utils;
 
 import static java.util.Arrays.asList;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.UnaryExpr;
 import java.io.IOException;
@@ -74,7 +73,7 @@ public static <T extends Number> T assertPositive(T number) {
     public static String escapeEndOfLines(String string) {
         StringBuilder escapedString = new StringBuilder();
         for (char c : string.toCharArray()) {
-            switch (c) {
+            switch(c) {
                 case '\n':
                     escapedString.append("\\n");
                     break;
@@ -173,8 +172,7 @@ public static String decapitalize(String s) {
         return stringTransformer(s, "decapitalize", String::toLowerCase);
     }
 
-    private static String stringTransformer(
-            String s, String operationDescription, Function<String, String> transformation) {
+    private static String stringTransformer(String s, String operationDescription, Function<String, String> transformation) {
         if (s.isEmpty()) {
             throw new IllegalArgumentException(String.format("You cannot %s an empty string", operationDescription));
         }
@@ -282,7 +280,8 @@ public static String normalizeEolInTextBlock(String content, LineSeparator desir
      */
     public static String removeFileExtension(String filename) {
         int extensionIndex = filename.lastIndexOf(".");
-        if (extensionIndex == -1) return filename;
+        if (extensionIndex == -1)
+            return filename;
         return filename.substring(0, extensionIndex);
     }
 
@@ -300,10 +299,6 @@ public static String trimTrailingSpaces(String line) {
      * Checks, if the parent is a unary expression with a minus operator. Used to check for negative literals.
      */
     public static boolean hasUnaryMinusAsParent(Node n) {
-        return n.getParentNode()
-                .filter(parent -> parent instanceof UnaryExpr)
-                .map(parent -> (UnaryExpr) parent)
-                .map(unaryExpr -> unaryExpr.getOperator() == UnaryExpr.Operator.MINUS)
-                .orElse(false);
+        return n.getParentNode().filter(parent -> parent instanceof UnaryExpr).map(parent -> (UnaryExpr) parent).map(unaryExpr -> unaryExpr.getOperator() == UnaryExpr.Operator.MINUS).orElse(false);
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorList.java b/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorList.java
index 0edcec07d5..6560d882bf 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorList.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorList.java
@@ -42,8 +42,7 @@ public class VisitorList<N extends Node> implements List<N> {
     /**
      * Pass the visitors to use for equals and hashcode.
      */
-    public VisitorList(
-            GenericVisitor<Integer, Void> hashcodeVisitor, GenericVisitor<Boolean, Visitable> equalsVisitor) {
+    public VisitorList(GenericVisitor<Integer, Void> hashcodeVisitor, GenericVisitor<Boolean, Visitable> equalsVisitor) {
         this.hashcodeVisitor = hashcodeVisitor;
         this.equalsVisitor = equalsVisitor;
         innerList = new ArrayList<>();
@@ -62,16 +61,20 @@ public void add(int index, N elem) {
     @Override
     public boolean addAll(Collection<? extends N> col) {
         boolean modified = false;
-        for (N elem : col) if (add(elem)) modified = true;
+        for (N elem : col) if (add(elem))
+            modified = true;
         return modified;
     }
 
     @Override
     public boolean addAll(int index, Collection<? extends N> col) {
-        if (col.isEmpty()) return false;
+        if (col.isEmpty())
+            return false;
         for (N elem : col) {
-            if (index == size()) add(elem);
-            else add(index, elem);
+            if (index == size())
+                add(elem);
+            else
+                add(index, elem);
             index++;
         }
         return true;
@@ -89,7 +92,8 @@ public boolean contains(Object elem) {
 
     @Override
     public boolean containsAll(Collection<?> col) {
-        for (Object elem : col) if (!contains(elem)) return false;
+        for (Object elem : col) if (!contains(elem))
+            return false;
         return true;
     }
 
@@ -207,7 +211,8 @@ public N remove(int index) {
     @Override
     public boolean removeAll(Collection<?> col) {
         boolean modified = false;
-        for (Object elem : col) if (remove(elem)) modified = true;
+        for (Object elem : col) if (remove(elem))
+            modified = true;
         return modified;
     }
 
@@ -241,24 +246,19 @@ public List<N> subList(int fromIndex, int toIndex) {
 
     @Override
     public Object[] toArray() {
-        return innerList.stream()
-                .map(facade -> facade.overridden)
-                .collect(Collectors.toList())
-                .toArray();
+        return innerList.stream().map(facade -> facade.overridden).collect(Collectors.toList()).toArray();
     }
 
     @Override
     public <T> T[] toArray(T[] arr) {
-        return innerList.stream()
-                .map(facade -> facade.overridden)
-                .collect(Collectors.toList())
-                .toArray(arr);
+        return innerList.stream().map(facade -> facade.overridden).collect(Collectors.toList()).toArray(arr);
     }
 
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder("[");
-        if (size() == 0) return sb.append("]").toString();
+        if (size() == 0)
+            return sb.append("]").toString();
         for (EqualsHashcodeOverridingFacade facade : innerList) {
             sb.append(facade.overridden.toString() + ", ");
         }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorMap.java b/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorMap.java
index 43a43dcbf5..f9f97e54d4 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorMap.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorMap.java
@@ -139,8 +139,6 @@ public Collection<V> values() {
 
     @Override
     public Set<Entry<N, V>> entrySet() {
-        return innerMap.entrySet().stream()
-                .map(e -> new HashMap.SimpleEntry<>(e.getKey().overridden, e.getValue()))
-                .collect(Collectors.toSet());
+        return innerMap.entrySet().stream().map(e -> new HashMap.SimpleEntry<>(e.getKey().overridden, e.getValue())).collect(Collectors.toSet());
     }
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorSet.java b/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorSet.java
index 1e849e431d..96e7a6ea55 100644
--- a/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorSet.java
+++ b/javaparser-core/src/main/java/com/github/javaparser/utils/VisitorSet.java
@@ -58,7 +58,8 @@ public boolean add(N elem) {
     @Override
     public boolean addAll(Collection<? extends N> col) {
         boolean modified = false;
-        for (N elem : col) if (add(elem)) modified = true;
+        for (N elem : col) if (add(elem))
+            modified = true;
         return modified;
     }
 
@@ -74,7 +75,8 @@ public boolean contains(Object elem) {
 
     @Override
     public boolean containsAll(Collection<?> col) {
-        for (Object elem : col) if (!contains(elem)) return false;
+        for (Object elem : col) if (!contains(elem))
+            return false;
         return true;
     }
 
@@ -114,7 +116,8 @@ public boolean remove(Object elem) {
     @Override
     public boolean removeAll(Collection<?> col) {
         boolean modified = false;
-        for (Object elem : col) if (remove(elem)) modified = true;
+        for (Object elem : col) if (remove(elem))
+            modified = true;
         return modified;
     }
 
@@ -133,18 +136,12 @@ public int size() {
 
     @Override
     public Object[] toArray() {
-        return innerSet.stream()
-                .map(facade -> facade.overridden)
-                .collect(Collectors.toList())
-                .toArray();
+        return innerSet.stream().map(facade -> facade.overridden).collect(Collectors.toList()).toArray();
     }
 
     @Override
     public <T> T[] toArray(T[] arr) {
-        return innerSet.stream()
-                .map(facade -> facade.overridden)
-                .collect(Collectors.toList())
-                .toArray(arr);
+        return innerSet.stream().map(facade -> facade.overridden).collect(Collectors.toList()).toArray(arr);
     }
 
     @Override
diff --git a/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserBase.java b/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserBase.java
index 56bd09a9bf..f4cf0125b2 100644
--- a/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserBase.java
+++ b/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserBase.java
@@ -21,6 +21,11 @@
 
 package com.github.javaparser;
 
+import static com.github.javaparser.GeneratedJavaParserConstants.EOF;
+import static com.github.javaparser.ast.type.ArrayType.unwrapArrayTypes;
+import static com.github.javaparser.ast.type.ArrayType.wrapInArrayTypes;
+import static com.github.javaparser.utils.Utils.assertNotNull;
+
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.BodyDeclaration;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
@@ -31,14 +36,8 @@
 import com.github.javaparser.ast.stmt.Statement;
 import com.github.javaparser.ast.type.*;
 import com.github.javaparser.utils.Pair;
-
 import java.util.*;
 
-import static com.github.javaparser.GeneratedJavaParserConstants.EOF;
-import static com.github.javaparser.ast.type.ArrayType.unwrapArrayTypes;
-import static com.github.javaparser.ast.type.ArrayType.wrapInArrayTypes;
-import static com.github.javaparser.utils.Utils.assertNotNull;
-
 /**
  * Base class for {@link GeneratedJavaParser}
  */
@@ -121,7 +120,6 @@ TokenRange range(NodeList<? extends Node> list) {
         return null;
     }
 
-
     /**
      * Return a TokenRange spanning from begin to end
      */
@@ -147,22 +145,20 @@ TokenRange range(JavaToken begin, Node end) {
      */
     TokenRange range(Node begin, Node end) {
         if (storeTokens) {
-            return new TokenRange(begin.getTokenRange().get().getBegin(), end.getTokenRange().get().getEnd());
+            return new TokenRange(
+                    begin.getTokenRange().get().getBegin(),
+                    end.getTokenRange().get().getEnd());
         }
         return null;
     }
 
-
     public JavaToken orIfInvalid(Object... nodesOrTokens) {
-        if (!storeTokens)
-            return null;
+        if (!storeTokens) return null;
 
         for (Object nort : nodesOrTokens) {
             if (nort == null) continue;
-            if (nort instanceof JavaToken j && j.valid())
-                return j;
-            if (nort instanceof Node n)
-                return n.getTokenRange().get().getBegin();
+            if (nort instanceof JavaToken j && j.valid()) return j;
+            if (nort instanceof Node n) return n.getTokenRange().get().getBegin();
         }
         return null;
     }
@@ -214,7 +210,7 @@ void setStoreTokens(boolean storeTokens) {
     }
 
     /* Called from within a catch block to skip forward to a known token,
-        and report the occurred exception as a problem. */
+    and report the occurred exception as a problem. */
     TokenRange recover(int recoveryTokenType, ParseException p) {
         JavaToken begin = null;
         if (p.currentToken != null) {
@@ -261,7 +257,7 @@ TokenRange recover(ParseException p, int... recoveryTokenTypes) {
     }
 
     /* Called from within a catch block to skip forward to a known token,
-        and report the occurred exception as a problem. */
+    and report the occurred exception as a problem. */
     TokenRange recoverStatement(int recoveryTokenType, int lBraceType, int rBraceType, ParseException p) {
         JavaToken begin = null;
         if (p.currentToken != null) {
@@ -353,7 +349,10 @@ <T> List<T> add(List<T> list, T obj) {
     private void propagateRangeGrowthOnRight(Node node, Node endNode) {
         if (storeTokens) {
             node.getParentNode().ifPresent(nodeParent -> {
-                boolean isChildOnTheRightBorderOfParent = node.getTokenRange().get().getEnd().equals(nodeParent.getTokenRange().get().getEnd());
+                boolean isChildOnTheRightBorderOfParent = node.getTokenRange()
+                        .get()
+                        .getEnd()
+                        .equals(nodeParent.getTokenRange().get().getEnd());
                 if (isChildOnTheRightBorderOfParent) {
                     propagateRangeGrowthOnRight(nodeParent, endNode);
                 }
@@ -369,11 +368,29 @@ Expression generateLambda(Expression ret, Statement lambdaBody) {
         if (ret instanceof EnclosedExpr) {
             Expression inner = ((EnclosedExpr) ret).getInner();
             SimpleName id = ((NameExpr) inner).getName();
-            NodeList<Parameter> params = add(new NodeList<>(), new Parameter(id.getTokenRange().orElse(null), new NodeList<>(), new NodeList<>(), new UnknownType(), false, new NodeList<>(), id));
+            NodeList<Parameter> params = add(
+                    new NodeList<>(),
+                    new Parameter(
+                            id.getTokenRange().orElse(null),
+                            new NodeList<>(),
+                            new NodeList<>(),
+                            new UnknownType(),
+                            false,
+                            new NodeList<>(),
+                            id));
             ret = new LambdaExpr(range(ret, lambdaBody), params, lambdaBody, true);
         } else if (ret instanceof NameExpr) {
             SimpleName id = ((NameExpr) ret).getName();
-            NodeList<Parameter> params = add(new NodeList<>(), new Parameter(ret.getTokenRange().orElse(null), new NodeList<>(), new NodeList<>(), new UnknownType(), false, new NodeList<>(), id));
+            NodeList<Parameter> params = add(
+                    new NodeList<>(),
+                    new Parameter(
+                            ret.getTokenRange().orElse(null),
+                            new NodeList<>(),
+                            new NodeList<>(),
+                            new UnknownType(),
+                            false,
+                            new NodeList<>(),
+                            id));
             ret = new LambdaExpr(range(ret, lambdaBody), params, lambdaBody, false);
         } else if (ret instanceof LambdaExpr) {
             ((LambdaExpr) ret).setBody(lambdaBody);
@@ -384,7 +401,8 @@ Expression generateLambda(Expression ret, Statement lambdaBody) {
             castExpr.setExpression(inner);
             propagateRangeGrowthOnRight(castExpr, inner);
         } else {
-            addProblem("Failed to parse lambda expression! Please create an issue at https://github.com/javaparser/javaparser/issues");
+            addProblem(
+                    "Failed to parse lambda expression! Please create an issue at https://github.com/javaparser/javaparser/issues");
         }
         return ret;
     }
@@ -392,7 +410,13 @@ Expression generateLambda(Expression ret, Statement lambdaBody) {
     /**
      * Throws together an ArrayCreationExpr from a lot of pieces
      */
-    ArrayCreationExpr juggleArrayCreation(TokenRange range, List<TokenRange> levelRanges, Type type, NodeList<Expression> dimensions, List<NodeList<AnnotationExpr>> arrayAnnotations, ArrayInitializerExpr arrayInitializerExpr) {
+    ArrayCreationExpr juggleArrayCreation(
+            TokenRange range,
+            List<TokenRange> levelRanges,
+            Type type,
+            NodeList<Expression> dimensions,
+            List<NodeList<AnnotationExpr>> arrayAnnotations,
+            ArrayInitializerExpr arrayInitializerExpr) {
         NodeList<ArrayCreationLevel> levels = new NodeList<>();
 
         for (int i = 0; i < arrayAnnotations.size(); i++) {
@@ -408,7 +432,8 @@ Type juggleArrayType(Type partialType, List<ArrayType.ArrayBracketPair> addition
         Pair<Type, List<ArrayType.ArrayBracketPair>> partialParts = unwrapArrayTypes(partialType);
         Type elementType = partialParts.a;
         List<ArrayType.ArrayBracketPair> leftMostBrackets = partialParts.b;
-        return wrapInArrayTypes(elementType, additionalBrackets, leftMostBrackets).clone();
+        return wrapInArrayTypes(elementType, additionalBrackets, leftMostBrackets)
+                .clone();
     }
 
     /**
@@ -449,10 +474,7 @@ private String makeMessageForParseException(ParseException exception) {
             if (image.equals(escapedTokenText)) {
                 sb.append(image);
             } else {
-                sb.append(" ")
-                        .append(escapedTokenText)
-                        .append(" ")
-                        .append(image);
+                sb.append(" ").append(escapedTokenText).append(" ").append(image);
             }
             token = token.next;
         }
@@ -476,10 +498,13 @@ Name scopeToName(Expression scope) {
         }
         if (scope.isFieldAccessExpr()) {
             FieldAccessExpr fieldAccessExpr = scope.asFieldAccessExpr();
-            return new Name(fieldAccessExpr.getTokenRange().orElse(null), scopeToName(fieldAccessExpr.getScope()), fieldAccessExpr.getName().getIdentifier());
-
+            return new Name(
+                    fieldAccessExpr.getTokenRange().orElse(null),
+                    scopeToName(fieldAccessExpr.getScope()),
+                    fieldAccessExpr.getName().getIdentifier());
         }
-        throw new IllegalStateException("Unexpected expression type: " + scope.getClass().getSimpleName());
+        throw new IllegalStateException(
+                "Unexpected expression type: " + scope.getClass().getSimpleName());
     }
 
     String unquote(String s) {
@@ -518,14 +543,12 @@ NodeList<TypeDeclaration<?>> typeDeclarationsForCu(NodeList<BodyDeclaration<?>>
         // We also know at this point that at least one body declaration exists, otherwise allMatch would have matched
         // the empty list.
 
-        ClassOrInterfaceDeclaration compactClass = new ClassOrInterfaceDeclaration(
-                new NodeList<Modifier>(),
-                false,
-                "$COMPACT_CLASS"
-        );
+        ClassOrInterfaceDeclaration compactClass =
+                new ClassOrInterfaceDeclaration(new NodeList<Modifier>(), false, "$COMPACT_CLASS");
 
         Optional<TokenRange> maybeStartingRange = bodyDeclarations.get(0).getTokenRange();
-        Optional<TokenRange> maybeEndRange = bodyDeclarations.get(bodyDeclarations.size() - 1).getTokenRange();
+        Optional<TokenRange> maybeEndRange =
+                bodyDeclarations.get(bodyDeclarations.size() - 1).getTokenRange();
         if (maybeStartingRange.isPresent() && maybeEndRange.isPresent()) {
             JavaToken begin = maybeStartingRange.get().getBegin();
             JavaToken end = maybeEndRange.get().getEnd();
diff --git a/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserTokenManagerBase.java b/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserTokenManagerBase.java
index ddcffc81d0..beba9ea99e 100644
--- a/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserTokenManagerBase.java
+++ b/javaparser-core/src/main/javacc-support/com/github/javaparser/GeneratedJavaParserTokenManagerBase.java
@@ -21,12 +21,11 @@
 
 package com.github.javaparser;
 
-import com.github.javaparser.ast.comments.*;
+import static com.github.javaparser.GeneratedJavaParserConstants.*;
 
+import com.github.javaparser.ast.comments.*;
 import java.util.ArrayDeque;
 
-import static com.github.javaparser.GeneratedJavaParserConstants.*;
-
 /**
  * Base class for {@link com.github.javaparser.GeneratedJavaParserTokenManager}
  */
@@ -53,13 +52,13 @@ static MarkdownComment createMarkdownCommentFromTokenList(ArrayDeque<Token> toke
         while (!tokens.isEmpty() && TokenTypes.isWhitespace(tokens.peekLast().kind)) {
             Token lastToken = tokens.removeLast();
 
-
             if (TokenTypes.isComment(lastToken.kind)) {
                 tokens.addLast(lastToken);
                 break;
             } else {
                 if (tokens.isEmpty()) {
-                    throw new IllegalArgumentException("createMarkdownCommentFromTokenList may not be called with a token list consisting only of whitespace tokens");
+                    throw new IllegalArgumentException(
+                            "createMarkdownCommentFromTokenList may not be called with a token list consisting only of whitespace tokens");
                 }
 
                 if (TokenTypes.isEndOfLineToken(lastToken.kind)) {
@@ -70,10 +69,7 @@ static MarkdownComment createMarkdownCommentFromTokenList(ArrayDeque<Token> toke
             }
         }
 
-        TokenRange range = new TokenRange(
-                tokens.peekFirst().javaToken,
-                tokens.peekLast().javaToken
-        );
+        TokenRange range = new TokenRange(tokens.peekFirst().javaToken, tokens.peekLast().javaToken);
 
         StringBuilder contentBuilder = new StringBuilder();
 
diff --git a/javaparser-core/src/main/javacc-support/com/github/javaparser/ModifierHolder.java b/javaparser-core/src/main/javacc-support/com/github/javaparser/ModifierHolder.java
index 44c72fe19a..a4c433bb94 100644
--- a/javaparser-core/src/main/javacc-support/com/github/javaparser/ModifierHolder.java
+++ b/javaparser-core/src/main/javacc-support/com/github/javaparser/ModifierHolder.java
@@ -21,12 +21,12 @@
 
 package com.github.javaparser;
 
+import static com.github.javaparser.utils.Utils.assertNotNull;
+
 import com.github.javaparser.ast.Modifier;
 import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.expr.AnnotationExpr;
 
-import static com.github.javaparser.utils.Utils.assertNotNull;
-
 /**
  * Helper class for {@link GeneratedJavaParser}
  */
diff --git a/javaparser-core/src/main/javacc-support/com/github/javaparser/RangedList.java b/javaparser-core/src/main/javacc-support/com/github/javaparser/RangedList.java
index e272a7ae3e..97c1d16c22 100644
--- a/javaparser-core/src/main/javacc-support/com/github/javaparser/RangedList.java
+++ b/javaparser-core/src/main/javacc-support/com/github/javaparser/RangedList.java
@@ -29,7 +29,7 @@
  */
 class RangedList<T extends Node> {
     /* A ranged list MUST be set to a begin and end,
-       or these temporary values will leak out */
+    or these temporary values will leak out */
     TokenRange range = new TokenRange(JavaToken.INVALID, JavaToken.INVALID);
     NodeList<T> list;
 
diff --git a/javaparser-core/src/main/javacc/java.jj b/javaparser-core/src/main/javacc/java.jj
index ed09b06700..93ef13ffb2 100644
--- a/javaparser-core/src/main/javacc/java.jj
+++ b/javaparser-core/src/main/javacc/java.jj
@@ -89,6 +89,8 @@ import com.github.javaparser.ast.jml.expr.*;
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.stmt.*;
 import com.github.javaparser.ast.jml.doc.*;
+import com.github.javaparser.ast.jml.doc.JmlDoc;
+import com.github.javaparser.ast.jml.doc.JmlDocModifier;
 import com.github.javaparser.ast.jml.*;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.stmt.*;
@@ -230,6 +232,7 @@ TOKEN : {
 | <ACCESSIBLE_REDUNDANTLY: "accessible_redundantly">
 | <ALSO: "also">
 | <ANTIVALENCE: "<=!=>">
+| <JML_ASSERT: "assert">
 | <ASSERT_REDUNDANTLY: "assert_redundantly">
 | <ASSIGNABLE: "assignable">
 | <ASSIGNABLE_REDUNDANTLY: "assignable_redundantly">
@@ -263,17 +266,21 @@ TOKEN : {
 | <CONTINUES_REDUNDANTLY: "continues_redundantly">
 | <CONTINUE_BEHAVIOR: "continue_behavior">
 | <CONTINUE_BEHAVIOUR: "continue_behaviour">
-| <DECLASSIFIES : "declassifies">
+| <DECLASSIFIES : "\\declassifies">
 | <DECREASES: "decreases">
 | <DECREASES_REDUNDANTLY: "decreases_redundantly">
 | <DECREASING: "decreasing">
 | <DECREASING_REDUNDANTLY: "decreasing_redundantly">
 | <DETERMINES : "determines">
+| <LOOP_DETERMINES : "loop_determines">
+| <SEPARATES : "separates">
+| <LOOP_SEPARATES : "loop_separates">
+| <NEW_OBJECTS : "\\new_objects">
+| <BY : "\\by">
 | <DIVERGES: "diverges">
 | <DIVERGES_REDUNDANTLY: "diverges_redundantly">
 | <DURATION: "\\duration">
 | <DURATION_REDUNDANTLY: "duration_redundantly">
-//| <ELEMTYPE: "\\elemtype">
 | <ENSURES: "ensures">
 | <ENSURES_REDUNDANTLY: "ensures_redundantly">
 | <ENSURES_FREE: "ensures_free">
@@ -281,8 +288,7 @@ TOKEN : {
 | <EQUIVALENCE: "<==>">
 | <IMPLICATION: "==>">
 | <IMPLICATION_BACKWARD: "<==">
-| <ERASES :  "erases">
-//| <EVERYTHING: "\\everything">
+| <ERASES :  "\\erases">
 | <EXAMPLE: "example">
 | <EXCEPTIONAL_BEHAVIOR: "exceptional_behavior">
 | <EXCEPTIONAL_BEHAVIOUR: "exceptional_behaviour">
@@ -349,7 +355,6 @@ TOKEN : {
 | <MONITORS_FOR: "monitors_for">
 | <NESTED_CONTRACT_END : "|}">
 | <NESTED_CONTRACT_START : "{|">
-| <NEW_OBJECT : "new_objects">
 //| <ESC_NONNULLELEMENTS: "\\nonnullelements">
 | <NONNULLELEMENTS: "nonnullelements">
 | <NON_NULL: "non_null">
@@ -428,7 +433,6 @@ TOKEN : {
 | <WORKING_SPACE: "working_space">
 | <WORKING_SPACE_REDUNDANTLY: "working_space_redundantly">
 | <WRITABLE: "writable">
-| <DOTDOT: "..">
 //| <LOCSET: "\\locset">
 //| <STOREREF: "\\storeref">
 //| <EMPTYSET: "\\emptyset">
@@ -632,7 +636,6 @@ TOKEN : {
   <JML_BLOCK_COMMENT: "*/" > : DEFAULT
 }
 
-
 <IN_JAVADOC_COMMENT>
 SPECIAL_TOKEN :
 {
@@ -660,11 +663,14 @@ MORE :
 
 
 /* RESERVED WORDS AND LITERALS */
+<DEFAULT> TOKEN :{
+	< ASSERT: "assert" > // ASSERT in JML contracts is called JML_ASSERT
+}
+
 <DEFAULT,JML_MULTI_CONTRACT,JML_SINGLE_CONTRACT>
 TOKEN :
 {
   < ABSTRACT: "abstract" >
-| < ASSERT: "assert" >
 | < BOOLEAN: "boolean" >
 | < BREAK: "break" >
 | < BYTE: "byte" >
@@ -1188,10 +1194,12 @@ MORE: { <ENTER_TEXT_BLOCK: "\"\"\"" >: IN_TEXT_BLOCK }
 // which might match that doublequote with following doublequotes.
 <IN_TEXT_BLOCK> MORE :{ <TEXT_BLOCK_CONTENT:  ( "\\" "\"" | ~[] ) > }
 
+/*
 <JML_SINGLE_CONTRACT, JML_MULTI_CONTRACT>
 TOKEN: {
   <JML_IDENTIFIER: "\\" <IDENTIFIER> >
 }
+*/
 
 /* IDENTIFIERS */
 <DEFAULT,JML_SINGLE_CONTRACT,JML_MULTI_CONTRACT>
@@ -1202,7 +1210,7 @@ TOKEN :
     | "\u005f" (<PART_LETTER>)+
   >
 |
-  < JMLIDENTIFIER: "\\"<IDENTIFIER> >
+  < JML_IDENTIFIER: "\\"<IDENTIFIER> >
 |
   < SVIDENTIFIER:  "#" <IDENTIFIER> >
 |
@@ -1390,8 +1398,9 @@ TOKEN :
 | < RBRACKET: "]" >
 | < SEMICOLON: ";" >
 | < COMMA: "," >
-| < DOT: "." >
+| < DOTDOT: "..">
 | < ELLIPSIS: "..." >
+| < DOT: "." >
 | < AT: "@" >
 | < DOUBLECOLON: "::" >
 }
@@ -3522,7 +3531,7 @@ String Identifier():
 }
 {
     (
-        <IDENTIFIER> | <SVIDENTIFIER> | <KEYIDENTIFIER> | <JMLIDENTIFIER> |
+        <IDENTIFIER> | <SVIDENTIFIER> | <KEYIDENTIFIER> | <JML_IDENTIFIER> |
         // TODO: Explain why these keywords are explicitly flagged up as "included", and why they're not already covered by {@code <IDENTIFIER>}.
         // TODO: Explain how / where boolean and null literals are excluded.
         // Make sure the module info keywords don't interfere with normal Java parsing by matching them as normal identifiers.
@@ -3530,7 +3539,7 @@ String Identifier():
         // Make sure older Java versions parse
         <ENUM> | <STRICTFP> | <YIELD> | <RECORD> | <PERMITS> | <SEALED> | <WHEN> | "_" | <ASSERT> |
         // overwritten by Key/SV but still valid in Java
-        "model" | "ghost" | "two_state" | "no_state" | "source" | "merge_point" | "exec" | "ccatch" | "ccat"
+        "source" | "exec" | "ccatch" | "ccat"
         // or a bunch of JML clause words
         | <INVARIANT> | <ABRUPT_BEHAVIOR> | <ABRUPT_BEHAVIOUR> | <ACCESSIBLE> | <ACCESSIBLE_REDUNDANTLY>
         | <MODEL_BEHAVIOR> | <MODEL_BEHAVIOUR>
@@ -3542,8 +3551,9 @@ String Identifier():
         | <CONSTRUCTOR> | <CONTINUES> | <CONTINUES_REDUNDANTLY> | <IMMUTABLE>
         | <CONTINUE_BEHAVIOR> | <CONTINUE_BEHAVIOUR> | <DECLASSIFIES > | <DECREASES>
         | <DECREASES_REDUNDANTLY> | <DECREASING> | <DECREASING_REDUNDANTLY> | <DETERMINES >
+        | <LOOP_DETERMINES> | <SEPARATES> | <LOOP_SEPARATES> | <BY> | <NEW_OBJECTS> | <ERASES>
         | <DIVERGES> | <DIVERGES_REDUNDANTLY> | <DURATION_REDUNDANTLY> | <ENSURES>
-        | <ENSURES_REDUNDANTLY> | <ENSURES_FREE> | <REQUIRES_FREE> | <ERASES>
+        | <ENSURES_REDUNDANTLY> | <ENSURES_FREE> | <REQUIRES_FREE>
         | <EXAMPLE> | <EXCEPTIONAL_BEHAVIOR> | <EXCEPTIONAL_BEHAVIOUR> | <EXCEPTIONAL_EXAMPLE>
         | <EXSURES> | <EXSURES_REDUNDANTLY> | <EXTRACT> | <FIELD> | <FORALL>
         | <FOR_EXAMPLE> | <GHOST> | <HELPER> | <HENCE_BY> | <HENCE_BY_REDUNDANTLY>
@@ -3553,7 +3563,7 @@ String Identifier():
         | <MAINTAINING_REDUNDANTLY> | <MAPS> | <MAPS_REDUNDANTLY> | <MEASURED_BY>
         | <MEASURED_BY_REDUNDANTLY> | <METHOD> | <MODEL> | <MODEL_PROGRAM> | <MODIFIABLE>
         | <MODIFIABLE_REDUNDANTLY> | <MODIFIES> | <MODIFIES_REDUNDANTLY> | <MONITORED>
-        | <MONITORS_FOR> | <NEW_OBJECT > | <NON_NULL> | <NORMAL_BEHAVIOR> | <NORMAL_BEHAVIOUR>
+        | <MONITORS_FOR> | <NON_NULL> | <NORMAL_BEHAVIOR> | <NORMAL_BEHAVIOUR>
         | <NORMAL_EXAMPLE> | <NULLABLE> | <NULLABLE_BY_DEFAULT> | <OLD> | <OR> //| <OLD_ESC>
         | <POST> | <POST_REDUNDANTLY> | <PRE> | <PRE_REDUNDANTLY> | <PURE>
         | <READABLE> | <REFINING> | <REPRESENTS> | <REPRESENTS_REDUNDANTLY> | <REQUIRES_REDUNDANTLY>
@@ -4674,7 +4684,7 @@ Expression JmlPrimaryPrefix():
     Type retType;
     VariableDeclarationExpr decls;
     SimpleName name;
-    Expression ret; 
+    Expression ret;
 }
 {
   (  LOOKAHEAD(2)
@@ -5118,7 +5128,6 @@ Statement StatementOrig():
             | ret = SynchronizedStatement()
             | ret = TryStatement()
             // KEY
-            //| ret = KeyActiveCommentStatement()
             | ret = KeyTransactionStatement()
             | ret = KeyMergePointStatement()
             | ret = KeyLoopScope()
@@ -5310,8 +5319,13 @@ Statement BlockStatementOrig():
          	// try assert statement separate from more general Statement() because assert can be confused with VariableDeclarationExpression sometimes
             LOOKAHEAD( AssertStatement() )
             ret = AssertStatement()
+    /*     |
+         	// try JML statement separate from more general Statement() because assert/assume & Co.
+         	// can be confused with VariableDeclarationExpression sometimes
+            LOOKAHEAD( JmlStatement() )
+            ret = JmlStatement()*/
          |
-            LOOKAHEAD( VariableDeclarationExpression() )
+            LOOKAHEAD( VariableDeclarationExpression() ";" )
             expr = VariableDeclarationExpression()
             ";"
             { ret = new ExpressionStmt(range(expr, token()), expr); }
@@ -7009,7 +7023,7 @@ JmlStatement JmlStatement():
 }
 {
   (
-    (<ASSERT> | <ASSUME> | <HENCE_BY> | <HENCE_BY_REDUNDANTLY> | <SET>)
+    ( <JML_ASSERT> | <ASSUME> | <HENCE_BY> | <HENCE_BY_REDUNDANTLY> | <SET> | <ASSERT_REDUNDANTLY> )
     { begin = token(); }
     expr=Expression()
     ";"
@@ -7025,8 +7039,8 @@ JmlStatement JmlStatement():
 }
 
 JmlStatement JmlSpecialStatement():
-{ 
-    JavaToken begin; Expression expr,target; 
+{
+    JavaToken begin; Expression expr,target;
     Statement stmt; SimpleName label;
     JmlStatement ret;
 }
@@ -7140,11 +7154,43 @@ JmlClause JmlLoopInvClauses():
   | ret=JmlDecreasesClause()
   | ret=JmlDefaultClause()
   | ret=JmlMultiExprClauses()
+  | ret=JmlInfFlowClause()
   )
   ";"
   {return ret;}
 }
 
+JmlInfFlowClause JmlInfFlowClause():
+{
+    NodeList<SimpleName> heaps = new NodeList<>();
+    Expression e;
+    JavaToken begin;
+    SimpleName name = null;
+    NodeList<Expression> determined = emptyNodeList();
+    NodeList<Expression> by = emptyNodeList();
+    NodeList<Expression> declassifies = emptyNodeList();
+    NodeList<Expression> erases = emptyNodeList();
+    NodeList<Expression> newObjects = emptyNodeList();
+}
+{
+	(<DETERMINES> | <SEPARATES> | <LOOP_SEPARATES> | <LOOP_DETERMINES> )
+	{begin = token();}
+	[LOOKAHEAD(2) name = SimpleName() ":"]
+	determined = ExpressionList()
+	[ <BY> by=ExpressionList() ]
+	(
+		  <DECLASSIFIES> declassifies = ExpressionList()
+		| <ERASES> 	     erases = ExpressionList()
+		| <NEW_OBJECTS>  newObjects = ExpressionList()
+	)*
+	<SEMICOLON>
+    { return new JmlInfFlowClause(range(begin, token()), begin, name, determined, by, declassifies, erases, newObjects); }
+}
+
+
+
+
+
 NodeList<JmlContract> JmlContracts():
 {
     JmlContract bc = null;
@@ -7220,6 +7266,7 @@ JmlClause JmlContractClause():
   | ret=JmlAccessibleClause()
   | ret=JmlDefaultClause()
   | ret=JmlMultiExprClauses()
+  | ret=JmlInfFlowClause()
   )
   ";"
   {return ret;}
@@ -7289,7 +7336,7 @@ JmlClause JmlBreaksClause():
   (<BREAKS> |<BREAKS_REDUNDANTLY>)  { begin = token();}
   <LPAREN> (label=SimpleName())? <RPAREN>
   expr=Expression()
-  { return new JmlClauseLabel(range(begin, token()), begin, label, expr); }
+  { return new JmlLabledClause(range(begin, token()), begin, label, expr); }
 }
 
 JmlClause JmlContinuesClause():
@@ -7302,7 +7349,7 @@ JmlClause JmlContinuesClause():
   (<CONTINUES>|<CONTINUES_REDUNDANTLY>) { begin = token();}
   <LPAREN> (label=SimpleName())? <RPAREN>
   expr=Expression()
-  { return new JmlClauseLabel(range(begin, token()), begin, label, expr); }
+  { return new JmlLabledClause(range(begin, token()), begin, label, expr); }
 }
 
 JmlClause JmlReturnsClause():
@@ -7901,22 +7948,6 @@ Expression ADTConstructor() :
     }
 }*/
 
-Expression KeyIndexRange() :
-    /*
-     * Introduced to handle postfix style sequence ranges as top-level expressions.
-     * XXX does not yet work since Expression may contain dots
-     */
-{
-    Expression result, end;
-    JavaToken begin;
-}
-{
-    result = Expression()
-    [ ".." end = Expression()
-      { result = new KeyRangeExpression(range(result, token()), result, end); } ]
-    { return result; }
-}
-
 
 Statement KeyCatchAllStatement() :
 {
@@ -7927,12 +7958,12 @@ Statement KeyCatchAllStatement() :
 {
   "#catchAll" {begin=token();} "(" qn = Name() ")" block = Block()
   {
-      return new KeyCatchAllStatement(range(begin,token()), qn,block);
+      return new KeyCatchAllStmt(range(begin,token()), qn,block);
   }
 }
 
 
-KeyMethodCallStatement KeyMethodCallStatement() :
+KeyMethodCallStmt KeyMethodCallStatement() :
 {
   JavaToken begin;
   Name qn = null;
@@ -7947,7 +7978,7 @@ KeyMethodCallStatement KeyMethodCallStatement() :
     ")"
     [":"]
   block = Block()
-  {   return new KeyMethodCallStatement(range(begin, token()), qn, ec, block); }
+  {   return new KeyMethodCallStmt(range(begin, token()), qn, ec, block); }
 }
 
 KeyAbstractExecutionContext KeyExecutionContextSV():
@@ -8024,7 +8055,7 @@ KeyActiveCommentStatement KeyActiveCommentStatement() :
 
 
 
-KeyTransactionStatement KeyTransactionStatement() :
+KeyTransactionStmt KeyTransactionStatement() :
 {
   JavaToken begin;
 }
@@ -8036,12 +8067,12 @@ KeyTransactionStatement KeyTransactionStatement() :
   ) {begin=token();}
 
   ";"
-  { return new KeyTransactionStatement(range(begin, token()), begin); }
+  { return new KeyTransactionStmt(range(begin, token()), begin); }
 }
 
-KeyLoopScopeBlock KeyLoopScope() :
+KeyLoopScopeBlockStmt KeyLoopScope() :
 {
-    KeyLoopScopeBlock result;
+    KeyLoopScopeBlockStmt result;
     Expression indexPV;
     BlockStmt block;
     JavaToken begin;
@@ -8050,24 +8081,24 @@ KeyLoopScopeBlock KeyLoopScope() :
   <LOOPSCOPE> { begin = token(); }
   "(" indexPV = Expression() ")"
   block = Block()
-  { return new KeyLoopScopeBlock(range(begin, token()), indexPV, block); }
+  { return new KeyLoopScopeBlockStmt(range(begin, token()), indexPV, block); }
 }
 
-KeyMergePointStatement KeyMergePointStatement() :
+KeyMergePointStmt KeyMergePointStatement() :
 {
     Expression expr = null;
-    KeyMergePointStatement result;
+    KeyMergePointStmt result;
     JavaToken begin;
 }
 {
   <MERGE_POINT>  { begin = token(); }
   "(" expr = Expression() ")"
   ";"
-  { return new KeyMergePointStatement(range(begin, token()), expr); }
+  { return new KeyMergePointStmt(range(begin, token()), expr); }
 }
 
 
-KeyExecStatement KeyExecStatement() :
+KeyExecStmt KeyExecStatement() :
 {
     JavaToken begin, beginC;
     BlockStmt block,execBlock;
@@ -8142,7 +8173,7 @@ KeyExecStatement KeyExecStatement() :
         {  branches.add(new KeyCcatchParameter(range(beginC, token()), param, block)); }
     )*
     ( LOOKAHEAD(3) ["ccatch"|"ccat"] cfsv=CcatchSV() { branches.add(cfsv); } )*
-    { return new KeyExecStatement(range(begin, token()), execBlock, branches); }
+    { return new KeyExecStmt(range(begin, token()), execBlock, branches); }
 }
 
 KeyTypeSV TypeSV(NodeList<AnnotationExpr> annotations) :
@@ -8261,9 +8292,7 @@ KeyMetaConstruct KeyMetaConstructStatement() :
                | loopStat = DoStatement()
               )
         ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), "#unwind-loop", loopStat, innerLabel, outerLabel);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), "#unwind-loop", loopStat, innerLabel, outerLabel); }
  |
         "#unwind-loop-bounded" {begin=token();} "("
             innerLabel = JumpLabelSV() "," outerLabel = JumpLabelSV() ","
@@ -8272,88 +8301,56 @@ KeyMetaConstruct KeyMetaConstructStatement() :
             | loopStat = DoStatement()
             )
         ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), "#unwind-loop-bounded", loopStat, innerLabel, outerLabel);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), "#unwind-loop-bounded", loopStat, innerLabel, outerLabel); }
  |
        <FORINITUNFOLDTRANSFORMER> {begin=token();} "(" ( loopInit=ForInit() ) ")" ";"
-       {
-           ret =  new KeyMetaConstruct(range(begin, token()), begin, loopInit.get(0));
-       }
+       { ret =  new KeyMetaConstruct(range(begin, token()), begin, loopInit.get(0)); }
  |
         <LOOPSCOPEINVARIANTTRANSFORMER> {begin=token();} "(" ( loopStat=WhileStatement() ) ")" ";"
-        {
-           ret =  new KeyMetaConstruct(range(begin, token()), begin, loopStat);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), begin, loopStat); }
  |
         <UNPACK> {begin=token();} "(" loopStat=ForStatement() ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), begin, loopStat);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), begin, loopStat); }
   |
         "#for-to-while" {begin=token();} "(" innerLabel = JumpLabelSV() "," outerLabel = JumpLabelSV() "," stat = Statement() ")"
-        {
-           ret =   new KeyMetaConstruct(range(begin, token()), begin, stat, innerLabel, outerLabel);
-        }
+        { ret =   new KeyMetaConstruct(range(begin, token()), begin, stat, innerLabel, outerLabel); }
   |
         <SWITCHTOIF> {begin=token();} "(" stat = Statement() ")"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), begin, stat);
-        }
+        {  ret =  new KeyMetaConstruct(range(begin, token()), begin, stat); }
   |
         "#do-break" {begin=token();} "(" labStat=LabeledStatement() ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), begin, labStat);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), begin, labStat); }
   |
         "#evaluate-arguments" {begin=token();} "(" methRef = Expression() ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), begin, methRef);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), begin, methRef); }
   |
         "#replace" {begin=token();} "(" stat = Statement() "," sv = VariableSV() ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), begin, stat, sv);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), begin, stat, sv); }
   |
         "#method-call" {begin=token();} "("
             [  LOOKAHEAD(2) sv = VariableSV() ","]
             [  LOOKAHEAD(2) execsv = ExecutionContextSV() ","]
             methRef = PrimaryExpression()
         ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), begin, methRef, sv, execsv);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), begin, methRef, sv, execsv); }
   |
         "#expand-method-body" {begin=token();} "(" stat = Statement() ("," sv = VariableSV() )?  ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), begin, stat, sv);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), begin, stat, sv); }
   |
         "#constructor-call" {begin=token();} "(" sv = VariableSV() "," consRef = ExpressionSV() ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), begin, consRef, sv);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), begin, consRef, sv); }
   |
         "#special-constructor-call" {begin=token();} "(" consRef = ExpressionSV() ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), begin, consRef);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), begin, consRef); }
   |
         "#post-work" {begin=token();} "(" consRef = ExpressionSV() ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), begin, consRef);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), begin, consRef); }
   |
         "#static-initialisation" {begin=token();} "(" activeAccess = PrimaryExpression() ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), begin, activeAccess);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), begin, activeAccess); }
   |
         "#resolve-multiple-var-decl" {begin=token();} "(" stat = Statement() ")" ";"
-        {
-            ret =  new KeyMetaConstruct(range(begin, token()), begin, stat);
-        }
+        { ret =  new KeyMetaConstruct(range(begin, token()), begin, stat); }
   |
         "#array-post-declaration" {begin=token();} "(" stat = Statement() ")" ";"
         { ret =  new KeyMetaConstruct(range(begin, token()), begin, stat); }
@@ -8372,8 +8369,8 @@ KeyMetaConstruct KeyMetaConstructStatement() :
   |
         <REATTACHLOOPINVARIANT> {begin=token();} "(" loopStat = WhileStatement() ")" ";"
         { ret =  new KeyMetaConstruct(range(begin, token()), begin, loopStat); }
-  ) 
-  {return ret;}
+  )
+  { return ret; }
 }
 
 
@@ -8477,4 +8474,4 @@ KeyCcatchSV CcatchSV() :
 {
     <SVIDENTIFIER>
     { return new KeyCcatchSV(token().toTokenRange(), token().getText()); }
-}
+}
\ No newline at end of file
diff --git a/javaparser-key-testing/build.gradle.kts b/javaparser-key-testing/build.gradle.kts
new file mode 100644
index 0000000000..cb3f87186f
--- /dev/null
+++ b/javaparser-key-testing/build.gradle.kts
@@ -0,0 +1,12 @@
+plugins {
+    id("buildlogic.java-conventions")
+}
+
+dependencies {
+    testImplementation(project(":jmlparser-core"))
+    testImplementation(project(":jmlparser-symbol-solver-core"))
+    testImplementation(libs.bundles.testing)
+    testRuntimeOnly(libs.bundles.testing.runtime)
+}
+
+description = "io.github.jmltoolkit:javaparser-key-testing"
diff --git a/javaparser-key-testing/pom.xml b/javaparser-key-testing/pom.xml
index cbb9521f34..c5eeac6bbb 100644
--- a/javaparser-key-testing/pom.xml
+++ b/javaparser-key-testing/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>jmlparser-parent</artifactId>
 		<groupId>io.github.jmltoolkit</groupId>
-		<version>3.28.0-J8.0-K10.1-SNAPSHOT</version>
+		<version>3.28.0-J8.0-K13.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/javaparser-key-testing/src/test/java/com/github/javaparser/ast/key/GhostTest.java b/javaparser-key-testing/src/test/java/com/github/javaparser/ast/key/GhostTest.java
new file mode 100644
index 0000000000..26a6cfbb53
--- /dev/null
+++ b/javaparser-key-testing/src/test/java/com/github/javaparser/ast/key/GhostTest.java
@@ -0,0 +1,29 @@
+package com.github.javaparser.ast.key;
+
+import com.github.javaparser.JavaParser;
+import com.github.javaparser.ParserConfiguration;
+import com.github.javaparser.ast.body.MethodDeclaration;
+import java.io.IOException;
+import java.nio.file.Paths;
+import org.junit.jupiter.api.Test;
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (3/4/26)
+ */
+public class GhostTest {
+
+    @Test
+    void m() throws IOException {
+        final var configuration = new ParserConfiguration();
+        configuration.setLanguageLevel(ParserConfiguration.LanguageLevel.RAW);
+        var parser = new JavaParser(configuration);
+        var cu = parser.parse(Paths.get("src/test/resources/Ghost.java"));
+        final var result = cu.getResult().get();
+        var body = ((MethodDeclaration) result.getPrimaryType().get().members().get(1))
+                .getBody()
+                .get();
+        System.out.println(result);
+    }
+}
diff --git a/javaparser-key-testing/src/test/java/com/github/javaparser/ast/key/MethodFrameTests.java b/javaparser-key-testing/src/test/java/com/github/javaparser/ast/key/MethodFrameTests.java
index 7d1316f7ca..477399503f 100644
--- a/javaparser-key-testing/src/test/java/com/github/javaparser/ast/key/MethodFrameTests.java
+++ b/javaparser-key-testing/src/test/java/com/github/javaparser/ast/key/MethodFrameTests.java
@@ -1,16 +1,12 @@
 package com.github.javaparser.ast.key;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParseResult;
 import com.github.javaparser.ParserConfiguration;
 import com.github.javaparser.Problem;
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
-import com.github.javaparser.ast.expr.Expression;
-import com.github.javaparser.ast.expr.FieldAccessExpr;
-import com.github.javaparser.ast.expr.NameExpr;
+import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
 import com.github.javaparser.resolution.Resolvable;
 import com.github.javaparser.resolution.UnsolvedSymbolException;
@@ -19,21 +15,32 @@
 import com.github.javaparser.symbolsolver.resolution.typesolvers.ClassLoaderTypeSolver;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
+import com.google.common.truth.Truth;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class MethodFrameTests {
     @Test
     void mftest1() throws IOException {
         loadAndResolveAll(new File("src/test/resources/nameResolution/A.java"));
     }
 
+
+    @Test
+    void mftestB() throws IOException {
+        loadAndResolveAll(new File("src/test/resources/nameResolution/B.java"));
+    }
+
     private void loadAndResolveAll(File file) throws IOException {
         final ParserConfiguration configuration = new ParserConfiguration();
         configuration.setSymbolResolver(new JavaSymbolSolver(new CombinedTypeSolver(
@@ -70,31 +77,56 @@ private static class ResolveAllVisitor extends VoidVisitorAdapter<Void> {
         @Override
         public void visit(NameExpr n, Void arg) {
             resolve(n);
+            super.visit(n, arg);
         }
 
         @Override
         public void visit(FieldAccessExpr n, Void arg) {
             resolve(n);
+            super.visit(n, arg);
+        }
+
+        @Override
+        public void visit(MethodCallExpr n, Void arg) {
+            resolve(n);
+            super.visit(n, arg);
+        }
+
+        @Override
+        public void visit(ObjectCreationExpr n, Void arg) {
+            resolve(n);
+            super.visit(n, arg);
         }
 
         public <T extends ResolvedDeclaration, N extends Expression & Resolvable<T>> void resolve(N n) {
+            Path base = n.findCompilationUnit()
+                    .flatMap(CompilationUnit::getStorage)
+                    .map(it -> it.getPath().getParent()).get();
             String pos = n.getRange().map(it -> it.begin.toString()).orElse("_");
+
             try {
                 ResolvedDeclaration rtype = n.resolve();
+                String target;
+                try {
+                    Node t = rtype.toAst().get();
+                    target = t.getRange().map(it -> it.begin.toString()).orElse("_");
+                    target += " in " + t.findCompilationUnit()
+                            .flatMap(CompilationUnit::getStorage)
+                            .map(it -> base.relativize(it.getPath()).toString())
+                            .orElse(null);
+                }catch (NoSuchElementException e) {
+                    target = "_";
+                }
 
-                Node t = rtype.toAst().get();
-                String target = t.getRange().map(it -> it.begin.toString()).orElse("_");
-
-                messages.add(String.format("name: %s@%s to %s@%s", n, pos, rtype.getName(), target));
+                messages.add(String.format("name: %s@%s refers to %s@%s", n, pos, rtype.getName(), target));
                 try {
-                    n.getSymbolResolver().calculateType(n);
-                    messages.add(String.format("type: %s@%s", n, pos));
+                    var x = n.getSymbolResolver().calculateType(n);
+                    messages.add(String.format("type: %s@%s refers to %s", n, pos, x));
                 } catch (UnsolvedSymbolException e) {
-                    messages.add(String.format("e type: %s@%s", n, pos));
+                    messages.add(String.format("ERROR type: %s@%s", n, pos));
                 }
             } catch (UnsolvedSymbolException e) {
-                messages.add(String.format("e name: %s@%s", n, pos));
-                // e.printStackTrace();
+                messages.add(String.format("ERROR name: %s@%s", n, pos));
             }
         }
     }
diff --git a/javaparser-key-testing/src/test/java/com/github/javaparser/ast/key/ReduxTest.java b/javaparser-key-testing/src/test/java/com/github/javaparser/ast/key/ReduxTest.java
deleted file mode 100644
index 49664b2141..0000000000
--- a/javaparser-key-testing/src/test/java/com/github/javaparser/ast/key/ReduxTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.github.javaparser.ast.key;
-
-import com.github.javaparser.JavaParser;
-import com.github.javaparser.ParseResult;
-import com.github.javaparser.ast.CompilationUnit;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.stream.Stream;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.TestFactory;
-
-/**
- * @author Alexander Weigl
- * @version 1 (17.04.23)
- */
-@Disabled
-public class ReduxTest {
-    public static final String PATHTOREDUX =
-            "/home/weigl/work/key/key.core/src/main/resources/de/uka/ilkd/key/java/JavaRedux/java";
-
-    @TestFactory
-    Stream<DynamicTest> testRedux() throws IOException {
-        return Files.walk(Paths.get(PATHTOREDUX))
-                .filter(it -> it.toString().endsWith(".java"))
-                .map(it -> DynamicTest.dynamicTest(it.toString(), () -> parse(it)));
-    }
-
-    JavaParser parser = new JavaParser();
-
-    private void parse(Path it) throws IOException {
-        ParseResult<CompilationUnit> res = parser.parse(it);
-        if (!res.isSuccessful()) {
-            res.getProblems().forEach(System.out::println);
-            Assertions.fail("Problems in file: " + it);
-        }
-    }
-}
diff --git a/javaparser-key-testing/src/test/resources/Ghost.java b/javaparser-key-testing/src/test/resources/Ghost.java
new file mode 100644
index 0000000000..981a6a7bef
--- /dev/null
+++ b/javaparser-key-testing/src/test/resources/Ghost.java
@@ -0,0 +1,52 @@
+class Ghost {
+    //contract encodes "accessible footprint;"
+    /*@ normal_behaviour
+      @   requires \inv;
+      @   requires arrayDep == \singleton(array);
+      @   requires sizeDep == \singleton(size);
+      @   requires (\forall int i; arraySlotDep[i] == \singleton(array[i]));
+      @   requires (\forall int i; arraySlotDep.length == array.length);
+      @   ensures \subset(ArrayList.resultDep, \old(footprint));
+      @   diverges true;
+      @*/
+    public /*@helper@*/ boolean contains(/*@nullable@*/ Object o) {
+        //@ ghost \locset pcDep = \empty;
+        //@ ghost \locset oDep = \empty;
+
+        //@ ghost \locset iDep = pcDep; //assignment
+        int i = 0;
+
+        //@ set pcDep = \set_union(pcDep, \set_union(iDep, sizeDep)); //entering loop
+
+        /*@ loop_invariant 0 <= i && i <= size
+          @    && \subset(pcDep, \old(footprint))
+          @    && \subset(iDep, \old(footprint));
+          @ assignable \nothing;
+          @ decreases size - i;
+          @*/
+        while(i < size) {
+            //@ set pcDep = \set_union(pcDep, \set_union(arrayDep, \set_union(iDep, \set_union(oDep, arraySlotDep[i])))); //entering conditional
+            if(array[i] == o) {
+                //@ set ArrayList.resultDep = pcDep; //return
+                return true;
+            }
+
+            //@ set iDep = \set_union(pcDep, iDep); //assignment
+            i++;
+
+            //@ set pcDep = \set_union(pcDep, \set_union(iDep, sizeDep)); //entering loop again
+            ; //workaround for RecodeR bug
+        }
+
+        //@ set ArrayList.resultDep = pcDep; //return
+        return false;
+    }
+
+    public /*@helper@*/ int size() {
+        //@ ghost \locset pcDep = \empty;
+        final int x;
+        //@ set ArrayList.resultDep = \set_union(pcDep, sizeDep);
+        return size;
+    }
+
+}
diff --git a/javaparser-key-testing/src/test/resources/com/github/javaparser/schemajava.txt b/javaparser-key-testing/src/test/resources/com/github/javaparser/schemajava.txt
index 3d191246b9..165db04470 100644
--- a/javaparser-key-testing/src/test/resources/com/github/javaparser/schemajava.txt
+++ b/javaparser-key-testing/src/test/resources/com/github/javaparser/schemajava.txt
@@ -599,7 +599,6 @@
 {.. try { continue #lb; #slist } catch #cs finally { #slist2 } ...}
 {.. try { continue; #slist } catch #cs ...}
 {.. try { continue; #slist } catch #cs finally { #slist2 } ...}
-{.. try {} #cs ...}
 {.. try { return #se; #slist } catch #cs ...}
 {.. try { return #se; #slist } catch #cs finally { #slist2 } ...}
 {.. try { return; #slist } catch #cs ...}
diff --git a/javaparser-key-testing/src/test/resources/nameResolution/A.java b/javaparser-key-testing/src/test/resources/nameResolution/A.java
index 455fb10133..757092f1f3 100644
--- a/javaparser-key-testing/src/test/resources/nameResolution/A.java
+++ b/javaparser-key-testing/src/test/resources/nameResolution/A.java
@@ -11,6 +11,7 @@ void foo() {
     }
 }
 
-//? e name: self@(line 8,col 54)
-//? name: this.x@(line 9,col 13) to x@(line 2,col 5)
-//? type: this.x@(line 9,col 13)
+//? name: self@(line 8,col 54) refers to self@(line 8,col 54) in A.java
+//? name: this.x@(line 9,col 13) refers to x@(line 2,col 5) in A.java
+//? type: self@(line 8,col 54) refers to ReferenceType{A, typeParametersMap=TypeParametersMap{nameToValue={}}}
+//? type: this.x@(line 9,col 13) refers to PrimitiveTypeUsage{name='int'}
\ No newline at end of file
diff --git a/javaparser-key-testing/src/test/resources/nameResolution/B.java b/javaparser-key-testing/src/test/resources/nameResolution/B.java
new file mode 100644
index 0000000000..9ac61d9fa7
--- /dev/null
+++ b/javaparser-key-testing/src/test/resources/nameResolution/B.java
@@ -0,0 +1,18 @@
+class B {
+    void m() {
+        $methodFrame(source = setSize(int)@sub1.TestJavaCardDLExtensions){
+            $methodFrame(source = setOther(int)@sub2.Other){
+                Third four = new Third();
+                int other2 = other;
+            }
+            TestJavaCardDLExtensions t = new TestJavaCardDLExtensions();
+        }
+    }
+}
+
+//? name: new TestJavaCardDLExtensions()@(line 8,col 42) refers to TestJavaCardDLExtensions@_
+//? name: new Third()@(line 5,col 30) refers to Third@_
+//? name: other@(line 6,col 30) refers to other@(line 4,col 5) in sub2/Other.java
+//? type: new TestJavaCardDLExtensions()@(line 8,col 42) refers to ReferenceType{sub1.TestJavaCardDLExtensions, typeParametersMap=TypeParametersMap{nameToValue={}}}
+//? type: new Third()@(line 5,col 30) refers to ReferenceType{sub2.Third, typeParametersMap=TypeParametersMap{nameToValue={}}}
+//? type: other@(line 6,col 30) refers to PrimitiveTypeUsage{name='int'}
\ No newline at end of file
diff --git a/javaparser-key-testing/src/test/resources/nameResolution/sub1/TestJavaCardDLExtensions.java b/javaparser-key-testing/src/test/resources/nameResolution/sub1/TestJavaCardDLExtensions.java
new file mode 100644
index 0000000000..3552c7b769
--- /dev/null
+++ b/javaparser-key-testing/src/test/resources/nameResolution/sub1/TestJavaCardDLExtensions.java
@@ -0,0 +1,8 @@
+package sub1;
+
+public class TestJavaCardDLExtensions {
+    public int size;
+    public void setSize(int size) {
+	this.size = size;
+    }
+}
diff --git a/javaparser-key-testing/src/test/resources/nameResolution/sub2/Other.java b/javaparser-key-testing/src/test/resources/nameResolution/sub2/Other.java
new file mode 100644
index 0000000000..7f2138e88f
--- /dev/null
+++ b/javaparser-key-testing/src/test/resources/nameResolution/sub2/Other.java
@@ -0,0 +1,8 @@
+package sub2;
+
+public class Other {
+    public int other;
+    public void setOther(int val) {
+	this.other = val;
+    }
+}
diff --git a/javaparser-key-testing/src/test/resources/nameResolution/sub2/Third.java b/javaparser-key-testing/src/test/resources/nameResolution/sub2/Third.java
new file mode 100644
index 0000000000..2cc9242f83
--- /dev/null
+++ b/javaparser-key-testing/src/test/resources/nameResolution/sub2/Third.java
@@ -0,0 +1,11 @@
+package sub2;
+
+class Third {
+
+    public int third;
+
+    public void setOther(int val) {
+	this.third = val;
+    }
+
+}
diff --git a/javaparser-symbol-solver-core/build.gradle.kts b/javaparser-symbol-solver-core/build.gradle.kts
new file mode 100644
index 0000000000..1ea0f8ec2f
--- /dev/null
+++ b/javaparser-symbol-solver-core/build.gradle.kts
@@ -0,0 +1,13 @@
+plugins {
+    id("buildlogic.java-conventions")
+    id("publish-convention")
+}
+
+dependencies {
+    api(project(":jmlparser-core"))
+    api(libs.org.javassist.javassist)
+    api(libs.com.google.guava.guava)
+    api(libs.org.checkerframework.checker.qual)
+}
+
+description = "io.github.jmltoolkit:jmlparser-symbol-solver-core"
diff --git a/javaparser-symbol-solver-core/pom.xml b/javaparser-symbol-solver-core/pom.xml
index 62786e4111..4af745db44 100644
--- a/javaparser-symbol-solver-core/pom.xml
+++ b/javaparser-symbol-solver-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
       <artifactId>jmlparser-parent</artifactId>
       <groupId>io.github.jmltoolkit</groupId>
-		<version>3.28.0-J8.0-K10.1-SNAPSHOT</version>
+		<version>3.28.0-J8.0-K13.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/SourceFileInfoExtractor.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/SourceFileInfoExtractor.java
index 6ebfdf9ea8..b301d05c3e 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/SourceFileInfoExtractor.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/SourceFileInfoExtractor.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/DefaultCacheStats.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/DefaultCacheStats.java
index 7c51c83099..aa84974efb 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/DefaultCacheStats.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/DefaultCacheStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/GuavaCache.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/GuavaCache.java
index af277bc69f..35b21f1d4b 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/GuavaCache.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/GuavaCache.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -37,9 +37,11 @@ public class GuavaCache<K, V> implements Cache<K, V> {
     /**
      * Wrap a Guava cache with a custom cache.
      *
-     * @param guavaCache  The guava cache to be wrapped-
+     * @param guavaCache The guava cache to be wrapped-
+     *
      * @param <expectedK> The expected type for the key.
      * @param <expectedV> The expected type for the value.
+     *
      * @return A newly created instance of {@link NoCache}.
      */
     public static <expectedK, expectedV> GuavaCache<expectedK, expectedV> create(
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/InMemoryCache.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/InMemoryCache.java
index b393bb3c03..8292621d4e 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/InMemoryCache.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/InMemoryCache.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -43,6 +43,7 @@ public class InMemoryCache<K, V> implements Cache<K, V> {
      *
      * @param <expectedK> The expected type for the key.
      * @param <expectedV> The expected type for the value.
+     *
      * @return A newly created instance of {@link InMemoryCache}.
      */
     public static <expectedK, expectedV> InMemoryCache<expectedK, expectedV> create() {
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/NoCache.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/NoCache.java
index d61ccad6d4..a0ee34018e 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/NoCache.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/cache/NoCache.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -38,6 +38,7 @@ public class NoCache<K, V> implements Cache<K, V> {
      *
      * @param <expectedK> The expected type for the key.
      * @param <expectedV> The expected type for the value.
+     *
      * @return A newly created instance of {@link NoCache}.
      */
     public static <expectedK, expectedV> NoCache<expectedK, expectedV> create() {
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/MethodUsageResolutionCapability.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/MethodUsageResolutionCapability.java
index cc9cb88cda..6b82c6ad84 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/MethodUsageResolutionCapability.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/MethodUsageResolutionCapability.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/SymbolResolutionCapability.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/SymbolResolutionCapability.java
index db87902077..e15fd80e2b 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/SymbolResolutionCapability.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/SymbolResolutionCapability.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/TypeVariableResolutionCapability.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/TypeVariableResolutionCapability.java
index 5880090e2d..d74905c262 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/TypeVariableResolutionCapability.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/core/resolution/TypeVariableResolutionCapability.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/declarations/common/MethodDeclarationCommonLogic.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/declarations/common/MethodDeclarationCommonLogic.java
index 216851b8d2..ef62a74071 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/declarations/common/MethodDeclarationCommonLogic.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/declarations/common/MethodDeclarationCommonLogic.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparser/package-info.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparser/package-info.java
index 8bbeccc843..fe0df1c0a5 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparser/package-info.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparser/package-info.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/DefaultVisitorAdapter.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/DefaultVisitorAdapter.java
index bd413462d7..237f025259 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/DefaultVisitorAdapter.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/DefaultVisitorAdapter.java
@@ -23,9 +23,10 @@
 
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
-import com.github.javaparser.ast.comments.*;
 import com.github.javaparser.ast.comments.BlockComment;
 import com.github.javaparser.ast.comments.LineComment;
+import com.github.javaparser.ast.comments.MarkdownComment;
+import com.github.javaparser.ast.comments.TraditionalJavadocComment;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.jml.body.*;
 import com.github.javaparser.ast.jml.clauses.*;
@@ -250,7 +251,7 @@ public ResolvedType visit(JmlQuantifiedExpr n, Boolean arg) {
     }
 
     @Override
-    public ResolvedType visit(JmlClauseLabel n, Boolean arg) {
+    public ResolvedType visit(JmlLabledClause n, Boolean arg) {
         throw new UnsupportedOperationException(n.getClass().getCanonicalName());
     }
 
@@ -310,7 +311,7 @@ public ResolvedType visit(JmlRefiningStmt n, Boolean arg) {
     }
 
     @Override
-    public ResolvedType visit(JmlClauseIf n, Boolean arg) {
+    public ResolvedType visit(JmlConditionalClause n, Boolean arg) {
         throw new UnsupportedOperationException(n.getClass().getCanonicalName());
     }
 
@@ -364,11 +365,6 @@ public ResolvedType visit(JmlDocStmt n, Boolean arg) {
         throw new UnsupportedOperationException(n.getClass().getCanonicalName());
     }
 
-    @Override
-    public ResolvedType visit(JmlDoc n, Boolean arg) {
-        throw new UnsupportedOperationException(n.getClass().getCanonicalName());
-    }
-
     @Override
     public ResolvedType visit(JmlDocType n, Boolean arg) {
         throw new UnsupportedOperationException(n.getClass().getCanonicalName());
@@ -440,7 +436,7 @@ public ResolvedType visit(KeyCcatchReturn n, Boolean arg) {
     }
 
     @Override
-    public ResolvedType visit(KeyCatchAllStatement n, Boolean arg) {
+    public ResolvedType visit(KeyCatchAllStmt n, Boolean arg) {
         throw new UnsupportedOperationException(n.getClass().getCanonicalName());
     }
 
@@ -450,7 +446,7 @@ public ResolvedType visit(KeyEscapeExpression n, Boolean arg) {
     }
 
     @Override
-    public ResolvedType visit(KeyExecStatement n, Boolean arg) {
+    public ResolvedType visit(KeyExecStmt n, Boolean arg) {
         throw new UnsupportedOperationException(n.getClass().getCanonicalName());
     }
 
@@ -460,12 +456,12 @@ public ResolvedType visit(KeyExecutionContext n, Boolean arg) {
     }
 
     @Override
-    public ResolvedType visit(KeyLoopScopeBlock n, Boolean arg) {
+    public ResolvedType visit(KeyLoopScopeBlockStmt n, Boolean arg) {
         throw new UnsupportedOperationException(n.getClass().getCanonicalName());
     }
 
     @Override
-    public ResolvedType visit(KeyMergePointStatement n, Boolean arg) {
+    public ResolvedType visit(KeyMergePointStmt n, Boolean arg) {
         throw new UnsupportedOperationException(n.getClass().getCanonicalName());
     }
 
@@ -475,7 +471,7 @@ public ResolvedType visit(KeyMethodBodyStatement n, Boolean arg) {
     }
 
     @Override
-    public ResolvedType visit(KeyMethodCallStatement n, Boolean arg) {
+    public ResolvedType visit(KeyMethodCallStmt n, Boolean arg) {
         throw new UnsupportedOperationException(n.getClass().getCanonicalName());
     }
 
@@ -485,12 +481,7 @@ public ResolvedType visit(KeyMethodSignature n, Boolean arg) {
     }
 
     @Override
-    public ResolvedType visit(KeyRangeExpression n, Boolean arg) {
-        throw new UnsupportedOperationException(n.getClass().getCanonicalName());
-    }
-
-    @Override
-    public ResolvedType visit(KeyTransactionStatement n, Boolean arg) {
+    public ResolvedType visit(KeyTransactionStmt n, Boolean arg) {
         throw new UnsupportedOperationException(n.getClass().getCanonicalName());
     }
 
@@ -556,12 +547,27 @@ public ResolvedType visit(KeyTypeSV n, Boolean arg) {
 
     @Override
     public ResolvedType visit(KeyCcatchSV n, Boolean arg) {
-        return null;
+        throw new UnsupportedOperationException(n.getClass().getCanonicalName());
     }
 
     @Override
     public ResolvedType visit(KeyExecutionContextSV n, Boolean arg) {
-        return null;
+        throw new UnsupportedOperationException(n.getClass().getCanonicalName());
+    }
+
+    @Override
+    public ResolvedType visit(JmlDoc n, Boolean arg) {
+        throw new UnsupportedOperationException(n.getClass().getCanonicalName());
+    }
+
+    @Override
+    public ResolvedType visit(KeYMarkerStatement n, Boolean arg) {
+        throw new UnsupportedOperationException(n.getClass().getCanonicalName());
+    }
+
+    @Override
+    public ResolvedType visit(JmlInfFlowClause n, Boolean arg) {
+        throw new UnsupportedOperationException(n.getClass().getCanonicalName());
     }
 
     @Override
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/FailureHandler.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/FailureHandler.java
index 9b580fdf5d..31b4647f2e 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/FailureHandler.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/FailureHandler.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java
index 2beb277105..4030719724 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java
@@ -32,10 +32,11 @@
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.key.KeyExecutionContext;
-import com.github.javaparser.ast.key.KeyMethodCallStatement;
+import com.github.javaparser.ast.key.KeyMethodCallStmt;
 import com.github.javaparser.ast.stmt.ExplicitConstructorInvocationStmt;
 import com.github.javaparser.ast.stmt.ForEachStmt;
 import com.github.javaparser.ast.stmt.ReturnStmt;
+import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.ast.type.Type;
 import com.github.javaparser.resolution.*;
 import com.github.javaparser.resolution.declarations.*;
@@ -132,6 +133,18 @@ public SymbolReference<? extends ResolvedValueDeclaration> solve(Expression expr
                 .orElseThrow(() -> new IllegalArgumentException(expr.getClass().getCanonicalName()));
     }
 
+    public static ResolvedReferenceTypeDeclaration find(Expression methodCallExpr) {
+        Optional<Node> parent = methodCallExpr.getParentNode();
+        while (parent.isPresent() && !(parent.get() instanceof ClassOrInterfaceType)) {
+            parent = parent.get().getParentNode();
+        }
+        if (parent.isPresent() && parent.get() instanceof ClassOrInterfaceType typeDecl) {
+            final ResolvedReferenceType refType = typeDecl.resolve().asReferenceType();
+            return refType.getTypeDeclaration().orElse(null);
+        }
+        return null;
+    }
+
     public SymbolReference<ResolvedMethodDeclaration> solve(MethodCallExpr methodCallExpr) {
         return solve(methodCallExpr, true);
     }
@@ -726,8 +739,8 @@ protected Node findContainingTypeDeclOrObjectCreationExpr(Node node) {
         boolean detachFlag = false;
         while (true) {
             parent = demandParentNode(parent);
-            if (parent instanceof KeyMethodCallStatement) { // weigl: fun with KeY name resolution.
-                Type type = ((KeyExecutionContext) ((KeyMethodCallStatement) parent).getContext()).getContext();
+            if (parent instanceof KeyMethodCallStmt) { // weigl: fun with KeY name resolution.
+                Type type = ((KeyExecutionContext) ((KeyMethodCallStmt) parent).getContext()).getContext();
                 ResolvedReferenceTypeDeclaration rt = typeSolver.solveType(type.asString());
                 return rt.toAst().get();
             } else if (parent instanceof BodyDeclaration) {
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFactory.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFactory.java
index 115fa4cb67..f3c9665f85 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFactory.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFactory.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -27,12 +27,15 @@
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.expr.*;
+import com.github.javaparser.ast.key.KeyCcatchReturn;
+import com.github.javaparser.ast.key.KeyMethodCallStmt;
 import com.github.javaparser.ast.stmt.*;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.resolution.Context;
 import com.github.javaparser.resolution.SymbolDeclarator;
 import com.github.javaparser.resolution.TypeSolver;
 import com.github.javaparser.symbolsolver.javaparsermodel.contexts.*;
+import com.github.javaparser.symbolsolver.javaparsermodel.contexts.key.KeyCcatchReturnContext;
 import com.github.javaparser.symbolsolver.javaparsermodel.declarators.*;
 import java.util.Optional;
 
@@ -46,6 +49,14 @@ public static Context getContext(Node node, TypeSolver typeSolver) {
             throw new NullPointerException("Node should not be null");
         }
 
+        if (node instanceof KeyCcatchReturn kcr) {
+            return new KeyCcatchReturnContext(kcr, typeSolver);
+        }
+
+        if (node instanceof KeyMethodCallStmt kcr) {
+            return new KeyMethodCallStatementContext(kcr, typeSolver);
+        }
+
         if (node instanceof ArrayAccessExpr) {
             return new ArrayAccessExprContext((ArrayAccessExpr) node, typeSolver);
         }
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/NormalCompletionVisitor.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/NormalCompletionVisitor.java
index a12baf3cef..bb7cad4f85 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/NormalCompletionVisitor.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/NormalCompletionVisitor.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/PatternVariableResult.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/PatternVariableResult.java
index 88d56c29fa..bcca0242a1 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/PatternVariableResult.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/PatternVariableResult.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/PatternVariableVisitor.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/PatternVariableVisitor.java
index dfc7e00173..243cdc3df3 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/PatternVariableVisitor.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/PatternVariableVisitor.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/TypeExtractor.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/TypeExtractor.java
index c60fca38ee..9c588f3792 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/TypeExtractor.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/TypeExtractor.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -23,10 +23,12 @@
 
 import static com.github.javaparser.ast.expr.Expression.EXCLUDE_ENCLOSED_EXPR;
 import static com.github.javaparser.ast.expr.Expression.IS_NOT_ENCLOSED_EXPR;
+import static com.github.javaparser.ast.stmt.SwitchEntry.Type.THROWS_STATEMENT;
 import static com.github.javaparser.resolution.Navigator.demandParentNode;
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.NodeList;
 import com.github.javaparser.ast.body.FieldDeclaration;
 import com.github.javaparser.ast.body.Parameter;
 import com.github.javaparser.ast.body.VariableDeclarator;
@@ -34,6 +36,8 @@
 import com.github.javaparser.ast.stmt.BlockStmt;
 import com.github.javaparser.ast.stmt.ExpressionStmt;
 import com.github.javaparser.ast.stmt.ReturnStmt;
+import com.github.javaparser.ast.stmt.SwitchEntry;
+import com.github.javaparser.ast.stmt.YieldStmt;
 import com.github.javaparser.ast.type.ClassOrInterfaceType;
 import com.github.javaparser.resolution.*;
 import com.github.javaparser.resolution.declarations.*;
@@ -53,10 +57,12 @@
 import com.github.javaparser.symbolsolver.resolution.SymbolSolver;
 import com.github.javaparser.symbolsolver.resolution.promotion.ConditionalExprResolver;
 import com.github.javaparser.symbolsolver.resolution.typeinference.LeastUpperBoundLogic;
+import com.github.javaparser.symbolsolver.resolution.typeinference.TypeHelper;
 import com.github.javaparser.utils.Log;
 import com.github.javaparser.utils.Pair;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -375,6 +381,109 @@ public ResolvedType visit(TypeExpr node, Boolean solveLambdas) {
                 "Solving " + node, classOrInterfaceType.getName().getId());
     }
 
+    @Override
+    public ResolvedType visit(SwitchExpr node, Boolean solveLambdas) {
+        NodeList<SwitchEntry> entries = node.getEntries();
+
+        Set<ResolvedType> resolvedEntryTypes = entries.stream()
+                .map(entry -> {
+                    switch (entry.getType()) {
+                        case EXPRESSION:
+                            // "case L -> e;" - the result is the expression value.
+                            // The expression is wrapped in a single ExpressionStmt
+                            return entry.getStatements()
+                                    .getOFirst()
+                                    .map(statement -> statement.accept(this, solveLambdas))
+                                    .orElseThrow(() -> new IllegalStateException("Empty switch entry"));
+                        case BLOCK:
+                            // "case L -> { ... yield e; }" - the result is the yielded value
+                            // The block is wrapped in a single BlockStmt, search within it for yield
+                            // Blocks may not have a yield if they throw, so return null in that case
+                            return entry.getStatements()
+                                    .getOFirst()
+                                    .flatMap(block -> findYieldForSwitch(block, node))
+                                    .map(YieldStmt::getExpression)
+                                    .map(expr -> expr.accept(this, solveLambdas))
+                                    .orElse(null);
+                        case STATEMENT_GROUP:
+                            // "case L: ... yield e;" - colon-style with yield
+                            // Search all of them for yield
+                            // Some groups may not have yield (e.g., fall-through or throw), so return null
+                            return entry.getStatements().stream()
+                                    .map(stmt -> findYieldForSwitch(stmt, node))
+                                    .filter(Optional::isPresent)
+                                    .map(Optional::get)
+                                    .findFirst()
+                                    .map(YieldStmt::getExpression)
+                                    .map(expr -> expr.accept(this, solveLambdas))
+                                    .orElse(null);
+                        case THROWS_STATEMENT:
+                            // Throwing statements do not contribute to the computation of the type of the switch
+                            // expression
+                            return null;
+                        default:
+                            throw new IllegalStateException("Unsupported switch entry type: " + entry.getType());
+                    }
+                })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+
+        if (resolvedEntryTypes.isEmpty()) {
+            // Should not happen because of prior validation
+            throw new IllegalStateException("Invalid switch expression with no result expressions");
+        }
+
+        // JLS 15.28.1 - Determine the type of the switch expression
+
+        if (resolvedEntryTypes.size() == 1) {
+            // If the result expressions all have the same type then that is the type of the switch expression
+            return resolvedEntryTypes.iterator().next();
+        }
+
+        if (resolvedEntryTypes.stream()
+                .allMatch(type -> type.isPrimitive() && type.asPrimitive().isBoolean()
+                        || type.isReferenceType()
+                                && type.asReferenceType().isUnboxableTo(ResolvedPrimitiveType.BOOLEAN))) {
+            // If the type of each result expression is boolean or Boolean the switch expression has type boolean.
+            return ResolvedPrimitiveType.BOOLEAN;
+        }
+
+        if (resolvedEntryTypes.stream().allMatch(ResolvedType::isNumericType)) {
+            // If the type of each result expression is convertible to a numeric type,
+            // then the switch type is determined by applying numeric promotion
+            return resolvedEntryTypes.stream()
+                    .map(type -> type.isReferenceType()
+                                    && type.asReferenceType().isUnboxable()
+                            ? type.asReferenceType().toUnboxedType().get().asPrimitive()
+                            : type.asPrimitive())
+                    .reduce(ResolvedPrimitiveType::bnp)
+                    .orElseThrow(() -> new IllegalStateException("Unexpected error in numeric promotion"));
+        }
+
+        // Otherwise, boxing conversion is applied to each result expression that has a primitive type,
+        // after which the type is the least upper bound of the types of the result expressions.
+        Set<ResolvedType> boxedTypes = resolvedEntryTypes.stream()
+                .map(type -> type.isPrimitive() ? TypeHelper.toBoxedType(type.asPrimitive(), typeSolver) : type)
+                .collect(Collectors.toSet());
+
+        return LeastUpperBoundLogic.of().lub(boxedTypes);
+    }
+
+    /**
+     * Finds the first YieldStmt that belongs to the given SwitchExpr (not to a nested switch).
+     */
+    private Optional<YieldStmt> findYieldForSwitch(Node searchRoot, SwitchExpr targetSwitch) {
+        return searchRoot.findFirst(YieldStmt.class, yieldStmt -> yieldStmt
+                .findAncestor(SwitchExpr.class)
+                .map(ancestor -> ancestor == targetSwitch)
+                .orElse(false));
+    }
+
+    @Override
+    public ResolvedType visit(ExpressionStmt node, Boolean solveLambdas) {
+        return node.getExpression().accept(this, solveLambdas);
+    }
+
     @Override
     public ResolvedType visit(ObjectCreationExpr node, Boolean solveLambdas) {
         return facade.convertToUsage(node.getType());
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractJavaParserContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractJavaParserContext.java
index 6dd28d79fe..c1a42869a1 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractJavaParserContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractJavaParserContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractMethodLikeDeclarationContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractMethodLikeDeclarationContext.java
index c8a0a46caf..c07908a300 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractMethodLikeDeclarationContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractMethodLikeDeclarationContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnnotationDeclarationContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnnotationDeclarationContext.java
index 8dfa1b2afc..6b84a56b5e 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnnotationDeclarationContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnnotationDeclarationContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnonymousClassDeclarationContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnonymousClassDeclarationContext.java
index c2a8b9d00e..adff240734 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnonymousClassDeclarationContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnonymousClassDeclarationContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ArrayAccessExprContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ArrayAccessExprContext.java
index 15ba73f6be..a7b5f77a24 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ArrayAccessExprContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ArrayAccessExprContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -28,9 +28,9 @@
 
 /**
  * <p>
- * Required to prevent recursive access to the "parent node" (not necessarily the same as the "parent context").
+ *     Required to prevent recursive access to the "parent node" (not necessarily the same as the "parent context").
  * </p><p>
- * Consider, for example, this code where the cursor is currently at the node of type {@code ArrayAccessExpr}:
+ *     Consider, for example, this code where the cursor is currently at the node of type {@code ArrayAccessExpr}:
  * </p>
  * <pre>{@code
  *     var1.perPriority[index].recovered
@@ -74,6 +74,9 @@
  *     </li>
  * </ul>
  *
+ *
+ *
+ *
  * @author Roger Howell
  */
 public class ArrayAccessExprContext extends ExpressionContext<ArrayAccessExpr> {
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/BinaryExprContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/BinaryExprContext.java
index 0aee8a2605..900a272e98 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/BinaryExprContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/BinaryExprContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/BlockStmtContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/BlockStmtContext.java
index 943548e9d4..32d237e640 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/BlockStmtContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/BlockStmtContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CatchClauseContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CatchClauseContext.java
index fad48397dd..6c096742c5 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CatchClauseContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CatchClauseContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java
index 678396eace..58c48d6eb3 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationExtendsContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationExtendsContext.java
index 0ca5cc3903..0b4c6a82fa 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationExtendsContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationExtendsContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java
index a53ed20bce..7a6fe98fbc 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConditionalExprContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConditionalExprContext.java
index 70c72bfaf0..d24b4ae0ce 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConditionalExprContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConditionalExprContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConstructorContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConstructorContext.java
index 2d7266eb31..ef578c4fb6 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConstructorContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ConstructorContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -36,7 +36,6 @@ public class ConstructorContext extends AbstractMethodLikeDeclarationContext<Con
     ///
     /// Constructors
     ///
-
     public ConstructorContext(ConstructorDeclaration wrappedNode, TypeSolver typeSolver) {
         super(wrappedNode, typeSolver);
     }
@@ -45,8 +44,7 @@ public ConstructorContext(ConstructorDeclaration wrappedNode, TypeSolver typeSol
     public List<Parameter> parametersExposedToChild(Node child) {
         // TODO/FIXME: Presumably the parameters must be exposed to all children and their descendants, not just the
         // direct child?
-        var b = wrappedNode.getBody();
-        if (b.isPresent() && child == b.get()) {
+        if (child == wrappedNode.getBody().get()) {
             return wrappedNode.getParameters();
         }
         return Collections.emptyList();
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ContextHelper.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ContextHelper.java
index 903d83c07a..45db643f5b 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ContextHelper.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ContextHelper.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/DoStatementContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/DoStatementContext.java
index 6c42f54093..c07c820323 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/DoStatementContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/DoStatementContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnclosedExprContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnclosedExprContext.java
index c293407ee4..892354065d 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnclosedExprContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnclosedExprContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnumDeclarationContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnumDeclarationContext.java
index 098f4f0c38..36d56f4caf 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnumDeclarationContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/EnumDeclarationContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ExpressionContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ExpressionContext.java
index 81d535d97d..999063e723 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ExpressionContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ExpressionContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/FieldAccessContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/FieldAccessContext.java
index 8312a80660..967a2f0e90 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/FieldAccessContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/FieldAccessContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForEachStatementContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForEachStatementContext.java
index 7251c2299f..ccdc337f03 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForEachStatementContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForEachStatementContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForStatementContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForStatementContext.java
index 67afe3ec27..968b31b56c 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForStatementContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ForStatementContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/IfStatementContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/IfStatementContext.java
index adbe81d8c9..7b27dc24a9 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/IfStatementContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/IfStatementContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/InstanceOfExprContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/InstanceOfExprContext.java
index d5bcfcb1a4..a76743ba33 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/InstanceOfExprContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/InstanceOfExprContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapter.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapter.java
index b9504fc1b6..2e00288d49 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapter.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapter.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/KeyMethodCallStatementContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/KeyMethodCallStatementContext.java
new file mode 100644
index 0000000000..f18736a549
--- /dev/null
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/KeyMethodCallStatementContext.java
@@ -0,0 +1,185 @@
+package com.github.javaparser.symbolsolver.javaparsermodel.contexts;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.body.Parameter;
+import com.github.javaparser.ast.body.TypeDeclaration;
+import com.github.javaparser.ast.body.VariableDeclarator;
+import com.github.javaparser.ast.expr.Expression;
+import com.github.javaparser.ast.expr.TypePatternExpr;
+import com.github.javaparser.ast.key.KeyExecutionContext;
+import com.github.javaparser.ast.key.KeyMethodCallStmt;
+import com.github.javaparser.ast.nodeTypes.NodeWithSimpleName;
+import com.github.javaparser.resolution.Context;
+import com.github.javaparser.resolution.MethodUsage;
+import com.github.javaparser.resolution.TypeSolver;
+import com.github.javaparser.resolution.declarations.*;
+import com.github.javaparser.resolution.model.SymbolReference;
+import com.github.javaparser.resolution.model.Value;
+import com.github.javaparser.resolution.types.ResolvedType;
+import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFactory;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (3/14/26)
+ */
+public class KeyMethodCallStatementContext extends AbstractJavaParserContext<KeyMethodCallStmt> {
+    private final Context context;
+    private final String selfName;
+    private final ResolvedType selfType;
+
+    public KeyMethodCallStatementContext(KeyMethodCallStmt kcr, TypeSolver typeSolver) {
+        super(kcr, typeSolver);
+
+        KeyExecutionContext sourceSpecification = (KeyExecutionContext) kcr.getContext();
+        var typeName = sourceSpecification.context().toString();
+        final var ref = solveTypeInParentContext(typeName);
+        if (!ref.isSolved()) {
+            throw new RuntimeException("Could not resolve type of method call statement: " + typeName);
+        }
+
+        var resolvedType = ref.getCorrespondingDeclaration();
+        var typeDeclaration = resolvedType.toAst(TypeDeclaration.class).get();
+
+        context = JavaParserFactory.getContext(typeDeclaration, typeSolver);
+
+        selfType = sourceSpecification.context().convertToUsage(context);
+
+        selfName = sourceSpecification.getInstance()
+                .flatMap(Expression::toNameExpr)
+                .map(NodeWithSimpleName::getNameAsString)
+                .orElse(null);
+    }
+
+
+    @Override
+    public Optional<MethodUsage> solveMethodAsUsage(String name, List<ResolvedType> argumentsTypes){
+                                                    //ResolvedReferenceTypeDeclaration invocationContext) {
+        return context.solveMethodAsUsage(name, argumentsTypes);
+    }
+
+    @Override
+    public List<TypePatternExpr> typePatternExprsExposedToChild(Node child) {
+        return context.typePatternExprsExposedToChild(child);
+    }
+
+    @Override
+    public Optional<TypePatternExpr> typePatternExprInScope(String name) {
+        return context.typePatternExprInScope(name);
+    }
+
+    @Override
+    public SymbolReference<ResolvedTypeDeclaration> solveType(String name, List<ResolvedType> typeArguments) {
+        return context.solveType(name, typeArguments);
+    }
+
+    @Override
+    public SymbolReference<ResolvedTypeDeclaration> solveType(String name) {
+        return context.solveType(name);
+    }
+
+    @Override
+    public Optional<Value> solveSymbolAsValueInParentContext(String name) {
+        return context.solveSymbolAsValueInParentContext(name);
+    }
+
+    @Override
+    public Optional<Value> solveSymbolAsValue(String name) {
+        if (Objects.equals(name, selfName)) {
+            return Optional.of(new Value(selfType, selfName));
+        }
+        return context.solveSymbolAsValue(name);
+    }
+
+    @Override
+    public SymbolReference<? extends ResolvedValueDeclaration> solveSymbol(String name) {
+        if (Objects.equals(name, selfName)) {
+            return getSymbolicReferenceOfSelfName();
+        }
+        return context.solveSymbol(name);
+    }
+
+    private SymbolReference<? extends ResolvedValueDeclaration> getSymbolicReferenceOfSelfName() {
+        return SymbolReference.solved(new KeyMethodCallInstanceDeclaration());
+    }
+
+    @Override
+    public SymbolReference<ResolvedMethodDeclaration> solveMethodInParentContext(String name,
+                                                                                 List<ResolvedType> argumentsTypes,
+                                                                                 boolean staticOnly) {
+        return context.solveMethodInParentContext(name, argumentsTypes, staticOnly);
+    }
+
+    @Override
+    public SymbolReference<ResolvedMethodDeclaration> solveMethod(
+            String name, List<ResolvedType> argumentsTypes,
+            boolean staticOnly) {
+        return context.solveMethod(name, argumentsTypes, staticOnly);
+    }
+
+    @Override
+    public Optional<ResolvedType> solveGenericTypeInParentContext(String name) {
+        return context.solveGenericTypeInParentContext(name);
+    }
+
+    @Override
+    public Optional<ResolvedType> solveGenericType(String name) {
+        return context.solveGenericType(name);
+    }
+
+    @Override
+    public SymbolReference<ResolvedConstructorDeclaration> solveConstructor(List<ResolvedType> argumentsTypes) {
+        return context.solveConstructor(argumentsTypes);
+    }
+
+    @Override
+    public List<Parameter> parametersExposedToChild(Node child) {
+        return context.parametersExposedToChild(child);
+    }
+
+    @Override
+    public Optional<Parameter> parameterDeclarationInScope(String name) {
+        return context.parameterDeclarationInScope(name);
+    }
+
+    @Override
+    public List<VariableDeclarator> localVariablesExposedToChild(Node child) {
+        return context.localVariablesExposedToChild(child);
+    }
+
+    @Override
+    public Optional<VariableDeclarator> localVariableDeclarationInScope(String name) {
+        return context.localVariableDeclarationInScope(name);
+    }
+
+    @Override
+    public List<ResolvedFieldDeclaration> fieldsExposedToChild(Node child) {
+        return context.fieldsExposedToChild(child);
+    }
+
+    @Override
+    public Optional<ResolvedFieldDeclaration> fieldDeclarationInScope(String name) {
+        return context.fieldDeclarationInScope(name);
+    }
+
+    public final class KeyMethodCallInstanceDeclaration implements ResolvedValueDeclaration {
+        @Override
+        public ResolvedType getType() {
+            return selfType;
+        }
+
+        @Override
+        public String getName() {
+            return selfName;
+        }
+
+        @Override
+        public Optional<Node> toAst() {
+            return Optional.ofNullable(((KeyExecutionContext) wrappedNode.getContext()).instance());
+        }
+    }
+}
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java
index cd663d940f..eb8b7ab888 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java
index c6062edb1a..44bec2bc7b 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodContext.java
index 6906cb60b3..1482ea1b2c 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodReferenceExprContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodReferenceExprContext.java
index b6d1d1598e..a65eefdebb 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodReferenceExprContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodReferenceExprContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ObjectCreationContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ObjectCreationContext.java
index 09894bb263..a07fc751cf 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ObjectCreationContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ObjectCreationContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/RecordDeclarationContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/RecordDeclarationContext.java
index cb7733c4e6..31f61c4203 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/RecordDeclarationContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/RecordDeclarationContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/StatementContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/StatementContext.java
index 361c014ff1..9cc0c6f877 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/StatementContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/StatementContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchEntryContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchEntryContext.java
index 62cf8d6dce..40b000d1a5 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchEntryContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchEntryContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/TryWithResourceContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/TryWithResourceContext.java
index ee4841b42a..0235d77902 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/TryWithResourceContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/TryWithResourceContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/UnaryExprContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/UnaryExprContext.java
index 98654959f1..f714b877e8 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/UnaryExprContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/UnaryExprContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/VariableDeclarationExprContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/VariableDeclarationExprContext.java
index 0856031d07..e1d37e7416 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/VariableDeclarationExprContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/VariableDeclarationExprContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/VariableDeclaratorContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/VariableDeclaratorContext.java
index 915be0b096..6f605b690f 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/VariableDeclaratorContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/VariableDeclaratorContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/WhileStatementContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/WhileStatementContext.java
index 49ed537b8c..be0ac8ceb2 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/WhileStatementContext.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/WhileStatementContext.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/key/KeyCcatchReturnContext.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/key/KeyCcatchReturnContext.java
new file mode 100644
index 0000000000..5bc628b45b
--- /dev/null
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/key/KeyCcatchReturnContext.java
@@ -0,0 +1,80 @@
+package com.github.javaparser.symbolsolver.javaparsermodel.contexts.key;
+
+import com.github.javaparser.ast.Node;
+import com.github.javaparser.ast.body.Parameter;
+import com.github.javaparser.ast.body.VariableDeclarator;
+import com.github.javaparser.ast.key.KeyCcatchReturn;
+import com.github.javaparser.resolution.SymbolDeclarator;
+import com.github.javaparser.resolution.TypeSolver;
+import com.github.javaparser.resolution.declarations.ResolvedMethodDeclaration;
+import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration;
+import com.github.javaparser.resolution.model.SymbolReference;
+import com.github.javaparser.resolution.model.Value;
+import com.github.javaparser.resolution.types.ResolvedType;
+import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFactory;
+import com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+
+public class KeyCcatchReturnContext extends AbstractJavaParserContext<KeyCcatchReturn> {
+    public KeyCcatchReturnContext(KeyCcatchReturn kcr, TypeSolver typeSolver) {
+        super(kcr, typeSolver);
+    }
+
+    @Override
+    public final SymbolReference<? extends ResolvedValueDeclaration> solveSymbol(String name) {
+        if (wrappedNode.getParameter().isPresent()) {
+            SymbolDeclarator sb = JavaParserFactory.getSymbolDeclarator(
+                    wrappedNode.getParameter().get(), typeSolver);
+            SymbolReference<? extends ResolvedValueDeclaration> symbolReference =
+                    AbstractJavaParserContext.solveWith(sb, name);
+            if (symbolReference.isSolved()) {
+                return symbolReference;
+            }
+        }
+
+        // if nothing is found we should ask the parent context
+        return solveSymbolInParentContext(name);
+    }
+
+    @Override
+    public final Optional<Value> solveSymbolAsValue(String name) {
+        if (wrappedNode.getParameter().isPresent()) {
+            SymbolDeclarator sb = JavaParserFactory.getSymbolDeclarator(
+                    wrappedNode.getParameter().get(), typeSolver);
+            Optional<Value> symbolReference = solveWithAsValue(sb, name);
+            if (symbolReference.isPresent()) {
+                // Perform parameter type substitution as needed
+                return symbolReference;
+            }
+        }
+
+        // if nothing is found we should ask the parent context
+        return solveSymbolAsValueInParentContext(name);
+    }
+
+    @Override
+    public final SymbolReference<ResolvedMethodDeclaration> solveMethod(
+            String name, List<ResolvedType> argumentsTypes, boolean staticOnly) {
+        // TODO: Document why staticOnly is forced to be false.
+        return solveMethodInParentContext(name, argumentsTypes, false);
+    }
+
+    @Override
+    public List<VariableDeclarator> localVariablesExposedToChild(Node child) {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public List<Parameter> parametersExposedToChild(Node child) {
+        // TODO/FIXME: Presumably the parameters must be exposed to all children and their descendants, not just the
+        // direct child?
+        if (getWrappedNode().getParameter().isPresent()
+                && getWrappedNode().getBlock().isPresent()
+                && child == getWrappedNode().getBlock().get()) {
+            return Collections.singletonList(getWrappedNode().getParameter().get());
+        }
+        return Collections.emptyList();
+    }
+}
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/AstResolutionUtils.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/AstResolutionUtils.java
index 75419e90bb..27f8cef760 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/AstResolutionUtils.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/AstResolutionUtils.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/DefaultConstructorDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/DefaultConstructorDeclaration.java
index 559a494317..9d99b5515c 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/DefaultConstructorDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/DefaultConstructorDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationDeclaration.java
index 1f128ce9aa..16d0576452 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -39,9 +39,9 @@
  */
 public class JavaParserAnnotationDeclaration extends AbstractTypeDeclaration implements ResolvedAnnotationDeclaration {
 
-    private final com.github.javaparser.ast.body.AnnotationDeclaration wrappedNode;
-    private final TypeSolver typeSolver;
-    private final JavaParserTypeAdapter<AnnotationDeclaration> javaParserTypeAdapter;
+    private com.github.javaparser.ast.body.AnnotationDeclaration wrappedNode;
+    private TypeSolver typeSolver;
+    private JavaParserTypeAdapter<AnnotationDeclaration> javaParserTypeAdapter;
 
     public JavaParserAnnotationDeclaration(AnnotationDeclaration wrappedNode, TypeSolver typeSolver) {
         this.wrappedNode = wrappedNode;
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationMemberDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationMemberDeclaration.java
index 10743be7cd..b70209db1c 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationMemberDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationMemberDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java
index d236c2926b..bcc82663f6 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java
index 63db5f2550..00f52e479b 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -54,9 +54,9 @@ public class JavaParserClassDeclaration extends AbstractClassDeclaration
     /// Fields
     ///
 
-    private final TypeSolver typeSolver;
-    private final ClassOrInterfaceDeclaration wrappedNode;
-    private final JavaParserTypeAdapter<ClassOrInterfaceDeclaration> javaParserTypeAdapter;
+    private TypeSolver typeSolver;
+    private ClassOrInterfaceDeclaration wrappedNode;
+    private JavaParserTypeAdapter<ClassOrInterfaceDeclaration> javaParserTypeAdapter;
 
     ///
     /// Constructors
@@ -463,7 +463,7 @@ private ResolvedReferenceType toReferenceType(ClassOrInterfaceType classOrInterf
         String className = classOrInterfaceType.getName().getId();
         if (classOrInterfaceType.getScope().isPresent()) {
             // look for the qualified name (for example class of type Rectangle2D.Double)
-            className = classOrInterfaceType.getScope().get() + "." + className;
+            className = classOrInterfaceType.getScope().get().toString() + "." + className;
         }
 
         // Since this is used to resolve reference to "extended" and "implemented" types, and since these type
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserConstructorDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserConstructorDeclaration.java
index 7815ed3b01..a09bd0db83 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserConstructorDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserConstructorDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumConstantDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumConstantDeclaration.java
index 43b9647232..636a2c6531 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumConstantDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumConstantDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java
index 24153dfbc3..621104514b 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java
index 04dd90c821..22b339fb14 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -21,10 +21,11 @@
 
 package com.github.javaparser.symbolsolver.javaparsermodel.declarations;
 
+import static com.github.javaparser.ast.Modifier.DefaultKeyword.STATIC;
+import static com.github.javaparser.ast.Modifier.DefaultKeyword.VOLATILE;
 import static com.github.javaparser.resolution.Navigator.demandParentNode;
 
 import com.github.javaparser.ast.AccessSpecifier;
-import com.github.javaparser.ast.Modifier;
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.body.TypeDeclaration;
 import com.github.javaparser.ast.body.VariableDeclarator;
@@ -40,9 +41,9 @@
  */
 public class JavaParserFieldDeclaration implements ResolvedFieldDeclaration {
 
-    private final VariableDeclarator variableDeclarator;
-    private final com.github.javaparser.ast.body.FieldDeclaration wrappedNode;
-    private final TypeSolver typeSolver;
+    private VariableDeclarator variableDeclarator;
+    private com.github.javaparser.ast.body.FieldDeclaration wrappedNode;
+    private TypeSolver typeSolver;
 
     public JavaParserFieldDeclaration(VariableDeclarator variableDeclarator, TypeSolver typeSolver) {
         if (typeSolver == null) {
@@ -69,12 +70,12 @@ public String getName() {
 
     @Override
     public boolean isStatic() {
-        return wrappedNode.hasModifier(Modifier.DefaultKeyword.STATIC);
+        return wrappedNode.hasModifier(STATIC);
     }
 
     @Override
     public boolean isVolatile() {
-        return wrappedNode.hasModifier(Modifier.DefaultKeyword.VOLATILE);
+        return wrappedNode.hasModifier(VOLATILE);
     }
 
     @Override
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java
index e6213b22b2..e7a5a67556 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -54,9 +54,9 @@ public class JavaParserInterfaceDeclaration extends AbstractTypeDeclaration
                 MethodUsageResolutionCapability,
                 SymbolResolutionCapability {
 
-    private final TypeSolver typeSolver;
-    private final ClassOrInterfaceDeclaration wrappedNode;
-    private final JavaParserTypeAdapter<ClassOrInterfaceDeclaration> javaParserTypeAdapter;
+    private TypeSolver typeSolver;
+    private ClassOrInterfaceDeclaration wrappedNode;
+    private JavaParserTypeAdapter<ClassOrInterfaceDeclaration> javaParserTypeAdapter;
 
     public JavaParserInterfaceDeclaration(ClassOrInterfaceDeclaration wrappedNode, TypeSolver typeSolver) {
         if (!wrappedNode.isInterface()) {
@@ -252,7 +252,7 @@ public String toString() {
     /**
      * This method is deprecated because it receives the TypesSolver as a parameter.
      * Eventually we would like to remove all usages of TypeSolver as a parameter.
-     * <p>
+     *
      * Also, resolution should move out of declarations, so that they are pure declarations and the resolution should
      * work for JavaParser, Reflection and Javassist classes in the same way and not be specific to the three
      * implementations.
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java
index 6f93ecb7d0..3156bd4a01 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java
index b1734b7a0b..7133618436 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserRecordDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserRecordDeclaration.java
index fc190c8c44..57d446f0ed 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserRecordDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserRecordDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclaration.java
index 82cbfbd28f..70d4bbf676 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -31,7 +31,7 @@
 
 /**
  * This should not be used to represent fields of parameters.
- * <p>
+ *
  * Eventually this should be renamed in JavaParserVariableDeclaration.
  *
  * @author Federico Tomassetti
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeAdapter.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeAdapter.java
index 9d627b5d26..fcf52161cd 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeAdapter.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeAdapter.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java
index 880a18de3e..df32093b41 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypePatternDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypePatternDeclaration.java
index 31047dd6fb..13709c6fa1 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypePatternDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypePatternDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java
index 2a5cbd595c..fdc96e2605 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserVariableDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserVariableDeclaration.java
index 1eb606f527..edfaf8d1c7 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserVariableDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserVariableDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/AbstractSymbolDeclarator.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/AbstractSymbolDeclarator.java
index e67928d045..c4b1dab155 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/AbstractSymbolDeclarator.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/AbstractSymbolDeclarator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/FieldSymbolDeclarator.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/FieldSymbolDeclarator.java
index aad8181dd8..f8c189e4ae 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/FieldSymbolDeclarator.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/FieldSymbolDeclarator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/NoSymbolDeclarator.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/NoSymbolDeclarator.java
index 1dc377e638..574c297e32 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/NoSymbolDeclarator.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/NoSymbolDeclarator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/ParameterSymbolDeclarator.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/ParameterSymbolDeclarator.java
index cb01a173f0..bd6bb8c7c7 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/ParameterSymbolDeclarator.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/ParameterSymbolDeclarator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/TypePatternSymbolDeclarator.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/TypePatternSymbolDeclarator.java
index ba31d7d1b2..12e5eeec84 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/TypePatternSymbolDeclarator.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/TypePatternSymbolDeclarator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/VariableSymbolDeclarator.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/VariableSymbolDeclarator.java
index d9bf89f345..e4cbb128b8 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/VariableSymbolDeclarator.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarators/VariableSymbolDeclarator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/package-info.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/package-info.java
index 45398024b4..cb1625cfc1 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/package-info.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/package-info.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationDeclaration.java
index ff32dfd203..7b5c0e0f57 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -40,9 +40,9 @@
  */
 public class JavassistAnnotationDeclaration extends AbstractTypeDeclaration implements ResolvedAnnotationDeclaration {
 
-    private final CtClass ctClass;
-    private final TypeSolver typeSolver;
-    private final JavassistTypeDeclarationAdapter javassistTypeDeclarationAdapter;
+    private CtClass ctClass;
+    private TypeSolver typeSolver;
+    private JavassistTypeDeclarationAdapter javassistTypeDeclarationAdapter;
 
     @Override
     public String toString() {
@@ -67,7 +67,7 @@ public String getPackageName() {
     public String getClassName() {
         String qualifiedName = getQualifiedName();
         if (qualifiedName.contains(".")) {
-            return qualifiedName.substring(qualifiedName.lastIndexOf(".") + 1);
+            return qualifiedName.substring(qualifiedName.lastIndexOf(".") + 1, qualifiedName.length());
         }
         return qualifiedName;
     }
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationMemberDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationMemberDeclaration.java
index 2e435a33a4..2c37c779ed 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationMemberDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationMemberDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java
index 34ac443aa0..745006accc 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistConstructorDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistConstructorDeclaration.java
index c9d92bb181..ef69fb28b2 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistConstructorDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistConstructorDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumConstantDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumConstantDeclaration.java
index a5bcd9eb97..e181694a78 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumConstantDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumConstantDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java
index 3f79237422..f8814106fe 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java
index da863eabc2..62ba1b5b15 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclaration.java
index 55e1d11190..55590b7f69 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -36,8 +36,8 @@
  * @author Federico Tomassetti
  */
 public class JavassistFieldDeclaration implements ResolvedFieldDeclaration {
-    private final CtField ctField;
-    private final TypeSolver typeSolver;
+    private CtField ctField;
+    private TypeSolver typeSolver;
 
     public JavassistFieldDeclaration(CtField ctField, TypeSolver typeSolver) {
         this.ctField = ctField;
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java
index 55677f77c5..153070c7af 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclaration.java
index 0edd7a662a..95e3ba61e9 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodLikeDeclarationAdapter.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodLikeDeclarationAdapter.java
index 28f154a071..5b115758d1 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodLikeDeclarationAdapter.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodLikeDeclarationAdapter.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -37,11 +37,11 @@
 
 public class JavassistMethodLikeDeclarationAdapter {
 
-    private final CtBehavior ctBehavior;
-    private final TypeSolver typeSolver;
-    private final ResolvedMethodLikeDeclaration declaration;
+    private CtBehavior ctBehavior;
+    private TypeSolver typeSolver;
+    private ResolvedMethodLikeDeclaration declaration;
 
-    private final SignatureAttribute.MethodSignature methodSignature;
+    private SignatureAttribute.MethodSignature methodSignature;
 
     public JavassistMethodLikeDeclarationAdapter(
             CtBehavior ctBehavior, TypeSolver typeSolver, ResolvedMethodLikeDeclaration declaration) {
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclaration.java
index 3a4f3c5f5d..595be36871 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclaration.java
index 7ceaf8bedb..509e8ee912 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapter.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapter.java
index 94ba920bbe..0b85b85981 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapter.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapter.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeParameter.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeParameter.java
index 81acb99015..52b8596e3e 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeParameter.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeParameter.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java
index 006b89464f..d9c130eec7 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/package-info.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/package-info.java
index 059db5e6a4..6934158969 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/package-info.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javassistmodel/package-info.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclaration.java
index 8935b1251e..969411b5c2 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclaration.java
index a55b7c67b7..085209cbd4 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/ObjectProvider.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/ObjectProvider.java
index b4e931becf..733705e74e 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/ObjectProvider.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/logic/ObjectProvider.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationDeclaration.java
index 74029b65ca..6681079367 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationMemberDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationMemberDeclaration.java
index cc4579ef1f..af526ae1cf 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationMemberDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationMemberDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassAdapter.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassAdapter.java
index c2ea78b3b8..ec9141de7b 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassAdapter.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassAdapter.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java
index 04e1858cfe..fd4167d84b 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionConstructorDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionConstructorDeclaration.java
index f13d77da3d..9cb45b8310 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionConstructorDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionConstructorDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumConstantDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumConstantDeclaration.java
index b8d5b56384..2fea148b90 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumConstantDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumConstantDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclaration.java
index b39a82056d..e21014bf55 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFactory.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFactory.java
index 157b6b4567..05f9486ddc 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFactory.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFactory.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclaration.java
index f25f627b78..757e0ff2af 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -34,9 +34,9 @@
  */
 public class ReflectionFieldDeclaration implements ResolvedFieldDeclaration {
 
-    private final Field field;
-    private final TypeSolver typeSolver;
-    private final ResolvedType type;
+    private Field field;
+    private TypeSolver typeSolver;
+    private ResolvedType type;
 
     public ReflectionFieldDeclaration(Field field, TypeSolver typeSolver) {
         this.field = field;
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java
index 627c2e583d..fe4154db35 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -143,9 +143,9 @@ public int hashCode() {
      * This method first resolves the basic method signature, then performs generic type inference
      * based on the actual parameter types provided at the call site.
      *
-     * @param name                the method name to resolve
-     * @param parameterTypes      the actual parameter types at the call site
-     * @param invokationContext   the context where the method is invoked
+     * @param name the method name to resolve
+     * @param parameterTypes the actual parameter types at the call site
+     * @param invokationContext the context where the method is invoked
      * @param typeParameterValues explicit type parameter values (if any)
      * @return an Optional containing the resolved MethodUsage with inferred types, or empty if resolution fails
      */
@@ -170,7 +170,7 @@ public Optional<MethodUsage> solveMethodAsUsage(
      * between formal parameter types and actual parameter types provided at the call site.
      * Handles both regular methods and varargs methods with appropriate constraint collection.
      *
-     * @param methodUsage    the initially resolved method usage
+     * @param methodUsage the initially resolved method usage
      * @param parameterTypes the actual parameter types from the call site
      * @return an Optional containing the method usage with inferred generic types, or empty if inference fails
      */
@@ -189,8 +189,8 @@ private Optional<MethodUsage> performTypeInference(MethodUsage methodUsage, List
      * Automatically detects whether the method is varargs and delegates to the appropriate
      * constraint collection strategy. Also validates that parameter counts are compatible.
      *
-     * @param methodUsage      the method usage to analyze
-     * @param parameterTypes   the actual parameter types from the call site
+     * @param methodUsage the method usage to analyze
+     * @param parameterTypes the actual parameter types from the call site
      * @param inferenceContext the inference context for collecting type constraints
      * @return a list of type constraints that will be used for generic type resolution
      * @throws IllegalArgumentException if parameter counts are incompatible
@@ -216,7 +216,7 @@ private List<ResolvedType> collectTypeConstraints(
      * For regular methods, counts must match exactly. For varargs methods, actual parameter
      * count must be at least the number of required parameters (formal count - 1).
      *
-     * @param isVarArgs        whether the method is a varargs method
+     * @param isVarArgs whether the method is a varargs method
      * @param formalParamCount the number of formal parameters in the method signature
      * @param actualParamCount the number of actual parameters provided at the call site
      * @throws IllegalArgumentException if parameter counts are incompatible
@@ -235,8 +235,8 @@ private void validateParameterCount(boolean isVarArgs, int formalParamCount, int
      * between each formal parameter type and its corresponding actual parameter type.
      * This is a straightforward one-to-one mapping since parameter counts must match exactly.
      *
-     * @param methodUsage      the method usage to analyze
-     * @param parameterTypes   the actual parameter types from the call site
+     * @param methodUsage the method usage to analyze
+     * @param parameterTypes the actual parameter types from the call site
      * @param inferenceContext the inference context for collecting constraints
      * @return a list of type constraints, one for each parameter position
      */
@@ -257,13 +257,13 @@ private List<ResolvedType> collectRegularConstraints(
      * Collects type constraints for varargs methods. This involves two phases:
      * 1. Regular parameters: handled like non-varargs methods (one-to-one mapping)
      * 2. Varargs parameter: handled specially based on how arguments are passed
-     * <p>
+     *
      * The varargs parameter can receive arguments in two ways:
      * - Direct array passing: method(array) - constraint between array types
      * - Individual elements: method(elem1, elem2, ...) - constraints between component type and each element
      *
-     * @param methodUsage      the varargs method usage to analyze
-     * @param parameterTypes   the actual parameter types from the call site
+     * @param methodUsage the varargs method usage to analyze
+     * @param parameterTypes the actual parameter types from the call site
      * @param inferenceContext the inference context for collecting constraints
      * @param formalParamCount the total number of formal parameters (including varargs)
      * @return a list of type constraints covering both regular and varargs parameters
@@ -295,20 +295,20 @@ private List<ResolvedType> collectVarArgsConstraints(
     /**
      * Processes the varargs parameter by determining how arguments are passed and creating
      * appropriate type constraints. Handles two scenarios:
-     * <p>
+     *
      * 1. Direct array passing: When exactly one argument is passed to varargs and it's an array,
-     * creates a constraint between the formal array type and the actual array type.
-     * Example: method(String[] args) called as method(stringArray)
-     * <p>
+     *    creates a constraint between the formal array type and the actual array type.
+     *    Example: method(String[] args) called as method(stringArray)
+     *
      * 2. Individual element passing: When multiple arguments are passed to varargs,
-     * creates constraints between the array's component type and each individual argument.
-     * Example: method(String... args) called as method("a", "b", "c")
+     *    creates constraints between the array's component type and each individual argument.
+     *    Example: method(String... args) called as method("a", "b", "c")
      *
-     * @param varargsParamType  the formal type of the varargs parameter (must be an array type)
-     * @param parameterTypes    all actual parameter types from the call site
+     * @param varargsParamType the formal type of the varargs parameter (must be an array type)
+     * @param parameterTypes all actual parameter types from the call site
      * @param regularParamCount the number of regular (non-varargs) parameters
-     * @param inferenceContext  the inference context for collecting constraints
-     * @param constraints       the constraint list to add new constraints to
+     * @param inferenceContext the inference context for collecting constraints
+     * @param constraints the constraint list to add new constraints to
      * @throws IllegalStateException if the varargs parameter is not an array type
      */
     private void processVarArgsParameter(
@@ -342,9 +342,9 @@ private void processVarArgsParameter(
      * This happens when there is exactly one argument for the varargs parameter and that argument
      * is an array type. This is a special case that requires different constraint handling.
      *
-     * @param parameterTypes    all actual parameter types from the call site
+     * @param parameterTypes all actual parameter types from the call site
      * @param regularParamCount the number of regular (non-varargs) parameters
-     * @param actualParamCount  the total number of actual parameters
+     * @param actualParamCount the total number of actual parameters
      * @return true if a single array is being passed directly to varargs, false otherwise
      */
     private boolean isDirectArrayPassing(
@@ -358,8 +358,8 @@ private boolean isDirectArrayPassing(
      * and updating both parameter types and return type with their concrete resolved types.
      * This is the final step that produces a fully resolved MethodUsage with no remaining generic placeholders.
      *
-     * @param methodUsage      the method usage to update with resolved types
-     * @param constraints      the collected type constraints from parameter analysis
+     * @param methodUsage the method usage to update with resolved types
+     * @param constraints the collected type constraints from parameter analysis
      * @param inferenceContext the inference context containing all type relationships
      * @return an Optional containing the fully resolved MethodUsage
      * @throws ConflictingGenericTypesException if type constraints are contradictory
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclaration.java
index f593778721..694461667e 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java
index f751e21282..541d0605ac 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclaration.java
index 2bcb11af32..a126925b5d 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -37,11 +37,12 @@ public class ReflectionParameterDeclaration implements ResolvedParameterDeclarat
     private String name;
 
     /**
+     *
      * @param type
      * @param genericType
      * @param typeSolver
      * @param variadic
-     * @param name        can potentially be null
+     * @param name can potentially be null
      */
     public ReflectionParameterDeclaration(
             Class<?> type, java.lang.reflect.Type genericType, TypeSolver typeSolver, boolean variadic, String name) {
@@ -53,6 +54,7 @@ public ReflectionParameterDeclaration(
     }
 
     /**
+     *
      * @return the name, which can be potentially null
      */
     @Override
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionPatternDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionPatternDeclaration.java
index 2bd56e6cd6..89f17b82a2 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionPatternDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionPatternDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionRecordDeclaration.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionRecordDeclaration.java
index 0530eae3bb..50b45d6305 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionRecordDeclaration.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionRecordDeclaration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2020 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTypeParameter.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTypeParameter.java
index 73da7094f7..b4dafc2ddb 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTypeParameter.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTypeParameter.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/comparators/ClassComparator.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/comparators/ClassComparator.java
index 471f2eb415..0a7fb82f8d 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/comparators/ClassComparator.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/comparators/ClassComparator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/comparators/MethodComparator.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/comparators/MethodComparator.java
index a1e8ef37b0..1d6f890e2b 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/comparators/MethodComparator.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/comparators/MethodComparator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/comparators/ParameterComparator.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/comparators/ParameterComparator.java
index a58341b156..10c11cfa17 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/comparators/ParameterComparator.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/comparators/ParameterComparator.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/package-info.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/package-info.java
index ac7a0a8ae9..cc28397e62 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/package-info.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/reflectionmodel/package-info.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/FileUtils.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/FileUtils.java
index b6a509f6a7..74d8edc195 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/FileUtils.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/FileUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/JavassistModuleHelper.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/JavassistModuleHelper.java
index f1db9c4d53..e2b9198778 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/JavassistModuleHelper.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/JavassistModuleHelper.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2025 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -29,7 +29,7 @@
 import javassist.bytecode.ConstPool;
 
 public class JavassistModuleHelper {
-    public static String MODULE_INFO_CLASS_NAME = "module-info";
+    public static final String MODULE_INFO_CLASS_NAME = "module-info";
 
     /**
      * Javassist does not provide support for modules beyond letting users fetch the module
@@ -52,8 +52,8 @@ public static Optional<Pair<String, List<String>>> getModuleWithExportedPackages
 
         // The first 2 bytes give the module_name_index, which is needed to get the module name from the constPool
         int attrIdx = 0;
-        int moduleNameIndex = moduleAttribute[attrIdx++] << 16;
-        moduleNameIndex |= moduleAttribute[attrIdx++];
+        int moduleNameIndex = (moduleAttribute[attrIdx++] & 0xFF) << 8;
+        moduleNameIndex |= (moduleAttribute[attrIdx++] & 0xFF);
 
         String moduleName = constPool.getModuleInfo(moduleNameIndex);
         ArrayList<String> exportedPackages = new ArrayList<>();
@@ -63,32 +63,34 @@ public static Optional<Pair<String, List<String>>> getModuleWithExportedPackages
         attrIdx += 4;
 
         // The next 2 bytes are the requires_count
-        int requiresCount = moduleAttribute[attrIdx++] << 16;
-        requiresCount |= moduleAttribute[attrIdx++];
+        int requiresCount = (moduleAttribute[attrIdx++] & 0xFF) << 8;
+        requiresCount |= (moduleAttribute[attrIdx++] & 0xFF);
 
         // Skip the requires table. Each require structure consists of 6 bytes.
         attrIdx += requiresCount * 6;
 
         // The next 2 bytes are the exports count
-        int exportsCount = moduleAttribute[attrIdx++] << 16;
-        exportsCount |= moduleAttribute[attrIdx++];
+        int exportsCount = (moduleAttribute[attrIdx++] & 0xFF) << 8;
+        exportsCount |= (moduleAttribute[attrIdx++] & 0xFF);
 
         for (int i = 0; i < exportsCount; i++) {
-            int exportsIndex = moduleAttribute[attrIdx++] << 16;
-            exportsIndex = moduleAttribute[attrIdx++];
+            int exportsIndex = (moduleAttribute[attrIdx++] & 0xFF) << 8;
+            exportsIndex |= (moduleAttribute[attrIdx++] & 0xFF);
             String exportedPackageName = constPool.getPackageInfo(exportsIndex).replace('/', '.');
             exportedPackages.add(exportedPackageName);
             // Skip the 2 byte exports_flags
             attrIdx += 2;
             // The next 2 bytes are the exports to count. Need this to skip the exports to table for now, but
             // could use them for better resolution.
-            int exportsToCount = moduleAttribute[attrIdx++] << 16;
-            exportsToCount |= moduleAttribute[attrIdx++];
+            int exportsToCount = (moduleAttribute[attrIdx++] & 0xFF) << 8;
+            exportsToCount |= (moduleAttribute[attrIdx++] & 0xFF);
             // TODO Eventually check exportedTo to see if this is valid
             // For now, skip each 2 byte exports_to
-            attrIdx += 2 + exportsToCount;
+            attrIdx += 2 * exportsToCount;
         }
 
+        // opens, uses and provides tables are not relevant
+
         return Optional.of(new Pair<>(moduleName, exportedPackages));
     }
 }
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/ModuleLayerHelper.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/ModuleLayerHelper.java
index 7f6b75109f..883d27f035 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/ModuleLayerHelper.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/ModuleLayerHelper.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2025 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategy.java b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategy.java
index 9cc39f854e..da85895852 100644
--- a/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategy.java
+++ b/javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategy.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/build.gradle.kts b/javaparser-symbol-solver-testing/build.gradle.kts
new file mode 100644
index 0000000000..a0a6e0c108
--- /dev/null
+++ b/javaparser-symbol-solver-testing/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    id("buildlogic.java-conventions")
+}
+
+dependencies {
+    api(project(":jmlparser-symbol-solver-core"))
+    testImplementation(libs.bundles.testing)
+    testRuntimeOnly(libs.bundles.testing.runtime)
+}
+
+description = "io.github.jmltoolkit:jmlparser-symbol-solver-testing"
diff --git a/javaparser-symbol-solver-testing/pom.xml b/javaparser-symbol-solver-testing/pom.xml
index c35601aca7..cf41a57a60 100644
--- a/javaparser-symbol-solver-testing/pom.xml
+++ b/javaparser-symbol-solver-testing/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>jmlparser-parent</artifactId>
         <groupId>io.github.jmltoolkit</groupId>
-        <version>3.28.0-J8.0-K10.1-SNAPSHOT</version>
+        <version>3.28.0-J8.0-K13.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -86,6 +86,10 @@
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.truth</groupId>
+            <artifactId>truth</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/SlowTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/SlowTest.java
index 8440f7a219..79d8946b7e 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/SlowTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/SlowTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/ast/type/ClassOrInterfaceTypeTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/ast/type/ClassOrInterfaceTypeTest.java
index 60918d722e..47d40e7104 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/ast/type/ClassOrInterfaceTypeTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/ast/type/ClassOrInterfaceTypeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/key/LogicalTypes.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/key/LogicalTypes.java
index 154f2f5ec6..e196df9a90 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/key/LogicalTypes.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/key/LogicalTypes.java
@@ -24,9 +24,9 @@
  */
 public class LogicalTypes {
     @Test
-    void resolveFree() {
-        CompilationUnit cu = StaticJavaParser.parse(
-                "public class A { public ghost \\free test; " + "public \\map abc() { return test;} }");
+    void resolveMap() {
+        CompilationUnit cu =
+                StaticJavaParser.parse("public class A { public \\seq test; " + "public \\map abc() { return test;} }");
 
         TypeSolver typeSolver = new TypeSolverBuilder()
                 .withCurrentJRE()
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/AssociableToASTTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/AssociableToASTTest.java
index 80289e3700..08d7b9a369 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/AssociableToASTTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/AssociableToASTTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -33,9 +33,10 @@ public interface AssociableToASTTest {
     /**
      * Helper method to cast the instance to the correct {@link Class}.
      *
-     * @param instance The instance to be casted.
-     * @param clazz    The expected {@link Class}.
-     * @param <T>      The expected type.
+     * @param instance  The instance to be casted.
+     * @param clazz     The expected {@link Class}.
+     * @param <T>       The expected type.
+     *
      * @return The instance casted as the correct type.
      */
     default <T extends AssociableToAST> T safeCast(AssociableToAST instance, Class<T> clazz) {
@@ -55,6 +56,7 @@ default <T extends AssociableToAST> T safeCast(AssociableToAST instance, Class<T
      * Get the node that can be associated with an AST.
      *
      * @param associableToAST The node that can be associated with an AST.
+     *
      * @return The node being wrapped.
      */
     Optional<Node> getWrappedDeclaration(AssociableToAST associableToAST);
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/HasAccessSpecifierTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/HasAccessSpecifierTest.java
index fe7122c0c9..ac08bbc89b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/HasAccessSpecifierTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/HasAccessSpecifierTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationDeclarationTest.java
index f4e256d834..0b7ef7aff8 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationMemberDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationMemberDeclarationTest.java
index da2811c346..603514cecd 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationMemberDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedAnnotationMemberDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedClassDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedClassDeclarationTest.java
index 6e871e3b3b..3a9c812d47 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedClassDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedClassDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedConstructorDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedConstructorDeclarationTest.java
index a59a39f9ae..eec79e36ad 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedConstructorDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedConstructorDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedDeclarationTest.java
index b9e63c4760..f91b34cfce 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedEnumConstantDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedEnumConstantDeclarationTest.java
index 8f4d845c8f..6e91371553 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedEnumConstantDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedEnumConstantDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedEnumDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedEnumDeclarationTest.java
index 0775afc23a..587ffa125a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedEnumDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedEnumDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedFieldDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedFieldDeclarationTest.java
index 67a5f2c0ff..2e211819a1 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedFieldDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedFieldDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedMethodDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedMethodDeclarationTest.java
index 0c7c18e355..5682584cf6 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedMethodDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedMethodDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedMethodLikeDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedMethodLikeDeclarationTest.java
index 9e54c55311..951e198b48 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedMethodLikeDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedMethodLikeDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedParameterDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedParameterDeclarationTest.java
index b3aeb33836..d6a4278122 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedParameterDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedParameterDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclarationTest.java
index b703c5ce15..9862a5c1e2 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedReferenceTypeDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypeDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypeDeclarationTest.java
index 2fcb1a7ec9..31d6249f0b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypeDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypeDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclarationTest.java
index c40ff19dc7..7fc98ff3cb 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypeParameterDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypeParametrizableTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypeParametrizableTest.java
index 881f8e71ac..7b394cc01b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypeParametrizableTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypeParametrizableTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypePatternDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypePatternDeclarationTest.java
index d6509ebe1e..9b14041bcf 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypePatternDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedTypePatternDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedValueDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedValueDeclarationTest.java
index bddf517c1a..4d2149d711 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedValueDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/resolution/declarations/ResolvedValueDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/AbstractSymbolResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/AbstractSymbolResolutionTest.java
index 803ae5ef42..659c377120 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/AbstractSymbolResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/AbstractSymbolResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -52,7 +52,6 @@ public static void tearDown() {
 
     /**
      * An initial attempt at allowing JDK-specific test cases. It is a work-in-progress, and subject to change.
-     *
      * @deprecated <strong>Note that use of TestJdk should be a last-resort, preferably implementing JDK-agnostic tests.</strong>
      */
     @Deprecated
@@ -119,9 +118,7 @@ public static TestJdk getCurrentHostJdk() {
                 return JDK18;
             }
 
-            // weigl just return JDK18
             return JDK18;
-            // throw new IllegalStateException("Unable to determine the current version of java running");
         }
 
         /**
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/FindingAllFieldsTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/FindingAllFieldsTest.java
index f839ef6a7a..210ca043d5 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/FindingAllFieldsTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/FindingAllFieldsTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue113Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue113Test.java
index bda56c7953..3fa36d637d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue113Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue113Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue116Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue116Test.java
index e4620b27c7..90420342a7 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue116Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue116Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue128Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue128Test.java
index 04ce98ab30..7e70c1e7c3 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue128Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue128Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1364Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1364Test.java
index 0ac61e265c..0bdf85d9f9 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1364Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1364Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1370Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1370Test.java
index f35c9efb55..95c4782d6d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1370Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1370Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue144Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue144Test.java
index 7fa02939ae..fecfe7e939 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue144Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue144Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1456Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1456Test.java
index 6b278fdfaf..28cab56726 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1456Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1456Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1479Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1479Test.java
index b22f8e9a4b..5e2b85b64a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1479Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1479Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1480Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1480Test.java
index 795341cf81..d6b1f07d26 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1480Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1480Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1485Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1485Test.java
index 426842fad1..f0a815d5fe 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1485Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1485Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1491Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1491Test.java
index d2768e8b40..12343e2a9a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1491Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1491Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1511Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1511Test.java
index 83a064e7b3..ae314bad54 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1511Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1511Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1518Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1518Test.java
index 5d67f51336..9f93aaa46c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1518Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1518Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1526Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1526Test.java
index 18bb1b6438..cdfbb8f21b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1526Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1526Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue156Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue156Test.java
index 232c431646..462bffa154 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue156Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue156Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1574Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1574Test.java
index 7cb246cb21..f1748efc5f 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1574Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1574Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1599Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1599Test.java
index 724a544beb..a5d640876c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1599Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1599Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1668Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1668Test.java
index 2b4459adb8..bc30d943f4 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1668Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1668Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1713Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1713Test.java
index 3e9837a132..a8df43489b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1713Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1713Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1726Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1726Test.java
index 31e2ae5733..7a8bda7320 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1726Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1726Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1757Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1757Test.java
index 022c687335..ae24f910cb 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1757Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1757Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1769Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1769Test.java
index b8a85b57e4..dc30daaab7 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1769Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1769Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1774Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1774Test.java
index 522b8f98de..198c647a1a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1774Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1774Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1814Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1814Test.java
index fbf97b10e0..383dbbbd7a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1814Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1814Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -21,11 +21,11 @@
 
 package com.github.javaparser.symbolsolver;
 
+import static com.github.javaparser.ast.Modifier.DefaultKeyword.PUBLIC;
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.github.javaparser.*;
 import com.github.javaparser.ast.CompilationUnit;
-import com.github.javaparser.ast.Modifier;
 import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
 import com.github.javaparser.ast.body.MethodDeclaration;
 import com.github.javaparser.ast.stmt.BlockStmt;
@@ -53,8 +53,8 @@ void setup() {
         final CompilationUnit compilationUnit = new CompilationUnit();
         compilationUnit.setPackageDeclaration("java.lang");
         // construct a fake java.lang.Object class with only one method (java.lang.Object#equals(java.lang.Object)
-        final ClassOrInterfaceDeclaration clazz = compilationUnit.addClass("Object", Modifier.DefaultKeyword.PUBLIC);
-        final MethodDeclaration equals = clazz.addMethod("equals", Modifier.DefaultKeyword.PUBLIC);
+        final ClassOrInterfaceDeclaration clazz = compilationUnit.addClass("Object", PUBLIC);
+        final MethodDeclaration equals = clazz.addMethod("equals", PUBLIC);
         equals.addParameter("Object", "obj");
         final BlockStmt body = new BlockStmt();
         body.addStatement("return this == obj;");
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1817Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1817Test.java
index a791436024..397537e397 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1817Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1817Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1827Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1827Test.java
index da59391497..658762e3b8 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1827Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1827Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue185Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue185Test.java
index 1f3a5b49d3..2faec19fff 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue185Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue185Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1868Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1868Test.java
index d7337e51be..79a707901a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1868Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1868Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue186Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue186Test.java
index 811aca74a2..bba4308188 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue186Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue186Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue18Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue18Test.java
index b486a03dd1..287ee1988b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue18Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue18Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1945Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1945Test.java
index 2324eedaf6..3dc0064cad 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1945Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1945Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1946Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1946Test.java
index ceae9483ae..3919a1985e 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1946Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1946Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1950Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1950Test.java
index 127fa77351..f23a2438f3 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1950Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue1950Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue200Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue200Test.java
index bf83ca409f..3508027568 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue200Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue200Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2035Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2035Test.java
index 834b97a508..190fc82070 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2035Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2035Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2044Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2044Test.java
index 3d6e346e5b..439c65e06c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2044Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2044Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2062Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2062Test.java
index 1d73937648..941f11e71e 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2062Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2062Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2065Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2065Test.java
index b353ec74b3..f82ba5fed7 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2065Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2065Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2083Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2083Test.java
index 598f732458..d95a42554e 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2083Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2083Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2132Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2132Test.java
index b4fead47a3..9ec916afa5 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2132Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2132Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2162Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2162Test.java
index 9fb9935a49..590a2eccc4 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2162Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2162Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2210Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2210Test.java
index 340b49b247..c81583cf1a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2210Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2210Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2236Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2236Test.java
index 0f5b073f70..62516bc3b7 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2236Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2236Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2259Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2259Test.java
index f50cdb9743..b6a147d2b9 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2259Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2259Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2284Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2284Test.java
index 8d1112f8ae..ad6fe4159e 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2284Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2284Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2289Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2289Test.java
index 8d26f34211..df18f40e38 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2289Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2289Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue228Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue228Test.java
index 5e2183fb4d..1ae99fe7b9 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue228Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue228Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue232Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue232Test.java
index 3e78a24227..62ac11f4be 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue232Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue232Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue235Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue235Test.java
index 65c7c7f9ea..c8e9a0a717 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue235Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue235Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2360.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2360.java
index 423813c39f..a72bfc531c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2360.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2360.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2362Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2362Test.java
index 66d31943fb..24c48b605b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2362Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2362Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2367Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2367Test.java
index 382289244b..1d69397d89 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2367Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2367Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2397Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2397Test.java
index 01ede43d2c..7fc1dbdaac 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2397Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2397Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2406Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2406Test.java
index 3959716211..875d25f0fc 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2406Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2406Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue241Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue241Test.java
index 09ef67acd1..8229006778 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue241Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue241Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2477Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2477Test.java
index d726e4d5f0..d71b762751 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2477Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2477Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2481Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2481Test.java
index fd69c345b4..5d0ee48a58 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2481Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2481Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2489Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2489Test.java
index b0f946819f..93302301a3 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2489Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2489Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue251Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue251Test.java
index 00e7341d7e..927414e7b8 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue251Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue251Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2595Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2595Test.java
index 6357ad43b5..aad1fd8f1c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2595Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2595Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2602Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2602Test.java
index 2f3b63b6df..7f1ac67ac9 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2602Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2602Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2738Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2738Test.java
index 19e9bdfb9b..4e2fcae084 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2738Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2738Test.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
 package com.github.javaparser.symbolsolver;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2740Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2740Test.java
index bb3a864ec8..ba6594067b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2740Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2740Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2764Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2764Test.java
index 1606b3d4f7..452c1b6294 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2764Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2764Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue276Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue276Test.java
index d9e0df8525..e2c381a6b1 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue276Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue276Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2781Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2781Test.java
index 48f01b58d5..c70f89910d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2781Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2781Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2823Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2823Test.java
index a78bc5724a..5ba0cad137 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2823Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2823Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2878Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2878Test.java
index 7e3e2242f1..02c5896c71 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2878Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2878Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2909Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2909Test.java
index 19e7b09ae1..5422a75c7d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2909Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2909Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2943Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2943Test.java
index 03c320deb2..b046046670 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2943Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2943Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2951Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2951Test.java
index aa6fb21277..b91c4981de 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2951Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2951Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2953Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2953Test.java
index dc6bade46a..c388793f6f 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2953Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2953Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2987Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2987Test.java
index 53cc26f252..908db4f5fc 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2987Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2987Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2995Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2995Test.java
index 839c4663f8..790ef8fc33 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2995Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue2995Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue300Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue300Test.java
index d8326d081a..347cf167e0 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue300Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue300Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3024Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3024Test.java
index 156318a9ad..a3339871f4 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3024Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3024Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3028Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3028Test.java
index f32dab0cb2..9fed25d639 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3028Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3028Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3030Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3030Test.java
index 9cd49c075a..07fda7c3a0 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3030Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3030Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3038Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3038Test.java
index 42a75a8535..e278fb0ec4 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3038Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3038Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3045Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3045Test.java
index 34d8242635..d04aa7e45e 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3045Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3045Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3083Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3083Test.java
index c8da082914..b5e703bb51 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3083Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3083Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3087Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3087Test.java
index 3cc8a56e56..e7df5e92d5 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3087Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3087Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3099Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3099Test.java
index a96630c969..03b82e772c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3099Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3099Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3100Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3100Test.java
index 5a6fdd4d66..9c74d7c447 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3100Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3100Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3112Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3112Test.java
index 98c925eb93..3fee6ccbc1 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3112Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3112Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3136Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3136Test.java
index 1f436bac42..433684e617 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3136Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3136Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue314Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue314Test.java
index 18cceb36df..e19d7f7302 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue314Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue314Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3159Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3159Test.java
index 4c213f1814..27197730d0 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3159Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3159Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3173Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3173Test.java
index 4d68678210..f6122b3f0f 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3173Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3173Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3184Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3184Test.java
index 824eabad05..8007fa21e9 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3184Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3184Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3200Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3200Test.java
index 413a71a0c6..77d82cadbb 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3200Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3200Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3272Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3272Test.java
index b0f98b9b49..c8f1118cb3 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3272Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3272Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3277Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3277Test.java
index 4a125959ae..6bbcc7dd5c 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3277Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3277Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3278Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3278Test.java
index 6dcc3a7741..0b146cd7e9 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3278Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3278Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3308Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3308Test.java
index be782ecada..df86bce09d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3308Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3308Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue343Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue343Test.java
index 43b7980439..8b746c31ce 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue343Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue343Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue347Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue347Test.java
index f351de0647..9f7b270cc1 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue347Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue347Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3614Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3614Test.java
index a7b484eea1..0fbfa5f15b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3614Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3614Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue366Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue366Test.java
index cbc42b2aa9..7010f68bcc 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue366Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue366Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3710Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3710Test.java
index 520dbc4738..df0207fd0a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3710Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3710Test.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
 package com.github.javaparser.symbolsolver;
 
 import com.github.javaparser.JavaParser;
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3859Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3859Test.java
index 8544ef2182..a15a8ab56a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3859Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3859Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3866Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3866Test.java
index 0ad32df842..f27abf06aa 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3866Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3866Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3878Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3878Test.java
index 53e2d1130a..173acbc195 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3878Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3878Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3916Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3916Test.java
index 801a7646f0..765c8bd33b 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3916Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3916Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3918Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3918Test.java
index d6b2b21633..9745d8dd69 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3918Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3918Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3951Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3951Test.java
index 467778f0c4..10f23b0e42 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3951Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3951Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3972Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3972Test.java
index 0ae2c27288..7dc6b319e3 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3972Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3972Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3976Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3976Test.java
index 7fab2a56bb..9a86db1a77 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3976Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue3976Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4037Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4037Test.java
index 0e51c986da..55c07f44b7 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4037Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4037Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4047Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4047Test.java
index aad9503734..a64669bf38 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4047Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4047Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4124Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4124Test.java
index 2b669173a8..cd4e669752 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4124Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4124Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4188Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4188Test.java
index f79b0ba8d6..9709a84742 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4188Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4188Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4284Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4284Test.java
index ec4d115779..c248ab7ce1 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4284Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4284Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4358Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4358Test.java
index d3ef5c2006..12877e0489 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4358Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4358Test.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
 package com.github.javaparser.symbolsolver;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4427Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4427Test.java
index ba581a91f1..99ff8c2ffe 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4427Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4427Test.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
 package com.github.javaparser.symbolsolver;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4450Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4450Test.java
index a1847c4348..393a66db1d 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4450Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4450Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4503Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4503Test.java
index 886fbf73fc..84f21a92a1 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4503Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4503Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4560Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4560Test.java
index f3556bd5af..2975364d4c 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4560Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4560Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4568Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4568Test.java
index 1874c60852..7673f3b84c 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4568Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4568Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4668Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4668Test.java
index 0e5559424b..7832985091 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4668Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4668Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4710Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4710Test.java
index 303906f212..17bb741927 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4710Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4710Test.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
 package com.github.javaparser.symbolsolver;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4722Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4722Test.java
index 797b612640..ba24d6bfd1 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4722Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4722Test.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
 package com.github.javaparser.symbolsolver;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4723Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4723Test.java
index fc90f3b67c..42aa791e01 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4723Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4723Test.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
 package com.github.javaparser.symbolsolver;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4832Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4832Test.java
index 22f84d99ee..ade527ea92 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4832Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4832Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4846Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4846Test.java
index 9cdbc84bf0..ee8aaf2a34 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4846Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4846Test.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
 package com.github.javaparser.symbolsolver;
 
 import static org.junit.jupiter.api.Assertions.*;
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4864Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4864Test.java
index 46452bfafa..8a8c68014c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4864Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue4864Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2013-2023 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue546Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue546Test.java
index 8b5e7903ad..00cafbf3d3 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue546Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue546Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue84Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue84Test.java
index 4c6550747b..4843d6199c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue84Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/Issue84Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/JavaParserAPIIntegrationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/JavaParserAPIIntegrationTest.java
index 2a73a9c314..cc946569c7 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/JavaParserAPIIntegrationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/JavaParserAPIIntegrationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/JavaSymbolSolverTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/JavaSymbolSolverTest.java
index c01ed30730..15122f0925 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/JavaSymbolSolverTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/JavaSymbolSolverTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/PullRequest2398Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/PullRequest2398Test.java
index 91f0ef3c8c..3eb8ea6d89 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/PullRequest2398Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/PullRequest2398Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/ResolutionOfOverloadedMethodsWithTypeVariablesInvolvedTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/ResolutionOfOverloadedMethodsWithTypeVariablesInvolvedTest.java
index 52bc892346..bb9858e0ad 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/ResolutionOfOverloadedMethodsWithTypeVariablesInvolvedTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/ResolutionOfOverloadedMethodsWithTypeVariablesInvolvedTest.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
 package com.github.javaparser.symbolsolver;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/SolveMethodDeclaredInEnumTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/SolveMethodDeclaredInEnumTest.java
index 5d3b095c4f..4bcaceb28e 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/SolveMethodDeclaredInEnumTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/SolveMethodDeclaredInEnumTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/cache/GuavaCacheAdapterTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/cache/GuavaCacheAdapterTest.java
index bfa0030b18..754c89cc69 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/cache/GuavaCacheAdapterTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/cache/GuavaCacheAdapterTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/cache/InMemoryCacheTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/cache/InMemoryCacheTest.java
index ed9497d0d6..a9cefa255d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/cache/InMemoryCacheTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/cache/InMemoryCacheTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/cache/NoCacheTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/cache/NoCacheTest.java
index 5c87534398..980a359384 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/cache/NoCacheTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/cache/NoCacheTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/core/resolution/MethodUsageResolutionCapabilityTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/core/resolution/MethodUsageResolutionCapabilityTest.java
index aa0953417f..722d4ff820 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/core/resolution/MethodUsageResolutionCapabilityTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/core/resolution/MethodUsageResolutionCapabilityTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/core/resolution/TypeVariableResolutionCapabilityTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/core/resolution/TypeVariableResolutionCapabilityTest.java
index ccae608459..0d43e19b57 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/core/resolution/TypeVariableResolutionCapabilityTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/core/resolution/TypeVariableResolutionCapabilityTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/ConvertToUsageTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/ConvertToUsageTest.java
index e099437d25..c33a0fe769 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/ConvertToUsageTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/ConvertToUsageTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/DifferentiateDotExpressionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/DifferentiateDotExpressionTest.java
index 9217aeac1e..24414480c3 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/DifferentiateDotExpressionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/DifferentiateDotExpressionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacadeTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacadeTest.java
index d74b68311b..85d3f3f9df 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacadeTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacadeTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContextTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContextTest.java
index 95497951d9..a8b2590452 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContextTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/ClassOrInterfaceDeclarationContextTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/IfStatementContextTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/IfStatementContextTest.java
index ee9c53f8c7..763af24c13 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/IfStatementContextTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/IfStatementContextTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2025 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapterTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapterTest.java
index 173810d667..dd8291189b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapterTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapterTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MultiCatchMethodCallExprTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MultiCatchMethodCallExprTest.java
index b5bd9826d7..0060c2640a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MultiCatchMethodCallExprTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MultiCatchMethodCallExprTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchStatementContextTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchStatementContextTest.java
index 6fdf4912bb..f48fa639ae 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchStatementContextTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/contexts/SwitchStatementContextTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2025 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationDeclarationTest.java
index d502a89f0c..d7363ea8aa 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnnotationDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclarationTest.java
index 53c7bb4e6b..bb15f5aaf8 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java
index 9d76edcfab..515fe7bfed 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -22,8 +22,6 @@
 package com.github.javaparser.symbolsolver.javaparsermodel.declarations;
 
 import static com.github.javaparser.StaticJavaParser.parse;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.github.javaparser.JavaParserAdapter;
@@ -53,6 +51,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
+import com.google.common.truth.Truth;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.*;
@@ -1109,11 +1108,8 @@ void testGetAllMethods() {
         if (TestJdk.getCurrentHostJdk().getMajorVersion() >= 14) {
             expected.remove("java.lang.Object.registerNatives()");
         }
-        // weigl: relax new JDKs
-        assertTrue(expected.size() == signatures.size() || expected.size() + 1 == signatures.size());
-
-        signatures.remove("java.lang.Object.wait0(long)");
-        assertThat(signatures, containsInAnyOrder(expected.toArray()));
+        // assertEquals(expected.size(), signatures.size());
+        Truth.assertThat(signatures).containsAtLeastElementsIn(expected);
     }
 
     ///
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclarationTest.java
index bdef5ff17d..ac0a37c0c5 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -21,8 +21,6 @@
 
 package com.github.javaparser.symbolsolver.javaparsermodel.declarations;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.github.javaparser.*;
@@ -50,6 +48,7 @@
 import com.github.javaparser.symbolsolver.utils.LeanParserConfiguration;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.truth.Truth;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -992,8 +991,8 @@ void testGetAllMethods() {
         if (TestJdk.getCurrentHostJdk().getMajorVersion() >= 14) {
             expected.remove("java.lang.Object.registerNatives()");
         }
-        signatures.remove("java.lang.Object.wait0(long)");
-        assertThat(signatures, containsInAnyOrder(expected.toArray()));
+
+        Truth.assertThat(signatures).containsAtLeastElementsIn(expected);
     }
 
     ///
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclarationTest.java
index c5d88ef961..2ec34179a9 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserFieldDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclarationTest.java
index 201be70df4..f08b5d973d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -21,8 +21,6 @@
 
 package com.github.javaparser.symbolsolver.javaparsermodel.declarations;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -51,6 +49,7 @@
 import com.github.javaparser.symbolsolver.utils.LeanParserConfiguration;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.truth.Truth;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -1041,9 +1040,8 @@ void testGetAllMethods() {
         if (TestJdk.getCurrentHostJdk().getMajorVersion() >= 14) {
             expected.remove("java.lang.Object.registerNatives()");
         }
-        signatures.remove("java.lang.Object.wait0(long)");
 
-        assertThat(signatures, containsInAnyOrder(expected.toArray()));
+        Truth.assertThat(signatures).containsAtLeastElementsIn(expected.toArray());
     }
 
     ///
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclarationTest.java
index aa231e30a5..88d1574b18 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserMethodDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclarationTest.java
index 6d2fcc07ae..c2deb4e7db 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserRecordDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserRecordDeclarationTest.java
index 6db04b6130..b201e29461 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserRecordDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserRecordDeclarationTest.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
 package com.github.javaparser.symbolsolver.javaparsermodel.declarations;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -13,7 +33,6 @@
 import com.github.javaparser.ast.expr.MethodCallExpr;
 import com.github.javaparser.ast.expr.ObjectCreationExpr;
 import com.github.javaparser.resolution.Navigator;
-import com.github.javaparser.resolution.UnsolvedSymbolException;
 import com.github.javaparser.resolution.declarations.*;
 import com.github.javaparser.resolution.model.SymbolReference;
 import com.github.javaparser.resolution.types.ResolvedReferenceType;
@@ -27,7 +46,6 @@
 import java.util.stream.Collectors;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledForJreRange;
 
 public class JavaParserRecordDeclarationTest {
 
@@ -228,24 +246,7 @@ void testGetQualifiedName() {
     ///
 
     @Test
-    @EnabledForJreRange(max = org.junit.jupiter.api.condition.JRE.JAVA_13)
-    void getGetAncestors_javaLangRecord_notAvailable() {
-        ParseResult<CompilationUnit> x = javaParser.parse(basicRecordWithImplements);
-        CompilationUnit compilationUnit = x.getResult().get();
-
-        RecordDeclaration recordDeclaration =
-                compilationUnit.findFirst(RecordDeclaration.class).get();
-        ResolvedReferenceTypeDeclaration resolvedReferenceTypeDeclaration = recordDeclaration.resolve();
-
-        /*
-         * `java.lang.Record` will have been introduced from  JRE14 preview / JRE16 release
-         *  -- thus the `java.lang.Record` ancestor will not be available via classloader/reflection before these versions
-         */
-        assertThrows(UnsolvedSymbolException.class, () -> resolvedReferenceTypeDeclaration.getAncestors());
-    }
-
-    @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     void getGetAncestors_javaLangRecord_available() {
         ParseResult<CompilationUnit> x = javaParser.parse(basicRecordWithImplements);
         CompilationUnit compilationUnit = x.getResult().get();
@@ -261,7 +262,7 @@ void getGetAncestors_javaLangRecord_available() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     void testGetDeclaredFields() {
         ParseResult<CompilationUnit> x = javaParser.parse("record Test(String s, Integer i) {}");
         CompilationUnit compilationUnit = x.getResult().get();
@@ -279,7 +280,7 @@ void testGetDeclaredFields() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     void testGetDeclaredMethods() {
         ParseResult<CompilationUnit> x = javaParser.parse("record Test(String s, Integer i) {\n"
                 + "    public int foo(int x) {\n"
@@ -316,7 +317,7 @@ void testGetDeclaredMethods() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     void testGetSuperclass() {
         ParseResult<CompilationUnit> cu = javaParser.parse("record Foo(String s) {}");
 
@@ -331,7 +332,7 @@ void testGetSuperclass() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     void testImplicitGetterResolution() {
         ParseResult<CompilationUnit> cu = javaParser.parse("package test;\n"
                 + "record Test(String s) {\n"
@@ -361,7 +362,7 @@ void testImplicitGetterResolution() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     void testImplicitGetterSolvingFromDecl() {
         ParseResult<CompilationUnit> cu = javaParser.parse("package test;\n" + "record Test(String s) { }");
 
@@ -392,7 +393,7 @@ void testImplicitGetterSolvingFromDecl() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     void testImplicitConstructor() {
         ParseResult<CompilationUnit> cu = javaParser.parse("package test;\nrecord Test(String s) { }");
 
@@ -414,7 +415,7 @@ void testImplicitConstructor() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     void testNonCanonicalConstructor() {
         ParseResult<CompilationUnit> cu = javaParser.parse("package test;\n"
                 + "record Test(String s) {\n"
@@ -453,7 +454,7 @@ void testNonCanonicalConstructor() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     void testInheritedMethods() {
         ParseResult<CompilationUnit> cu = javaParser.parse("package test;\n" + "interface Foo {\n"
                 + "    default void foo() {}\n"
@@ -476,7 +477,7 @@ void testInheritedMethods() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     void testGetAllStaticFields() {
         ParseResult<CompilationUnit> cu = javaParser.parse(
                 "package test;\n" + "record Test(String s) {\n" + "    static Integer value = 2;" + "}");
@@ -496,7 +497,7 @@ void testGetAllStaticFields() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     void testGetAllNonStaticFields() {
         ParseResult<CompilationUnit> cu = javaParser.parse(
                 "package test;\n" + "record Test(String s) {\n" + "    static Integer value = 2;" + "}");
@@ -516,7 +517,7 @@ void testGetAllNonStaticFields() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     public void testStaticMethod() {
         ParserConfiguration.LanguageLevel oldLevel =
                 StaticJavaParser.getParserConfiguration().getLanguageLevel();
@@ -549,13 +550,16 @@ public void testStaticMethod() {
         }
     }
 
+    @Test
     void testGenericInvocation() {
-        ParseResult<CompilationUnit> cu = javaParser.parse("record GenericBox<T> (T value) {}\n" + "class Test {\n"
-                + "  public static void main(String[] args) {\n"
-                + "    GenericBox<Integer> box = new GenericBox<>(2);\n"
-                + "    System.out.println(box.value());\n"
-                + "  }\n"
-                + "}");
+        ParseResult<CompilationUnit> cu = javaParser.parse("""
+                record GenericBox<T> (T value) {}
+                class Test {
+                  public static void main(String[] args) {
+                    GenericBox<Integer> box = new GenericBox<>(2);
+                    System.out.println(box.value());
+                  }
+                }""");
 
         MethodCallExpr valueCall = cu.getResult().get().findAll(MethodCallExpr.class).stream()
                 .filter(call -> call.getNameAsString().equals("value"))
@@ -569,15 +573,16 @@ void testGenericInvocation() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_14)
     void genericConstructorTest() {
-        ParseResult<CompilationUnit> cu = javaParser.parse("record GenericBox<T>(T value) {}\n"
-                + "class Test {\n"
-                + "  public static void main(String[] args) {\n"
-                + "    GenericBox<Integer> box = new GenericBox<>(2);\n"
-                + "    System.out.println(box.value());\n"
-                + "  }\n"
-                + "}");
+        ParseResult<CompilationUnit> cu = javaParser.parse("""
+                record GenericBox<T>(T value) {}
+                class Test {
+                  public static void main(String[] args) {
+                    GenericBox<Integer> box = new GenericBox<>(2);
+                    System.out.println(box.value());
+                  }
+                }""");
 
         ObjectCreationExpr constructorInvocation =
                 cu.getResult().get().findFirst(ObjectCreationExpr.class).get();
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclarationTest.java
index 18cf288bbb..af5f7b7e0d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserSymbolDeclarationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameterTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameterTest.java
index 48fc1bd2a6..21789d48d3 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameterTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameterTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypePatternDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypePatternDeclarationTest.java
index 4667be5779..ff12b58ca7 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypePatternDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypePatternDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclarationTest.java
index 22bc0efb4f..010065382b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeVariableDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserVariableDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserVariableDeclarationTest.java
index f5854430a4..02a0aea644 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserVariableDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserVariableDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/Issue257Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/Issue257Test.java
index 91a9d7407f..5e76911c19 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/Issue257Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/Issue257Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationDeclarationTest.java
index c6d75e901c..1b77f2012e 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationMemberDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationMemberDeclarationTest.java
index 86cd67424a..07255a386c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationMemberDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistAnnotationMemberDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclarationTest.java
index 43de8fa4d0..222b8de238 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistConstructorDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistConstructorDeclarationTest.java
index 4a1bcf5eb1..83c475ba11 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistConstructorDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistConstructorDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumConstantDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumConstantDeclarationTest.java
index 1c4d0dea28..0ed19af83c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumConstantDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumConstantDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclarationTest.java
index dbfcd2895f..ab31b925d0 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistEnumDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclarationTest.java
index 021da4c586..7b55854fa1 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistFieldDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclarationTest.java
index 65e4c2f50a..13e66d4902 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclarationTest.java
index 11c5258b8f..af427da531 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistMethodDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistModuleTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistModuleTest.java
index 3a59771680..8e6cb5d159 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistModuleTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistModuleTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2025 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclarationTest.java
index eecfe83bee..089029530b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistParameterDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclarationTest.java
index a922855c1d..10cf669431 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistRecordDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -332,7 +332,7 @@ void testNonCanonicalConstructor() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void genericConstructorTest() {
         ParserConfiguration configuration = new ParserConfiguration()
                 .setSymbolResolver(new JavaSymbolSolver(new CombinedTypeSolver(new ReflectionTypeSolver(), typeSolver)))
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapterTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapterTest.java
index 906f28e929..8e4215dfd2 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapterTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapterTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeParameterDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeParameterDeclarationTest.java
index 2355f4fe44..d30127ac34 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeParameterDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeParameterDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclarationTest.java
index 03478d037b..0c85e3d6bd 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractClassDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclarationTest.java
index 30bf53294b..4bcecc57db 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/AbstractTypeDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -38,6 +38,7 @@ public abstract class AbstractTypeDeclarationTest extends AbstractSymbolResoluti
      * Should say if an {@link AbstractTypeDeclaration} is functional interface.
      *
      * @param typeDeclaration The type declaration to check.
+     *
      * @return {@code True}
      */
     public abstract boolean isFunctionalInterface(AbstractTypeDeclaration typeDeclaration);
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/FunctionInterfaceLogicTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/FunctionInterfaceLogicTest.java
index b1d5e8a5a0..e40b27a9d9 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/FunctionInterfaceLogicTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/FunctionInterfaceLogicTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/InferenceContextTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/InferenceContextTest.java
index 83ebf1562e..1747ec7909 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/InferenceContextTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/InferenceContextTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/MethodResolutionCapabilityTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/MethodResolutionCapabilityTest.java
index 474c02cd1c..f60d0cf517 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/MethodResolutionCapabilityTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/logic/MethodResolutionCapabilityTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/resolution/SymbolReferenceTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/resolution/SymbolReferenceTest.java
index 3b45819bd4..756364397c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/resolution/SymbolReferenceTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/resolution/SymbolReferenceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ArrayTypeTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ArrayTypeTest.java
index 68f210d320..69f9406a4c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ArrayTypeTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ArrayTypeTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/LazyTypeTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/LazyTypeTest.java
index 67631e9963..cde589d4a1 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/LazyTypeTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/LazyTypeTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/NullTypeTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/NullTypeTest.java
index d4b254c980..df3be96c98 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/NullTypeTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/NullTypeTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveTypeTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveTypeTest.java
index dfb030baf7..d9cba64a97 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveTypeTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveTypeTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeTest.java
index 49b609bb17..1fe43eef42 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -648,8 +648,7 @@ void testGetAllAncestorsOnRawType() {
 
         Map<String, ResolvedReferenceType> ancestors = new HashMap<>();
         rawArrayList.getAllAncestors().forEach(a -> ancestors.put(a.getQualifiedName(), a));
-        // weigl: disable test, in new JDKs the number is 10 (SequencedCollection was added)
-        // assertEquals(9, ancestors.size());
+        assertEquals(10, ancestors.size());
 
         ResolvedTypeVariable tv =
                 new ResolvedTypeVariable(arraylist.getTypeParameters().get(0));
@@ -685,6 +684,9 @@ void testGetAllAncestorsOnRawType() {
         assertEquals(
                 new ReferenceTypeImpl(new ReflectionInterfaceDeclaration(Serializable.class, typeResolver)),
                 ancestors.get("java.io.Serializable"));
+        assertEquals(
+                new ReferenceTypeImpl(new ReflectionInterfaceDeclaration(SequencedCollection.class, typeResolver)),
+                ancestors.get("java.util.SequencedCollection"));
     }
 
     @Test
@@ -696,8 +698,7 @@ void testGetAllAncestorsOnTypeWithSpecifiedTypeParametersForInterface() {
 
         Map<String, ResolvedReferenceType> ancestors = new HashMap<>();
         listOfString.getAllAncestors().forEach(a -> ancestors.put(a.getQualifiedName(), a));
-        // weigl: disable new JDKs are different
-        // assertEquals(2, ancestors.size());
+        assertEquals(3, ancestors.size());
 
         assertEquals(
                 new ReferenceTypeImpl(
@@ -707,6 +708,11 @@ void testGetAllAncestorsOnTypeWithSpecifiedTypeParametersForInterface() {
                 new ReferenceTypeImpl(
                         new ReflectionInterfaceDeclaration(Iterable.class, typeResolver), ImmutableList.of(string)),
                 ancestors.get("java.lang.Iterable"));
+        assertEquals(
+                new ReferenceTypeImpl(
+                        new ReflectionInterfaceDeclaration(SequencedCollection.class, typeResolver),
+                        ImmutableList.of(string)),
+                ancestors.get("java.util.SequencedCollection"));
     }
 
     @Test
@@ -744,8 +750,6 @@ void testGetAllAncestorsOnTypeWithSpecifiedTypeParametersForClassAbstractList()
 
         Map<String, ResolvedReferenceType> ancestors = new HashMap<>();
         abstractListOfString.getAllAncestors().forEach(a -> ancestors.put(a.getQualifiedName(), a));
-        // weigl: disable new JDKs are different
-        // assertEquals(5, ancestors.size());
 
         assertEquals(
                 new ReferenceTypeImpl(
@@ -767,6 +771,13 @@ void testGetAllAncestorsOnTypeWithSpecifiedTypeParametersForClassAbstractList()
                 new ReferenceTypeImpl(
                         new ReflectionInterfaceDeclaration(Iterable.class, typeResolver), ImmutableList.of(string)),
                 ancestors.get("java.lang.Iterable"));
+        assertEquals(
+                new ReferenceTypeImpl(
+                        new ReflectionInterfaceDeclaration(SequencedCollection.class, typeResolver),
+                        ImmutableList.of(string)),
+                ancestors.get("java.util.SequencedCollection"));
+
+        assertEquals(6, ancestors.size());
     }
 
     @Test
@@ -778,9 +789,13 @@ void testGetAllAncestorsOnTypeWithSpecifiedTypeParametersForClassArrayList() {
 
         Map<String, ResolvedReferenceType> ancestors = new HashMap<>();
         arrayListOfString.getAllAncestors().forEach(a -> ancestors.put(a.getQualifiedName(), a));
-        // weigl: disable new JDKs are different
-        // assertEquals(9, ancestors.size());
+        assertEquals(10, ancestors.size());
 
+        assertEquals(
+                new ReferenceTypeImpl(
+                        new ReflectionInterfaceDeclaration(SequencedCollection.class, typeResolver),
+                        ImmutableList.of(string)),
+                ancestors.get("java.util.SequencedCollection"));
         assertEquals(
                 new ReferenceTypeImpl(new ReflectionInterfaceDeclaration(RandomAccess.class, typeResolver)),
                 ancestors.get("java.util.RandomAccess"));
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/TypeVariableUsageTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/TypeVariableUsageTest.java
index efdc5aef68..b8bbf7e4fd 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/TypeVariableUsageTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/TypeVariableUsageTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/VoidTypeTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/VoidTypeTest.java
index 8c3526759c..4975f79fbe 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/VoidTypeTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/VoidTypeTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/WildcardUsageTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/WildcardUsageTest.java
index 4c753ad8a0..c05339ff9f 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/WildcardUsageTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/model/typesystem/WildcardUsageTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationDeclarationTest.java
index 64511ca9b9..821e6ab807 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionAnnotationDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java
index cbc67e2463..b2fc1a4131 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -22,8 +22,6 @@
 package com.github.javaparser.symbolsolver.reflectionmodel;
 
 import static java.util.Comparator.comparing;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.*;
 
 import com.github.javaparser.ast.AccessSpecifier;
@@ -37,6 +35,7 @@
 import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.truth.Truth;
 import java.io.Serializable;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -314,17 +313,18 @@ void testGetAllInterfaces() {
         TypeSolver typeResolver = new ReflectionTypeSolver();
         ResolvedClassDeclaration arraylist = new ReflectionClassDeclaration(ArrayList.class, typeResolver);
         // Serializable, Cloneable, Iterable<E>, Collection<E>, List<E>, RandomAccess
-        assertThat(
-                ImmutableSet.of(
+        var actual = arraylist.getAllInterfaces().stream()
+                .map(ResolvedReferenceType::getQualifiedName)
+                .collect(Collectors.toSet());
+        Truth.assertThat(actual)
+                .containsExactly(
                         Serializable.class.getCanonicalName(),
+                        SequencedCollection.class.getCanonicalName(),
                         Cloneable.class.getCanonicalName(),
                         List.class.getCanonicalName(),
                         RandomAccess.class.getCanonicalName(),
                         Collection.class.getCanonicalName(),
-                        Iterable.class.getCanonicalName()),
-                everyItem(in(arraylist.getAllInterfaces().stream()
-                        .map(i -> i.getQualifiedName())
-                        .collect(Collectors.toSet()))));
+                        Iterable.class.getCanonicalName());
     }
 
     @Test
@@ -431,14 +431,17 @@ void testAllAncestorsWithDepthFirstTraversalOrder() {
         ResolvedClassDeclaration arraylist = new ReflectionClassDeclaration(ArrayList.class, typeResolver);
         Map<String, ResolvedReferenceType> ancestors = new HashMap<>();
         arraylist.getAllAncestors().forEach(a -> ancestors.put(a.getQualifiedName(), a));
-        // weigl: disable for later JDKs
-        // assertEquals(9, ancestors.size());
+        assertEquals(10, ancestors.size());
 
         ResolvedTypeVariable typeVariable =
                 new ResolvedTypeVariable(arraylist.getTypeParameters().get(0));
         assertEquals(
                 new ReferenceTypeImpl(new ReflectionInterfaceDeclaration(RandomAccess.class, typeResolver)),
                 ancestors.get("java.util.RandomAccess"));
+        assertEquals(
+                new ReferenceTypeImpl(new ReflectionInterfaceDeclaration(SequencedCollection.class, typeResolver)),
+                ancestors.get("java.util.SequencedCollection"));
+
         assertEquals(
                 new ReferenceTypeImpl(
                         new ReflectionClassDeclaration(AbstractCollection.class, typeResolver),
@@ -595,12 +598,12 @@ void testGetInterfacesWithParameters() {
         ResolvedReferenceType interfaze;
 
         interfaze = constructorDeclaration.getInterfaces().get(0);
-        assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt", interfaze.getQualifiedName());
+        assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithOptionalBlockStmt", interfaze.getQualifiedName());
         assertEquals(
                 "com.github.javaparser.ast.body.ConstructorDeclaration",
                 interfaze
                         .typeParametersMap()
-                        .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt.N")
+                        .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithOptionalBlockStmt.N")
                         .get()
                         .asReferenceType()
                         .getQualifiedName());
@@ -731,18 +734,18 @@ void testGetAllInterfacesWithParametersWithDepthFirstTraversalOrder() {
         ReflectionClassDeclaration constructorDeclaration = (ReflectionClassDeclaration)
                 typeResolver.solveType("com.github.javaparser.ast.body.ConstructorDeclaration");
         List<ResolvedReferenceType> interfaces = constructorDeclaration.getAllInterfaces();
-        assertEquals(34, interfaces.size());
+        assertEquals(35, interfaces.size());
 
         ResolvedReferenceType interfaze;
         int i = 0;
 
         interfaze = constructorDeclaration.getAllInterfaces().get(i++);
-        assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt", interfaze.getQualifiedName());
+        assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithOptionalBlockStmt", interfaze.getQualifiedName());
         assertEquals(
                 "com.github.javaparser.ast.body.ConstructorDeclaration",
                 interfaze
                         .typeParametersMap()
-                        .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt.N")
+                        .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithOptionalBlockStmt.N")
                         .get()
                         .asReferenceType()
                         .getQualifiedName());
@@ -1107,17 +1110,17 @@ void testGetAncestorsWithTypeParameters() {
                         .asReferenceType()
                         .getQualifiedName());
 
-        ancestor = ancestors.get(1);
-        assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt", ancestor.getQualifiedName());
+        ancestor = ancestors.get(2);
+        assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithOptionalBlockStmt", ancestor.getQualifiedName());
         assertEquals(
                 "com.github.javaparser.ast.body.ConstructorDeclaration",
                 ancestor.typeParametersMap()
-                        .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt.N")
+                        .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithOptionalBlockStmt.N")
                         .get()
                         .asReferenceType()
                         .getQualifiedName());
 
-        ancestor = ancestors.get(2);
+        ancestor = ancestors.get(1);
         assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithJavadoc", ancestor.getQualifiedName());
         assertEquals(
                 "com.github.javaparser.ast.body.ConstructorDeclaration",
@@ -1242,21 +1245,21 @@ void testGetAllAncestorsWithTypeParametersWithDepthFirstTraversalOrder() {
                         .getQualifiedName());
 
         ancestor = ancestors.remove(0);
-        assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithAnnotations", ancestor.getQualifiedName());
+        assertEquals("com.github.javaparser.ast.jml.NodeWithContracts", ancestor.getQualifiedName());
         assertEquals(
                 "com.github.javaparser.ast.body.ConstructorDeclaration",
                 ancestor.typeParametersMap()
-                        .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithAnnotations.N")
+                        .getValueBySignature("com.github.javaparser.ast.jml.NodeWithContracts.N")
                         .get()
                         .asReferenceType()
                         .getQualifiedName());
 
         ancestor = ancestors.remove(0);
-        assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt", ancestor.getQualifiedName());
+        assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithAnnotations", ancestor.getQualifiedName());
         assertEquals(
                 "com.github.javaparser.ast.body.ConstructorDeclaration",
                 ancestor.typeParametersMap()
-                        .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithBlockStmt.N")
+                        .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithAnnotations.N")
                         .get()
                         .asReferenceType()
                         .getQualifiedName());
@@ -1294,6 +1297,16 @@ void testGetAllAncestorsWithTypeParametersWithDepthFirstTraversalOrder() {
                         .asReferenceType()
                         .getQualifiedName());
 
+        ancestor = ancestors.remove(0);
+        assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithOptionalBlockStmt", ancestor.getQualifiedName());
+        assertEquals(
+                "com.github.javaparser.ast.body.ConstructorDeclaration",
+                ancestor.typeParametersMap()
+                        .getValueBySignature("com.github.javaparser.ast.nodeTypes.NodeWithOptionalBlockStmt.N")
+                        .get()
+                        .asReferenceType()
+                        .getQualifiedName());
+
         ancestor = ancestors.remove(0);
         assertEquals("com.github.javaparser.ast.nodeTypes.NodeWithParameters", ancestor.getQualifiedName());
         assertEquals(
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclarationTest.java
index 0fe3ea2d87..2631bfd4bf 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclarationTest.java
index 7386350c8b..a5ca183a5d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionFieldDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -32,7 +32,7 @@
 
 class ReflectionFieldDeclarationTest extends AbstractSymbolResolutionTest {
 
-    private final TypeSolver typeSolver = new ReflectionTypeSolver(false);
+    private TypeSolver typeSolver = new ReflectionTypeSolver(false);
 
     @Test
     void verifyIsVolatileVariableDeclaration() {
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclarationTest.java
index aa6461ab4f..8bd3ccdb10 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -79,8 +79,7 @@ void testAllAncestors() {
         ResolvedInterfaceDeclaration list = new ReflectionInterfaceDeclaration(List.class, typeResolver);
         Map<String, ResolvedReferenceType> ancestors = new HashMap<>();
         list.getAllAncestors().forEach(a -> ancestors.put(a.getQualifiedName(), a));
-        // weigl: disable due to new JDK versions
-        // assertEquals(2, ancestors.size());
+        assertEquals(3, ancestors.size());
 
         // Since List is an interface, Object cannot be an ancestor of List
         ResolvedTypeVariable typeVariable =
@@ -95,6 +94,11 @@ void testAllAncestors() {
                         new ReflectionInterfaceDeclaration(Iterable.class, typeResolver),
                         ImmutableList.of(typeVariable)),
                 ancestors.get("java.lang.Iterable"));
+        assertEquals(
+                new ReferenceTypeImpl(
+                        new ReflectionInterfaceDeclaration(SequencedCollection.class, typeResolver),
+                        ImmutableList.of(typeVariable)),
+                ancestors.get("java.util.SequencedCollection"));
     }
 
     @Test
@@ -102,7 +106,6 @@ void testAllAncestorsForAnInterfaceWithBreadthFirstFunc() {
         TypeSolver typeResolver = new ReflectionTypeSolver();
         ResolvedInterfaceDeclaration list = new ReflectionInterfaceDeclaration(List.class, typeResolver);
         List<ResolvedReferenceType> ancestors = list.getAllAncestors(ResolvedReferenceTypeDeclaration.breadthFirstFunc);
-
         assertEquals(3, ancestors.size());
 
         ResolvedTypeVariable typeVariable =
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclarationTest.java
index eaa6ff8baa..759c58e39f 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclarationTest.java
index 19f3e2132d..119766a768 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionParameterDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionRecordDeclarationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionRecordDeclarationTest.java
index 5f758aa4b8..94f550b546 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionRecordDeclarationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionRecordDeclarationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -78,56 +78,56 @@ private byte[] loadClassData(String name) throws ClassNotFoundException {
      * The test classes were compiled with Java 17, so attempting to load them with any lower version will crash
      */
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testIsClass() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertFalse(compilationUnit.isClass());
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testIsInterface() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertFalse(compilationUnit.isInterface());
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testIsEnum() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertFalse(compilationUnit.isEnum());
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testIsRecord() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertTrue(compilationUnit.isRecord());
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testIsTypeVariable() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertFalse(compilationUnit.isTypeParameter());
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testIsType() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertTrue(compilationUnit.isType());
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testAsType() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertEquals(compilationUnit, compilationUnit.asType());
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testAsClass() {
         assertThrows(UnsupportedOperationException.class, () -> {
             ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
@@ -136,7 +136,7 @@ void testAsClass() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testAsInterface() {
         assertThrows(UnsupportedOperationException.class, () -> {
             ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
@@ -145,7 +145,7 @@ void testAsInterface() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testAsEnum() {
         assertThrows(UnsupportedOperationException.class, () -> {
             ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
@@ -154,35 +154,35 @@ void testAsEnum() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testAsRecord() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertEquals(compilationUnit, compilationUnit.asRecord());
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testGetPackageName() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertEquals("box", compilationUnit.getPackageName());
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testGetClassName() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertEquals("Box", compilationUnit.getClassName());
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testGetQualifiedName() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertEquals("box.Box", compilationUnit.getQualifiedName());
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testGetGenericTypeField() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         List<ResolvedFieldDeclaration> declarationList = compilationUnit.getAllFields();
@@ -199,7 +199,7 @@ void testGetGenericTypeField() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testGetDeclaredMethods() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         Set<ResolvedMethodDeclaration> methodsSet = compilationUnit.getDeclaredMethods();
@@ -230,7 +230,7 @@ void testGetDeclaredMethods() {
     ///
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testGetSuperclass() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertEquals(
@@ -242,7 +242,7 @@ void testGetSuperclass() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testGetAllSuperclasses() {
         ReflectionRecordDeclaration cu = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertEquals(
@@ -253,7 +253,7 @@ void testGetAllSuperclasses() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testGetAllAncestorsWithDepthFirstTraversalOrder() {
         ReflectionRecordDeclaration cu = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertEquals(
@@ -264,7 +264,7 @@ void testGetAllAncestorsWithDepthFirstTraversalOrder() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testGetInterfaces() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertEquals(
@@ -275,7 +275,7 @@ void testGetInterfaces() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testGetAllInterfaces() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
         assertEquals(
@@ -286,7 +286,7 @@ void testGetAllInterfaces() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testGetImplicitConstructor() {
         ReflectionRecordDeclaration compilationUnit = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
 
@@ -303,7 +303,7 @@ void testGetImplicitConstructor() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testGetExplicitConstructors() {
         ReflectionRecordDeclaration compilationUnit =
                 (ReflectionRecordDeclaration) typeSolver.solveType("box.BoxWithAllConstructors");
@@ -334,7 +334,7 @@ void testGetExplicitConstructors() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testNonCanonicalConstructor() {
         ReflectionRecordDeclaration compilationUnit =
                 (ReflectionRecordDeclaration) typeSolver.solveType("box.BoxWithNonCanonicalConstructor");
@@ -369,7 +369,7 @@ void testNonCanonicalConstructor() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void genericConstructorTest() {
         ParserConfiguration configuration = new ParserConfiguration()
                 .setSymbolResolver(new JavaSymbolSolver(new CombinedTypeSolver(new ReflectionTypeSolver(), typeSolver)))
@@ -398,7 +398,7 @@ void genericConstructorTest() {
     }
 
     @Test
-    @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
+    // @EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_17)
     void testToStringShouldUseCorrectClassName() {
         ReflectionRecordDeclaration decl = (ReflectionRecordDeclaration) typeSolver.solveType("box.Box");
 
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTestObject.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTestObject.java
index ed8f53aedf..2135a065c1 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTestObject.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTestObject.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AbstractResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AbstractResolutionTest.java
index 2d2a309ddf..260fe515e3 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AbstractResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AbstractResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseJavaParserTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseJavaParserTest.java
index 4af1b11d2a..a9989c0231 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseJavaParserTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseJavaParserTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseJavaSymbolSolver060Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseJavaSymbolSolver060Test.java
index ffc7079e2f..b943286af4 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseJavaSymbolSolver060Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseJavaSymbolSolver060Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -82,7 +82,7 @@ private static String readFile(File file) throws IOException {
 
     /**
      * @param projectName is one of "java-symbol-solver-core", "java-symbol-solver-logic", "java-symbol-solver-model"
-     * @param fileName    describes the file being analyzed
+     * @param fileName describes the file being analyzed
      */
     private void parse(String projectName, String fileName) throws IOException {
         Path sourceFile = src.resolve(projectName + "/" + fileName + ".java");
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserHelpersTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserHelpersTest.java
index bffd7ec80b..cd32f31104 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserHelpersTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserHelpersTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserTest.java
index aa95741dfd..760bb4e899 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnalyseNewJavaParserTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnnotationsResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnnotationsResolutionTest.java
index 66aae8d337..1ce74c1278 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnnotationsResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnnotationsResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnonymousClassesResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnonymousClassesResolutionTest.java
index 094d34a441..6d9f9786fe 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnonymousClassesResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/AnonymousClassesResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ArrayExprTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ArrayExprTest.java
index 9a9e9b28a9..05488516fa 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ArrayExprTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ArrayExprTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/CompilationUnitContextResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/CompilationUnitContextResolutionTest.java
index a12be89c83..27f2c434ea 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/CompilationUnitContextResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/CompilationUnitContextResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ConditionalExprTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ConditionalExprTest.java
index 1f212c743e..3a6384835a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ConditionalExprTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ConditionalExprTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ConstructorsResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ConstructorsResolutionTest.java
index add2ea0611..3941cca9d0 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ConstructorsResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ConstructorsResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ContextTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ContextTest.java
index 3e6b396672..e03156b70b 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ContextTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ContextTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/DefaultPackageTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/DefaultPackageTest.java
index cf323a7be2..6aaadf47ae 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/DefaultPackageTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/DefaultPackageTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/EnumLiteralsInAnnotatedClassTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/EnumLiteralsInAnnotatedClassTest.java
index 4353320d51..2a607b9478 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/EnumLiteralsInAnnotatedClassTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/EnumLiteralsInAnnotatedClassTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/EnumResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/EnumResolutionTest.java
index 682df307ef..3753cf09ea 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/EnumResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/EnumResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ExprResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ExprResolutionTest.java
index c0d47f15e8..27ecb17568 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ExprResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ExprResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/FieldAccessExprResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/FieldAccessExprResolutionTest.java
index b08ffaaa2e..af85ffd3d2 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/FieldAccessExprResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/FieldAccessExprResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/FieldsResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/FieldsResolutionTest.java
index 62f482c1a6..dae6b8740c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/FieldsResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/FieldsResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/GenericsResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/GenericsResolutionTest.java
index ba5afaf552..b9afdd8c52 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/GenericsResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/GenericsResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ImplementedOrExtendedTypeResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ImplementedOrExtendedTypeResolutionTest.java
index 8c2caea5be..6133599476 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ImplementedOrExtendedTypeResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ImplementedOrExtendedTypeResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/InstanceOfTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/InstanceOfTest.java
index c24a3af10a..64cde19597 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/InstanceOfTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/InstanceOfTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/InternalClassInInterfaceTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/InternalClassInInterfaceTest.java
index e185197af1..0e2112086d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/InternalClassInInterfaceTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/InternalClassInInterfaceTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/Issue4703Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/Issue4703Test.java
index d0d3395ab9..15437721ee 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/Issue4703Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/Issue4703Test.java
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
 package com.github.javaparser.symbolsolver.resolution;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/JavaParserFacadeResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/JavaParserFacadeResolutionTest.java
index 8cb3dbf67a..0f32d7bee9 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/JavaParserFacadeResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/JavaParserFacadeResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/LambdaGenericResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/LambdaGenericResolutionTest.java
index 5b9d7bbc49..edcbba2369 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/LambdaGenericResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/LambdaGenericResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007-2010 Júlio Vilmar Gesser.
- * Copyright (C) 2011, 2013-2024 The JavaParser Team.
+ * Copyright (C) 2011, 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/LambdaResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/LambdaResolutionTest.java
index 25f81a9c82..8fe4fd30b2 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/LambdaResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/LambdaResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodDescriptorTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodDescriptorTest.java
index d9e67a0241..70308d4644 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodDescriptorTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodDescriptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodLikeSignaturesTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodLikeSignaturesTest.java
index 1779cac169..605785bddd 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodLikeSignaturesTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodLikeSignaturesTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodReferenceResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodReferenceResolutionTest.java
index 328a25b67b..22c2d3b570 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodReferenceResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodReferenceResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionLogicTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionLogicTest.java
index 67608c8f1e..b12d2f244f 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionLogicTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionLogicTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionTest.java
index 3ff740e8c5..7e61ffa3c3 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionWithJavassistTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionWithJavassistTest.java
index f0620228ed..516ab660e5 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionWithJavassistTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/MethodsResolutionWithJavassistTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/NotQuiteCyclicParentTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/NotQuiteCyclicParentTest.java
index f4c5554d86..f5d4b2a730 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/NotQuiteCyclicParentTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/NotQuiteCyclicParentTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/PatternVariableIntroductionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/PatternVariableIntroductionTest.java
index 6be1527211..77671e31ef 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/PatternVariableIntroductionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/PatternVariableIntroductionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/PolyExpressionResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/PolyExpressionResolutionTest.java
index e8c71db760..3c011e2a0c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/PolyExpressionResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/PolyExpressionResolutionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/QualifiedNameResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/QualifiedNameResolutionTest.java
index 971bbc2633..b8ce0d4a54 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/QualifiedNameResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/QualifiedNameResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ReferenceTypeResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ReferenceTypeResolutionTest.java
index 3f7da4fd29..7381d516e3 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ReferenceTypeResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/ReferenceTypeResolutionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/StatementContextResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/StatementContextResolutionTest.java
index d7c7a90688..c0f4251919 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/StatementContextResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/StatementContextResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SwitchExprTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SwitchExprTest.java
index da1fe66af6..4e88c8db46 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SwitchExprTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SwitchExprTest.java
@@ -1,15 +1,38 @@
+/*
+ * Copyright (C) 2013-2026 The JavaParser Team.
+ *
+ * This file is part of JavaParser.
+ *
+ * JavaParser can be used either under the terms of
+ * a) the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * b) the terms of the Apache License
+ *
+ * You should have received a copy of both licenses in LICENCE.LGPL and
+ * LICENCE.APACHE. Please refer to those files for details.
+ *
+ * JavaParser is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+
 package com.github.javaparser.symbolsolver.resolution;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParserConfiguration;
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.expr.NameExpr;
+import com.github.javaparser.ast.expr.SwitchExpr;
 import com.github.javaparser.resolution.Navigator;
 import com.github.javaparser.resolution.TypeSolver;
 import com.github.javaparser.resolution.UnsolvedSymbolException;
+import com.github.javaparser.resolution.types.ResolvedType;
 import com.github.javaparser.symbolsolver.JavaSymbolSolver;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
 import org.junit.jupiter.api.Test;
@@ -100,4 +123,660 @@ public void nestedSwitchRecordPatternShouldResolve() {
         NameExpr name = Navigator.findNameExpression(cu, "s").get();
         assertEquals("java.lang.String", name.resolve().getType().describe());
     }
+
+    /**
+     * Test that switch expressions used as method arguments can have their type resolved.
+     */
+    @Test
+    public void switchExprAsMethodArgShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        System.out.println(\n"
+                + "            switch (\"a\") {\n"
+                + "                case \"a\" -> 3;\n"
+                + "                default -> 0;\n"
+                + "            });\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test that switch expressions returning String can have their type resolved.
+     */
+    @Test
+    public void switchExprReturningStringShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        String result = switch (1) {\n"
+                + "            case 1 -> \"one\";\n"
+                + "            case 2 -> \"two\";\n"
+                + "            default -> \"other\";\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("java.lang.String", resolvedType.describe());
+    }
+
+    /**
+     * Test that switch expressions with yield statements can have their type resolved.
+     */
+    @Test
+    public void switchExprWithYieldShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        int result = switch (\"x\") {\n"
+                + "            case \"a\" -> 1;\n"
+                + "            default -> {\n"
+                + "                int val = 42;\n"
+                + "                yield val;\n"
+                + "            }\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test block with multiple yield paths (nested if/else).
+     */
+    @Test
+    public void switchExprWithMultipleYieldPathsShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test(boolean condition) {\n"
+                + "        int result = switch (\"x\") {\n"
+                + "            default -> {\n"
+                + "                if (condition) {\n"
+                + "                    yield 1;\n"
+                + "                } else {\n"
+                + "                    yield 2;\n"
+                + "                }\n"
+                + "            }\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test colon-style switch expression (STATEMENT_GROUP) with yield.
+     * JLS 15.28.1 - "case L:" style requires yield statement.
+     */
+    @Test
+    public void switchExprWithColonStyleShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        int result = switch (\"x\") {\n"
+                + "            case \"a\":\n"
+                + "                yield 1;\n"
+                + "            default:\n"
+                + "                yield 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test colon-style switch expression with multiple statements before yield.
+     * This tests that we correctly find the yield even when it's not the first statement.
+     */
+    @Test
+    public void switchExprWithColonStyleAndMultipleStatementsShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        int result = switch (\"x\") {\n"
+                + "            case \"a\":\n"
+                + "                int val = 42;\n"
+                + "                yield val;\n"
+                + "            default:\n"
+                + "                yield 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test mixed primitive types - int and long should LUB to long.
+     * JLS 15.28.2 - numeric promotion rules apply.
+     */
+    @Test
+    public void switchExprWithMixedPrimitiveTypesShouldResolveToLub() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        var result = switch (1) {\n"
+                + "            case 1 -> 1;\n"
+                + "            case 2 -> 2L;\n"
+                + "            default -> 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("long", resolvedType.describe());
+    }
+
+    /**
+     * Test mixed reference types - String and StringBuilder should LUB to a common supertype.
+     */
+    @Test
+    public void switchExprWithMixedReferenceTypesShouldResolveToLub() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        var result = switch (1) {\n"
+                + "            case 1 -> \"hello\";\n"
+                + "            case 2 -> new StringBuilder();\n"
+                + "            default -> \"world\";\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        // String and StringBuilder both implement CharSequence and Serializable
+        // LUB should be one of their common supertypes
+        assertEquals("java.io.Serializable", resolvedType.describe());
+    }
+
+    /**
+     * Test mixed boxed and unboxed types - int and Integer.
+     */
+    @Test
+    public void switchExprWithBoxedAndUnboxedTypesShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        var result = switch (1) {\n"
+                + "            case 1 -> 1;\n"
+                + "            case 2 -> Integer.valueOf(2);\n"
+                + "            default -> 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        String type = resolvedType.describe();
+        assertTrue(type.equals("int"), "Expected int: " + type);
+    }
+
+    /**
+     * Test switch expression with throw in a case (THROWS_STATEMENT).
+     * The throw case doesn't contribute to the type.
+     */
+    @Test
+    public void switchExprWithThrowCaseShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n" + "    public void test() {\n"
+                + "        int result = switch (\"x\") {\n"
+                + "            case \"error\" -> throw new RuntimeException();\n"
+                + "            default -> 42;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test switch expression with only default case.
+     */
+    @Test
+    public void switchExprWithDefaultOnlyShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n" + "    public void test() {\n"
+                + "        String result = switch (\"x\") {\n"
+                + "            default -> \"default value\";\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("java.lang.String", resolvedType.describe());
+    }
+
+    /**
+     * Test nested switch expressions.
+     */
+    @Test
+    public void nestedSwitchExprShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n" + "    public void test() {\n"
+                + "        int result = switch (\"outer\") {\n"
+                + "            case \"outer\" -> switch (\"inner\") {\n"
+                + "                case \"inner\" -> 1;\n"
+                + "                default -> 2;\n"
+                + "            };\n"
+                + "            default -> 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test switch expression in cast context.
+     */
+    @Test
+    public void switchExprInCastContextShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n" + "    public void test() {\n"
+                + "        Number result = (Number) switch (1) {\n"
+                + "            case 1 -> 1;\n"
+                + "            default -> 2L;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        // As a standalone expression, the type is determined by LUB of int and long
+        assertEquals("long", resolvedType.describe());
+    }
+
+    /**
+     * Test switch expression in ternary conditional.
+     */
+    @Test
+    public void switchExprInTernaryContextShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n" + "    public void test(boolean condition) {\n"
+                + "        int result = condition ? switch (1) {\n"
+                + "            case 1 -> 10;\n"
+                + "            default -> 20;\n"
+                + "        } : 0;\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test switch expression as return value.
+     */
+    @Test
+    public void switchExprAsReturnValueShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public String test() {\n"
+                + "        return switch (1) {\n"
+                + "            case 1 -> \"one\";\n"
+                + "            default -> \"other\";\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("java.lang.String", resolvedType.describe());
+    }
+
+    /**
+     * Test mixed boolean and Boolean types.
+     * JLS 15.28.2 - If each result is boolean or Boolean, unbox to boolean.
+     */
+    @Test
+    public void switchExprWithMixedBooleanTypesShouldResolveToBoolean() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        var result = switch (1) {\n"
+                + "            case 1 -> true;\n"
+                + "            case 2 -> Boolean.FALSE;\n"
+                + "            default -> false;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("boolean", resolvedType.describe());
+    }
+
+    /**
+     * Test switch expression where all results are null.
+     */
+    @Test
+    public void switchExprWithAllNullResultsShouldResolveToNullType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        Object result = switch (1) {\n"
+                + "            case 1 -> null;\n"
+                + "            case 2 -> null;\n"
+                + "            default -> null;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("null", resolvedType.describe());
+    }
+
+    /**
+     * Test null mixed with reference type.
+     * LUB of String and null should be String.
+     */
+    @Test
+    public void switchExprWithNullAndReferenceTypeShouldResolveToReferenceType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        var result = switch (1) {\n"
+                + "            case 1 -> \"hello\";\n"
+                + "            case 2 -> null;\n"
+                + "            default -> \"world\";\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("java.lang.String", resolvedType.describe());
+    }
+
+    /**
+     * Test JLS rule 4: primitive boxed before LUB with incompatible reference type.
+     * int should be boxed to Integer, then LUB with String computed.
+     */
+    @Test
+    public void switchExprWithPrimitiveAndReferenceTypeShouldBoxThenLub() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        var result = switch (1) {\n"
+                + "            case 1 -> 42;\n"
+                + "            case 2 -> \"hello\";\n"
+                + "            default -> 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        // LUB of Integer and String is Serializable (both implement it)
+        assertEquals("java.io.Serializable", resolvedType.describe());
+    }
+
+    /**
+     * Test switch expression where all cases throw.
+     * Since all branches throw, there are no result expressions to determine the type from.
+     * This is not valid Java code - the validator should catch it.
+     */
+    @Test
+    public void switchExprWithAllThrowsShouldBeInvalid() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        int result = switch (1) {\n"
+                + "            case 1 -> throw new IllegalArgumentException();\n"
+                + "            default -> throw new RuntimeException();\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        // When all cases throw, there are no result expressions to infer the type from.
+        // This should be caught earlier by the validator, but here we check that type resolution fails.
+        assertThrows(IllegalStateException.class, switchExpr::calculateResolvedType);
+    }
+
+    /**
+     * Test float/double numeric promotion.
+     * JLS 15.28.2 - numeric promotion with float and double.
+     */
+    @Test
+    public void switchExprWithFloatAndDoubleShouldResolveToDouble() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        var result = switch (1) {\n"
+                + "            case 1 -> 1.0f;\n"
+                + "            case 2 -> 2.0;\n"
+                + "            default -> 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("double", resolvedType.describe());
+    }
+
+    /**
+     * Test int/float numeric promotion.
+     */
+    @Test
+    public void switchExprWithIntAndFloatShouldResolveToFloat() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        var result = switch (1) {\n"
+                + "            case 1 -> 1;\n"
+                + "            case 2 -> 2.0f;\n"
+                + "            default -> 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("float", resolvedType.describe());
+    }
+
+    /**
+     * Test colon-style switch expression with fall-through cases.
+     * The first case falls through to the second case which has the yield.
+     */
+    @Test
+    public void switchExprWithColonStyleFallThroughShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        int result = switch (1) {\n"
+                + "            case 1:\n"
+                + "            case 2:\n"
+                + "                yield 10;\n"
+                + "            default:\n"
+                + "                yield 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test colon-style switch expression where a case throws instead of yielding.
+     * The throw case doesn't contribute to the type, similar to arrow-style throws.
+     */
+    @Test
+    public void switchExprWithColonStyleThrowShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        int result = switch (1) {\n"
+                + "            case 1:\n"
+                + "                yield 10;\n"
+                + "            default:\n"
+                + "                throw new IllegalArgumentException();\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test colon-style switch expression with multiple fall-through cases.
+     * Cases 1, 2, and 3 all fall through to case 3's yield.
+     */
+    @Test
+    public void switchExprWithColonStyleMultipleFallThroughShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        String result = switch (1) {\n"
+                + "            case 1:\n"
+                + "            case 2:\n"
+                + "            case 3:\n"
+                + "                yield \"low\";\n"
+                + "            case 4:\n"
+                + "            case 5:\n"
+                + "                yield \"high\";\n"
+                + "            default:\n"
+                + "                yield \"other\";\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("java.lang.String", resolvedType.describe());
+    }
+
+    /**
+     * Test colon-style switch expression where default throws.
+     * Only the regular cases contribute to the type.
+     */
+    @Test
+    public void switchExprWithColonStyleDefaultThrowsShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        String result = switch (1) {\n"
+                + "            case 1:\n"
+                + "                yield \"one\";\n"
+                + "            case 2:\n"
+                + "                yield \"two\";\n"
+                + "            default:\n"
+                + "                throw new IllegalArgumentException(\"unexpected\");\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("java.lang.String", resolvedType.describe());
+    }
+
+    /**
+     * Test colon-style switch expression with mixed fall-through and throw.
+     * Case 1 falls through to case 2 which yields, case 3 throws.
+     */
+    @Test
+    public void switchExprWithColonStyleMixedFallThroughAndThrowShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        int result = switch (1) {\n"
+                + "            case 1:\n"
+                + "            case 2:\n"
+                + "                yield 10;\n"
+                + "            case 3:\n"
+                + "                throw new RuntimeException();\n"
+                + "            default:\n"
+                + "                yield 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test arrow-style switch expression where a block throws instead of yielding.
+     * The throwing block doesn't contribute to the type.
+     */
+    @Test
+    public void switchExprWithBlockThrowShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        int result = switch (1) {\n"
+                + "            case 1 -> {\n"
+                + "                throw new IllegalArgumentException();\n"
+                + "            }\n"
+                + "            default -> 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test nested switch expressions in blocks.
+     * The outer switch should find its own yield, not the inner switch's yield.
+     */
+    @Test
+    public void switchExprWithNestedSwitchInBlockShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        int result = switch (1) {\n"
+                + "            case 1 -> {\n"
+                + "                String inner = switch (\"x\") {\n"
+                + "                    case \"a\" -> {\n"
+                + "                        yield \"inner result\";\n"
+                + "                    }\n"
+                + "                    default -> \"default\";\n"
+                + "                };\n"
+                + "                yield 42;\n"
+                + "            }\n"
+                + "            default -> 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        // The outer switch should resolve to int (from yield 42), not String (from inner yield)
+        assertEquals("int", resolvedType.describe());
+    }
+
+    /**
+     * Test nested switch expressions in colon-style (STATEMENT_GROUP).
+     * The outer switch should find its own yield, not the inner switch's yield.
+     */
+    @Test
+    public void switchExprWithNestedSwitchInStatementGroupShouldResolveType() {
+        CompilationUnit cu = parse("class Test {\n"
+                + "    public void test() {\n"
+                + "        int result = switch (1) {\n"
+                + "            case 1:\n"
+                + "                String inner = switch (\"x\") {\n"
+                + "                    case \"a\":\n"
+                + "                        yield \"inner result\";\n"
+                + "                    default:\n"
+                + "                        yield \"default\";\n"
+                + "                };\n"
+                + "                yield 42;\n"
+                + "            default:\n"
+                + "                yield 0;\n"
+                + "        };\n"
+                + "    }\n"
+                + "}");
+
+        SwitchExpr switchExpr = cu.findFirst(SwitchExpr.class).get();
+        ResolvedType resolvedType = switchExpr.calculateResolvedType();
+        // The outer switch should resolve to int (from yield 42), not String (from inner yield)
+        assertEquals("int", resolvedType.describe());
+    }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverTest.java
index 51593571f3..9ea19789f6 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverWithJavassistClassTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverWithJavassistClassTest.java
index 00e134887f..5b044e2a01 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverWithJavassistClassTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverWithJavassistClassTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverWithJavassistEnumTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverWithJavassistEnumTest.java
index f786d10b55..cf66caff17 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverWithJavassistEnumTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverWithJavassistEnumTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverWithJavassistInterfaceTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverWithJavassistInterfaceTest.java
index c0c77d7420..d3bfd0246c 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverWithJavassistInterfaceTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/SymbolSolverWithJavassistInterfaceTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeDescriptorTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeDescriptorTest.java
index c8cd295c74..f923e19005 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeDescriptorTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeDescriptorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeInClassWithAnnotationAncestorTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeInClassWithAnnotationAncestorTest.java
index 478aae9f04..76cf2a29f9 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeInClassWithAnnotationAncestorTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeInClassWithAnnotationAncestorTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeResolutionWithSameNameTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeResolutionWithSameNameTest.java
index f128df2b14..64dfcd7e72 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeResolutionWithSameNameTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/TypeResolutionWithSameNameTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/UnknownMethodsResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/UnknownMethodsResolutionTest.java
index ac125f7eeb..8fa77d7d39 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/UnknownMethodsResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/UnknownMethodsResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/VariableResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/VariableResolutionTest.java
index 66945a5dbc..08e56826fe 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/VariableResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/VariableResolutionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/VariadicResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/VariadicResolutionTest.java
index 7024feca7d..065137819d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/VariadicResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/VariadicResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/VarTypeTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/VarTypeTest.java
index b7c6d550c8..da187858c1 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/VarTypeTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/VarTypeTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/BlockStmtContextResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/BlockStmtContextResolutionTest.java
index e4ab00b841..d388b8d4a9 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/BlockStmtContextResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/BlockStmtContextResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContextResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContextResolutionTest.java
index 9168e7ef31..8529513bdb 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContextResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/ClassOrInterfaceDeclarationContextResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/CompilationUnitContextResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/CompilationUnitContextResolutionTest.java
index b17439cd45..23761ef51e 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/CompilationUnitContextResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/CompilationUnitContextResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/EnumDeclarationContextResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/EnumDeclarationContextResolutionTest.java
index ba9fbd40bf..28f577dfe7 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/EnumDeclarationContextResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/EnumDeclarationContextResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/FieldAccessContextResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/FieldAccessContextResolutionTest.java
index d0fe07facf..1c2cc60b93 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/FieldAccessContextResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/FieldAccessContextResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/LambdaExprContextResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/LambdaExprContextResolutionTest.java
index 1562ffcb14..422198132a 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/LambdaExprContextResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/LambdaExprContextResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/MethodCallExprContextResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/MethodCallExprContextResolutionTest.java
index e51c8f2de8..b28f56f6c5 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/MethodCallExprContextResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/MethodCallExprContextResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/MethodContextResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/MethodContextResolutionTest.java
index ba604eefb6..ddd98a94de 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/MethodContextResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/contexts/MethodContextResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/declarations/JavaParserTypeParameterResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/declarations/JavaParserTypeParameterResolutionTest.java
index fb2e97fa7f..a1f7975235 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/declarations/JavaParserTypeParameterResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/javaparser/declarations/JavaParserTypeParameterResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/logic/FunctionalInterfaceLogicTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/logic/FunctionalInterfaceLogicTest.java
index f3faacf018..ba8b6e4d36 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/logic/FunctionalInterfaceLogicTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/logic/FunctionalInterfaceLogicTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/AbstractNameLogicTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/AbstractNameLogicTest.java
index d5c2afe4eb..0507cc8de8 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/AbstractNameLogicTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/AbstractNameLogicTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogicDisambiguationTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogicDisambiguationTest.java
index 6ca609c1ca..a6611520f4 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogicDisambiguationTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogicDisambiguationTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogicTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogicTest.java
index 44fbd249a4..5dfab96bc3 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogicTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogicTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogicTestingJss060Test.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogicTestingJss060Test.java
index 5dbdba00e3..0a7a6a0cc6 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogicTestingJss060Test.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/naming/NameLogicTestingJss060Test.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/reflectionmodel/SymbolResolutionResolutionTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/reflectionmodel/SymbolResolutionResolutionTest.java
index a1fe0a2b7d..f0696c9937 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/reflectionmodel/SymbolResolutionResolutionTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/reflectionmodel/SymbolResolutionResolutionTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/LeastUpperBoundTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/LeastUpperBoundTest.java
index 2785f053f9..a451084a61 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/LeastUpperBoundTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/LeastUpperBoundTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/bounds/SameAsBoundTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/bounds/SameAsBoundTest.java
index c5c751d5f2..ae6a93c0b5 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/bounds/SameAsBoundTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/bounds/SameAsBoundTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/bounds/SubtypeOfBoundTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/bounds/SubtypeOfBoundTest.java
index 0612cd604f..a9c16ee06e 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/bounds/SubtypeOfBoundTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/bounds/SubtypeOfBoundTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/constraintformulas/ConstraintFormulaTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/constraintformulas/ConstraintFormulaTest.java
index 754e677ae4..27c066508d 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/constraintformulas/ConstraintFormulaTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typeinference/constraintformulas/ConstraintFormulaTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -44,7 +44,7 @@ class ConstraintFormulaTest {
 
     /**
      * From JLS 18.1.2
-     * <p>
+     *
      * From Collections.singleton("hi"), we have the constraint formula ‹"hi" → α›.
      * Through reduction, this will become the constraint formula: ‹String <: α›.
      */
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/types/ResolvedArrayTypeTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/types/ResolvedArrayTypeTest.java
index b2d05bcd07..1b6054ec1a 100755
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/types/ResolvedArrayTypeTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/types/ResolvedArrayTypeTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/types/ResolvedPrimitiveTypeTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/types/ResolvedPrimitiveTypeTest.java
index 763d2e4ea3..052d0b3435 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/types/ResolvedPrimitiveTypeTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/types/ResolvedPrimitiveTypeTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/AarTypeSolverTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/AarTypeSolverTest.java
index 44629c8293..070c91b3be 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/AarTypeSolverTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/AarTypeSolverTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/AbstractTypeSolverTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/AbstractTypeSolverTest.java
index 2180f02925..4c46a28591 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/AbstractTypeSolverTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/AbstractTypeSolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/ClassLoaderTypeSolverTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/ClassLoaderTypeSolverTest.java
index f968116ec7..327ab49372 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/ClassLoaderTypeSolverTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/ClassLoaderTypeSolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/CombinedTypeSolverTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/CombinedTypeSolverTest.java
index c21850b531..25c4c3d6e9 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/CombinedTypeSolverTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/CombinedTypeSolverTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/JarTypeSolverTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/JarTypeSolverTest.java
index 7be10450cc..b27b29ab99 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/JarTypeSolverTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/JarTypeSolverTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/JavaParserTypeSolverTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/JavaParserTypeSolverTest.java
index 6e56818fe4..301d0e6455 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/JavaParserTypeSolverTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/JavaParserTypeSolverTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -156,7 +156,7 @@ public void givenJavaParserTypeSolver_tryToSolveAnUnexpectedSourceFileName_expec
 
     /**
      * {@link com.github.javaparser.JavaParser} doesn't work across multiple threads.
-     * <p>
+     *
      * This test makes sure the concurrency is handled.
      */
     @RepeatedTest(25)
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/MemoryTypeSolverTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/MemoryTypeSolverTest.java
index 3350ad8f3f..88d9b6629f 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/MemoryTypeSolverTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/MemoryTypeSolverTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -88,6 +88,7 @@ void memoryTypeSolversHaveSameHashCodeIfMemoryInformationMatches() {
      * Create the type solver with pre-registered classes.
      *
      * @param multipleClazz The classes to be registered.
+     *
      * @return The created memory solver.
      */
     public MemoryTypeSolver createTypeSolver(Class<?>... multipleClazz) {
@@ -103,8 +104,8 @@ public MemoryTypeSolver createTypeSolver(Class<?>... multipleClazz) {
     /**
      * Register the class in memory.
      *
-     * @param memorySolver The memory solver where the information should be registered.
-     * @param clazz        The class to be registered.
+     * @param memorySolver  The memory solver where the information should be registered.
+     * @param clazz         The class to be registered.
      */
     private static void registerClassInMemory(MemoryTypeSolver memorySolver, Class<?> clazz) {
         ResolvedReferenceTypeDeclaration declaration = ReflectionFactory.typeDeclarationFor(clazz, memorySolver);
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/ReflectionTypeSolverTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/ReflectionTypeSolverTest.java
index b67fbcb204..c5946b4b65 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/ReflectionTypeSolverTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/ReflectionTypeSolverTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/TypeSolverBuilderTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/TypeSolverBuilderTest.java
index 07ab6fac2c..b77337fbd3 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/TypeSolverBuilderTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/resolution/typesolvers/TypeSolverBuilderTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -292,7 +292,7 @@ void testBuild_withCustomClassLoaderInConfiguration() {
      * Assert a class can be resolved inside the current type solver.
      *
      * @param typeSolver The type solver to search.
-     * @param className  The class to find.
+     * @param className The class to find.
      */
     private static void assertIsSolved(TypeSolver typeSolver, String className) {
         assertTrue(typeSolver.hasType(className), String.format("Unable to solve type %s", className));
@@ -302,7 +302,7 @@ private static void assertIsSolved(TypeSolver typeSolver, String className) {
      * Assert a class can't be resolved inside the current type solver.
      *
      * @param typeSolver The type solver to search.
-     * @param className  The class to find.
+     * @param className The class to find.
      */
     private static void assertNotSolved(TypeSolver typeSolver, String className) {
         assertFalse(
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/testingclasses/SomeClass.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/testingclasses/SomeClass.java
index 8feefc7392..2289bb94c0 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/testingclasses/SomeClass.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/testingclasses/SomeClass.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/testingclasses/TargetType.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/testingclasses/TargetType.java
index 572c59b9e3..5dd21f4735 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/testingclasses/TargetType.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/testingclasses/TargetType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2024 The JavaParser Team.
+ * Copyright (C) 2013-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/testingclasses/UtilityClass.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/testingclasses/UtilityClass.java
index 0ba036ba0f..36b5788295 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/testingclasses/UtilityClass.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/testingclasses/UtilityClass.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/LeanParserConfiguration.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/LeanParserConfiguration.java
index cc220de803..b35f20cb05 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/LeanParserConfiguration.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/LeanParserConfiguration.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
diff --git a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategyTest.java b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategyTest.java
index 38c68f7715..4351d2d19e 100644
--- a/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategyTest.java
+++ b/javaparser-symbol-solver-testing/src/test/java/com/github/javaparser/symbolsolver/utils/SymbolSolverCollectionStrategyTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2015-2016 Federico Tomassetti
- * Copyright (C) 2017-2024 The JavaParser Team.
+ * Copyright (C) 2017-2026 The JavaParser Team.
  *
  * This file is part of JavaParser.
  *
@@ -37,12 +37,16 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
+
+import com.google.common.truth.Truth;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+@SuppressWarnings("OptionalGetWithoutIsPresent")
 class SymbolSolverCollectionStrategyTest {
 
     private final Path root = classLoaderRoot(SymbolSolverCollectionStrategyTest.class)
-            .resolve("../../../javaparser-core")
+            .resolve("../../../../../javaparser-core")
             .normalize();
     private final ProjectRoot projectRoot = new SymbolSolverCollectionStrategy().collect(root);
 
@@ -73,17 +77,18 @@ void resolveExpressions() throws IOException {
     }
 
     @Test
+    @Disabled("weigl: There are runtime issues (heap space) with this approach.")
     void resolveMultiSourceRoots() {
-        String[] relativeRootDir = {
-            "/src/main/java-templates",
+        var relativeRootDir = List.of(
+            "src/main/java-templates",
             "src/main/java",
             "src/main/javacc-support",
             "target/generated-sources/javacc",
             "target/generated-sources/java-templates",
             "src/main/java-templates"
-        };
+        );
         Path mainDirectory = classLoaderRoot(SymbolSolverCollectionStrategyTest.class)
-                .resolve("../../../javaparser-core")
+                .resolve("../../../../../javaparser-core")
                 .normalize();
         ProjectRoot projectRoot = new SymbolSolverCollectionStrategy().collect(mainDirectory);
         List<com.github.javaparser.utils.SourceRoot> sourceRoots = projectRoot.getSourceRoots();
@@ -92,9 +97,10 @@ void resolveMultiSourceRoots() {
                 .map(s -> s.getRoot().toString())
                 .collect(Collectors.toList());
         // verify each member of the list
-        Arrays.stream(relativeRootDir).forEach(rrd -> {
-            Path p = Paths.get(mainDirectory.toString(), rrd);
-            assertTrue(roots.contains(p.toString()));
-        });
+        var relativeRootDirPaths = relativeRootDir.stream()
+                .map(rrd -> Paths.get(mainDirectory.toString(), rrd))
+                .map(Path::toString)
+                .toList();
+        Truth.assertThat(roots).containsAnyIn(relativeRootDirPaths);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/00_receiver/main/Parent.java b/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/00_receiver/main/Parent.java
index 57cd9b9503..3857b76e05 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/00_receiver/main/Parent.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/00_receiver/main/Parent.java
@@ -1,5 +1,7 @@
 package main;
 
+import static main.Parent.MyEnum.*;
+
 public class Parent {
 
     public enum MyEnum {
diff --git a/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/01_parent/main/GrandParent.java b/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/01_parent/main/GrandParent.java
index 5c0df10588..d037b0adde 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/01_parent/main/GrandParent.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/01_parent/main/GrandParent.java
@@ -1,5 +1,7 @@
 package main;
 
+import static main.GrandParent.MyEnum.*;
+
 public class GrandParent {
 
     public enum MyEnum {
diff --git a/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/02_nested/main/Parent.java b/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/02_nested/main/Parent.java
index 2ebd0cc20d..e921d55f18 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/02_nested/main/Parent.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/02_nested/main/Parent.java
@@ -1,5 +1,7 @@
 package main;
 
+import static main.Parent.MyEnum.*;
+
 public class Parent {
 
     public class ParentNested {
diff --git a/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/03_symbol/main/Clazz.java b/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/03_symbol/main/Clazz.java
index a6e89b7a24..5961136cfb 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/03_symbol/main/Clazz.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/03_symbol/main/Clazz.java
@@ -1,5 +1,7 @@
 package main;
 
+import static main.Clazz.MyEnum.*;
+
 public class Clazz {
 
     public enum MyEnum {
diff --git a/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/04_reviewComment/main/Main.java b/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/04_reviewComment/main/Main.java
index 738fe4d8fb..70afc0ede3 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/04_reviewComment/main/Main.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/CompilationUnitContextResolutionTest/04_reviewComment/main/Main.java
@@ -13,14 +13,8 @@ public Main() {
 
     public enum NestedEnum {
         ;
-
-        public static void foo() {
-        }
-
-        public static void bar() {
-        }
-
-        public void baz() {
-        }
+        public static void foo() {}
+        public static void bar() {}
+        public void baz() {}
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/02_ignore_static_non_type_import/main/Main.java b/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/02_ignore_static_non_type_import/main/Main.java
index d5ca87a32a..fd7813b3a2 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/02_ignore_static_non_type_import/main/Main.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/02_ignore_static_non_type_import/main/Main.java
@@ -1,5 +1,6 @@
 package main;
 
+import static another.MyEnum.A;
 import another.A;
 
 class Main {
diff --git a/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/05_asterisk_import_precedes_java_lang/main/Main.java b/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/05_asterisk_import_precedes_java_lang/main/Main.java
index 11943eb703..ffa3ed7a2d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/05_asterisk_import_precedes_java_lang/main/Main.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/TypeResolutionWithSameNameTest/05_asterisk_import_precedes_java_lang/main/Main.java
@@ -1,5 +1,7 @@
 package main;
 
+import another.*;
+
 class Main {
     String s;
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/FieldDotExpressions.java b/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/FieldDotExpressions.java
index b54aeeaa31..63f9b74692 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/FieldDotExpressions.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/FieldDotExpressions.java
@@ -8,15 +8,12 @@ public static void main(String[] args) {
 
 class FieldContainer {
     FieldContainer containerField = new FieldContainer();
-
     public String firstContainerMethod() {
         return "firstContainerMethod()";
     }
-
     public String secondContainerMethod() {
         return "secondContainerMethod()";
     }
-
     public String thirdContainerMethod() {
         return "thirdContainerMethod()";
     }
@@ -24,13 +21,10 @@ public String thirdContainerMethod() {
 
 class InnerClassFieldContainer {
     FieldContainer outerField = new FieldContainer();
-
     class InnerClass {
         FieldContainer innerField = new FieldContainer();
-
         class InnerInnerClass {
             FieldContainer innerInnerField = new FieldContainer();
-
             class InnerInnerInnerClass {
                 FieldContainer innerInnerInnerField = new FieldContainer();
             }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/InnerClassDotExpressions.java b/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/InnerClassDotExpressions.java
index 9de73192ea..17b89f02f1 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/InnerClassDotExpressions.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/InnerClassDotExpressions.java
@@ -11,12 +11,10 @@ class InnerClass {
         public static String methodCall() {
             return "CalledMethod";
         }
-
         class InnerInnerClass {
             public static String innerMethodCall() {
                 return "CalledInnerInnerClass";
             }
-
             class InnerInnerInnerClass {
                 public static String innerInnerMethodCall() {
                     return "CalledInnerInnerInnerClass";
diff --git a/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/com/packageName/InnerClassContainer.java b/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/com/packageName/InnerClassContainer.java
index b13456c6bf..eb80bc9e89 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/com/packageName/InnerClassContainer.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/com/packageName/InnerClassContainer.java
@@ -3,12 +3,10 @@ class InnerClass {
         public static String methodCall() {
             return "CalledMethod";
         }
-
         class InnerInnerClass {
             public static String innerMethodCall() {
                 return "CalledInnerInnerClass";
             }
-
             class InnerInnerInnerClass {
                 public static String innerInnerMethodCall() {
                     return "CalledInnerInnerInnerClass";
diff --git a/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/com/packageName/InnerClassFieldContainer.java b/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/com/packageName/InnerClassFieldContainer.java
index 2dc10970fa..5a09bcf9a6 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/com/packageName/InnerClassFieldContainer.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/com/packageName/InnerClassFieldContainer.java
@@ -1,12 +1,9 @@
 public class InnerClassFieldContainer {
     FieldContainer outerField = new FieldContainer();
-
     class InnerClass {
         FieldContainer innerField = new FieldContainer();
-
         class InnerInnerClass {
             FieldContainer innerInnerField = new FieldContainer();
-
             class InnerInnerInnerClass {
                 FieldContainer innerInnerInnerField = new FieldContainer();
             }
@@ -16,15 +13,12 @@ class InnerInnerInnerClass {
 
 class FieldContainer {
     FieldContainer containerField = new FieldContainer();
-
     public String firstContainerMethod() {
         return "firstContainerMethod()";
     }
-
     public String secondContainerMethod() {
         return "secondContainerMethod()";
     }
-
     public String thirdContainerMethod() {
         return "thirdContainerMethod()";
     }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/com/packageName/InnerStaticClassFieldContainer.java b/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/com/packageName/InnerStaticClassFieldContainer.java
index 874a196689..f9cc6cac8e 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/com/packageName/InnerStaticClassFieldContainer.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/differentiate_dot_expressions/com/packageName/InnerStaticClassFieldContainer.java
@@ -5,10 +5,8 @@ static class InnerClass {
         public static String methodCall() {
             return "CalledMethod";
         }
-
         static class InnerInnerClass {
             public static final String MY_INT = "1";
-
             public static String innerMethodCall() {
                 return "CalledInnerInnerClass";
             }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/enumLiteralsInAnnotatedClass/foo/bar/BinaryExpr.java b/javaparser-symbol-solver-testing/src/test/resources/enumLiteralsInAnnotatedClass/foo/bar/BinaryExpr.java
index 03bfd31acf..c9a09bbe8b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/enumLiteralsInAnnotatedClass/foo/bar/BinaryExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/enumLiteralsInAnnotatedClass/foo/bar/BinaryExpr.java
@@ -6,7 +6,6 @@ enum Operator {
         OR("||"),
         AND("&&");
 
-        Operator(String codeRepresentation) {
-        }
+        Operator(String codeRepresentation) { }
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/enums/EnumWithInnerType.java b/javaparser-symbol-solver-testing/src/test/resources/enums/EnumWithInnerType.java
index 8fe94852c7..d91aaefbaa 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/enums/EnumWithInnerType.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/enums/EnumWithInnerType.java
@@ -2,7 +2,6 @@ public static enum EnumWithInnerType {
 
     PUBLIC, PRIVATE;
 
-    public static class EnumInner {
-    }
+    public static class EnumInner {}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue113/com/foo/Widget.java b/javaparser-symbol-solver-testing/src/test/resources/issue113/com/foo/Widget.java
index 49de8fe11e..2dcab368f7 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue113/com/foo/Widget.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue113/com/foo/Widget.java
@@ -3,6 +3,9 @@
  */
 package com.foo;
 
+import java.io.File;
+import java.io.IOException;
+
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParseException;
 import com.github.javaparser.ast.CompilationUnit;
@@ -13,9 +16,6 @@
 import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver;
 import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
 
-import java.io.File;
-import java.io.IOException;
-
 public class Widget extends com.foo.base.Widget {
     private static final String PROJECT_ROOT = "/Users/peloquina/dev/javasymbolsolver-issue";
     private static final String JAVA_ROOT = PROJECT_ROOT + "/src/main/java";
@@ -31,7 +31,7 @@ public static void main(String[] args) throws IOException, ParseException {
 
         JavaParserFacade parserFacade = JavaParserFacade.get(combinedTypeSolver);
         MethodDeclaration methodDeclaration = compilationUnit.getNodesByType(MethodDeclaration.class).stream()
-                .filter(node -> node.getName().equals("doSomething")).findAny().orElse(null);
+              .filter(node -> node.getName().equals("doSomething")).findAny().orElse(null);
         methodDeclaration.getNodesByType(MethodCallExpr.class).forEach(parserFacade::solve);
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue113/com/foo/base/Widget.java b/javaparser-symbol-solver-testing/src/test/resources/issue113/com/foo/base/Widget.java
index 1067c43038..cffffefb25 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue113/com/foo/base/Widget.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue113/com/foo/base/Widget.java
@@ -3,5 +3,4 @@
  */
 package com.foo.base;
 
-public class Widget {
-}
+public class Widget {}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue128/foo/Issue128.java b/javaparser-symbol-solver-testing/src/test/resources/issue128/foo/Issue128.java
index 72c0568d3d..50410e15da 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue128/foo/Issue128.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue128/foo/Issue128.java
@@ -4,7 +4,7 @@
 // here could be the correct import for bar
 
 public class JavaTest {
-    public void test() {
-        bar();
-    }
+	public void test() {
+		bar();
+	}
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue144/HelloWorld.java b/javaparser-symbol-solver-testing/src/test/resources/issue144/HelloWorld.java
index 58d6895e95..994d632007 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue144/HelloWorld.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue144/HelloWorld.java
@@ -1,6 +1,6 @@
 public class HelloWorld {
 
-    static String hw = "Hello world";
+    static String hw="Hello world";
 
     public static void main(String[] args) {
         System.out.println(hw);
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1456/bar/A.java b/javaparser-symbol-solver-testing/src/test/resources/issue1456/bar/A.java
index 737cf3983e..1c093c30f5 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1456/bar/A.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1456/bar/A.java
@@ -1,5 +1,4 @@
 package bar;
-
 public class A extends foo.A {
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1456/foo/A.java b/javaparser-symbol-solver-testing/src/test/resources/issue1456/foo/A.java
index 2bd37d8d0b..3ded56e4ed 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1456/foo/A.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1456/foo/A.java
@@ -1,5 +1,4 @@
 package foo;
-
 public class A {
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1479/A.java b/javaparser-symbol-solver-testing/src/test/resources/issue1479/A.java
index 1c6d914f89..49e14d4486 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1479/A.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1479/A.java
@@ -1,3 +1,3 @@
 public class A {
-    public static final String AFIELD = "a";
+  public static final String AFIELD = "a";
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1479/B.java b/javaparser-symbol-solver-testing/src/test/resources/issue1479/B.java
index 5f1ebf5eae..19a79fd319 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1479/B.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1479/B.java
@@ -1,3 +1,3 @@
 public class B extends A {
-    public static final String BFIELD = "b";
+  public static final String BFIELD = "b";
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1480/A.java b/javaparser-symbol-solver-testing/src/test/resources/issue1480/A.java
index c2223d3086..5e51be7452 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1480/A.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1480/A.java
@@ -1,7 +1,5 @@
-public class A {
-    public void foo() {
-    }
 
-    private void bar() {
-    }
+public class A {
+  public void foo() {}
+  private void bar() {}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1480/B.java b/javaparser-symbol-solver-testing/src/test/resources/issue1480/B.java
index 7d661f3d39..ca992e3e1d 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1480/B.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1480/B.java
@@ -1,10 +1,11 @@
+
 public class B extends A {
 
 //  public void test1() {
 //    foo(); // should be inherited from A, so there should exist an (implicit) method org.testapp.B.foo()
 //  }
 
-    public void test2() {
-        bar(); // should not be resolvable, since bar() is private in A and not inherited by B
-    }
+  public void test2() {
+    bar(); // should not be resolvable, since bar() is private in A and not inherited by B
+  }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1485/Complex.java b/javaparser-symbol-solver-testing/src/test/resources/issue1485/Complex.java
index cf2f88a4f7..e05f245379 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1485/Complex.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1485/Complex.java
@@ -9,12 +9,12 @@ public class Complex {
     }
 
     Complex(String eval) {
-        Complex result = new Complex(0, 0);
-        System.out.println(result.getReal() + "," + result.getImaginary());
+        Complex result = new Complex(0,0);
+        System.out.println(result.getReal()+","+result.getImaginary());
     }
 
     public Complex add(Complex arg) {
-        return new Complex(real + arg.getReal(), imaginary + arg.getImaginary());
+        return new Complex(real+arg.getReal(), imaginary+arg.getImaginary());
     }
 
     public double getReal() {
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1518/Test1.java b/javaparser-symbol-solver-testing/src/test/resources/issue1518/Test1.java
index 4177114b70..f20a861811 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1518/Test1.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1518/Test1.java
@@ -1,7 +1,7 @@
+
 public class Test1 {
     public static class Test2 {
     }
-
     public static class Test3 {
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1526/compiles/a/b/c/ExampleClass.java b/javaparser-symbol-solver-testing/src/test/resources/issue1526/compiles/a/b/c/ExampleClass.java
index 5df45b26ec..a76e082274 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1526/compiles/a/b/c/ExampleClass.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1526/compiles/a/b/c/ExampleClass.java
@@ -1,6 +1,6 @@
 package a.b.c;
 
-import d.e.f.DataObjectFactory;
+import d.e.f.DataObjectFactory; // Resolving imports takes precedence over within-the-same-package (commenting this line causes a compilation error!).
 
 public class ExampleClass {
 
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1526/compiles/d/e/f/DataObjectFactory.java b/javaparser-symbol-solver-testing/src/test/resources/issue1526/compiles/d/e/f/DataObjectFactory.java
index 1ad1138726..55580df723 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1526/compiles/d/e/f/DataObjectFactory.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1526/compiles/d/e/f/DataObjectFactory.java
@@ -4,7 +4,7 @@
 
 public class DataObjectFactory {
 
-    public DataObject getDataObject(String objectID) {
+    public DataObject getDataObject(String objectID){
         return null;
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1526/errors/d/e/f/DataObjectFactory.java b/javaparser-symbol-solver-testing/src/test/resources/issue1526/errors/d/e/f/DataObjectFactory.java
index 1ad1138726..55580df723 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1526/errors/d/e/f/DataObjectFactory.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1526/errors/d/e/f/DataObjectFactory.java
@@ -4,7 +4,7 @@
 
 public class DataObjectFactory {
 
-    public DataObject getDataObject(String objectID) {
+    public DataObject getDataObject(String objectID){
         return null;
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1574/BlockComment.java b/javaparser-symbol-solver-testing/src/test/resources/issue1574/BlockComment.java
index 4ec7806b99..b2535d6ffb 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1574/BlockComment.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1574/BlockComment.java
@@ -8,9 +8,8 @@
 Comment3
  */
 package aPackage;
-
-public class comment {
-    public void main(String args[]) {
+public class comment{
+    public void main(String args[]){
         System.out.println("HelloWorld");
     }
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1574/ClassWithOrphanComments.java b/javaparser-symbol-solver-testing/src/test/resources/issue1574/ClassWithOrphanComments.java
index b7a04dec71..6ca7c9f46f 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1574/ClassWithOrphanComments.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1574/ClassWithOrphanComments.java
@@ -1,13 +1,11 @@
 package japa.parser.comments;
 
-/**
- * Javadoc associated with the class
- */
+/**Javadoc associated with the class*/
 public class ClassWithOrphanComments {
     //a first comment floating in the class
 
     //comment associated to the method
-    void foo() {
+    void foo(){
         /*comment floating inside the method*/
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1574/Comment.java b/javaparser-symbol-solver-testing/src/test/resources/issue1574/Comment.java
index 8e1906c96f..d01313122b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1574/Comment.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1574/Comment.java
@@ -2,9 +2,8 @@
 //Comment2
 //Comment3
 package aPackage;
-
-public class comment {
-    public void main(String args[]) {
+public class comment{
+    public void main(String args[]){
         System.out.println("HelloWorld");
     }
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1599/A.java b/javaparser-symbol-solver-testing/src/test/resources/issue1599/A.java
index 8fd676f434..dde0ac295b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1599/A.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1599/A.java
@@ -1,3 +1,3 @@
 public abstract class A {
-    public abstract void bar();
+  public abstract void bar();
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1769/foo/OtherClass.java b/javaparser-symbol-solver-testing/src/test/resources/issue1769/foo/OtherClass.java
index 30ee602f38..a9ddb84303 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1769/foo/OtherClass.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1769/foo/OtherClass.java
@@ -1,6 +1,4 @@
 package foo;
-
 public class OtherClass {
-    public static class InnerClass {
-    }
+    public static class InnerClass {}
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/implementations/HairTypeWool.java b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/implementations/HairTypeWool.java
index 383420ae52..25476be9fd 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/implementations/HairTypeWool.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/implementations/HairTypeWool.java
@@ -1,12 +1,11 @@
 package issue1945.implementations;
-
 import issue1945.interfaces.HairType;
 
 public class HairTypeWool implements HairType<WoolRenderer> {
-
-    @Override
-    public WoolRenderer getRenderer() {
-        return WoolRenderer.INSTANCE;
-    }
-
+	
+	@Override
+	public WoolRenderer getRenderer() {
+		return WoolRenderer.INSTANCE;
+	}
+	
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/implementations/Sheep.java b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/implementations/Sheep.java
index 229b2e0793..d764fa9947 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/implementations/Sheep.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/implementations/Sheep.java
@@ -1,14 +1,13 @@
 package issue1945.implementations;
-
 import issue1945.interfaces.HairType;
 import issue1945.interfaces.HairyAnimal;
 
 public class Sheep implements HairyAnimal {
-
-    @Override
-    public HairType<?> getHairType() {
-        //simplified
-        return new HairTypeWool();
-    }
-
+	
+	@Override
+	public HairType<?> getHairType() {
+		//simplified
+		return new HairTypeWool();
+	}
+	
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/implementations/WoolRenderer.java b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/implementations/WoolRenderer.java
index 77ad910529..0f7332bc37 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/implementations/WoolRenderer.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/implementations/WoolRenderer.java
@@ -1,19 +1,18 @@
 package issue1945.implementations;
-
 import issue1945.interfaces.HairTypeRenderer;
 import issue1945.interfaces.HairyAnimal;
 
 public class WoolRenderer extends HairTypeRenderer<HairTypeWool> {
-
-    public final static WoolRenderer INSTANCE = new WoolRenderer();
-
-    private WoolRenderer() {
-        //I'm a singleton
-    }
-
-    @Override
-    public void renderHair(HairTypeWool type, HairyAnimal animal) {
-        //... snip ...
-    }
-
+	
+	public final static WoolRenderer INSTANCE = new WoolRenderer();
+	
+	private WoolRenderer() {
+		//I'm a singleton
+	}
+	
+	@Override
+	public void renderHair(HairTypeWool type, HairyAnimal animal) {
+		//... snip ...
+	}
+	
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/interfaces/HairType.java b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/interfaces/HairType.java
index 2fb5b865f5..b51b267861 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/interfaces/HairType.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/interfaces/HairType.java
@@ -1,7 +1,7 @@
 package issue1945.interfaces;
 
 public interface HairType<R extends HairTypeRenderer<?>> {
-
-    R getRenderer();
-
+	
+	R getRenderer();
+	
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/interfaces/HairTypeRenderer.java b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/interfaces/HairTypeRenderer.java
index 4e745146c7..357969c19a 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/interfaces/HairTypeRenderer.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/interfaces/HairTypeRenderer.java
@@ -1,20 +1,20 @@
 package issue1945.interfaces;
 
 public abstract class HairTypeRenderer<T> {
-
-    protected abstract void renderHair(T typeInstance, HairyAnimal animal);
-
-    /**
-     * A proxy method casting the <code>typeInstance</code> parameter to the appropriate type for this renderer.
-     * This is necessary because the type that's retrieved by {@link HairyAnimal#getHairType()} is the generic {@link HairType} super interface.
-     */
-    @SuppressWarnings("unchecked")
-    public final void renderHair(HairType<?> typeInstance, HairyAnimal animal) {
-        try {
-            renderHair((T) typeInstance, animal);
-        } catch (ClassCastException e) {
-            throw new IllegalStateException("Renderer type and instance type don't match", e);
-        }
-    }
-
+	
+	protected abstract void renderHair(T typeInstance, HairyAnimal animal);
+	
+	/**
+	 * A proxy method casting the <code>typeInstance</code> parameter to the appropriate type for this renderer.
+	 * This is necessary because the type that's retrieved by {@link HairyAnimal#getHairType()} is the generic {@link HairType} super interface.
+	 */
+	@SuppressWarnings("unchecked")
+	public final void renderHair(HairType<?> typeInstance, HairyAnimal animal) {
+		try {
+			renderHair((T)typeInstance, animal);
+		} catch (ClassCastException e) {
+			throw new IllegalStateException("Renderer type and instance type don't match", e);
+		}
+	}
+	
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/interfaces/HairyAnimal.java b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/interfaces/HairyAnimal.java
index 0abd7d1cf6..f6e3749df6 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/interfaces/HairyAnimal.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/interfaces/HairyAnimal.java
@@ -1,7 +1,7 @@
 package issue1945.interfaces;
 
 public interface HairyAnimal {
-
-    HairType<?> getHairType();
-
+	
+	HairType<?> getHairType();
+	
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/main/MainIssue1945.java b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/main/MainIssue1945.java
index 4a0387bdd7..b414cbefea 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/main/MainIssue1945.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue1945/issue1945/main/MainIssue1945.java
@@ -6,40 +6,43 @@
 import issue1945.interfaces.HairyAnimal;
 
 public class MainIssue1945 {
-
-    private final HairyAnimal sheep = new Sheep();
-
-    public void chokes() {
-        sheep.getHairType().getRenderer().renderHair(sheep.getHairType(), sheep);
-    }
-
-    public void chokes2() {
-        HairType<?> hairType = sheep.getHairType();
-        hairType.getRenderer().renderHair(hairType, sheep);
-    }
-
-    public void chokes3() {
-        HairType<?> hairType = sheep.getHairType();
-        hairType.getRenderer().renderHair(sheep.getHairType(), sheep);
-    }
-
-
-    public void works() {
-        HairType<?> hairType = sheep.getHairType();
-        HairTypeRenderer<?> hairTypeRenderer = hairType.getRenderer();
-
-        hairTypeRenderer.renderHair(hairType, sheep);
-    }
-
-    public void works2() {
-        HairTypeRenderer<?> hairTypeRenderer = sheep.getHairType().getRenderer();
-        hairTypeRenderer.renderHair(sheep.getHairType(), sheep);
-    }
-
-    public void works3() {
-        HairType<?> hairType = sheep.getHairType();
-        HairTypeRenderer<?> hairTypeRenderer = hairType.getRenderer();
-
-        hairTypeRenderer.renderHair(sheep.getHairType(), sheep);
-    }
+	
+	private final HairyAnimal sheep = new Sheep();
+	
+	public void chokes() {
+		sheep.getHairType().getRenderer().renderHair(sheep.getHairType(), sheep);
+	}
+	
+	public void chokes2() {
+		HairType<?> hairType = sheep.getHairType();
+		hairType.getRenderer().renderHair(hairType, sheep);
+	}
+	
+	public void chokes3() {
+		HairType<?> hairType = sheep.getHairType();
+		hairType.getRenderer().renderHair(sheep.getHairType(), sheep);
+	}
+	
+	
+	
+	
+	
+	public void works() {
+		HairType<?> hairType = sheep.getHairType();
+		HairTypeRenderer<?> hairTypeRenderer = hairType.getRenderer();
+		
+		hairTypeRenderer.renderHair(hairType, sheep);
+	}
+	
+	public void works2() {
+		HairTypeRenderer<?> hairTypeRenderer = sheep.getHairType().getRenderer();
+		hairTypeRenderer.renderHair(sheep.getHairType(), sheep);
+	}
+	
+	public void works3() {
+		HairType<?> hairType = sheep.getHairType();
+		HairTypeRenderer<?> hairTypeRenderer = hairType.getRenderer();
+		
+		hairTypeRenderer.renderHair(sheep.getHairType(), sheep);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue2236/A.java b/javaparser-symbol-solver-testing/src/test/resources/issue2236/A.java
index 84f58387a0..4c0184e5eb 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue2236/A.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue2236/A.java
@@ -1,10 +1,11 @@
-public class A<T> {
+public class A<T> 
+{
     A(boolean b) {
     }
-
+    
     A(Boolean b) {
     }
-
+    
     A(T t) {
-    }
+    } 
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue2362/Test.java b/javaparser-symbol-solver-testing/src/test/resources/issue2362/Test.java
index dfab9d78b7..ed930e5aae 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue2362/Test.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue2362/Test.java
@@ -1,10 +1,11 @@
-public class Test {
-    public class InnerClass {
-        public InnerClass(int i) {
-        }
-    }
-
-    public Test() {
-        new InnerClass(~8);
-    }
+public class Test
+{
+   public class InnerClass
+   {
+       public InnerClass(int i) {}
+   }
+    
+   public Test() {
+     new InnerClass(~8); 
+   }
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue2366/Test.java b/javaparser-symbol-solver-testing/src/test/resources/issue2366/Test.java
index a93b644f92..97319045a5 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue2366/Test.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue2366/Test.java
@@ -1,13 +1,14 @@
-public class Test {
-    public class InnerTest {
-        public InnerTest(int i) {
-        }
-    }
+public class Test
+{
+   public class InnerTest
+   {
+       public InnerTest(int i) {}
+   }
+    
+   public Test() {
+   }
 
-    public Test() {
-    }
-
-    public static void main(String[] args) {
-        new Test().new InnerTest();
-    }
+   public static void main( String[] args ) { 
+       new Test().new InnerTest();
+   }
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue241/TypeWithMemberType.java b/javaparser-symbol-solver-testing/src/test/resources/issue241/TypeWithMemberType.java
index 3657e29431..c6d21a1971 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue241/TypeWithMemberType.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue241/TypeWithMemberType.java
@@ -2,8 +2,8 @@
 
 public class TypeWithMemberType {
 
-    public interface MemberInterface {
-
-    }
+	public interface MemberInterface {
+	
+	}
 
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue2489/ObjectContext.java b/javaparser-symbol-solver-testing/src/test/resources/issue2489/ObjectContext.java
index 7a512f8cc1..4fbce9f39b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue2489/ObjectContext.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue2489/ObjectContext.java
@@ -1,5 +1,5 @@
 public class ObjectContext {
     public void set(String characteristicName, Object value, boolean forced) {
-        //...
+       //...
     }
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue276/foo/A.java b/javaparser-symbol-solver-testing/src/test/resources/issue276/foo/A.java
index 9be238ad61..c302ef3d21 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue276/foo/A.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue276/foo/A.java
@@ -2,10 +2,10 @@
 
 interface A {
 
-    enum FindMeIfYouCan {
-        CONSTANT
-    }
-
-    void overrideMe(FindMeIfYouCan v);
+	enum FindMeIfYouCan {
+		CONSTANT
+	}
+	
+	void overrideMe(FindMeIfYouCan v);
 }
 	
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue276/foo/C.java b/javaparser-symbol-solver-testing/src/test/resources/issue276/foo/C.java
index 158f004555..bc4f5e6002 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue276/foo/C.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue276/foo/C.java
@@ -1,11 +1,11 @@
 package foo;
 
 public class C {
-    public static A getFoo() {
-        return new B() {
-            @Override
-            public void overrideMe(FindMeIfYouCan v) {
-            }
-        };
-    }
+	public static A getFoo() {
+		return new B() {
+			@Override
+			public void overrideMe(FindMeIfYouCan v) {
+			}
+		};
+	}
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue2878/U9.java b/javaparser-symbol-solver-testing/src/test/resources/issue2878/U9.java
index 6aec18c8aa..ab3bfd1d66 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue2878/U9.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue2878/U9.java
@@ -1,12 +1,7 @@
 import java.util.Optional;
 
 public class U9 {
-    public U9(Optional<String> parent1, Optional<U9> parent2, int i) {
-    }
-
-    public U9(Optional<String> parent1, Optional<String> parent2, String p) {
-    }
-
-    public U9(Optional<U9> parent1, Optional<U9> parent2, boolean p) {
-    }
+    public U9(Optional < String > parent1, Optional < U9 > parent2, int i) {}
+    public U9(Optional < String > parent1, Optional < String > parent2, String p) {}
+    public U9(Optional < U9 > parent1, Optional < U9 > parent2, boolean p) {}
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue2951/foo/A.class b/javaparser-symbol-solver-testing/src/test/resources/issue2951/foo/A.class
new file mode 100644
index 0000000000..b25290eec9
Binary files /dev/null and b/javaparser-symbol-solver-testing/src/test/resources/issue2951/foo/A.class differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue2951/foo/A.java b/javaparser-symbol-solver-testing/src/test/resources/issue2951/foo/A.java
index 7b2c1222db..4d11b21bbf 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue2951/foo/A.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue2951/foo/A.java
@@ -1,8 +1,5 @@
 package foo;
-
 import java.util.List;
-
 class A {
-    public void get(List<byte[]> b) {
-    }
+    public void get(List<byte[]> b) {}
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/A.class b/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/A.class
new file mode 100644
index 0000000000..f9660720b5
Binary files /dev/null and b/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/A.class differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/A.java b/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/A.java
index c8dbcec6bd..68946ed1e1 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/A.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/A.java
@@ -1,12 +1,10 @@
 package foo;
-
 import foo.IB;
 
 public enum A implements IB {
     X(0);
 
     private Integer code;
-
     A(Integer code) {
         this.code = code;
     }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/IB.class b/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/IB.class
new file mode 100644
index 0000000000..1f406777fc
Binary files /dev/null and b/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/IB.class differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/IB.java b/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/IB.java
index e2f5257e3a..eb7b3056af 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/IB.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue2953/foo/IB.java
@@ -1,5 +1,4 @@
 package foo;
-
 public interface IB {
     Integer getCode();
 
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue3099/com/example/Alpha.java b/javaparser-symbol-solver-testing/src/test/resources/issue3099/com/example/Alpha.java
index b02efeccdb..83d2b7c917 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue3099/com/example/Alpha.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue3099/com/example/Alpha.java
@@ -22,6 +22,5 @@
 package com.example;
 
 interface Alpha {
-    interface CustomInterface {
-    }
+  interface CustomInterface {}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/issue3099/com/example/Beta.java b/javaparser-symbol-solver-testing/src/test/resources/issue3099/com/example/Beta.java
index e9d4dc370c..393165f983 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/issue3099/com/example/Beta.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/issue3099/com/example/Beta.java
@@ -22,10 +22,9 @@
 package com.example;
 
 class Beta implements Alpha.CustomInterface {
+  
+  public interface CustomInterface<T> {}
 
-    public interface CustomInterface<T> {
-    }
-
-    private final CustomInterface<Object> instanceOfBetaInnerClass;
+  private final CustomInterface<Object> instanceOfBetaInnerClass;
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javassist_generics/javaparser/GenericClass.java b/javaparser-symbol-solver-testing/src/test/resources/javassist_generics/javaparser/GenericClass.java
index d7beb7f857..474c4bfb3b 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javassist_generics/javaparser/GenericClass.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/javassist_generics/javaparser/GenericClass.java
@@ -5,11 +5,9 @@
 
 public class GenericClass<S> {
 
-    public GenericClass(S s) {
-    }
+    public GenericClass(S s) {}
 
-    public GenericClass(Foo foo) {
-    }
+    public GenericClass(Foo foo) {}
 
     public S get() {
         return null;
@@ -19,7 +17,7 @@ public <T> List<List<T>> genericMethodWithNestedReturnType() {
         return null;
     }
 
-    public <T, V> Map<T, V> genericMethodWithDoubleTypedReturnType() {
+    public <T,V> Map<T,V> genericMethodWithDoubleTypedReturnType() {
         return null;
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/resources/javassist_symbols/README.md b/javaparser-symbol-solver-testing/src/test/resources/javassist_symbols/README.md
index 140daffeea..389f94c200 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/javassist_symbols/README.md
+++ b/javaparser-symbol-solver-testing/src/test/resources/javassist_symbols/README.md
@@ -1,12 +1,8 @@
-For the tests regarding resolving symbols in Jar files, we need some jar files. Some other tests within JavaSymbolSolver
-use established external jars for that purpose. Given the very specific cases we need here, that would severly
-complicate writing and maintaining tests. Therefore, I've decided to write custom jars for the cases we need.
+For the tests regarding resolving symbols in Jar files, we need some jar files. Some other tests within JavaSymbolSolver use established external jars for that purpose. Given the very specific cases we need here, that would severly complicate writing and maintaining tests. Therefore, I've decided to write custom jars for the cases we need.
 
-`main_jar` contains most of the necessary classes, `included_jar` and `excluded_jar` both contain an interface and a
-superclass. Included_jar is included in the combined type solver, while excluded_jar is not.
+`main_jar` contains most of the necessary classes, `included_jar` and `excluded_jar` both contain an interface and a superclass. Included_jar is included in the combined type solver, while excluded_jar is not.
 
 Running the buildTestJarMainJar gradle task should rebuild all necessary files.
-When you need to rebuild the jar, it is important to make sure you actually update the jar in git. Jar-files are in the
-git-ignore, so you'll have to force-add them using `git -f main_jar.jar`.
+When you need to rebuild the jar, it is important to make sure you actually update the jar in git. Jar-files are in the git-ignore, so you'll have to force-add them using `git -f main_jar.jar`.
 
 (`result` was chosen as a name instead of `target` or `out`, because those seem to be ignored.)
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/modules/com-github-javaparser-testmodule.jar b/javaparser-symbol-solver-testing/src/test/resources/modules/com-github-javaparser-testmodule.jar
index 21593b55f8..b138eeaab4 100644
Binary files a/javaparser-symbol-solver-testing/src/test/resources/modules/com-github-javaparser-testmodule.jar and b/javaparser-symbol-solver-testing/src/test/resources/modules/com-github-javaparser-testmodule.jar differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/modules/src/main/java/com.github.javaparser.testmodule/com/github/javaparser/testpackage2/AnotherClass.java b/javaparser-symbol-solver-testing/src/test/resources/modules/src/main/java/com.github.javaparser.testmodule/com/github/javaparser/testpackage2/AnotherClass.java
new file mode 100644
index 0000000000..d2f21b3119
--- /dev/null
+++ b/javaparser-symbol-solver-testing/src/test/resources/modules/src/main/java/com.github.javaparser.testmodule/com/github/javaparser/testpackage2/AnotherClass.java
@@ -0,0 +1,5 @@
+package com.github.javaparser.testpackage2;
+
+public class AnotherClass {
+  public static void anotherMethod() {}
+}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/modules/src/main/java/com.github.javaparser.testmodule/com/github/javaparser/testpackage3/ThirdClass.java b/javaparser-symbol-solver-testing/src/test/resources/modules/src/main/java/com.github.javaparser.testmodule/com/github/javaparser/testpackage3/ThirdClass.java
new file mode 100644
index 0000000000..a394f1d606
--- /dev/null
+++ b/javaparser-symbol-solver-testing/src/test/resources/modules/src/main/java/com.github.javaparser.testmodule/com/github/javaparser/testpackage3/ThirdClass.java
@@ -0,0 +1,5 @@
+package com.github.javaparser.testpackage3;
+
+public class ThirdClass {
+  public static void thirdMethod() {}
+}
diff --git a/javaparser-symbol-solver-testing/src/test/resources/modules/src/main/java/com.github.javaparser.testmodule/module-info.java b/javaparser-symbol-solver-testing/src/test/resources/modules/src/main/java/com.github.javaparser.testmodule/module-info.java
index b2da518ba6..d56fd8e8e1 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/modules/src/main/java/com.github.javaparser.testmodule/module-info.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/modules/src/main/java/com.github.javaparser.testmodule/module-info.java
@@ -1,3 +1,6 @@
 module com.github.javaparser.testmodule {
   exports com.github.javaparser.testpackage;
+  exports com.github.javaparser.testpackage2 to java.base, java.logging;
+  exports com.github.javaparser.testpackage3;
+  opens com.github.javaparser.testpackage;
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/pullRequest2398/A.class b/javaparser-symbol-solver-testing/src/test/resources/pullRequest2398/A.class
new file mode 100644
index 0000000000..1fad334920
Binary files /dev/null and b/javaparser-symbol-solver-testing/src/test/resources/pullRequest2398/A.class differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/pullRequest2398/A.java b/javaparser-symbol-solver-testing/src/test/resources/pullRequest2398/A.java
index a651f7aebe..8084158c43 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/pullRequest2398/A.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/pullRequest2398/A.java
@@ -3,7 +3,7 @@
  * @date 2019-10-25
  */
 public class A {
-    public B b() {
+    public B b(){
         return null;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/resources/pullRequest2398/B.class b/javaparser-symbol-solver-testing/src/test/resources/pullRequest2398/B.class
new file mode 100644
index 0000000000..ed4a82c4a2
Binary files /dev/null and b/javaparser-symbol-solver-testing/src/test/resources/pullRequest2398/B.class differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/Box.class b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/Box.class
new file mode 100644
index 0000000000..f6aa9b6f7b
Binary files /dev/null and b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/Box.class differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/BoxWithAllConstructors.class b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/BoxWithAllConstructors.class
new file mode 100644
index 0000000000..0968cc02cc
Binary files /dev/null and b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/BoxWithAllConstructors.class differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/BoxWithNonCanonicalConstructor.class b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/BoxWithNonCanonicalConstructor.class
new file mode 100644
index 0000000000..93f8da7aaf
Binary files /dev/null and b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/BoxWithNonCanonicalConstructor.class differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/Foo.class b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/Foo.class
new file mode 100644
index 0000000000..7193886284
Binary files /dev/null and b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/Foo.class differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/GenericBox.class b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/GenericBox.class
new file mode 100644
index 0000000000..f55eae8833
Binary files /dev/null and b/javaparser-symbol-solver-testing/src/test/resources/record_declarations/box/GenericBox.class differ
diff --git a/javaparser-symbol-solver-testing/src/test/resources/recursion-issue/Base.java b/javaparser-symbol-solver-testing/src/test/resources/recursion-issue/Base.java
index 551c880a83..1deebf2059 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/recursion-issue/Base.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/recursion-issue/Base.java
@@ -1,3 +1,5 @@
-public interface Base<T, S extends Base<T, S>> {
+
+
+public interface Base<T, S extends Base<T, S>>{
 
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/resources/recursion-issue/Extends.java b/javaparser-symbol-solver-testing/src/test/resources/recursion-issue/Extends.java
index d2f2a31d22..5f69935b4c 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/recursion-issue/Extends.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/recursion-issue/Extends.java
@@ -1,3 +1,5 @@
+import java.util.stream.BaseStream;
+
 public interface Extends extends Base<Integer, Extends> {
 
     public static void foo() {
diff --git a/javaparser-symbol-solver-testing/src/test/resources/recursion-issue/Usage.java b/javaparser-symbol-solver-testing/src/test/resources/recursion-issue/Usage.java
index d290277d88..fb8fb2e531 100644
--- a/javaparser-symbol-solver-testing/src/test/resources/recursion-issue/Usage.java
+++ b/javaparser-symbol-solver-testing/src/test/resources/recursion-issue/Usage.java
@@ -1,6 +1,6 @@
-class Usage {
+class Usage{
 
-    void bar() {
+    void bar(){
         Extends.foo();
     }
 }
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/CommentsInserter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/CommentsInserter.java
index cf5fcaab3b..eee450d20d 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/CommentsInserter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/CommentsInserter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -33,7 +33,7 @@
 
 /**
  * Assigns comments to nodes of the AST.
- *
+ * 
  * @author Sebastian Kuerten
  * @author Júlio Vilmar Gesser
  */
@@ -43,7 +43,7 @@ class CommentsInserter {
     CommentsInserter(ParserConfiguration configuration) {
         this.configuration = configuration;
     }
-
+    
     /**
      * Comments are attributed to the thing they comment and are removed from
      * the comments.
@@ -79,9 +79,9 @@ private void insertComments(CompilationUnit cu, TreeSet<Comment> comments) {
     void insertComments(Node node, TreeSet<Comment> commentsToAttribute) {
         if (commentsToAttribute.isEmpty())
             return;
-
-        if (node instanceof CompilationUnit) {
-            insertComments((CompilationUnit) node, commentsToAttribute);
+        
+        if(node instanceof CompilationUnit){
+            insertComments((CompilationUnit)node, commentsToAttribute);
         }
 
         // the comments can:
@@ -114,9 +114,9 @@ void insertComments(Node node, TreeSet<Comment> commentsToAttribute) {
             if (comment.isLineComment()) {
                 for (Node child : children) {
                     if (child.getEnd().line == comment.getBegin().line
-                            && attributeLineCommentToNodeOrChild(child,
-                            comment.asLineComment())) {
-                        attributedComments.add(comment);
+                        && attributeLineCommentToNodeOrChild(child,
+                                comment.asLineComment())) {
+                            attributedComments.add(comment);
                     }
                 }
             }
@@ -165,7 +165,7 @@ private boolean attributeLineCommentToNodeOrChild(Node node, LineComment lineCom
         // let's give to it the comment
         if (node.getBegin().line == lineComment.getBegin().line
                 && !node.hasComment()) {
-            if (!(node instanceof Comment)) {
+            if(!(node instanceof Comment)) {
                 node.setComment(lineComment);
             }
             return true;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/JavaParser.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/JavaParser.java
index 64060c04a6..7fdc77f21f 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/JavaParser.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/JavaParser.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -46,147 +46,147 @@
  * @author Júlio Vilmar Gesser
  */
 public final class JavaParser {
-    private final CommentsInserter commentsInserter;
+	private final CommentsInserter commentsInserter;
 
-    private ASTParser astParser = null;
+	private ASTParser astParser = null;
 
-    /**
-     * Instantiate the parser with default configuration. Note that parsing can also be done with the static methods on this class.
-     * Creating an instance will reduce setup time between parsing files.
-     */
-    public JavaParser() {
-        this(new ParserConfiguration());
-    }
+	/**
+	 * Instantiate the parser with default configuration. Note that parsing can also be done with the static methods on this class.
+	 * Creating an instance will reduce setup time between parsing files.
+	 */
+	public JavaParser() {
+		this(new ParserConfiguration());
+	}
 
-    /**
-     * Instantiate the parser. Note that parsing can also be done with the static methods on this class.
-     * Creating an instance will reduce setup time between parsing files.
-     */
-    public JavaParser(ParserConfiguration configuration) {
-        commentsInserter = new CommentsInserter(configuration);
-    }
+	/**
+	 * Instantiate the parser. Note that parsing can also be done with the static methods on this class.
+	 * Creating an instance will reduce setup time between parsing files.
+	 */
+	public JavaParser(ParserConfiguration configuration) {
+		commentsInserter = new CommentsInserter(configuration);
+	}
 
-    private ASTParser getParserForProvider(Provider provider) {
-        if (astParser == null) {
-            astParser = new ASTParser(provider);
-        } else {
-            astParser.ReInit(provider);
-        }
-        return astParser;
-    }
+	private ASTParser getParserForProvider(Provider provider) {
+		if (astParser == null) {
+			astParser = new ASTParser(provider);
+		} else {
+			astParser.ReInit(provider);
+		}
+		return astParser;
+	}
 
-    /**
-     * Parses source code.
-     * It takes the source code from a Provider.
-     * The start indicates what can be found in the source code (compilation unit, block, import...)
-     *
+	/**
+	 * Parses source code.
+	 * It takes the source code from a Provider.
+	 * The start indicates what can be found in the source code (compilation unit, block, import...)
+	 *
      * @param start    refer to the constants in ParseStart to see what can be parsed.
      * @param provider refer to Providers to see how you can read source.
      * @param <N>      the subclass of Node that is the result of parsing in the start.
      * @return the parse result, a collection of encountered problems, and some extra data.
      */
-    public <N extends Node> ParseResult<N> parse(ParseStart<N> start, Provider provider) {
-        try {
+	public <N extends Node> ParseResult<N> parse(ParseStart<N> start, Provider provider) {
+		try {
             final ASTParser parser = getParserForProvider(provider);
-            N resultNode = start.parse(parser);
+			N resultNode = start.parse(parser);
             final CommentsCollection comments = astParser.getCommentsCollection();
             commentsInserter.insertComments(resultNode, comments.copy().getComments());
-
-            return new ParseResult<>(Optional.of(resultNode), parser.problems, Optional.of(astParser.getTokens()), Optional.of(astParser.getCommentsCollection()));
-        } catch (ParseException e) {
-            return new ParseResult<>(e);
+            
+			return new ParseResult<>(Optional.of(resultNode), parser.problems, Optional.of(astParser.getTokens()), Optional.of(astParser.getCommentsCollection()));
+		} catch (ParseException e) {
+			return new ParseResult<>(e);
         } catch (TokenMgrException e) {
             return new ParseResult<>(e);
-        } finally {
-            try {
-                provider.close();
-            } catch (IOException e) {
-                // Since we're done parsing and have our result, we don't care about any errors.
-            }
-        }
-    }
+		} finally {
+			try {
+				provider.close();
+			} catch (IOException e) {
+				// Since we're done parsing and have our result, we don't care about any errors.
+			}
+		}
+	}
 
-    /**
-     * Parses the Java code contained in the {@link InputStream} and returns a
-     * {@link CompilationUnit} that represents it.
-     *
-     * @param in       {@link InputStream} containing Java source code
-     * @param encoding encoding of the source code
-     * @return CompilationUnit representing the Java source code
-     * @throws ParseProblemException if the source code has parser errors
-     */
-    public static CompilationUnit parse(final InputStream in, Charset encoding) {
-        return simplifiedParse(COMPILATION_UNIT, provider(in, encoding));
-    }
+	/**
+	 * Parses the Java code contained in the {@link InputStream} and returns a
+	 * {@link CompilationUnit} that represents it.
+	 *
+	 * @param in       {@link InputStream} containing Java source code
+	 * @param encoding encoding of the source code
+	 * @return CompilationUnit representing the Java source code
+	 * @throws ParseProblemException if the source code has parser errors
+	 */
+	public static CompilationUnit parse(final InputStream in, Charset encoding) {
+		return simplifiedParse(COMPILATION_UNIT, provider(in, encoding));
+	}
 
-    /**
-     * Parses the Java code contained in the {@link InputStream} and returns a
-     * {@link CompilationUnit} that represents it.<br>
-     * Note: Uses UTF-8 encoding
-     *
-     * @param in {@link InputStream} containing Java source code
-     * @return CompilationUnit representing the Java source code
-     * @throws ParseProblemException if the source code has parser errors
-     */
-    public static CompilationUnit parse(final InputStream in) {
-        return parse(in, UTF8);
-    }
+	/**
+	 * Parses the Java code contained in the {@link InputStream} and returns a
+	 * {@link CompilationUnit} that represents it.<br>
+	 * Note: Uses UTF-8 encoding
+	 *
+	 * @param in {@link InputStream} containing Java source code
+	 * @return CompilationUnit representing the Java source code
+	 * @throws ParseProblemException if the source code has parser errors
+	 */
+	public static CompilationUnit parse(final InputStream in) {
+		return parse(in, UTF8);
+	}
 
-    /**
-     * Parses the Java code contained in a {@link File} and returns a
-     * {@link CompilationUnit} that represents it.
-     *
-     * @param file     {@link File} containing Java source code
-     * @param encoding encoding of the source code
-     * @return CompilationUnit representing the Java source code
-     * @throws ParseProblemException if the source code has parser errors
+	/**
+	 * Parses the Java code contained in a {@link File} and returns a
+	 * {@link CompilationUnit} that represents it.
+	 *
+	 * @param file     {@link File} containing Java source code
+	 * @param encoding encoding of the source code
+	 * @return CompilationUnit representing the Java source code
+	 * @throws ParseProblemException if the source code has parser errors
      * @throws FileNotFoundException the file was not found
-     */
-    public static CompilationUnit parse(final File file, final Charset encoding) throws FileNotFoundException {
-        return simplifiedParse(COMPILATION_UNIT, provider(file, encoding));
-    }
+	 */
+	public static CompilationUnit parse(final File file, final Charset encoding) throws FileNotFoundException {
+		return simplifiedParse(COMPILATION_UNIT, provider(file, encoding));
+	}
 
-    /**
-     * Parses the Java code contained in a {@link File} and returns a
-     * {@link CompilationUnit} that represents it.<br>
-     * Note: Uses UTF-8 encoding
-     *
-     * @param file {@link File} containing Java source code
-     * @return CompilationUnit representing the Java source code
-     * @throws ParseProblemException if the source code has parser errors
-     * @throws FileNotFoundException the file was not found
-     */
-    public static CompilationUnit parse(final File file) throws FileNotFoundException {
-        return simplifiedParse(COMPILATION_UNIT, provider(file));
-    }
+	/**
+	 * Parses the Java code contained in a {@link File} and returns a
+	 * {@link CompilationUnit} that represents it.<br>
+	 * Note: Uses UTF-8 encoding
+	 *
+	 * @param file {@link File} containing Java source code
+	 * @return CompilationUnit representing the Java source code
+	 * @throws ParseProblemException if the source code has parser errors
+	 * @throws FileNotFoundException the file was not found
+	 */
+	public static CompilationUnit parse(final File file) throws FileNotFoundException {
+		return simplifiedParse(COMPILATION_UNIT, provider(file));
+	}
 
-    /**
-     * Parses the Java code contained in a file and returns a
-     * {@link CompilationUnit} that represents it.
-     *
-     * @param path     path to a file containing Java source code
-     * @param encoding encoding of the source code
-     * @return CompilationUnit representing the Java source code
-     * @throws IOException           the path could not be accessed
-     * @throws ParseProblemException if the source code has parser errors
-     */
-    public static CompilationUnit parse(final Path path, final Charset encoding) throws IOException {
-        return simplifiedParse(COMPILATION_UNIT, provider(path, encoding));
-    }
+	/**
+	 * Parses the Java code contained in a file and returns a
+	 * {@link CompilationUnit} that represents it.
+	 *
+	 * @param path     path to a file containing Java source code
+	 * @param encoding encoding of the source code
+	 * @return CompilationUnit representing the Java source code
+	 * @throws IOException the path could not be accessed
+	 * @throws ParseProblemException if the source code has parser errors
+	 */
+	public static CompilationUnit parse(final Path path, final Charset encoding) throws IOException {
+		return simplifiedParse(COMPILATION_UNIT, provider(path, encoding));
+	}
 
-    /**
-     * Parses the Java code contained in a file and returns a
-     * {@link CompilationUnit} that represents it.<br>
-     * Note: Uses UTF-8 encoding
-     *
-     * @param path path to a file containing Java source code
-     * @return CompilationUnit representing the Java source code
-     * @throws ParseProblemException if the source code has parser errors
-     * @throws IOException           the path could not be accessed
-     */
-    public static CompilationUnit parse(final Path path) throws IOException {
-        return simplifiedParse(COMPILATION_UNIT, provider(path));
-    }
+	/**
+	 * Parses the Java code contained in a file and returns a
+	 * {@link CompilationUnit} that represents it.<br>
+	 * Note: Uses UTF-8 encoding
+	 *
+	 * @param path     path to a file containing Java source code
+	 * @return CompilationUnit representing the Java source code
+	 * @throws ParseProblemException if the source code has parser errors
+	 * @throws IOException the path could not be accessed
+	 */
+	public static CompilationUnit parse(final Path path) throws IOException {
+		return simplifiedParse(COMPILATION_UNIT, provider(path));
+	}
 
     /**
      * Parses Java code from a Reader and returns a
@@ -196,123 +196,123 @@ public static CompilationUnit parse(final Path path) throws IOException {
      * @return CompilationUnit representing the Java source code
      * @throws ParseProblemException if the source code has parser errors
      */
-    public static CompilationUnit parse(final Reader reader) {
-        return simplifiedParse(COMPILATION_UNIT, provider(reader));
-    }
+	public static CompilationUnit parse(final Reader reader) {
+		return simplifiedParse(COMPILATION_UNIT, provider(reader));
+	}
 
-    /**
-     * Parses the Java code contained in code and returns a
-     * {@link CompilationUnit} that represents it.
-     *
-     * @param code Java source code
-     * @return CompilationUnit representing the Java source code
-     * @throws ParseProblemException if the source code has parser errors
-     */
-    public static CompilationUnit parse(String code) {
-        return simplifiedParse(COMPILATION_UNIT, provider(code));
-    }
+	/**
+	 * Parses the Java code contained in code and returns a
+	 * {@link CompilationUnit} that represents it.
+	 *
+	 * @param code             Java source code
+	 * @return CompilationUnit representing the Java source code
+	 * @throws ParseProblemException if the source code has parser errors
+	 */
+	public static CompilationUnit parse(String code) {
+		return simplifiedParse(COMPILATION_UNIT, provider(code));
+	}
 
-    /**
-     * Parses the Java block contained in a {@link String} and returns a
-     * {@link BlockStmt} that represents it.
-     *
-     * @param blockStatement {@link String} containing Java block code
-     * @return BlockStmt representing the Java block
-     * @throws ParseProblemException if the source code has parser errors
-     */
-    public static BlockStmt parseBlock(final String blockStatement) {
-        return simplifiedParse(BLOCK, provider(blockStatement));
-    }
+	/**
+	 * Parses the Java block contained in a {@link String} and returns a
+	 * {@link BlockStmt} that represents it.
+	 *
+	 * @param blockStatement {@link String} containing Java block code
+	 * @return BlockStmt representing the Java block
+	 * @throws ParseProblemException if the source code has parser errors
+	 */
+	public static BlockStmt parseBlock(final String blockStatement) {
+		return simplifiedParse(BLOCK, provider(blockStatement));
+	}
 
-    /**
-     * Parses the Java statement contained in a {@link String} and returns a
-     * {@link Statement} that represents it.
-     *
-     * @param statement {@link String} containing Java statement code
-     * @return Statement representing the Java statement
-     * @throws ParseProblemException if the source code has parser errors
-     */
-    public static Statement parseStatement(final String statement) {
-        return simplifiedParse(STATEMENT, provider(statement));
-    }
+	/**
+	 * Parses the Java statement contained in a {@link String} and returns a
+	 * {@link Statement} that represents it.
+	 *
+	 * @param statement {@link String} containing Java statement code
+	 * @return Statement representing the Java statement
+	 * @throws ParseProblemException if the source code has parser errors
+	 */
+	public static Statement parseStatement(final String statement) {
+		return simplifiedParse(STATEMENT, provider(statement));
+	}
 
-    private static <T extends Node> T simplifiedParse(ParseStart<T> context, Provider provider) {
-        ParseResult<T> result = new JavaParser(new ParserConfiguration()).parse(context, provider);
-        if (result.isSuccessful()) {
-            return result.getResult().get();
-        }
-        throw new ParseProblemException(result.getProblems());
-    }
+	private static <T extends Node> T simplifiedParse(ParseStart<T> context, Provider provider) {
+		ParseResult<T> result = new JavaParser(new ParserConfiguration()).parse(context, provider);
+		if (result.isSuccessful()) {
+			return result.getResult().get();
+		}
+		throw new ParseProblemException(result.getProblems());
+	}
 
-    /**
-     * Parses the Java import contained in a {@link String} and returns a
-     * {@link ImportDeclaration} that represents it.
-     *
-     * @param importDeclaration {@link String} containing Java import code
-     * @return ImportDeclaration representing the Java import declaration
-     * @throws ParseProblemException if the source code has parser errors
-     */
-    public static ImportDeclaration parseImport(final String importDeclaration) {
-        return simplifiedParse(IMPORT_DECLARATION, provider(importDeclaration));
-    }
+	/**
+	 * Parses the Java import contained in a {@link String} and returns a
+	 * {@link ImportDeclaration} that represents it.
+	 *
+	 * @param importDeclaration {@link String} containing Java import code
+	 * @return ImportDeclaration representing the Java import declaration
+	 * @throws ParseProblemException if the source code has parser errors
+	 */
+	public static ImportDeclaration parseImport(final String importDeclaration) {
+		return simplifiedParse(IMPORT_DECLARATION, provider(importDeclaration));
+	}
 
-    /**
-     * Parses the Java expression contained in a {@link String} and returns a
-     * {@link Expression} that represents it.
-     *
-     * @param expression {@link String} containing Java expression
-     * @return Expression representing the Java expression
-     * @throws ParseProblemException if the source code has parser errors
-     */
-    public static Expression parseExpression(final String expression) {
-        return simplifiedParse(EXPRESSION, provider(expression));
-    }
+	/**
+	 * Parses the Java expression contained in a {@link String} and returns a
+	 * {@link Expression} that represents it.
+	 *
+	 * @param expression {@link String} containing Java expression
+	 * @return Expression representing the Java expression
+	 * @throws ParseProblemException if the source code has parser errors
+	 */
+	public static Expression parseExpression(final String expression) {
+		return simplifiedParse(EXPRESSION, provider(expression));
+	}
 
-    /**
-     * Parses the Java annotation contained in a {@link String} and returns a
-     * {@link AnnotationExpr} that represents it.
-     *
-     * @param annotation {@link String} containing Java annotation
-     * @return AnnotationExpr representing the Java annotation
-     * @throws ParseProblemException if the source code has parser errors
-     */
-    public static AnnotationExpr parseAnnotation(final String annotation) {
-        return simplifiedParse(ANNOTATION, provider(annotation));
-    }
+	/**
+	 * Parses the Java annotation contained in a {@link String} and returns a
+	 * {@link AnnotationExpr} that represents it.
+	 *
+	 * @param annotation {@link String} containing Java annotation
+	 * @return AnnotationExpr representing the Java annotation
+	 * @throws ParseProblemException if the source code has parser errors
+	 */
+	public static AnnotationExpr parseAnnotation(final String annotation) {
+		return simplifiedParse(ANNOTATION, provider(annotation));
+	}
 
-    /**
-     * Parses the Java annotation body declaration(e.g fields or methods) contained in a
-     * {@link String} and returns a {@link BodyDeclaration} that represents it.
-     *
-     * @param body {@link String} containing Java body declaration
-     * @return BodyDeclaration representing the Java annotation
-     * @throws ParseProblemException if the source code has parser errors
-     */
-    public static BodyDeclaration<?> parseAnnotationBodyDeclaration(final String body) {
-        return simplifiedParse(ANNOTATION_BODY, provider(body));
-    }
+	/**
+	 * Parses the Java annotation body declaration(e.g fields or methods) contained in a
+	 * {@link String} and returns a {@link BodyDeclaration} that represents it.
+	 *
+	 * @param body {@link String} containing Java body declaration
+	 * @return BodyDeclaration representing the Java annotation
+	 * @throws ParseProblemException if the source code has parser errors
+	 */
+	public static BodyDeclaration<?> parseAnnotationBodyDeclaration(final String body) {
+		return simplifiedParse(ANNOTATION_BODY, provider(body));
+	}
 
-    /**
-     * Parses a Java class body declaration(e.g fields or methods) and returns a
-     * {@link BodyDeclaration} that represents it.
-     *
-     * @param body the body of a class
-     * @return BodyDeclaration representing the Java class body
-     * @throws ParseProblemException if the source code has parser errors
-     */
-    public static BodyDeclaration<?> parseClassBodyDeclaration(String body) {
-        return simplifiedParse(CLASS_BODY, provider(body));
-    }
+	/**
+	 * Parses a Java class body declaration(e.g fields or methods) and returns a
+	 * {@link BodyDeclaration} that represents it.
+	 *
+	 * @param body the body of a class
+	 * @return BodyDeclaration representing the Java class body
+	 * @throws ParseProblemException if the source code has parser errors
+	 */
+	public static BodyDeclaration<?> parseClassBodyDeclaration(String body) {
+		return simplifiedParse(CLASS_BODY, provider(body));
+	}
 
-    /**
-     * Parses a Java interface body declaration(e.g fields or methods) and returns a
-     * {@link BodyDeclaration} that represents it.
-     *
-     * @param body the body of an interface
-     * @return BodyDeclaration representing the Java interface body
-     * @throws ParseProblemException if the source code has parser errors
-     */
-    public static BodyDeclaration parseInterfaceBodyDeclaration(String body) {
-        return simplifiedParse(INTERFACE_BODY, provider(body));
-    }
+	/**
+	 * Parses a Java interface body declaration(e.g fields or methods) and returns a
+	 * {@link BodyDeclaration} that represents it.
+	 *
+	 * @param body the body of an interface
+	 * @return BodyDeclaration representing the Java interface body
+	 * @throws ParseProblemException if the source code has parser errors
+	 */
+	public static BodyDeclaration parseInterfaceBodyDeclaration(String body) {
+		return simplifiedParse(INTERFACE_BODY, provider(body));
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/PackageLocalClasses.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/PackageLocalClasses.java
index 78e5522cfa..90a33f5ba8 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/PackageLocalClasses.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/PackageLocalClasses.java
@@ -1,7 +1,4 @@
 package com.github.javaparser;
 
-class FooClass {
-}
-
-class BarClass {
-}
\ No newline at end of file
+class FooClass {}
+class BarClass {}
\ No newline at end of file
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseProblemException.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseProblemException.java
index af0fef830c..f6a029886b 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseProblemException.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseProblemException.java
@@ -28,7 +28,7 @@ public class ParseProblemException extends RuntimeException {
 
     private static String createMessage(List<Problem> problems) {
         StringBuilder message = new StringBuilder();
-        for (Problem problem : problems) {
+        for(Problem problem: problems){
             message.append(problem.toString()).append(EOL);
         }
         return message.toString();
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseResult.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseResult.java
index 4777eeca33..88e400525c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseResult.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseResult.java
@@ -21,10 +21,9 @@ public class ParseResult<T> {
 
     /**
      * General constructor.
-     *
-     * @param result   the AST, or empty if it wasn't created.
+     * @param result the AST, or empty if it wasn't created.
      * @param problems a list of encountered parsing problems.
-     * @param tokens   the complete list of tokens that were parsed, or empty if parsing failed completely.
+     * @param tokens the complete list of tokens that were parsed, or empty if parsing failed completely.
      */
     ParseResult(Optional<T> result, List<Problem> problems, Optional<List<Token>> tokens, Optional<CommentsCollection> commentsCollection) {
         this.commentsCollection = assertNotNull(commentsCollection);
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseStart.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseStart.java
index a24402c2e2..f94a662820 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseStart.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ParseStart.java
@@ -14,20 +14,19 @@
  * For example,
  * COMPILATION_UNIT indicates a complete Java file,
  * and CLASS_BODY would indicate the part of a class that is within { and }.
- *
  * @see JavaParser#parse(ParseStart, Provider)
  */
 @FunctionalInterface
 public interface ParseStart<R> {
-    ParseStart<CompilationUnit> COMPILATION_UNIT = ASTParser::CompilationUnit;
-    ParseStart<BlockStmt> BLOCK = ASTParser::Block;
-    ParseStart<Statement> STATEMENT = ASTParser::BlockStatement;
-    ParseStart<ImportDeclaration> IMPORT_DECLARATION = ASTParser::ImportDeclaration;
-    ParseStart<Expression> EXPRESSION = ASTParser::Expression;
-    ParseStart<AnnotationExpr> ANNOTATION = ASTParser::Annotation;
-    ParseStart<BodyDeclaration<?>> ANNOTATION_BODY = ASTParser::AnnotationBodyDeclaration;
-    ParseStart<BodyDeclaration<?>> CLASS_BODY = p -> p.ClassOrInterfaceBodyDeclaration(false);
-    ParseStart<BodyDeclaration<?>> INTERFACE_BODY = p -> p.ClassOrInterfaceBodyDeclaration(true);
+	ParseStart<CompilationUnit> COMPILATION_UNIT = ASTParser::CompilationUnit;
+	ParseStart<BlockStmt> BLOCK = ASTParser::Block;
+	ParseStart<Statement> STATEMENT = ASTParser::BlockStatement;
+	ParseStart<ImportDeclaration> IMPORT_DECLARATION= ASTParser::ImportDeclaration;
+	ParseStart<Expression> EXPRESSION = ASTParser::Expression;
+	ParseStart<AnnotationExpr> ANNOTATION = ASTParser::Annotation;
+	ParseStart<BodyDeclaration<?>> ANNOTATION_BODY = ASTParser::AnnotationBodyDeclaration;
+	ParseStart<BodyDeclaration<?>> CLASS_BODY = p -> p.ClassOrInterfaceBodyDeclaration(false);
+	ParseStart<BodyDeclaration<?>> INTERFACE_BODY = p -> p.ClassOrInterfaceBodyDeclaration(true);
 
-    R parse(ASTParser parser) throws ParseException;
+	R parse(ASTParser parser) throws ParseException;
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Position.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Position.java
index 12ff3ee400..3128244455 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Position.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Position.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -29,114 +29,114 @@
  * A position in a source file. Lines and columns start counting at 1.
  */
 public class Position implements Comparable<Position> {
-    public final int line;
-    public final int column;
-
-    public static final Position ABSOLUTE_START = new Position(Node.ABSOLUTE_BEGIN_LINE, -1);
-    public static final Position ABSOLUTE_END = new Position(Node.ABSOLUTE_END_LINE, -1);
-
-    /**
-     * The first position in the file
-     */
-    public static final Position HOME = new Position(1, 1);
-    public static final Position UNKNOWN = new Position(0, 0);
-
-    public Position(int line, int column) {
-        if (line < Node.ABSOLUTE_END_LINE) {
-            throw new IllegalArgumentException("Can't position at line " + line);
-        }
-        if (column < -1) {
-            throw new IllegalArgumentException("Can't position at column " + column);
-        }
-        this.line = line;
-        this.column = column;
-    }
-
-    /**
-     * Convenient factory method.
-     */
-    public static Position pos(int line, int column) {
-        return new Position(line, column);
-    }
-
-    public Position withColumn(int column) {
-        return new Position(this.line, column);
-    }
-
-    public Position withLine(int line) {
-        return new Position(line, this.column);
-    }
-
-    /**
-     * Check if the position is usable. Does not know what it is pointing at, so it can't check if the position is after the end of the source.
-     */
-    public boolean valid() {
-        return line > 0 && column > 0;
-    }
-
-    public boolean invalid() {
-        return !valid();
-    }
-
-    public Position orIfInvalid(Position anotherPosition) {
-        if (valid()) {
-            return this;
-        }
-        return anotherPosition;
-    }
-
-    public boolean isAfter(Position position) {
-        assertNotNull(position);
-        if (position.line == Node.ABSOLUTE_BEGIN_LINE) return true;
-        if (line > position.line) {
-            return true;
-        } else if (line == position.line) {
-            return column > position.column;
-        }
-        return false;
-
-    }
-
-    public boolean isBefore(Position position) {
-        assertNotNull(position);
-        if (position.line == Node.ABSOLUTE_END_LINE) return true;
-        if (line < position.line) {
-            return true;
-        } else if (line == position.line) {
-            return column < position.column;
-        }
-        return false;
-    }
-
-    @Override
-    public int compareTo(Position o) {
-        assertNotNull(o);
-        if (isBefore(o)) {
-            return -1;
-        }
-        if (isAfter(o)) {
-            return 1;
-        }
-        return 0;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Position position = (Position) o;
-
-        return line == position.line && column == position.column;
-    }
-
-    @Override
-    public int hashCode() {
-        return 31 * line + column;
-    }
-
-    @Override
-    public String toString() {
-        return "(line " + line + ",col " + column + ")";
-    }
+	public final int line;
+	public final int column;
+
+	public static final Position ABSOLUTE_START = new Position(Node.ABSOLUTE_BEGIN_LINE, -1);
+	public static final Position ABSOLUTE_END = new Position(Node.ABSOLUTE_END_LINE, -1);
+
+	/**
+	 * The first position in the file
+	 */
+	public static final Position HOME = new Position(1, 1);
+	public static final Position UNKNOWN = new Position(0, 0);
+
+	public Position(int line, int column) {
+		if (line < Node.ABSOLUTE_END_LINE) {
+			throw new IllegalArgumentException("Can't position at line " + line);
+		}
+		if (column < -1) {
+			throw new IllegalArgumentException("Can't position at column " + column);
+		}
+		this.line = line;
+		this.column = column;
+	}
+
+	/**
+	 * Convenient factory method.
+	 */
+	public static Position pos(int line, int column) {
+		return new Position(line, column);
+	}
+
+	public Position withColumn(int column) {
+		return new Position(this.line, column);
+	}
+
+	public Position withLine(int line) {
+		return new Position(line, this.column);
+	}
+
+	/**
+	 * Check if the position is usable. Does not know what it is pointing at, so it can't check if the position is after the end of the source.
+	 */
+	public boolean valid() {
+		return line > 0 && column > 0;
+	}
+
+	public boolean invalid() {
+		return !valid();
+	}
+
+	public Position orIfInvalid(Position anotherPosition) {
+		if (valid()) {
+			return this;
+		}
+		return anotherPosition;
+	}
+	
+	public boolean isAfter(Position position) {
+		assertNotNull(position);
+		if (position.line == Node.ABSOLUTE_BEGIN_LINE) return true;
+		if (line > position.line) {
+			return true;
+		} else if (line == position.line) {
+			return column > position.column;
+		}
+		return false;
+
+	}
+
+	public boolean isBefore(Position position) {
+		assertNotNull(position);
+		if (position.line == Node.ABSOLUTE_END_LINE) return true;
+		if (line < position.line) {
+			return true;
+		} else if (line == position.line) {
+			return column < position.column;
+		}
+		return false;
+	}
+
+	@Override
+	public int compareTo(Position o) {
+		assertNotNull(o);
+		if (isBefore(o)) {
+			return -1;
+		}
+		if (isAfter(o)) {
+			return 1;
+		}
+		return 0;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		Position position = (Position) o;
+
+		return line == position.line && column == position.column;
+	}
+
+	@Override
+	public int hashCode() {
+		return 31 * line + column;
+	}
+
+	@Override
+	public String toString() {
+		return "(line " + line + ",col " + column + ")";
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Providers.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Providers.java
index 3d8eb4e461..b5e731c094 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Providers.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Providers.java
@@ -13,49 +13,49 @@
  * Providers that have no parameter for encoding but need it will use UTF-8.
  */
 public final class Providers {
-    public static final Charset UTF8 = Charset.forName("utf-8");
-
-    private Providers() {
-    }
-
-    public static Provider provider(Reader reader) {
-        return new StreamProvider(assertNotNull(reader));
-    }
-
-    public static Provider provider(InputStream input, Charset encoding) {
-        assertNotNull(input);
-        assertNotNull(encoding);
-        try {
-            return new StreamProvider(input, encoding.name());
-        } catch (IOException e) {
-            // The only one that is thrown is UnsupportedCharacterEncodingException,
-            // and that's a fundamental problem, so runtime exception.
-            throw new RuntimeException(e);
-        }
-    }
-
-    public static Provider provider(InputStream input) {
-        return provider(input, UTF8);
-    }
-
-    public static Provider provider(File file, Charset encoding) throws FileNotFoundException {
-        return provider(new FileInputStream(assertNotNull(file)), assertNotNull(encoding));
-    }
-
-    public static Provider provider(File file) throws FileNotFoundException {
-        return provider(assertNotNull(file), UTF8);
-    }
-
-    public static Provider provider(Path path, Charset encoding) throws IOException {
-        return provider(Files.newInputStream(assertNotNull(path)), assertNotNull(encoding));
-    }
-
-    public static Provider provider(Path path) throws IOException {
-        return provider(assertNotNull(path), UTF8);
-    }
-
-    public static Provider provider(String source) {
-        return new StringProvider(assertNotNull(source));
-    }
+	public static final Charset UTF8 = Charset.forName("utf-8");
+
+	private Providers() {
+	}
+
+	public static Provider provider(Reader reader) {
+		return new StreamProvider(assertNotNull(reader));
+	}
+
+	public static Provider provider(InputStream input, Charset encoding) {
+		assertNotNull(input);
+		assertNotNull(encoding);
+		try {
+			return new StreamProvider(input, encoding.name());
+		} catch (IOException e) {
+			// The only one that is thrown is UnsupportedCharacterEncodingException,
+			// and that's a fundamental problem, so runtime exception.
+			throw new RuntimeException(e);
+		}
+	}
+
+	public static Provider provider(InputStream input) {
+		return provider(input, UTF8);
+	}
+
+	public static Provider provider(File file, Charset encoding) throws FileNotFoundException {
+		return provider(new FileInputStream(assertNotNull(file)), assertNotNull(encoding));
+	}
+
+	public static Provider provider(File file) throws FileNotFoundException {
+		return provider(assertNotNull(file), UTF8);
+	}
+
+	public static Provider provider(Path path, Charset encoding) throws IOException {
+		return provider(Files.newInputStream(assertNotNull(path)), assertNotNull(encoding));
+	}
+
+	public static Provider provider(Path path) throws IOException {
+		return provider(assertNotNull(path), UTF8);
+	}
+
+	public static Provider provider(String source) {
+		return new StringProvider(assertNotNull(source));
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Range.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Range.java
index d7f54de4e1..68e364aede 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Range.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/Range.java
@@ -84,6 +84,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return begin + "-" + end;
+        return begin+"-"+end;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java
index 09a01edd40..f23f8631d0 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/AccessSpecifier.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast;
 
 /**
@@ -41,7 +41,7 @@ public enum AccessSpecifier {
         this.codeRepresenation = codeRepresentation;
     }
 
-    public String getCodeRepresenation() {
+    public String getCodeRepresenation(){
         return this.codeRepresenation;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayBracketPair.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayBracketPair.java
index 57dcf3303a..cca0b87615 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayBracketPair.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayBracketPair.java
@@ -23,14 +23,12 @@ public ArrayBracketPair(Range range, List<AnnotationExpr> annotations) {
         setAnnotations(annotations);
     }
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+    @Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
         return v.visit(this, arg);
     }
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
+    @Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
     }
 
     public List<AnnotationExpr> getAnnotations() {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayCreationLevel.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayCreationLevel.java
index b132714bba..2edc68c2aa 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayCreationLevel.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ArrayCreationLevel.java
@@ -26,13 +26,11 @@ public ArrayCreationLevel(Range range, Expression dimension, List<AnnotationExpr
         setAnnotations(annotations);
     }
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+    @Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
         return v.visit(this, arg);
     }
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+    @Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
         v.visit(this, arg);
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java
index 62e7715b1c..2f30777def 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/CompilationUnit.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -53,7 +53,7 @@
  * compilation unit.
  * </p>
  * The CompilationUnit is constructed following the syntax:<br>
- *
+ * 
  * <pre>
  * {@code
  * CompilationUnit ::=  ( }{@link PackageDeclaration}{@code )?
@@ -61,7 +61,7 @@
  *                      ( }{@link TypeDeclaration}{@code )*
  * }
  * </pre>
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public final class CompilationUnit extends Node {
@@ -104,9 +104,9 @@ public <A> void accept(VoidVisitor<A> v, A arg) {
      * Including javadocs, line comments and block comments of all types,
      * inner-classes and other members.<br>
      * If there is no comment, <code>null</code> is returned.
-     *
+     * 
      * @return list with all comments of this compilation unit or
-     * <code>null</code>
+     *         <code>null</code>
      * @see JavadocComment
      * @see com.github.javaparser.ast.comments.LineComment
      * @see com.github.javaparser.ast.comments.BlockComment
@@ -118,7 +118,7 @@ public List<Comment> getComments() {
     /**
      * Retrieves the list of imports declared in this compilation unit or
      * <code>null</code> if there is no import.
-     *
+     * 
      * @return the list of imports or <code>null</code> if there is no import
      */
     public List<ImportDeclaration> getImports() {
@@ -130,7 +130,7 @@ public List<ImportDeclaration> getImports() {
      * Retrieves the package declaration of this compilation unit.<br>
      * If this compilation unit has no package declaration (default package),
      * <code>null</code> is returned.
-     *
+     * 
      * @return the package declaration or <code>null</code>
      */
     public PackageDeclaration getPackage() {
@@ -140,7 +140,7 @@ public PackageDeclaration getPackage() {
     /**
      * Return the list of types declared in this compilation unit.<br>
      * If there is no types declared, <code>null</code> is returned.
-     *
+     * 
      * @return the list of types or <code>null</code> null if there is no type
      * @see AnnotationDeclaration
      * @see ClassOrInterfaceDeclaration
@@ -154,8 +154,9 @@ public List<TypeDeclaration<?>> getTypes() {
 
     /**
      * Sets the list of comments of this compilation unit.
-     *
-     * @param comments the list of comments
+     * 
+     * @param comments
+     *            the list of comments
      */
     public CompilationUnit setComments(List<Comment> comments) {
         throw new RuntimeException("Not implemented!");
@@ -164,8 +165,9 @@ public CompilationUnit setComments(List<Comment> comments) {
     /**
      * Sets the list of imports of this compilation unit. The list is initially
      * <code>null</code>.
-     *
-     * @param imports the list of imports
+     * 
+     * @param imports
+     *            the list of imports
      */
     public CompilationUnit setImports(List<ImportDeclaration> imports) {
         this.imports = imports;
@@ -175,9 +177,10 @@ public CompilationUnit setImports(List<ImportDeclaration> imports) {
 
     /**
      * Sets or clear the package declarations of this compilation unit.
-     *
-     * @param pakage the pakage declaration to set or <code>null</code> to default
-     *               package
+     * 
+     * @param pakage
+     *            the pakage declaration to set or <code>null</code> to default
+     *            package
      */
     public CompilationUnit setPackage(PackageDeclaration pakage) {
         this.pakage = pakage;
@@ -187,8 +190,9 @@ public CompilationUnit setPackage(PackageDeclaration pakage) {
 
     /**
      * Sets the list of types declared in this compilation unit.
-     *
-     * @param types the lis of types
+     * 
+     * @param types
+     *            the lis of types
      */
     public CompilationUnit setTypes(List<TypeDeclaration<?>> types) {
         this.types = types;
@@ -198,7 +202,7 @@ public CompilationUnit setTypes(List<TypeDeclaration<?>> types) {
 
     /**
      * sets the package declaration of this compilation unit
-     *
+     * 
      * @param name the name of the package
      * @return this, the {@link CompilationUnit}
      */
@@ -210,7 +214,7 @@ public CompilationUnit setPackageName(String name) {
     /**
      * Add an import to the list of {@link ImportDeclaration} of this compilation unit<br>
      * shorthand for {@link #addImport(String, boolean, boolean)} with name,false,false
-     *
+     * 
      * @param name the import name
      * @return this, the {@link CompilationUnit}
      */
@@ -221,7 +225,7 @@ public CompilationUnit addImport(String name) {
     /**
      * Add an import to the list of {@link ImportDeclaration} of this compilation unit<br>
      * shorthand for {@link #addImport(String)} with clazz.getName()
-     *
+     * 
      * @param clazz the class to import
      * @return this, the {@link CompilationUnit}
      */
@@ -237,9 +241,9 @@ else if (clazz.isArray() && !ClassUtils.isPrimitiveOrWrapper(clazz.getComponentT
     /**
      * Add an import to the list of {@link ImportDeclaration} of this compilation unit<br>
      * <b>This method check if no import with the same name is already in the list</b>
-     *
-     * @param name       the import name
-     * @param isStatic   is it an "import static"
+     * 
+     * @param name the import name
+     * @param isStatic      is it an "import static"
      * @param isAsterisk does the import end with ".*"
      * @return this, the {@link CompilationUnit}
      */
@@ -257,7 +261,7 @@ public CompilationUnit addImport(String name, boolean isStatic, boolean isAsteri
 
     /**
      * Add a public class to the types of this compilation unit
-     *
+     * 
      * @param name the class name
      * @return the newly created class
      */
@@ -267,8 +271,8 @@ public ClassOrInterfaceDeclaration addClass(String name) {
 
     /**
      * Add a class to the types of this compilation unit
-     *
-     * @param name      the class name
+     * 
+     * @param name the class name
      * @param modifiers the modifiers (like Modifier.PUBLIC)
      * @return the newly created class
      */
@@ -284,7 +288,7 @@ public ClassOrInterfaceDeclaration addClass(String name, Modifier... modifiers)
 
     /**
      * Add a public interface class to the types of this compilation unit
-     *
+     * 
      * @param name the interface name
      * @return the newly created class
      */
@@ -294,8 +298,8 @@ public ClassOrInterfaceDeclaration addInterface(String name) {
 
     /**
      * Add an interface to the types of this compilation unit
-     *
-     * @param name      the interface name
+     * 
+     * @param name the interface name
      * @param modifiers the modifiers (like Modifier.PUBLIC)
      * @return the newly created class
      */
@@ -311,7 +315,7 @@ public ClassOrInterfaceDeclaration addInterface(String name, Modifier... modifie
 
     /**
      * Add a public enum to the types of this compilation unit
-     *
+     * 
      * @param name the enum name
      * @return the newly created class
      */
@@ -321,8 +325,8 @@ public EnumDeclaration addEnum(String name) {
 
     /**
      * Add an enum to the types of this compilation unit
-     *
-     * @param name      the enum name
+     * 
+     * @param name the enum name
      * @param modifiers the modifiers (like Modifier.PUBLIC)
      * @return the newly created class
      */
@@ -336,7 +340,7 @@ public EnumDeclaration addEnum(String name, Modifier... modifiers) {
 
     /**
      * Add a public annotation declaration to the types of this compilation unit
-     *
+     * 
      * @param name the annotation name
      * @return the newly created class
      */
@@ -346,8 +350,8 @@ public AnnotationDeclaration addAnnotationDeclaration(String name) {
 
     /**
      * Add an annotation declaration to the types of this compilation unit
-     *
-     * @param name      the annotation name
+     * 
+     * @param name the annotation name
      * @param modifiers the modifiers (like Modifier.PUBLIC)
      * @return the newly created class
      */
@@ -361,49 +365,49 @@ public AnnotationDeclaration addAnnotationDeclaration(String name, Modifier... m
 
     /**
      * Try to get a class by its name
-     *
+     * 
      * @param className the class name (case-sensitive)
      * @return null if not found, the class otherwise
      */
     public ClassOrInterfaceDeclaration getClassByName(String className) {
         return (ClassOrInterfaceDeclaration) getTypes().stream().filter(type -> type.getName().equals(className)
-                        && type instanceof ClassOrInterfaceDeclaration && !((ClassOrInterfaceDeclaration) type).isInterface())
+                && type instanceof ClassOrInterfaceDeclaration && !((ClassOrInterfaceDeclaration) type).isInterface())
                 .findFirst().orElse(null);
     }
 
     /**
      * Try to get an interface by its name
-     *
+     * 
      * @param interfaceName the interface name (case-sensitive)
      * @return null if not found, the interface otherwise
      */
     public ClassOrInterfaceDeclaration getInterfaceByName(String interfaceName) {
         return (ClassOrInterfaceDeclaration) getTypes().stream().filter(type -> type.getName().equals(interfaceName)
-                        && type instanceof ClassOrInterfaceDeclaration && ((ClassOrInterfaceDeclaration) type).isInterface())
+                && type instanceof ClassOrInterfaceDeclaration && ((ClassOrInterfaceDeclaration) type).isInterface())
                 .findFirst().orElse(null);
     }
 
     /**
      * Try to get an enum by its name
-     *
+     * 
      * @param enumName the enum name (case-sensitive)
      * @return null if not found, the enum otherwise
      */
     public EnumDeclaration getEnumByName(String enumName) {
         return (EnumDeclaration) getTypes().stream().filter(type -> type.getName().equals(enumName)
-                        && type instanceof EnumDeclaration)
+                && type instanceof EnumDeclaration)
                 .findFirst().orElse(null);
     }
 
     /**
      * Try to get an annotation by its name
-     *
+     * 
      * @param annotationName the annotation name (case-sensitive)
      * @return null if not found, the annotation otherwise
      */
     public AnnotationDeclaration getAnnotationDeclarationByName(String annotationName) {
         return (AnnotationDeclaration) getTypes().stream().filter(type -> type.getName().equals(annotationName)
-                        && type instanceof AnnotationDeclaration)
+                && type instanceof AnnotationDeclaration)
                 .findFirst().orElse(null);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ImportDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ImportDeclaration.java
index 4a6e39d14d..863c8d3648 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ImportDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/ImportDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast;
 
 import com.github.javaparser.Range;
@@ -38,7 +38,6 @@
  * }
  * </pre>
  * An enmpty import declaration is simply a semicolon among the import declarations.
- *
  * @author Julio Vilmar Gesser
  */
 public final class ImportDeclaration extends Node {
@@ -64,14 +63,14 @@ private ImportDeclaration(Range range) {
     /**
      * Create an empty import declaration without specifying its position.
      */
-    public static ImportDeclaration createEmptyDeclaration() {
+    public static ImportDeclaration createEmptyDeclaration(){
         return new ImportDeclaration();
     }
 
     /**
      * Create an empty import declaration specifying its position.
      */
-    public static ImportDeclaration createEmptyDeclaration(Range range) {
+    public static ImportDeclaration createEmptyDeclaration(Range range){
         return new ImportDeclaration(range);
     }
 
@@ -93,7 +92,7 @@ public ImportDeclaration(Range range, NameExpr name, boolean isStatic, boolean i
     /**
      * Is this an empty import declaration or a normal import declaration?
      */
-    public boolean isEmptyImportDeclaration() {
+    public boolean isEmptyImportDeclaration(){
         return this.isEmptyImportDeclaration;
     }
 
@@ -109,7 +108,7 @@ public <A> void accept(VoidVisitor<A> v, A arg) {
 
     /**
      * Retrieves the name of the import.
-     *
+     * 
      * @return the name of the import
      * @throws UnsupportedOperationException when invoked on an empty import declaration
      */
@@ -122,9 +121,9 @@ public NameExpr getName() {
 
     /**
      * Return if the import ends with "*".
-     *
+     * 
      * @return <code>true</code> if the import ends with "*", <code>false</code>
-     * otherwise
+     *         otherwise
      */
     public boolean isAsterisk() {
         return asterisk;
@@ -132,9 +131,9 @@ public boolean isAsterisk() {
 
     /**
      * Return if the import is static.
-     *
+     * 
      * @return <code>true</code> if the import is static, <code>false</code>
-     * otherwise
+     *         otherwise
      */
     public boolean isStatic() {
         return static_;
@@ -142,8 +141,9 @@ public boolean isStatic() {
 
     /**
      * Sets if this import is asterisk.
-     *
-     * @param asterisk <code>true</code> if this import is asterisk
+     * 
+     * @param asterisk
+     *            <code>true</code> if this import is asterisk
      * @throws UnsupportedOperationException when setting true on an empty import declaration
      */
     public ImportDeclaration setAsterisk(boolean asterisk) {
@@ -156,8 +156,9 @@ public ImportDeclaration setAsterisk(boolean asterisk) {
 
     /**
      * Sets the name this import.
-     *
-     * @param name the name to set
+     * 
+     * @param name
+     *            the name to set
      * @throws UnsupportedOperationException when invoked on an empty import declaration
      */
     public ImportDeclaration setName(NameExpr name) {
@@ -171,8 +172,9 @@ public ImportDeclaration setName(NameExpr name) {
 
     /**
      * Sets if this import is static.
-     *
-     * @param static_ <code>true</code> if this import is static
+     * 
+     * @param static_
+     *            <code>true</code> if this import is static
      * @throws UnsupportedOperationException when setting true on an empty import declaration
      */
     public ImportDeclaration setStatic(boolean static_) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Modifier.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Modifier.java
index ce226e6cf5..3f5a50b453 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Modifier.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Modifier.java
@@ -3,17 +3,17 @@
 import java.util.EnumSet;
 
 public enum Modifier {
-    PUBLIC("public"),
+	PUBLIC("public"),
     PROTECTED("protected"),
-    PRIVATE("private"),
+	PRIVATE("private"),
     ABSTRACT("abstract"),
-    STATIC("static"),
-    FINAL("final"),
-    TRANSIENT("transient"),
+	STATIC("static"),
+	FINAL("final"),
+    TRANSIENT("transient"), 
     VOLATILE("volatile"),
-    SYNCHRONIZED("synchronized"),
-    NATIVE("native"),
-    STRICTFP("strictfp");
+	SYNCHRONIZED("synchronized"),
+	NATIVE("native"),
+	STRICTFP("strictfp");
 
     String lib;
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Node.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Node.java
index 8c6bfb7932..f2bae43b1a 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Node.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/Node.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -32,11 +32,11 @@
 
 /**
  * Abstract class for all nodes of the AST.
- * <p>
+ *
  * Each Node can have one associated comment which describe it and
  * a number of "orphan comments" which it contains but are not specifically
  * associated to any element.
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public abstract class Node implements Cloneable {
@@ -66,21 +66,28 @@ public Node(Range range) {
 
     /**
      * Accept method for visitor support.
-     *
-     * @param <R> the type the return value of the visitor
-     * @param <A> the type the argument passed to the visitor
-     * @param v   the visitor implementation
-     * @param arg the argument passed to the visitor
+     * 
+     * @param <R>
+     *            the type the return value of the visitor
+     * @param <A>
+     *            the type the argument passed to the visitor
+     * @param v
+     *            the visitor implementation
+     * @param arg
+     *            the argument passed to the visitor
      * @return the result of the visit
      */
     public abstract <R, A> R accept(GenericVisitor<R, A> v, A arg);
 
     /**
      * Accept method for visitor support.
-     *
-     * @param <A> the type the argument passed for the visitor
-     * @param v   the visitor implementation
-     * @param arg any value relevant for the visitor
+     * 
+     * @param <A>
+     *            the type the argument passed for the visitor
+     * @param v
+     *            the visitor implementation
+     * @param arg
+     *            any value relevant for the visitor
      */
     public abstract <A> void accept(VoidVisitor<A> v, A arg);
 
@@ -158,6 +165,7 @@ public final Node setComment(final Comment comment) {
     }
 
 
+
     /**
      * Use this to store additional information to this node.
      *
@@ -178,7 +186,7 @@ public final Node setBlockComment(String comment) {
 
     /**
      * Return the String representation of this node.
-     *
+     * 
      * @return the String representation of this node
      */
     @Override
@@ -243,13 +251,13 @@ public void addOrphanComment(Comment comment) {
     /**
      * This is a list of Comment which are inside the node and are not associated
      * with any meaningful AST Node.
-     * <p>
+     *
      * For example, comments at the end of methods (immediately before the parenthesis)
      * or at the end of CompilationUnit are orphan comments.
-     * <p>
+     *
      * When more than one comment preceeds a statement, the one immediately preceding it
      * it is associated with the statements, while the others are orphans.
-     *
+     * 
      * @return all comments that cannot be attributed to a concept
      */
     public List<Comment> getOrphanComments() {
@@ -260,7 +268,7 @@ public List<Comment> getOrphanComments() {
      * This is the list of Comment which are contained in the Node either because
      * they are properly associated to one of its children or because they are floating
      * around inside the Node
-     *
+     * 
      * @return all Comments within the node as a list
      */
     public List<Comment> getAllContainedComments() {
@@ -350,8 +358,11 @@ public <N extends Node> List<N> getNodesByType(Class<N> clazz) {
     /**
      * Gets user data for this component using the given key.
      *
-     * @param <M> The type of the user data.
-     * @param key The key for the data
+     * @param <M>
+     *            The type of the user data.
+     *
+     * @param key
+     *            The key for the data
      * @return The user data or null of no user data was found for the given key
      * @see UserDataKey
      */
@@ -366,9 +377,13 @@ public <M> M getUserData(final UserDataKey<M> key) {
      * Sets user data for this component using the given key.
      * For information on creating UserDataKey, see {@link UserDataKey}.
      *
-     * @param <M>    The type of user data
-     * @param key    The singleton key for the user data
-     * @param object The user data object
+     * @param <M>
+     *            The type of user data
+     *
+     * @param key
+     *            The singleton key for the user data
+     * @param object
+     *            The user data object
      * @throws IllegalArgumentException
      * @see UserDataKey
      */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/PackageDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/PackageDeclaration.java
index 2645307ba1..4252ad4e98 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/PackageDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/PackageDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast;
 
 import com.github.javaparser.Range;
@@ -42,7 +42,6 @@
  * PackageDeclaration ::= ( }{@link AnnotationExpr}{@code )* "package" }{@link NameExpr}{@code ) ";"
  * }
  * </pre>
- *
  * @author Julio Vilmar Gesser
  */
 public final class PackageDeclaration extends Node implements NodeWithAnnotations<PackageDeclaration> {
@@ -82,7 +81,7 @@ public <A> void accept(VoidVisitor<A> v, A arg) {
     /**
      * Retrieves the list of annotations declared before the package
      * declaration. Return <code>null</code> if there are no annotations.
-     *
+     * 
      * @return list of annotations or <code>null</code>
      */
     public List<AnnotationExpr> getAnnotations() {
@@ -107,7 +106,8 @@ public String getPackageName() {
     }
 
     /**
-     * @param annotations the annotations to set
+     * @param annotations
+     *            the annotations to set
      */
     public PackageDeclaration setAnnotations(List<AnnotationExpr> annotations) {
         this.annotations = annotations;
@@ -117,8 +117,9 @@ public PackageDeclaration setAnnotations(List<AnnotationExpr> annotations) {
 
     /**
      * Sets the name of this package declaration.
-     *
-     * @param name the name to set
+     * 
+     * @param name
+     *            the name to set
      */
     public PackageDeclaration setName(NameExpr name) {
         this.name = name;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/UserDataKey.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/UserDataKey.java
index 39a15f9ae8..4d7caa2e2f 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/UserDataKey.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/UserDataKey.java
@@ -13,15 +13,18 @@
  * public static final UserDataKey&lt;Role&gt; ROLE = new UserDataKey&lt;Role&gt;() { };
  * </code>
  * </pre>
- * <p>
+ *
  * This code was taken from the <a href="http://wicket.apache.org/">Wicket project</a>.
  *
- * @param <T> The type of the object which is stored
+ * @param <T>
+ *            The type of the object which is stored
+ *
  * @see Node#getUserData(UserDataKey)
  */
 public abstract class UserDataKey<T> {
     @Override
-    public int hashCode() {
+    public int hashCode()
+    {
         return getClass().hashCode();
     }
 
@@ -29,7 +32,8 @@ public int hashCode() {
      * @see java.lang.Object#equals(java.lang.Object)
      */
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(Object obj)
+    {
         return obj != null && getClass().equals(obj.getClass());
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationDeclaration.java
index c6f3a11545..74d84e8221 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import java.util.List;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
index a0797bac7a..66b9dc3a34 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -96,9 +96,9 @@ public Expression getDefaultValue() {
 
     /**
      * Return the modifiers of this member declaration.
-     *
-     * @return modifiers
+     * 
      * @see Modifier
+     * @return modifiers
      */
     @Override
     public EnumSet<Modifier> getModifiers() {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/BodyDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/BodyDeclaration.java
index 29051122af..9055d96a54 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/BodyDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/BodyDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import java.util.List;
@@ -40,12 +40,12 @@ public BodyDeclaration() {
     }
 
     public BodyDeclaration(List<AnnotationExpr> annotations) {
-        setAnnotations(annotations);
+    	setAnnotations(annotations);
     }
 
     public BodyDeclaration(Range range, List<AnnotationExpr> annotations) {
         super(range);
-        setAnnotations(annotations);
+    	setAnnotations(annotations);
     }
 
     @Override
@@ -55,6 +55,7 @@ public final List<AnnotationExpr> getAnnotations() {
     }
 
     /**
+     *
      * @param annotations a null value is currently treated as an empty list. This behavior could change
      *                    in the future, so please avoid passing null
      */
@@ -62,7 +63,7 @@ public final List<AnnotationExpr> getAnnotations() {
     @Override
     public final T setAnnotations(List<AnnotationExpr> annotations) {
         this.annotations = annotations;
-        setAsParentNodeOf(this.annotations);
+		setAsParentNodeOf(this.annotations);
         return (T) this;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
index 7b1a37cb8a..4120d4a718 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -119,8 +119,9 @@ public boolean isInterface() {
     }
 
     /**
+     * 
      * @param extendsList a null value is currently treated as an empty list. This behavior could change
-     *                    in the future, so please avoid passing null
+     *            in the future, so please avoid passing null
      * @return
      */
     @Override
@@ -131,8 +132,9 @@ public ClassOrInterfaceDeclaration setExtends(final List<ClassOrInterfaceType> e
     }
 
     /**
+     * 
      * @param implementsList a null value is currently treated as an empty list. This behavior could change
-     *                       in the future, so please avoid passing null
+     *            in the future, so please avoid passing null
      */
     @Override
     public ClassOrInterfaceDeclaration setImplements(final List<ClassOrInterfaceType> implementsList) {
@@ -147,8 +149,9 @@ public ClassOrInterfaceDeclaration setInterface(final boolean interface_) {
     }
 
     /**
+     *
      * @param typeParameters a null value is currently treated as an empty list. This behavior could change
-     *                       in the future, so please avoid passing null
+     *            in the future, so please avoid passing null
      */
     public ClassOrInterfaceDeclaration setTypeParameters(final List<TypeParameter> typeParameters) {
         this.typeParameters = typeParameters;
@@ -156,5 +159,7 @@ public ClassOrInterfaceDeclaration setTypeParameters(final List<TypeParameter> t
         return this;
     }
 
+   
+
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ConstructorDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ConstructorDeclaration.java
index 52dca655bb..4a9cd2a2a3 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ConstructorDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/ConstructorDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -105,9 +105,9 @@ public <A> void accept(VoidVisitor<A> v, A arg) {
 
     /**
      * Return the modifiers of this member declaration.
-     *
-     * @return modifiers
+     * 
      * @see Modifier
+     * @return modifiers
      */
     @Override
     public EnumSet<Modifier> getModifiers() {
@@ -180,7 +180,7 @@ public ConstructorDeclaration setTypeParameters(List<TypeParameter> typeParamete
 
     /**
      * The declaration returned has this schema:
-     * <p>
+     *
      * [accessSpecifier] className ([paramType [paramName]])
      * [throws exceptionsList]
      */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyMemberDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
index 87bf0330fa..102eb7aa42 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.Range;
@@ -53,7 +53,7 @@ public <A> void accept(VoidVisitor<A> v, A arg) {
 
     @Override
     public JavadocComment getJavaDoc() {
-        if (getComment() instanceof JavadocComment) {
+        if(getComment() instanceof JavadocComment){
             return (JavadocComment) getComment();
         }
         return null;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyTypeDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
index 63b20acbe8..3a774de998 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import java.util.EnumSet;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumConstantDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumConstantDeclaration.java
index c0c697f037..646f6c2876 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumConstantDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumConstantDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import static com.github.javaparser.ast.expr.NameExpr.*;
@@ -102,13 +102,13 @@ public String getName() {
 
     public EnumConstantDeclaration setArgs(List<Expression> args) {
         this.args = args;
-        setAsParentNodeOf(this.args);
+		setAsParentNodeOf(this.args);
         return this;
     }
 
     public EnumConstantDeclaration setClassBody(List<BodyDeclaration<?>> classBody) {
         this.classBody = classBody;
-        setAsParentNodeOf(this.classBody);
+		setAsParentNodeOf(this.classBody);
         return this;
     }
 
@@ -120,7 +120,7 @@ public EnumConstantDeclaration setName(String name) {
 
     @Override
     public JavadocComment getJavaDoc() {
-        if (getComment() instanceof JavadocComment) {
+        if(getComment() instanceof JavadocComment){
             return (JavadocComment) getComment();
         }
         return null;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumDeclaration.java
index c8c5e09d1b..0ad3089b6b 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/EnumDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import static com.github.javaparser.utils.Utils.ensureNotNull;
@@ -91,18 +91,19 @@ public List<ClassOrInterfaceType> getImplements() {
 
     public EnumDeclaration setEntries(List<EnumConstantDeclaration> entries) {
         this.entries = entries;
-        setAsParentNodeOf(this.entries);
+		setAsParentNodeOf(this.entries);
         return this;
     }
 
     @Override
     public EnumDeclaration setImplements(List<ClassOrInterfaceType> implementsList) {
         this.implementsList = implementsList;
-        setAsParentNodeOf(this.implementsList);
+		setAsParentNodeOf(this.implementsList);
         return this;
     }
 
 
+
     public EnumConstantDeclaration addEnumConstant(String name) {
         EnumConstantDeclaration enumConstant = new EnumConstantDeclaration(name);
         getEntries().add(enumConstant);
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/FieldDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/FieldDeclaration.java
index 61ab8e27aa..aa04a52304 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/FieldDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/FieldDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -101,13 +101,16 @@ public FieldDeclaration(Range range, EnumSet<Modifier> modifiers, List<Annotatio
     /**
      * Creates a {@link FieldDeclaration}.
      *
-     * @param modifiers modifiers
-     * @param type      type
-     * @param variable  variable declarator
+     * @param modifiers
+     *            modifiers
+     * @param type
+     *            type
+     * @param variable
+     *            variable declarator
      * @return instance of {@link FieldDeclaration}
      */
     public static FieldDeclaration create(EnumSet<Modifier> modifiers, Type type,
-                                          VariableDeclarator variable) {
+                                                          VariableDeclarator variable) {
         List<VariableDeclarator> variables = new ArrayList<>();
         variables.add(variable);
         return new FieldDeclaration(modifiers, type, variables);
@@ -116,9 +119,12 @@ public static FieldDeclaration create(EnumSet<Modifier> modifiers, Type type,
     /**
      * Creates a {@link FieldDeclaration}.
      *
-     * @param modifiers modifiers
-     * @param type      type
-     * @param name      field name
+     * @param modifiers
+     *            modifiers
+     * @param type
+     *            type
+     * @param name
+     *            field name
      * @return instance of {@link FieldDeclaration}
      */
     public static FieldDeclaration create(EnumSet<Modifier> modifiers, Type type, String name) {
@@ -139,9 +145,9 @@ public <A> void accept(VoidVisitor<A> v, A arg) {
 
     /**
      * Return the modifiers of this member declaration.
-     *
-     * @return modifiers
+     * 
      * @see Modifier
+     * @return modifiers
      */
     @Override
     public EnumSet<Modifier> getModifiers() {
@@ -178,10 +184,10 @@ public JavadocComment getJavaDoc() {
     /**
      * Create a getter for this field, <b>will only work if this field declares only 1 identifier and if this field is
      * already added to a ClassOrInterfaceDeclaration</b>
-     *
+     * 
      * @return the {@link MethodDeclaration} created
      * @throws IllegalStateException if there is more than 1 variable identifier or if this field isn't attached to a
-     *                               class or enum
+     *             class or enum
      */
     public MethodDeclaration createGetter() {
         if (getVariables().size() != 1)
@@ -210,10 +216,10 @@ public MethodDeclaration createGetter() {
     /**
      * Create a setter for this field, <b>will only work if this field declares only 1 identifier and if this field is
      * already added to a ClassOrInterfaceDeclaration</b>
-     *
+     * 
      * @return the {@link MethodDeclaration} created
      * @throws IllegalStateException if there is more than 1 variable identifier or if this field isn't attached to a
-     *                               class or enum
+     *             class or enum
      */
     public MethodDeclaration createSetter() {
         if (getVariables().size() != 1)
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/InitializerDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/InitializerDeclaration.java
index 7146dab426..adb893f03e 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/InitializerDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/InitializerDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.Range;
@@ -73,7 +73,7 @@ public boolean isStatic() {
 
     public InitializerDeclaration setBlock(BlockStmt block) {
         this.block = block;
-        setAsParentNodeOf(this.block);
+		setAsParentNodeOf(this.block);
         return this;
     }
 
@@ -84,7 +84,7 @@ public InitializerDeclaration setStatic(boolean isStatic) {
 
     @Override
     public JavadocComment getJavaDoc() {
-        if (getComment() instanceof JavadocComment) {
+        if(getComment() instanceof JavadocComment){
             return (JavadocComment) getComment();
         }
         return null;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/MethodDeclaration.java
index 25e7c3c500..a89103a3b3 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/MethodDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/MethodDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -53,15 +53,15 @@
 /**
  * @author Julio Vilmar Gesser
  */
-public final class MethodDeclaration extends BodyDeclaration<MethodDeclaration> implements
-        NodeWithJavaDoc<MethodDeclaration>,
-        NodeWithDeclaration,
+public final class MethodDeclaration extends BodyDeclaration<MethodDeclaration> implements 
+        NodeWithJavaDoc<MethodDeclaration>, 
+        NodeWithDeclaration, 
         NodeWithName<MethodDeclaration>,
         NodeWithType<MethodDeclaration>,
         NodeWithElementType<MethodDeclaration>,
-        NodeWithModifiers<MethodDeclaration>,
+        NodeWithModifiers<MethodDeclaration>, 
         NodeWithParameters<MethodDeclaration>,
-        NodeWithThrowable<MethodDeclaration>,
+        NodeWithThrowable<MethodDeclaration>, 
         NodeWithBlockStmt<MethodDeclaration> {
 
     private EnumSet<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
@@ -101,15 +101,15 @@ public MethodDeclaration(final EnumSet<Modifier> modifiers, final Type elementTy
         setParameters(parameters);
     }
 
-    public MethodDeclaration(final EnumSet<Modifier> modifiers,
+    public MethodDeclaration(final EnumSet<Modifier> modifiers, 
                              final List<AnnotationExpr> annotations,
-                             final List<TypeParameter> typeParameters,
+                             final List<TypeParameter> typeParameters, 
                              final Type elementType,
                              final List<ArrayBracketPair> arrayBracketPairsAfterElementType,
                              final String name,
-                             final List<Parameter> parameters,
+                             final List<Parameter> parameters, 
                              final List<ArrayBracketPair> arrayBracketPairsAfterParameterList,
-                             final List<ReferenceType> throws_,
+                             final List<ReferenceType> throws_, 
                              final BlockStmt body) {
         super(annotations);
         setModifiers(modifiers);
@@ -124,15 +124,15 @@ public MethodDeclaration(final EnumSet<Modifier> modifiers,
     }
 
     public MethodDeclaration(Range range,
-                             final EnumSet<Modifier> modifiers,
+                             final EnumSet<Modifier> modifiers, 
                              final List<AnnotationExpr> annotations,
-                             final List<TypeParameter> typeParameters,
+                             final List<TypeParameter> typeParameters, 
                              final Type elementType,
                              final List<ArrayBracketPair> arrayBracketPairsAfterElementType,
                              final NameExpr nameExpr,
-                             final List<Parameter> parameters,
+                             final List<Parameter> parameters, 
                              final List<ArrayBracketPair> arrayBracketPairsAfterParameterList,
-                             final List<ReferenceType> throws_,
+                             final List<ReferenceType> throws_, 
                              final BlockStmt body) {
         super(range, annotations);
         setModifiers(modifiers);
@@ -163,9 +163,9 @@ public BlockStmt getBody() {
 
     /**
      * Return the modifiers of this member declaration.
-     *
-     * @return modifiers
+     * 
      * @see Modifier
+     * @return modifiers
      */
     @Override
     public EnumSet<Modifier> getModifiers() {
@@ -292,11 +292,11 @@ public String getDeclarationAsString(boolean includingModifiers, boolean includi
 
     /**
      * The declaration returned has this schema:
-     * <p>
+     *
      * [accessSpecifier] [static] [abstract] [final] [native]
      * [synchronized] returnType methodName ([paramType [paramName]])
      * [throws exceptionsList]
-     *
+     * 
      * @return method declaration as String
      */
     @Override
@@ -383,7 +383,7 @@ public MethodDeclaration setArrayBracketPairsAfterElementType(List<ArrayBracketP
         return this;
     }
 
-    /**
+	/**
      * @return the array brackets in this position: <code>int abc()[] {...}</code>
      */
     public List<ArrayBracketPair> getArrayBracketPairsAfterParameterList() {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/Parameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/Parameter.java
index 99ba822f53..d66b39a003 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/Parameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/Parameter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.Range;
@@ -34,7 +34,6 @@
 import com.github.javaparser.utils.Pair;
 
 import static com.github.javaparser.ast.type.ArrayType.wrapInArrayTypes;
-
 import java.util.EnumSet;
 import java.util.List;
 
@@ -73,8 +72,10 @@ public Parameter(Type elementType, VariableDeclaratorId id) {
     /**
      * Creates a new {@link Parameter}.
      *
-     * @param elementType type of the parameter
-     * @param name        name of the parameter
+     * @param elementType
+     *            type of the parameter
+     * @param name
+     *            name of the parameter
      * @return instance of {@link Parameter}
      */
     public static Parameter create(Type elementType, String name) {
@@ -87,12 +88,12 @@ public Parameter(EnumSet<Modifier> modifiers, Type elementType, VariableDeclarat
         setElementType(elementType);
     }
 
-    public Parameter(final Range range,
-                     EnumSet<Modifier> modifiers,
-                     List<AnnotationExpr> annotations,
+    public Parameter(final Range range, 
+                     EnumSet<Modifier> modifiers, 
+                     List<AnnotationExpr> annotations, 
                      Type elementType,
                      List<ArrayBracketPair> arrayBracketPairsAfterElementType,
-                     boolean isVarArgs,
+                     boolean isVarArgs, 
                      VariableDeclaratorId id) {
         super(range);
         setModifiers(modifiers);
@@ -137,7 +138,6 @@ public Parameter setVarArgs(boolean isVarArgs) {
         this.isVarArgs = isVarArgs;
         return this;
     }
-
     /**
      * @return the list returned could be immutable (in that case it will be empty)
      */
@@ -169,8 +169,8 @@ public Parameter setName(String name) {
     /**
      * Return the modifiers of this parameter declaration.
      *
-     * @return modifiers
      * @see Modifier
+     * @return modifiers
      */
     @Override
     public EnumSet<Modifier> getModifiers() {
@@ -179,7 +179,7 @@ public EnumSet<Modifier> getModifiers() {
 
     /**
      * @param annotations a null value is currently treated as an empty list. This behavior could change
-     *                    in the future, so please avoid passing null
+     *            in the future, so please avoid passing null
      */
     @Override
     @SuppressWarnings("unchecked")
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/TypeDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/TypeDeclaration.java
index 4b90e56af3..829d37c263 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/TypeDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/TypeDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import static com.github.javaparser.utils.Utils.ensureNotNull;
@@ -44,116 +44,117 @@
 public abstract class TypeDeclaration<T> extends BodyDeclaration<T>
         implements NodeWithName<T>, NodeWithJavaDoc<T>, NodeWithModifiers<T>, NodeWithMembers<T> {
 
-    private NameExpr name;
+	private NameExpr name;
 
     private EnumSet<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
 
     private List<BodyDeclaration<?>> members;
 
-    public TypeDeclaration() {
-    }
+	public TypeDeclaration() {
+	}
 
     public TypeDeclaration(EnumSet<Modifier> modifiers, String name) {
-        setName(name);
-        setModifiers(modifiers);
-    }
+		setName(name);
+		setModifiers(modifiers);
+	}
 
-    public TypeDeclaration(List<AnnotationExpr> annotations,
+	public TypeDeclaration(List<AnnotationExpr> annotations,
                            EnumSet<Modifier> modifiers, String name,
                            List<BodyDeclaration<?>> members) {
-        super(annotations);
-        setName(name);
-        setModifiers(modifiers);
-        setMembers(members);
-    }
+		super(annotations);
+		setName(name);
+		setModifiers(modifiers);
+		setMembers(members);
+	}
 
-    public TypeDeclaration(Range range, List<AnnotationExpr> annotations,
+	public TypeDeclaration(Range range, List<AnnotationExpr> annotations,
                            EnumSet<Modifier> modifiers, String name,
                            List<BodyDeclaration<?>> members) {
-        super(range, annotations);
-        setName(name);
-        setModifiers(modifiers);
-        setMembers(members);
-    }
-
-    /**
-     * Adds the given declaration to the specified type. The list of members
-     * will be initialized if it is <code>null</code>.
-     *
-     * @param decl member declaration
-     */
-    public TypeDeclaration<T> addMember(BodyDeclaration<?> decl) {
-        List<BodyDeclaration<?>> members = getMembers();
-        if (isNullOrEmpty(members)) {
-            members = new ArrayList<>();
-            setMembers(members);
-        }
-        members.add(decl);
-        decl.setParentNode(this);
-        return this;
-    }
+		super(range, annotations);
+		setName(name);
+		setModifiers(modifiers);
+		setMembers(members);
+	}
+
+	/**
+	 * Adds the given declaration to the specified type. The list of members
+	 * will be initialized if it is <code>null</code>.
+	 *
+	 * @param decl
+	 *            member declaration
+	 */
+	public TypeDeclaration<T> addMember(BodyDeclaration<?> decl) {
+		List<BodyDeclaration<?>> members = getMembers();
+		if (isNullOrEmpty(members)) {
+			members = new ArrayList<>();
+			setMembers(members);
+		}
+		members.add(decl);
+		decl.setParentNode(this);
+		return this;
+	}
 
     @Override
     public List<BodyDeclaration<?>> getMembers() {
-        members = ensureNotNull(members);
-        return members;
-    }
+        	members = ensureNotNull(members);
+        	return members;
+	}
 
-    /**
+	/**
      * Return the modifiers of this type declaration.
-     *
-     * @return modifiers
+     * 
      * @see Modifier
+     * @return modifiers
      */
-    @Override
+	@Override
     public final EnumSet<Modifier> getModifiers() {
-        return modifiers;
-    }
+		return modifiers;
+	}
 
-    @Override
-    public final String getName() {
-        return name.getName();
-    }
+	@Override
+	public final String getName() {
+		return name.getName();
+	}
 
     @SuppressWarnings("unchecked")
     @Override
     public T setMembers(List<BodyDeclaration<?>> members) {
-        this.members = members;
-        setAsParentNodeOf(this.members);
+		this.members = members;
+		setAsParentNodeOf(this.members);
         return (T) this;
-    }
+	}
 
     @SuppressWarnings("unchecked")
     @Override
     public T setModifiers(EnumSet<Modifier> modifiers) {
-        this.modifiers = modifiers;
+		this.modifiers = modifiers;
         return (T) this;
-    }
+	}
 
     @Override
     @SuppressWarnings("unchecked")
     public T setName(String name) {
-        setNameExpr(new NameExpr(name));
+		setNameExpr(new NameExpr(name));
         return (T) this;
-    }
+	}
 
     @SuppressWarnings("unchecked")
     public T setNameExpr(NameExpr nameExpr) {
-        this.name = nameExpr;
-        setAsParentNodeOf(this.name);
+		this.name = nameExpr;
+		setAsParentNodeOf(this.name);
         return (T) this;
-    }
-
-    public final NameExpr getNameExpr() {
-        return name;
-    }
-
-    @Override
-    public JavadocComment getJavaDoc() {
-        if (getComment() instanceof JavadocComment) {
-            return (JavadocComment) getComment();
-        }
-        return null;
-    }
+	}
+
+	public final NameExpr getNameExpr() {
+		return name;
+	}
+
+	@Override
+	public JavadocComment getJavaDoc() {
+		if(getComment() instanceof JavadocComment){
+			return (JavadocComment) getComment();
+		}
+		return null;
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclarator.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclarator.java
index 73a40260c7..ff78d6e682 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclarator.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclarator.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -61,11 +61,11 @@ public VariableDeclarator(String variableName) {
 
     /**
      * Defines the declaration of a variable.
-     *
-     * @param id   The identifier for this variable. IE. The variables name.
+     * 
+     * @param id The identifier for this variable. IE. The variables name.
      * @param init What this variable should be initialized to.
-     *             An {@link com.github.javaparser.ast.expr.AssignExpr} is unnecessary as the <code>=</code> operator is
-     *             already added.
+     *            An {@link com.github.javaparser.ast.expr.AssignExpr} is unnecessary as the <code>=</code> operator is
+     *            already added.
      */
     public VariableDeclarator(VariableDeclaratorId id, Expression init) {
         setId(id);
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclaratorId.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclaratorId.java
index 812eca95e7..b6dccc2aab 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclaratorId.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/body/VariableDeclaratorId.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.Range;
@@ -45,7 +45,7 @@ public VariableDeclaratorId() {
     }
 
     public VariableDeclaratorId(String name) {
-        setName(name);
+       setName(name);
     }
 
     public VariableDeclaratorId(Range range, String name, List<ArrayBracketPair> arrayBracketPairsAfterId) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/BlockComment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/BlockComment.java
index e4946b790a..ca162f6d91 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/BlockComment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/BlockComment.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.comments;
 
 import com.github.javaparser.Range;
@@ -31,7 +31,7 @@
  * </p>
  * Block comments can have multi lines and are delimited by "/&#42;" and
  * "&#42;/".
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public final class BlockComment extends Comment {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/Comment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/Comment.java
index 41c27cad7c..9da994ec45 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/Comment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/Comment.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.comments;
 
 import com.github.javaparser.Range;
@@ -26,11 +26,11 @@
 
 /**
  * Abstract class for all AST nodes that represent comments.
- *
- * @author Julio Vilmar Gesser
+ * 
  * @see BlockComment
  * @see LineComment
  * @see JavadocComment
+ * @author Julio Vilmar Gesser
  */
 public abstract class Comment extends Node {
 
@@ -51,7 +51,7 @@ public Comment(Range range, String content) {
 
     /**
      * Return the text of the comment.
-     *
+     * 
      * @return text of the comment
      */
     public final String getContent() {
@@ -60,15 +60,17 @@ public final String getContent() {
 
     /**
      * Sets the text of the comment.
-     *
-     * @param content the text of the comment to set
+     * 
+     * @param content
+     *            the text of the comment to set
      */
     public Comment setContent(String content) {
         this.content = content;
         return this;
     }
 
-    public boolean isLineComment() {
+    public boolean isLineComment()
+    {
         return false;
     }
 
@@ -80,16 +82,18 @@ public LineComment asLineComment() {
         }
     }
 
-    public Node getCommentedNode() {
+    public Node getCommentedNode()
+    {
         return this.commentedNode;
     }
 
-    public Comment setCommentedNode(Node commentedNode) {
-        if (commentedNode == null) {
+    public Comment setCommentedNode(Node commentedNode)
+    {
+        if (commentedNode==null) {
             this.commentedNode = null;
             return this;
         }
-        if (commentedNode == this) {
+        if (commentedNode==this) {
             throw new IllegalArgumentException();
         }
         if (commentedNode instanceof Comment) {
@@ -99,7 +103,8 @@ public Comment setCommentedNode(Node commentedNode) {
         return this;
     }
 
-    public boolean isOrphan() {
+    public boolean isOrphan()
+    {
         return this.commentedNode == null;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/JavadocComment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/JavadocComment.java
index a603869f65..18b77af285 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/JavadocComment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/JavadocComment.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.comments;
 
 import com.github.javaparser.Range;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/LineComment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/LineComment.java
index d205282077..56b8054d39 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/LineComment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/comments/LineComment.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.comments;
 
 import com.github.javaparser.Range;
@@ -30,7 +30,7 @@
  * AST node that represent line comments.
  * </p>
  * Line comments are started with "//" and finish at the end of the line ("\n").
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public final class LineComment extends Comment {
@@ -57,7 +57,8 @@ public <A> void accept(VoidVisitor<A> v, A arg) {
     }
 
     @Override
-    public boolean isLineComment() {
+    public boolean isLineComment()
+    {
         return true;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AnnotationExpr.java
index fef5b3eb67..a1cad1cdb7 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AnnotationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -28,22 +28,21 @@
  */
 public abstract class AnnotationExpr extends Expression {
 
-    protected NameExpr name;
+	protected NameExpr name;
 
-    public AnnotationExpr() {
-    }
+	public AnnotationExpr() {}
 
-    public AnnotationExpr(Range range) {
-        super(range);
-    }
+	public AnnotationExpr(Range range) {
+		super(range);
+	}
 
-    public NameExpr getName() {
-        return name;
-    }
+	public NameExpr getName() {
+		return name;
+	}
 
-    public AnnotationExpr setName(NameExpr name) {
-        this.name = name;
-        setAsParentNodeOf(name);
-        return this;
-    }
+	public AnnotationExpr setName(NameExpr name) {
+		this.name = name;
+		setAsParentNodeOf(name);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayAccessExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayAccessExpr.java
index 1db7f23756..b461ea87bb 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayAccessExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayAccessExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -68,13 +68,13 @@ public Expression getName() {
 
     public ArrayAccessExpr setIndex(Expression index) {
         this.index = index;
-        setAsParentNodeOf(this.index);
+		setAsParentNodeOf(this.index);
         return this;
     }
 
     public ArrayAccessExpr setName(Expression name) {
         this.name = name;
-        setAsParentNodeOf(this.name);
+		setAsParentNodeOf(this.name);
         return this;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayCreationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayCreationExpr.java
index d0dcb19417..79d55a56ca 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayCreationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayCreationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -91,14 +91,14 @@ public Type getType() {
 
     public ArrayCreationExpr setInitializer(ArrayInitializerExpr initializer) {
         this.initializer = initializer;
-        setAsParentNodeOf(this.initializer);
+		setAsParentNodeOf(this.initializer);
         return this;
     }
 
     @Override
     public ArrayCreationExpr setType(Type type) {
         this.type = type;
-        setAsParentNodeOf(this.type);
+		setAsParentNodeOf(this.type);
         return this;
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayInitializerExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
index 4dcb1ac0dd..67c10739bc 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -40,7 +40,7 @@ public ArrayInitializerExpr() {
     }
 
     public ArrayInitializerExpr(List<Expression> values) {
-        setValues(values);
+       setValues(values);
     }
 
     public ArrayInitializerExpr(Range range, List<Expression> values) {
@@ -65,7 +65,7 @@ public List<Expression> getValues() {
 
     public ArrayInitializerExpr setValues(List<Expression> values) {
         this.values = values;
-        setAsParentNodeOf(this.values);
+		setAsParentNodeOf(this.values);
         return this;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AssignExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AssignExpr.java
index b5fdc75267..cf16c6fff2 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AssignExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/AssignExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -96,13 +96,13 @@ public AssignExpr setOperator(Operator op) {
 
     public AssignExpr setTarget(Expression target) {
         this.target = target;
-        setAsParentNodeOf(this.target);
+		setAsParentNodeOf(this.target);
         return this;
     }
 
     public AssignExpr setValue(Expression value) {
         this.value = value;
-        setAsParentNodeOf(this.value);
+		setAsParentNodeOf(this.value);
         return this;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BinaryExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BinaryExpr.java
index 7809d8f004..83675c8c49 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BinaryExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BinaryExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -62,16 +62,16 @@ public BinaryExpr() {
     }
 
     public BinaryExpr(Expression left, Expression right, Operator op) {
-        setLeft(left);
-        setRight(right);
-        setOperator(op);
+    	setLeft(left);
+    	setRight(right);
+    	setOperator(op);
     }
 
     public BinaryExpr(Range range, Expression left, Expression right, Operator op) {
         super(range);
-        setLeft(left);
-        setRight(right);
-        setOperator(op);
+    	setLeft(left);
+    	setRight(right);
+    	setOperator(op);
     }
 
     @Override
@@ -98,7 +98,7 @@ public Expression getRight() {
 
     public BinaryExpr setLeft(Expression left) {
         this.left = left;
-        setAsParentNodeOf(this.left);
+		setAsParentNodeOf(this.left);
         return this;
     }
 
@@ -109,7 +109,7 @@ public BinaryExpr setOperator(Operator op) {
 
     public BinaryExpr setRight(Expression right) {
         this.right = right;
-        setAsParentNodeOf(this.right);
+		setAsParentNodeOf(this.right);
         return this;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BooleanLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
index 359b936a45..a42c8c722a 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -36,7 +36,7 @@ public BooleanLiteralExpr() {
     }
 
     public BooleanLiteralExpr(boolean value) {
-        setValue(value);
+    	setValue(value);
     }
 
     public BooleanLiteralExpr(Range range, boolean value) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CastExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CastExpr.java
index c32b5a5fee..d2a54bc088 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CastExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CastExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -40,14 +40,14 @@ public CastExpr() {
     }
 
     public CastExpr(Type type, Expression expr) {
-        setType(type);
-        setExpr(expr);
+    	setType(type);
+    	setExpr(expr);
     }
 
     public CastExpr(Range range, Type type, Expression expr) {
         super(range);
         setType(type);
-        setExpr(expr);
+    	setExpr(expr);
     }
 
     @Override
@@ -71,14 +71,14 @@ public Type getType() {
 
     public CastExpr setExpr(Expression expr) {
         this.expr = expr;
-        setAsParentNodeOf(this.expr);
+		setAsParentNodeOf(this.expr);
         return this;
     }
 
     @Override
     public CastExpr setType(Type type) {
         this.type = type;
-        setAsParentNodeOf(this.type);
+		setAsParentNodeOf(this.type);
         return this;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CharLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CharLiteralExpr.java
index 95ce62e149..e799e887c3 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CharLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/CharLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ClassExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ClassExpr.java
index ee724d4545..a6dc9058d0 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ClassExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ClassExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -31,9 +31,8 @@
  * Defines an expression that accesses the class of a type.
  * Example:
  * <code>
- * Object.class
+ *     Object.class
  * </code>
- *
  * @author Julio Vilmar Gesser
  */
 public final class ClassExpr extends Expression implements NodeWithType<ClassExpr> {
@@ -44,7 +43,7 @@ public ClassExpr() {
     }
 
     public ClassExpr(Type type) {
-        setType(type);
+       setType(type);
     }
 
     public ClassExpr(Range range, Type type) {
@@ -70,7 +69,7 @@ public Type getType() {
     @Override
     public ClassExpr setType(Type type) {
         this.type = type;
-        setAsParentNodeOf(this.type);
+		setAsParentNodeOf(this.type);
         return this;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ConditionalExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ConditionalExpr.java
index 08448c00bc..4dd4c4b0f7 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ConditionalExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ConditionalExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -76,19 +76,19 @@ public Expression getThenExpr() {
 
     public ConditionalExpr setCondition(Expression condition) {
         this.condition = condition;
-        setAsParentNodeOf(this.condition);
+		setAsParentNodeOf(this.condition);
         return this;
     }
 
     public ConditionalExpr setElseExpr(Expression elseExpr) {
         this.elseExpr = elseExpr;
-        setAsParentNodeOf(this.elseExpr);
+		setAsParentNodeOf(this.elseExpr);
         return this;
     }
 
     public ConditionalExpr setThenExpr(Expression thenExpr) {
         this.thenExpr = thenExpr;
-        setAsParentNodeOf(this.thenExpr);
+		setAsParentNodeOf(this.thenExpr);
         return this;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/DoubleLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
index df8f70d4f3..b78923851c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,24 +30,22 @@
  */
 public final class DoubleLiteralExpr extends StringLiteralExpr {
 
-    public DoubleLiteralExpr() {
-    }
+	public DoubleLiteralExpr() {
+	}
 
-    public DoubleLiteralExpr(final String value) {
-        super(value);
-    }
+	public DoubleLiteralExpr(final String value) {
+		super(value);
+	}
 
-    public DoubleLiteralExpr(final Range range, final String value) {
-        super(range, value);
-    }
+	public DoubleLiteralExpr(final Range range, final String value) {
+		super(range, value);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/EnclosedExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/EnclosedExpr.java
index 61b85e6b78..a7c40febc2 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/EnclosedExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/EnclosedExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,37 +30,35 @@
  */
 public final class EnclosedExpr extends Expression {
 
-    private Expression inner;
+	private Expression inner;
 
-    public EnclosedExpr() {
-    }
+	public EnclosedExpr() {
+	}
 
-    public EnclosedExpr(final Expression inner) {
-        setInner(inner);
-    }
+	public EnclosedExpr(final Expression inner) {
+		setInner(inner);
+	}
 
-    public EnclosedExpr(final Range range, final Expression inner) {
-        super(range);
-        setInner(inner);
-    }
+	public EnclosedExpr(final Range range, final Expression inner) {
+		super(range);
+		setInner(inner);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getInner() {
-        return inner;
-    }
+	public Expression getInner() {
+		return inner;
+	}
 
-    public EnclosedExpr setInner(final Expression inner) {
-        this.inner = inner;
-        setAsParentNodeOf(this.inner);
-        return this;
-    }
+	public EnclosedExpr setInner(final Expression inner) {
+		this.inner = inner;
+		setAsParentNodeOf(this.inner);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/Expression.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/Expression.java
index 2b82a323a1..f9745646fb 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/Expression.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/Expression.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -29,11 +29,11 @@
  */
 public abstract class Expression extends Node {
 
-    public Expression() {
-    }
+	public Expression() {
+	}
 
-    public Expression(Range range) {
-        super(range);
-    }
+	public Expression(Range range) {
+		super(range);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/FieldAccessExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/FieldAccessExpr.java
index d1ed170a43..0a4badf5cc 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/FieldAccessExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/FieldAccessExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -34,76 +34,74 @@
  */
 public final class FieldAccessExpr extends Expression implements NodeWithTypeArguments<FieldAccessExpr> {
 
-    private Expression scope;
-
-    private List<Type<?>> typeArguments;
-
-    private NameExpr field;
-
-    public FieldAccessExpr() {
-    }
-
-    public FieldAccessExpr(final Expression scope, final String field) {
-        setScope(scope);
-        setField(field);
-    }
-
-    public FieldAccessExpr(final Range range, final Expression scope, final List<Type<?>> typeArguments, final String field) {
-        super(range);
-        setScope(scope);
-        setTypeArguments(typeArguments);
-        setField(field);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public String getField() {
-        return field.getName();
-    }
-
-    public NameExpr getFieldExpr() {
-        return field;
-    }
-
-    public Expression getScope() {
-        return scope;
-    }
-
-    public FieldAccessExpr setField(final String field) {
-        setFieldExpr(new NameExpr(field));
-        return this;
-    }
-
-    public FieldAccessExpr setFieldExpr(NameExpr field) {
-        this.field = field;
-        setAsParentNodeOf(this.field);
-        return this;
-    }
-
-    public FieldAccessExpr setScope(final Expression scope) {
-        this.scope = scope;
-        setAsParentNodeOf(this.scope);
-        return this;
-    }
-
-
-    @Override
-    public List<Type<?>> getTypeArguments() {
-        return typeArguments;
-    }
-
-    @Override
-    public FieldAccessExpr setTypeArguments(final List<Type<?>> types) {
-        this.typeArguments = types;
-        setAsParentNodeOf(this.typeArguments);
-        return this;
-    }
+	private Expression scope;
+
+	private List<Type<?>> typeArguments;
+
+	private NameExpr field;
+
+	public FieldAccessExpr() {
+	}
+
+	public FieldAccessExpr(final Expression scope, final String field) {
+		setScope(scope);
+		setField(field);
+	}
+
+	public FieldAccessExpr(final Range range, final Expression scope, final List<Type<?>> typeArguments, final String field) {
+		super(range);
+		setScope(scope);
+		setTypeArguments(typeArguments);
+		setField(field);
+	}
+
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public String getField() {
+		return field.getName();
+	}
+
+	public NameExpr getFieldExpr() {
+		return field;
+	}
+
+	public Expression getScope() {
+		return scope;
+	}
+
+	public FieldAccessExpr setField(final String field) {
+		setFieldExpr(new NameExpr(field));
+		return this;
+	}
+
+	public FieldAccessExpr setFieldExpr(NameExpr field) {
+		this.field = field;
+		setAsParentNodeOf(this.field);
+		return this;
+	}
+
+	public FieldAccessExpr setScope(final Expression scope) {
+		this.scope = scope;
+		setAsParentNodeOf(this.scope);
+		return this;
+	}
+
+
+	@Override
+	public List<Type<?>> getTypeArguments() {
+		return typeArguments;
+	}
+
+	@Override
+	public FieldAccessExpr setTypeArguments(final List<Type<?>> types) {
+		this.typeArguments = types;
+		setAsParentNodeOf(this.typeArguments);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/InstanceOfExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/InstanceOfExpr.java
index 6283854901..ffc248ce6a 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/InstanceOfExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/InstanceOfExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -32,53 +32,51 @@
  */
 public final class InstanceOfExpr extends Expression implements NodeWithType<InstanceOfExpr> {
 
-    private Expression expr;
+	private Expression expr;
 
-    private Type type;
+	private Type type;
 
-    public InstanceOfExpr() {
-    }
+	public InstanceOfExpr() {
+	}
 
-    public InstanceOfExpr(final Expression expr, final Type type) {
-        setExpr(expr);
-        setType(type);
-    }
+	public InstanceOfExpr(final Expression expr, final Type type) {
+		setExpr(expr);
+		setType(type);
+	}
 
-    public InstanceOfExpr(final Range range, final Expression expr, final Type type) {
-        super(range);
-        setExpr(expr);
-        setType(type);
-    }
+	public InstanceOfExpr(final Range range, final Expression expr, final Type type) {
+		super(range);
+		setExpr(expr);
+		setType(type);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getExpr() {
-        return expr;
-    }
+	public Expression getExpr() {
+		return expr;
+	}
 
-    @Override
-    public Type getType() {
-        return type;
-    }
+	@Override
+	public Type getType() {
+		return type;
+	}
 
-    public InstanceOfExpr setExpr(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-        return this;
-    }
+	public InstanceOfExpr setExpr(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+		return this;
+	}
 
-    @Override
+	@Override
     public InstanceOfExpr setType(final Type type) {
-        this.type = type;
-        setAsParentNodeOf(this.type);
+		this.type = type;
+		setAsParentNodeOf(this.type);
         return this;
-    }
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
index 98710883a4..91f5dec770 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,34 +30,32 @@
  */
 public class IntegerLiteralExpr extends StringLiteralExpr {
 
-    private static final String UNSIGNED_MIN_VALUE = "2147483648";
+	private static final String UNSIGNED_MIN_VALUE = "2147483648";
 
-    protected static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE;
+	protected static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE;
 
-    public IntegerLiteralExpr() {
-    }
+	public IntegerLiteralExpr() {
+	}
 
-    public IntegerLiteralExpr(final String value) {
-        super(value);
-    }
+	public IntegerLiteralExpr(final String value) {
+		super(value);
+	}
 
-    public IntegerLiteralExpr(final Range range, final String value) {
-        super(range, value);
-    }
+	public IntegerLiteralExpr(final Range range, final String value) {
+		super(range, value);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public final boolean isMinValue() {
-        return value != null && //
-                value.length() == 10 && //
-                value.equals(UNSIGNED_MIN_VALUE);
-    }
+	public final boolean isMinValue() {
+		return value != null && //
+				value.length() == 10 && //
+				value.equals(UNSIGNED_MIN_VALUE);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
index 779d3ca508..2665aafe39 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,22 +30,20 @@
  */
 public final class IntegerLiteralMinValueExpr extends IntegerLiteralExpr {
 
-    public IntegerLiteralMinValueExpr() {
-        super(MIN_VALUE);
-    }
+	public IntegerLiteralMinValueExpr() {
+		super(MIN_VALUE);
+	}
 
-    public IntegerLiteralMinValueExpr(final Range range) {
-        super(range, MIN_VALUE);
-    }
+	public IntegerLiteralMinValueExpr(final Range range) {
+		super(range, MIN_VALUE);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LambdaExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LambdaExpr.java
index 35ca49bc92..4db1b0dfb4 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LambdaExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LambdaExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -38,62 +38,62 @@
  */
 public class LambdaExpr extends Expression {
 
-    private List<Parameter> parameters;
+	private List<Parameter> parameters;
 
-    private boolean parametersEnclosed;
+	private boolean parametersEnclosed;
 
-    private Statement body;
+	private Statement body;
 
-    public LambdaExpr() {
-    }
+	public LambdaExpr() {
+	}
 
-    public LambdaExpr(Range range, List<Parameter> parameters, Statement body,
+	public LambdaExpr(Range range, List<Parameter> parameters, Statement body,
                       boolean parametersEnclosed) {
 
-        super(range);
-        setParameters(parameters);
-        setBody(body);
+		super(range);
+		setParameters(parameters);
+		setBody(body);
         setParametersEnclosed(parametersEnclosed);
-    }
+	}
 
-    public List<Parameter> getParameters() {
+	public List<Parameter> getParameters() {
         parameters = ensureNotNull(parameters);
         return parameters;
-    }
-
-    public LambdaExpr setParameters(List<Parameter> parameters) {
-        this.parameters = parameters;
-        setAsParentNodeOf(this.parameters);
-        return this;
-    }
-
-    public Statement getBody() {
-        return body;
-    }
-
-    public LambdaExpr setBody(Statement body) {
-        this.body = body;
-        setAsParentNodeOf(this.body);
-        return this;
-    }
-
-    @Override
-    public <R, A> R accept(GenericVisitor<R, A> v, A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(VoidVisitor<A> v, A arg) {
-        v.visit(this, arg);
-    }
-
-    public boolean isParametersEnclosed() {
-        return parametersEnclosed;
-    }
-
-    public LambdaExpr setParametersEnclosed(boolean parametersEnclosed) {
-        this.parametersEnclosed = parametersEnclosed;
-        return this;
-    }
+	}
+
+	public LambdaExpr setParameters(List<Parameter> parameters) {
+		this.parameters = parameters;
+		setAsParentNodeOf(this.parameters);
+		return this;
+	}
+
+	public Statement getBody() {
+		return body;
+	}
+
+	public LambdaExpr setBody(Statement body) {
+		this.body = body;
+		setAsParentNodeOf(this.body);
+		return this;
+	}
+
+	@Override
+	public <R, A> R accept(GenericVisitor<R, A> v, A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override
+	public <A> void accept(VoidVisitor<A> v, A arg) {
+		v.visit(this, arg);
+	}
+
+	public boolean isParametersEnclosed() {
+		return parametersEnclosed;
+	}
+
+	public LambdaExpr setParametersEnclosed(boolean parametersEnclosed) {
+		this.parametersEnclosed = parametersEnclosed;
+		return this;
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LiteralExpr.java
index 9eaf9d02ae..9cafefdc4c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -28,10 +28,10 @@
  */
 public abstract class LiteralExpr extends Expression {
 
-    public LiteralExpr() {
-    }
+	public LiteralExpr() {
+	}
 
-    public LiteralExpr(Range range) {
-        super(range);
-    }
+	public LiteralExpr(Range range) {
+		super(range);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralExpr.java
index 329c80f220..0e2e8f299b 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,35 +30,33 @@
  */
 public class LongLiteralExpr extends StringLiteralExpr {
 
-    private static final String UNSIGNED_MIN_VALUE = "9223372036854775808";
+	private static final String UNSIGNED_MIN_VALUE = "9223372036854775808";
 
-    protected static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE + "L";
+	protected static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE + "L";
 
-    public LongLiteralExpr() {
-    }
+	public LongLiteralExpr() {
+	}
 
-    public LongLiteralExpr(final String value) {
-        super(value);
-    }
+	public LongLiteralExpr(final String value) {
+		super(value);
+	}
 
-    public LongLiteralExpr(final Range range, final String value) {
-        super(range, value);
-    }
+	public LongLiteralExpr(final Range range, final String value) {
+		super(range, value);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public final boolean isMinValue() {
-        return value != null && //
-                value.length() == 20 && //
-                value.startsWith(UNSIGNED_MIN_VALUE) && //
-                (value.charAt(19) == 'L' || value.charAt(19) == 'l');
-    }
+	public final boolean isMinValue() {
+		return value != null && //
+				value.length() == 20 && //
+				value.startsWith(UNSIGNED_MIN_VALUE) && //
+				(value.charAt(19) == 'L' || value.charAt(19) == 'l');
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
index 34f8938958..d46145a4a1 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,22 +30,20 @@
  */
 public final class LongLiteralMinValueExpr extends LongLiteralExpr {
 
-    public LongLiteralMinValueExpr() {
-        super(MIN_VALUE);
-    }
+	public LongLiteralMinValueExpr() {
+		super(MIN_VALUE);
+	}
 
-    public LongLiteralMinValueExpr(final Range range) {
-        super(range, MIN_VALUE);
-    }
+	public LongLiteralMinValueExpr(final Range range) {
+		super(range, MIN_VALUE);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
index 1c58ff6129..1a117ff976 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,26 +30,24 @@
  */
 public final class MarkerAnnotationExpr extends AnnotationExpr {
 
-    public MarkerAnnotationExpr() {
-    }
+	public MarkerAnnotationExpr() {
+	}
 
-    public MarkerAnnotationExpr(final NameExpr name) {
-        setName(name);
-    }
+	public MarkerAnnotationExpr(final NameExpr name) {
+		setName(name);
+	}
 
-    public MarkerAnnotationExpr(final Range range, final NameExpr name) {
-        super(range);
-        setName(name);
-    }
+	public MarkerAnnotationExpr(final Range range, final NameExpr name) {
+		super(range);
+		setName(name);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MemberValuePair.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MemberValuePair.java
index 3684599100..f87af5dbbe 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MemberValuePair.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MemberValuePair.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -32,52 +32,50 @@
  */
 public final class MemberValuePair extends Node implements NodeWithName<MemberValuePair> {
 
-    private String name;
+	private String name;
 
-    private Expression value;
+	private Expression value;
 
-    public MemberValuePair() {
-    }
+	public MemberValuePair() {
+	}
 
-    public MemberValuePair(final String name, final Expression value) {
-        setName(name);
-        setValue(value);
-    }
+	public MemberValuePair(final String name, final Expression value) {
+		setName(name);
+		setValue(value);
+	}
 
-    public MemberValuePair(final Range range, final String name, final Expression value) {
-        super(range);
-        setName(name);
-        setValue(value);
-    }
+	public MemberValuePair(final Range range, final String name, final Expression value) {
+		super(range);
+		setName(name);
+		setValue(value);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    @Override
-    public String getName() {
-        return name;
-    }
+	@Override
+	public String getName() {
+		return name;
+	}
 
-    public Expression getValue() {
-        return value;
-    }
+	public Expression getValue() {
+		return value;
+	}
 
     @Override
     public MemberValuePair setName(final String name) {
-        this.name = name;
+		this.name = name;
         return this;
-    }
+	}
 
-    public MemberValuePair setValue(final Expression value) {
-        this.value = value;
-        setAsParentNodeOf(this.value);
-        return this;
-    }
+	public MemberValuePair setValue(final Expression value) {
+		this.value = value;
+		setAsParentNodeOf(this.value);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodCallExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodCallExpr.java
index eba053a7f4..98a2464553 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodCallExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodCallExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -58,18 +58,19 @@ public MethodCallExpr(final Expression scope, final String name, final List<Expr
         setArgs(args);
     }
 
-    public MethodCallExpr(final Range range, final Expression scope, final List<Type<?>> typeArguments, final String name, final List<Expression> args) {
-        super(range);
-        setScope(scope);
-        setTypeArguments(typeArguments);
-        setName(name);
-        setArgs(args);
-    }
+	public MethodCallExpr(final Range range, final Expression scope, final List<Type<?>> typeArguments, final String name, final List<Expression> args) {
+		super(range);
+		setScope(scope);
+		setTypeArguments(typeArguments);
+		setName(name);
+		setArgs(args);
+	}
 
     /**
      * Adds the given argument to the method call.
      *
-     * @param arg argument value
+     * @param arg
+     *            argument value
      */
     public MethodCallExpr addArgument(Expression arg) {
         getArgs().add(arg);
@@ -108,10 +109,10 @@ public Expression getScope() {
         return scope;
     }
 
-    public void setArgs(final List<Expression> args) {
-        this.args = args;
-        setAsParentNodeOf(this.args);
-    }
+	public void setArgs(final List<Expression> args) {
+		this.args = args;
+		setAsParentNodeOf(this.args);
+	}
 
     public MethodCallExpr setName(final String name) {
         setNameExpr(new NameExpr(name));
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodReferenceExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodReferenceExpr.java
index 80d12d3f9e..d048ca16ad 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodReferenceExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/MethodReferenceExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -34,12 +34,12 @@
 /**
  * Method reference expressions introduced in Java 8 specifically designed to simplify lambda Expressions.
  * These are some examples:
- * <p>
- * System.out::println;
- * <p>
- * (test ? stream.map(String::trim) : stream)::toArray;
  *
+ * System.out::println; 
+ *
+ * (test ? stream.map(String::trim) : stream)::toArray; 
  * @author Raquel Pau
+ *
  */
 public class MethodReferenceExpr extends Expression implements NodeWithTypeArguments<MethodReferenceExpr> {
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NameExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NameExpr.java
index ef32048e10..331fa2af3c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NameExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NameExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -31,56 +31,55 @@
  */
 public class NameExpr extends Expression implements NodeWithName<NameExpr> {
 
-    private String name;
+	private String name;
 
-    public NameExpr() {
-    }
+	public NameExpr() {
+	}
 
-    public NameExpr(final String name) {
-        this.name = name;
-    }
+	public NameExpr(final String name) {
+		this.name = name;
+	}
 
-    public NameExpr(Range range, final String name) {
-        super(range);
-        this.name = name;
-    }
+	public NameExpr(Range range, final String name) {
+		super(range);
+		this.name = name;
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    @Override
-    public final String getName() {
-        return name;
-    }
+	@Override
+	public final String getName() {
+		return name;
+	}
 
     @Override
     public NameExpr setName(final String name) {
-        this.name = name;
+		this.name = name;
         return this;
-    }
+	}
 
 
-    /**
-     * Creates a new {@link NameExpr} from a qualified name.<br>
-     * The qualified name can contains "." (dot) characters.
-     *
-     * @param qualifiedName qualified name
-     * @return instanceof {@link NameExpr}
-     */
-    public static NameExpr name(String qualifiedName) {
-        String[] split = qualifiedName.split("\\.");
-        NameExpr ret = new NameExpr(split[0]);
-        for (int i = 1; i < split.length; i++) {
-            ret = new QualifiedNameExpr(ret, split[i]);
-        }
-        return ret;
-    }
+	/**
+	 * Creates a new {@link NameExpr} from a qualified name.<br>
+	 * The qualified name can contains "." (dot) characters.
+	 *
+	 * @param qualifiedName
+	 *            qualified name
+	 * @return instanceof {@link NameExpr}
+	 */
+	public static NameExpr name(String qualifiedName) {
+		String[] split = qualifiedName.split("\\.");
+		NameExpr ret = new NameExpr(split[0]);
+		for (int i = 1; i < split.length; i++) {
+			ret = new QualifiedNameExpr(ret, split[i]);
+		}
+		return ret;
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NormalAnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
index 5750c15240..502b11dbde 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -78,7 +78,7 @@ public NormalAnnotationExpr setPairs(final List<MemberValuePair> pairs) {
 
     /**
      * adds a pair to this annotation
-     *
+     * 
      * @return this, the {@link NormalAnnotationExpr}
      */
     public NormalAnnotationExpr addPair(String key, String value) {
@@ -87,7 +87,7 @@ public NormalAnnotationExpr addPair(String key, String value) {
 
     /**
      * adds a pair to this annotation
-     *
+     * 
      * @return this, the {@link NormalAnnotationExpr}
      */
     public NormalAnnotationExpr addPair(String key, NameExpr value) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NullLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NullLiteralExpr.java
index cc4c392a35..cb0a92b83c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NullLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/NullLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,20 +30,18 @@
  */
 public final class NullLiteralExpr extends LiteralExpr {
 
-    public NullLiteralExpr() {
-    }
+	public NullLiteralExpr() {
+	}
 
-    public NullLiteralExpr(final Range range) {
-        super(range);
-    }
+	public NullLiteralExpr(final Range range) {
+		super(range);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ObjectCreationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ObjectCreationExpr.java
index 541ab332db..4d06ff8db2 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ObjectCreationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ObjectCreationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -39,12 +39,12 @@
  * Defines constructor call expression.
  * Example:
  * <code>
- * new Object()
+ *     new Object()
  * </code>
  *
  * @author Julio Vilmar Gesser
  */
-public final class ObjectCreationExpr extends Expression implements
+public final class ObjectCreationExpr extends Expression implements 
         NodeWithTypeArguments<ObjectCreationExpr>,
         NodeWithType<ObjectCreationExpr> {
 
@@ -64,10 +64,10 @@ public ObjectCreationExpr() {
 
     /**
      * Defines a call to a constructor.
-     *
+     * 
      * @param scope may be null
-     * @param type  this is the class that the constructor is being called for.
-     * @param args  Any arguments to pass to the constructor
+     * @param type this is the class that the constructor is being called for.
+     * @param args Any arguments to pass to the constructor
      */
     public ObjectCreationExpr(final Expression scope, final ClassOrInterfaceType type, final List<Expression> args) {
         setScope(scope);
@@ -75,16 +75,16 @@ public ObjectCreationExpr(final Expression scope, final ClassOrInterfaceType typ
         setArgs(args);
     }
 
-    public ObjectCreationExpr(final Range range,
-                              final Expression scope, final ClassOrInterfaceType type, final List<Type<?>> typeArguments,
+	public ObjectCreationExpr(final Range range,
+			final Expression scope, final ClassOrInterfaceType type, final List<Type<?>> typeArguments,
                               final List<Expression> args, final List<BodyDeclaration<?>> anonymousBody) {
-        super(range);
-        setScope(scope);
-        setType(type);
-        setTypeArguments(typeArguments);
-        setArgs(args);
-        setAnonymousClassBody(anonymousBody);
-    }
+		super(range);
+		setScope(scope);
+		setType(type);
+		setTypeArguments(typeArguments);
+		setArgs(args);
+		setAnonymousClassBody(anonymousBody);
+	}
 
     @Override
     public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/QualifiedNameExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/QualifiedNameExpr.java
index 9185b7d126..dd906310d5 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/QualifiedNameExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/QualifiedNameExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,38 +30,36 @@
  */
 public final class QualifiedNameExpr extends NameExpr {
 
-    private NameExpr qualifier;
+	private NameExpr qualifier;
 
-    public QualifiedNameExpr() {
-    }
+	public QualifiedNameExpr() {
+	}
 
-    public QualifiedNameExpr(final NameExpr scope, final String name) {
-        super(name);
-        setQualifier(scope);
-    }
+	public QualifiedNameExpr(final NameExpr scope, final String name) {
+		super(name);
+		setQualifier(scope);
+	}
 
-    public QualifiedNameExpr(final Range range, final NameExpr scope, final String name) {
-        super(range, name);
-        setQualifier(scope);
-    }
+	public QualifiedNameExpr(final Range range, final NameExpr scope, final String name) {
+		super(range, name);
+		setQualifier(scope);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public NameExpr getQualifier() {
-        return qualifier;
-    }
+	public NameExpr getQualifier() {
+		return qualifier;
+	}
 
-    public QualifiedNameExpr setQualifier(final NameExpr qualifier) {
-        this.qualifier = qualifier;
-        setAsParentNodeOf(this.qualifier);
-        return this;
-    }
+	public QualifiedNameExpr setQualifier(final NameExpr qualifier) {
+		this.qualifier = qualifier;
+		setAsParentNodeOf(this.qualifier);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
index 6d6208311d..bd6692c83c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,39 +30,37 @@
  */
 public final class SingleMemberAnnotationExpr extends AnnotationExpr {
 
-    private Expression memberValue;
+	private Expression memberValue;
 
-    public SingleMemberAnnotationExpr() {
-    }
+	public SingleMemberAnnotationExpr() {
+	}
 
-    public SingleMemberAnnotationExpr(final NameExpr name, final Expression memberValue) {
-        setName(name);
-        setMemberValue(memberValue);
-    }
+	public SingleMemberAnnotationExpr(final NameExpr name, final Expression memberValue) {
+		setName(name);
+		setMemberValue(memberValue);
+	}
 
-    public SingleMemberAnnotationExpr(final Range range, final NameExpr name, final Expression memberValue) {
-        super(range);
-        setName(name);
-        setMemberValue(memberValue);
-    }
+	public SingleMemberAnnotationExpr(final Range range, final NameExpr name, final Expression memberValue) {
+		super(range);
+		setName(name);
+		setMemberValue(memberValue);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getMemberValue() {
-        return memberValue;
-    }
+	public Expression getMemberValue() {
+		return memberValue;
+	}
 
-    public SingleMemberAnnotationExpr setMemberValue(final Expression memberValue) {
-        this.memberValue = memberValue;
-        setAsParentNodeOf(this.memberValue);
-        return this;
-    }
+	public SingleMemberAnnotationExpr setMemberValue(final Expression memberValue) {
+		this.memberValue = memberValue;
+		setAsParentNodeOf(this.memberValue);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/StringLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/StringLiteralExpr.java
index 7701550a30..f66a594dac 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/StringLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/StringLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -28,52 +28,49 @@
 
 /**
  * Java® Language Specification 3.10.5 String Literals
- *
  * @author Julio Vilmar Gesser
  */
 public class StringLiteralExpr extends LiteralExpr {
 
-    protected String value;
+	protected String value;
 
-    public StringLiteralExpr() {
+	public StringLiteralExpr() {
         this.value = "";
-    }
+	}
 
-    public StringLiteralExpr(final String value) {
+	public StringLiteralExpr(final String value) {
         if (value.contains("\n") || value.contains("\r")) {
             throw new IllegalArgumentException("Illegal literal expression: newlines (line feed or carriage return) have to be escaped");
         }
-        this.value = value;
-    }
+		this.value = value;
+	}
 
-    /**
-     * Utility method that creates a new StringLiteralExpr. Escapes EOL characters.
-     */
-    public static StringLiteralExpr escape(String string) {
-        return new StringLiteralExpr(Utils.escapeEndOfLines(string));
-    }
+	/**
+	 * Utility method that creates a new StringLiteralExpr. Escapes EOL characters.
+	 */
+	public static StringLiteralExpr escape(String string) {
+		return new StringLiteralExpr(Utils.escapeEndOfLines(string));
+	}
 
-    public StringLiteralExpr(final Range range, final String value) {
-        super(range);
-        this.value = value;
-    }
+	public StringLiteralExpr(final Range range, final String value) {
+		super(range);
+		this.value = value;
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public final String getValue() {
-        return value;
-    }
+	public final String getValue() {
+		return value;
+	}
 
-    public final StringLiteralExpr setValue(final String value) {
-        this.value = value;
-        return this;
-    }
+	public final StringLiteralExpr setValue(final String value) {
+		this.value = value;
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SuperExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SuperExpr.java
index 9d89128508..3f5e1866cb 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SuperExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/SuperExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,37 +30,35 @@
  */
 public final class SuperExpr extends Expression {
 
-    private Expression classExpr;
+	private Expression classExpr;
 
-    public SuperExpr() {
-    }
+	public SuperExpr() {
+	}
 
-    public SuperExpr(final Expression classExpr) {
-        setClassExpr(classExpr);
-    }
+	public SuperExpr(final Expression classExpr) {
+		setClassExpr(classExpr);
+	}
 
-    public SuperExpr(final Range range, final Expression classExpr) {
-        super(range);
-        setClassExpr(classExpr);
-    }
+	public SuperExpr(final Range range, final Expression classExpr) {
+		super(range);
+		setClassExpr(classExpr);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getClassExpr() {
-        return classExpr;
-    }
+	public Expression getClassExpr() {
+		return classExpr;
+	}
 
-    public SuperExpr setClassExpr(final Expression classExpr) {
-        this.classExpr = classExpr;
-        setAsParentNodeOf(this.classExpr);
-        return this;
-    }
+	public SuperExpr setClassExpr(final Expression classExpr) {
+		this.classExpr = classExpr;
+		setAsParentNodeOf(this.classExpr);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ThisExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ThisExpr.java
index 7916599407..117fed53de 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ThisExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/ThisExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,37 +30,35 @@
  */
 public final class ThisExpr extends Expression {
 
-    private Expression classExpr;
+	private Expression classExpr;
 
-    public ThisExpr() {
-    }
+	public ThisExpr() {
+	}
 
-    public ThisExpr(final Expression classExpr) {
-        setClassExpr(classExpr);
-    }
+	public ThisExpr(final Expression classExpr) {
+		setClassExpr(classExpr);
+	}
 
-    public ThisExpr(final Range range, final Expression classExpr) {
-        super(range);
-        setClassExpr(classExpr);
-    }
+	public ThisExpr(final Range range, final Expression classExpr) {
+		super(range);
+		setClassExpr(classExpr);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getClassExpr() {
-        return classExpr;
-    }
+	public Expression getClassExpr() {
+		return classExpr;
+	}
 
-    public ThisExpr setClassExpr(final Expression classExpr) {
-        this.classExpr = classExpr;
-        setAsParentNodeOf(this.classExpr);
-        return this;
-    }
+	public ThisExpr setClassExpr(final Expression classExpr) {
+		this.classExpr = classExpr;
+		setAsParentNodeOf(this.classExpr);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/TypeExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/TypeExpr.java
index b8ed9eaea0..28b14e19fd 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/TypeExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/TypeExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -29,15 +29,14 @@
 
 /**
  * This class is just instantiated as scopes for MethodReferenceExpr nodes to encapsulate Types.
- *
  * @author Raquel Pau
+ *
  */
 public class TypeExpr extends Expression implements NodeWithType<TypeExpr> {
 
     private Type<?> type;
 
-    public TypeExpr() {
-    }
+    public TypeExpr(){}
 
     public TypeExpr(Range range, Type<?> type) {
         super(range);
@@ -67,4 +66,5 @@ public TypeExpr setType(Type<?> type) {
     }
 
 
+
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/UnaryExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/UnaryExpr.java
index 08460c7f8c..eef9101ee8 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/UnaryExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/UnaryExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.Range;
@@ -30,61 +30,59 @@
  */
 public final class UnaryExpr extends Expression {
 
-    public enum Operator {
-        positive, // +
-        negative, // -
-        preIncrement, // ++
-        preDecrement, // --
-        not, // !
-        inverse, // ~
-        posIncrement, // ++
-        posDecrement, // --
-    }
+	public enum Operator {
+		positive, // +
+		negative, // -
+		preIncrement, // ++
+		preDecrement, // --
+		not, // !
+		inverse, // ~
+		posIncrement, // ++
+		posDecrement, // --
+	}
 
-    private Expression expr;
+	private Expression expr;
 
-    private Operator op;
+	private Operator op;
 
-    public UnaryExpr() {
-    }
+	public UnaryExpr() {
+	}
 
-    public UnaryExpr(final Expression expr, final Operator op) {
-        setExpr(expr);
-        setOperator(op);
-    }
+	public UnaryExpr(final Expression expr, final Operator op) {
+		setExpr(expr);
+		setOperator(op);
+	}
 
-    public UnaryExpr(final Range range, final Expression expr, final Operator op) {
-        super(range);
-        setExpr(expr);
-        setOperator(op);
-    }
+	public UnaryExpr(final Range range, final Expression expr, final Operator op) {
+		super(range);
+		setExpr(expr);
+		setOperator(op);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getExpr() {
-        return expr;
-    }
+	public Expression getExpr() {
+		return expr;
+	}
 
-    public Operator getOperator() {
-        return op;
-    }
+	public Operator getOperator() {
+		return op;
+	}
 
-    public UnaryExpr setExpr(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-        return this;
-    }
+	public UnaryExpr setExpr(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+		return this;
+	}
 
-    public UnaryExpr setOperator(final Operator op) {
-        this.op = op;
-        return this;
-    }
+	public UnaryExpr setOperator(final Operator op) {
+		this.op = op;
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/VariableDeclarationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
index 7c8157011f..5bb0f62998 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -139,9 +139,9 @@ public List<AnnotationExpr> getAnnotations() {
 
     /**
      * Return the modifiers of this variable declaration.
-     *
-     * @return modifiers
+     * 
      * @see Modifier
+     * @return modifiers
      */
     @Override
     public EnumSet<Modifier> getModifiers() {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
index ef4f391b9b..71ff7179b5 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithAnnotations.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -46,7 +46,7 @@ public interface NodeWithAnnotations<T> {
 
     /**
      * Annotates this
-     *
+     * 
      * @param name the name of the annotation
      * @return the {@link NormalAnnotationExpr} added
      */
@@ -60,7 +60,7 @@ public default NormalAnnotationExpr addAnnotation(String name) {
 
     /**
      * Annotates this and automatically add the import
-     *
+     * 
      * @param clazz the class of the annotation
      * @return the {@link NormalAnnotationExpr} added
      */
@@ -71,7 +71,7 @@ public default NormalAnnotationExpr addAnnotation(Class<? extends Annotation> cl
 
     /**
      * Annotates this with a marker annotation
-     *
+     * 
      * @param name the name of the annotation
      * @return this
      */
@@ -86,7 +86,7 @@ public default T addMarkerAnnotation(String name) {
 
     /**
      * Annotates this with a marker annotation and automatically add the import
-     *
+     * 
      * @param clazz the class of the annotation
      * @return this
      */
@@ -97,8 +97,8 @@ public default T addMarkerAnnotation(Class<? extends Annotation> clazz) {
 
     /**
      * Annotates this with a single member annotation
-     *
-     * @param name  the name of the annotation
+     * 
+     * @param name the name of the annotation
      * @param value the value, don't forget to add \"\" for a string value
      * @return this
      */
@@ -113,7 +113,7 @@ public default T addSingleMemberAnnotation(String name, String value) {
 
     /**
      * Annotates this with a single member annotation and automatically add the import
-     *
+     * 
      * @param clazz the class of the annotation
      * @param value the value, don't forget to add \"\" for a string value
      * @return this
@@ -126,7 +126,7 @@ public default T addSingleMemberAnnotation(Class<? extends Annotation> clazz,
 
     /**
      * Check whether an annotation with this name is present on this element
-     *
+     * 
      * @param annotationName the name of the annotation
      * @return true if found, false if not
      */
@@ -136,7 +136,7 @@ public default boolean isAnnotationPresent(String annotationName) {
 
     /**
      * Check whether an annotation with this class is present on this element
-     *
+     * 
      * @param annotationClass the class of the annotation
      * @return true if found, false if not
      */
@@ -146,7 +146,7 @@ public default boolean isAnnotationPresent(Class<? extends Annotation> annotatio
 
     /**
      * Try to find an annotation by its name
-     *
+     * 
      * @param annotationName the name of the annotation
      * @return null if not found, the annotation otherwise
      */
@@ -157,7 +157,7 @@ public default AnnotationExpr getAnnotationByName(String annotationName) {
 
     /**
      * Try to find an annotation by its class
-     *
+     * 
      * @param annotationClass the class of the annotation
      * @return null if not found, the annotation otherwise
      */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java
index d04089e0be..875d28de0c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.nodeTypes;
 
 /**
@@ -32,7 +32,6 @@ public interface NodeWithDeclaration {
     /**
      * As {@link NodeWithDeclaration#getDeclarationAsString(boolean, boolean, boolean)} including
      * the modifiers, the throws clause and the parameters with both type and name.
-     *
      * @return String representation of declaration
      */
     String getDeclarationAsString();
@@ -40,9 +39,8 @@ public interface NodeWithDeclaration {
     /**
      * As {@link NodeWithDeclaration#getDeclarationAsString(boolean, boolean, boolean)} including
      * the parameters with both type and name.
-     *
      * @param includingModifiers flag to include the modifiers (if present) in the string produced
-     * @param includingThrows    flag to include the throws clause (if present) in the string produced
+     * @param includingThrows flag to include the throws clause (if present) in the string produced
      * @return String representation of declaration based on parameter flags
      */
     String getDeclarationAsString(boolean includingModifiers, boolean includingThrows);
@@ -50,9 +48,8 @@ public interface NodeWithDeclaration {
     /**
      * A simple representation of the element declaration.
      * It should fit one string.
-     *
-     * @param includingModifiers     flag to include the modifiers (if present) in the string produced
-     * @param includingThrows        flag to include the throws clause (if present) in the string produced
+     * @param includingModifiers flag to include the modifiers (if present) in the string produced
+     * @param includingThrows flag to include the throws clause (if present) in the string produced
      * @param includingParameterName flag to include the parameter name (while the parameter type is always included) in the string produced
      * @return String representation of declaration based on parameter flags
      */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithElementType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithElementType.java
index 309a954ad6..21a41bad81 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithElementType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithElementType.java
@@ -35,7 +35,7 @@
  * In most cases, the element type is simply the type.
  * In case of arrays, the element type is the type that is inside the deepest nesting:
  * for int[][][], the element type is int.
- * <p>
+ *
  * The main reason for this interface is to permit users to manipulate homogeneously all nodes with getElementType/setElementType
  * methods
  */
@@ -57,7 +57,7 @@ public interface NodeWithElementType<T> {
 
     /**
      * Sets this type to this class and try to import it to the {@link CompilationUnit} if needed
-     *
+     * 
      * @param typeClass the type
      * @return this
      */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java
index 7a7ed603b4..083fc01b1a 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithExtends.java
@@ -12,7 +12,7 @@ public interface NodeWithExtends<T> {
 
     /**
      * Add an extends to this and automatically add the import
-     *
+     * 
      * @param clazz the class to extand from
      * @return this
      */
@@ -23,7 +23,7 @@ public default T addExtends(Class<?> clazz) {
 
     /**
      * Add an extends to this
-     *
+     * 
      * @param name the name of the type to extends from
      * @return this
      */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java
index bc711990ce..3f5192587f 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithImplements.java
@@ -12,7 +12,7 @@ public interface NodeWithImplements<T> {
 
     /**
      * Add an implements to this
-     *
+     * 
      * @param name the name of the type to extends from
      * @return this
      */
@@ -26,7 +26,7 @@ public default T addImplements(String name) {
 
     /**
      * Add an implements to this and automatically add the import
-     *
+     * 
      * @param clazz the type to implements from
      * @return this
      */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java
index 32364fc297..b00cffa5d6 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithJavaDoc.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java
index 6cb1173eb8..827e5edee3 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithMembers.java
@@ -27,9 +27,10 @@
 
 /**
  * A node having members.
- * <p>
+ *
  * The main reason for this interface is to permit users to manipulate homogeneously all nodes with a getMembers
  * method.
+ *
  */
 public interface NodeWithMembers<T> {
     List<BodyDeclaration<?>> getMembers();
@@ -40,7 +41,7 @@ public interface NodeWithMembers<T> {
      * Add a field to this and automatically add the import of the type if needed
      *
      * @param typeClass the type of the field
-     * @param name      the name of the field
+     * @param name the name of the field
      * @param modifiers the modifiers like {@link Modifier#PUBLIC}
      * @return the {@link FieldDeclaration} created
      */
@@ -52,8 +53,8 @@ default FieldDeclaration addField(Class<?> typeClass, String name, Modifier... m
     /**
      * Add a field to this
      *
-     * @param type      the type of the field
-     * @param name      the name of the field
+     * @param type the type of the field
+     * @param name the name of the field
      * @param modifiers the modifiers like {@link Modifier#PUBLIC}
      * @return the {@link FieldDeclaration} created
      */
@@ -64,8 +65,8 @@ default FieldDeclaration addField(String type, String name, Modifier... modifier
     /**
      * Add a field to this
      *
-     * @param type      the type of the field
-     * @param name      the name of the field
+     * @param type the type of the field
+     * @param name the name of the field
      * @param modifiers the modifiers like {@link Modifier#PUBLIC}
      * @return the {@link FieldDeclaration} created
      */
@@ -86,7 +87,7 @@ default FieldDeclaration addField(Type<?> type, String name, Modifier... modifie
      * Add a private field to this
      *
      * @param typeClass the type of the field
-     * @param name      the name of the field
+     * @param name the name of the field
      * @return the {@link FieldDeclaration} created
      */
     default FieldDeclaration addPrivateField(Class<?> typeClass, String name) {
@@ -107,9 +108,9 @@ default FieldDeclaration addPrivateField(String type, String name) {
 
     /**
      * Add a public field to this
-     *
+     * 
      * @param typeClass the type of the field
-     * @param name      the name of the field
+     * @param name the name of the field
      * @return the {@link FieldDeclaration} created
      */
     default FieldDeclaration addPublicField(Class<?> typeClass, String name) {
@@ -132,7 +133,7 @@ default FieldDeclaration addPublicField(String type, String name) {
      * Add a protected field to this
      *
      * @param typeClass the type of the field
-     * @param name      the name of the field
+     * @param name the name of the field
      * @return the {@link FieldDeclaration} created
      */
     default FieldDeclaration addProtectedField(Class<?> typeClass, String name) {
@@ -155,7 +156,7 @@ default FieldDeclaration addProtectedField(String type, String name) {
      * Adds a methods with void return by default to this
      *
      * @param methodName the method name
-     * @param modifiers  the modifiers like {@link Modifier#PUBLIC}
+     * @param modifiers the modifiers like {@link Modifier#PUBLIC}
      * @return the {@link MethodDeclaration} created
      */
     default MethodDeclaration addMethod(String methodName, Modifier... modifiers) {
@@ -171,7 +172,7 @@ default MethodDeclaration addMethod(String methodName, Modifier... modifiers) {
 
     /**
      * Adds a constructor to this
-     *
+     * 
      * @param modifiers the modifiers like {@link Modifier#PUBLIC}
      * @return the {@link MethodDeclaration} created
      */
@@ -229,14 +230,14 @@ default List<MethodDeclaration> getMethods() {
      * Try to find a {@link MethodDeclaration} by its parameters types
      *
      * @param paramTypes the types of parameters like "Map&lt;Integer,String&gt;","int" to match<br>
-     *                   void foo(Map&lt;Integer,String&gt; myMap,int number)
+     *            void foo(Map&lt;Integer,String&gt; myMap,int number)
      * @return the methods found (multiple in case of polymorphism)
      */
     default List<MethodDeclaration> getMethodsByParameterTypes(String... paramTypes) {
         return getMembers().stream()
                 .filter(m -> m instanceof MethodDeclaration
                         && ((MethodDeclaration) m).getParameters().stream().map(p -> p.getType().toString())
-                        .collect(toSet()).equals(Stream.of(paramTypes).collect(toSet())))
+                                .collect(toSet()).equals(Stream.of(paramTypes).collect(toSet())))
                 .map(m -> (MethodDeclaration) m).collect(toList());
     }
 
@@ -244,15 +245,15 @@ default List<MethodDeclaration> getMethodsByParameterTypes(String... paramTypes)
      * Try to find a {@link MethodDeclaration} by its parameters types
      *
      * @param paramTypes the types of parameters like "Map&lt;Integer,String&gt;","int" to match<br>
-     *                   void foo(Map&lt;Integer,String&gt; myMap,int number)
+     *            void foo(Map&lt;Integer,String&gt; myMap,int number)
      * @return the methods found (multiple in case of polymorphism)
      */
     default List<MethodDeclaration> getMethodsByParameterTypes(Class<?>... paramTypes) {
         return getMembers().stream()
                 .filter(m -> m instanceof MethodDeclaration
                         && ((MethodDeclaration) m).getParameters().stream().map(p -> p.getType().toString())
-                        .collect(toSet())
-                        .equals(Stream.of(paramTypes).map(Class::getSimpleName).collect(toSet())))
+                                .collect(toSet())
+                                .equals(Stream.of(paramTypes).map(Class::getSimpleName).collect(toSet())))
                 .map(m -> (MethodDeclaration) m).collect(toList());
     }
 
@@ -270,13 +271,13 @@ default FieldDeclaration getFieldByName(String name) {
     }
 
     /**
-     * Find all fields in the members of this node.
+	 * Find all fields in the members of this node.
      *
-     * @return the fields found. This list is immutable.
+	 * @return the fields found. This list is immutable.
      */
     default List<FieldDeclaration> getFields() {
         return unmodifiableList(getMembers().stream()
-                .filter(m -> m instanceof FieldDeclaration)
+                .filter(m -> m instanceof FieldDeclaration )
                 .map(m -> (FieldDeclaration) m)
                 .collect(toList()));
     }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java
index 9c377def81..6a1959ecfe 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithModifiers.java
@@ -13,8 +13,8 @@ public interface NodeWithModifiers<T> {
     /**
      * Return the modifiers of this variable declaration.
      *
-     * @return modifiers
      * @see Modifier
+     * @return modifiers
      */
     EnumSet<Modifier> getModifiers();
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithName.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithName.java
index ac19520e6a..edcff5cff9 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithName.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithName.java
@@ -23,10 +23,10 @@
 
 /**
  * A node having a name.
- * <p>
+ *  
  * The main reason for this interface is to permit users to manipulate homogeneously all nodes with a getName method.
- *
- * @since 2.0.1
+ * 
+ * @since 2.0.1 
  */
 public interface NodeWithName<T> {
     String getName();
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java
index 9b4a810b0e..fb8697f3cc 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithParameters.java
@@ -24,9 +24,9 @@ default T addParameter(Class<?> paramClass, String name) {
 
     /**
      * Remember to import the class in the compilation unit yourself
-     *
+     * 
      * @param className the name of the class, ex : org.test.Foo or Foo if you added manually the import
-     * @param name      the name of the parameter
+     * @param name the name of the parameter
      */
     default T addParameter(String className, String name) {
         return addParameter(new ClassOrInterfaceType(className), name);
@@ -50,9 +50,9 @@ default Parameter addAndGetParameter(Class<?> paramClass, String name) {
 
     /**
      * Remember to import the class in the compilation unit yourself
-     *
+     * 
      * @param className the name of the class, ex : org.test.Foo or Foo if you added manually the import
-     * @param name      the name of the parameter
+     * @param name the name of the parameter
      * @return the {@link Parameter} created
      */
     default Parameter addAndGetParameter(String className, String name) {
@@ -67,7 +67,7 @@ default Parameter addAndGetParameter(Parameter parameter) {
 
     /**
      * Try to find a {@link Parameter} by its name
-     *
+     * 
      * @param name the name of the param
      * @return null if not found, the param found otherwise
      */
@@ -78,7 +78,7 @@ default Parameter getParamByName(String name) {
 
     /**
      * Try to find a {@link Parameter} by its type
-     *
+     * 
      * @param type the type of the param
      * @return null if not found, the param found otherwise
      */
@@ -89,7 +89,7 @@ default Parameter getParamByType(String type) {
 
     /**
      * Try to find a {@link Parameter} by its type
-     *
+     * 
      * @param type the type of the param <b>take care about generics, it wont work</b>
      * @return null if not found, the param found otherwise
      */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java
index 593545b9d3..beee9e7274 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithThrowable.java
@@ -13,7 +13,7 @@ public interface NodeWithThrowable<T> {
 
     /**
      * Adds this type to the throws clause
-     *
+     * 
      * @param throwType the exception type
      * @return this
      */
@@ -26,7 +26,7 @@ default T addThrows(ReferenceType throwType) {
 
     /**
      * Adds this class to the throws clause
-     *
+     * 
      * @param clazz the exception class
      * @return this
      */
@@ -37,7 +37,7 @@ default T addThrows(Class<? extends Throwable> clazz) {
 
     /**
      * Check whether this elements throws this exception class
-     *
+     * 
      * @param clazz the class of the exception
      * @return true if found in throws clause, false if not
      */
@@ -47,7 +47,7 @@ public default boolean isThrows(Class<? extends Throwable> clazz) {
 
     /**
      * Check whether this elements throws this exception class
-     *
+     * 
      * @param throwableName the class of the exception
      * @return true if found in throws clause, false if not
      */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithType.java
index 79679f5794..fc183b20bd 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithType.java
@@ -28,7 +28,7 @@
 
 /**
  * A node having a type.
- * <p>
+ *
  * The main reason for this interface is to permit users to manipulate homogeneously all nodes with getType/setType
  * methods
  *
@@ -37,14 +37,14 @@
 public interface NodeWithType<T> {
     /**
      * Gets the type
-     *
+     * 
      * @return the type
      */
     Type<?> getType();
 
     /**
      * Sets the type
-     *
+     * 
      * @param type the type
      * @return this
      */
@@ -52,7 +52,7 @@ public interface NodeWithType<T> {
 
     /**
      * Sets this type to this class and try to import it to the {@link CompilationUnit} if needed
-     *
+     * 
      * @param typeClass the type
      * @return this
      */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java
index c6620ed1bc..3ce27971e5 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithTypeArguments.java
@@ -31,8 +31,8 @@
  * A node that can have type arguments.
  * <pre>
  *     new X();        --> typeArguments == null
- *     new X&lt;>();      --> typeArguments.types = [], typeArguments.diamondOperator=true
- *     new X&lt;C,D>();   --> typeArguments.types = [C,D], typeArguments.diamondOperator=false
+ *     new X&lt;>();      --> typeArguments.types = [], typeArguments.diamondOperator=true 
+ *     new X&lt;C,D>();   --> typeArguments.types = [C,D], typeArguments.diamondOperator=false 
  * </pre>
  */
 public interface NodeWithTypeArguments<T> {
@@ -43,7 +43,6 @@ public interface NodeWithTypeArguments<T> {
 
     /**
      * Allows you to set the generic arguments
-     *
      * @param typeArguments The list of types of the generics
      */
     T setTypeArguments(List<Type<?>> typeArguments);
@@ -52,7 +51,7 @@ public interface NodeWithTypeArguments<T> {
      * @return whether the type arguments look like &lt;>.
      */
     default boolean isUsingDiamondOperator() {
-        if (getTypeArguments() == null) {
+        if(getTypeArguments()==null){
             return false;
         }
         return getTypeArguments().isEmpty();
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java
index caee195c12..2c6702ac48 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/nodeTypes/NodeWithVariables.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/AssertStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/AssertStmt.java
index df42434cf3..85a34a847e 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/AssertStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/AssertStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -31,57 +31,55 @@
  */
 public final class AssertStmt extends Statement {
 
-    private Expression check;
-
-    private Expression msg;
-
-    public AssertStmt() {
-    }
-
-    public AssertStmt(final Expression check) {
-        setCheck(check);
-    }
-
-    public AssertStmt(final Expression check, final Expression msg) {
-        setCheck(check);
-        setMessage(msg);
-    }
-
-    public AssertStmt(final Range range, final Expression check, final Expression msg) {
-        super(range);
-
-        setCheck(check);
-        setMessage(msg);
-
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public Expression getCheck() {
-        return check;
-    }
-
-    public Expression getMessage() {
-        return msg;
-    }
-
-    public AssertStmt setCheck(final Expression check) {
-        this.check = check;
-        setAsParentNodeOf(this.check);
-        return this;
-    }
-
-    public AssertStmt setMessage(final Expression msg) {
-        this.msg = msg;
-        setAsParentNodeOf(this.msg);
-        return this;
-    }
+	private Expression check;
+
+	private Expression msg;
+
+	public AssertStmt() {
+	}
+
+	public AssertStmt(final Expression check) {
+		setCheck(check);
+	}
+
+	public AssertStmt(final Expression check, final Expression msg) {
+		setCheck(check);
+		setMessage(msg);
+	}
+
+	public AssertStmt(final Range range, final Expression check, final Expression msg) {
+		super(range);
+		
+		setCheck(check);
+		setMessage(msg);
+		
+	}
+
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public Expression getCheck() {
+		return check;
+	}
+
+	public Expression getMessage() {
+		return msg;
+	}
+
+	public AssertStmt setCheck(final Expression check) {
+		this.check = check;
+		setAsParentNodeOf(this.check);
+		return this;
+	}
+
+	public AssertStmt setMessage(final Expression msg) {
+		this.msg = msg;
+		setAsParentNodeOf(this.msg);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BlockStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BlockStmt.java
index 4aa6c838a3..31cbfa3917 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BlockStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BlockStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -73,4 +73,5 @@ public BlockStmt setStmts(final List<Statement> stmts) {
     }
 
 
+
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BreakStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BreakStmt.java
index d8f0609d33..04c39fb9f5 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BreakStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/BreakStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -30,36 +30,34 @@
  */
 public final class BreakStmt extends Statement {
 
-    private String id;
+	private String id;
 
-    public BreakStmt() {
-    }
+	public BreakStmt() {
+	}
 
-    public BreakStmt(final String id) {
-        this.id = id;
-    }
+	public BreakStmt(final String id) {
+		this.id = id;
+	}
 
-    public BreakStmt(final Range range, final String id) {
-        super(range);
-        this.id = id;
-    }
+	public BreakStmt(final Range range, final String id) {
+		super(range);
+		this.id = id;
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public String getId() {
-        return id;
-    }
+	public String getId() {
+		return id;
+	}
 
-    public BreakStmt setId(final String id) {
-        this.id = id;
-        return this;
-    }
+	public BreakStmt setId(final String id) {
+		this.id = id;
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/CatchClause.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/CatchClause.java
index 7bd096de8b..a1f3005449 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/CatchClause.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/CatchClause.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -54,59 +54,57 @@ public CatchClause(final Parameter param, final BlockStmt catchBlock) {
     }
 
     public CatchClause(final Range range,
-                       final EnumSet<Modifier> exceptModifier,
+                       final EnumSet<Modifier> exceptModifier, 
                        final List<AnnotationExpr> exceptAnnotations,
                        final Type exceptType,
-                       final VariableDeclaratorId exceptId,
+                       final VariableDeclaratorId exceptId, 
                        final BlockStmt catchBlock) {
         super(range);
         setParam(new Parameter(range, exceptModifier, exceptAnnotations, exceptType, null, false, exceptId));
         setBody(catchBlock);
     }
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
     /**
      * Use {@link #getBody()} instead
      */
     @Deprecated
-    public BlockStmt getCatchBlock() {
-        return catchBlock;
-    }
-
-    /**
-     * Note that the type of the Parameter can be a UnionType. In this case, any annotations found at the start of the catch(@X A a |...)
-     * are found directly in the Parameter. Annotations that are on the second or later type - catch(A a | @X B b ...) are found on those types.
-     */
-    public Parameter getParam() {
-        return param;
-    }
+	public BlockStmt getCatchBlock() {
+		return catchBlock;
+	}
+
+	/**
+	 * Note that the type of the Parameter can be a UnionType. In this case, any annotations found at the start of the catch(@X A a |...)
+	 * are found directly in the Parameter. Annotations that are on the second or later type - catch(A a | @X B b ...) are found on those types.
+	 */
+	public Parameter getParam() {
+		return param;
+	}
 
     /**
      * Use {@link #setBody(BlockStmt)} instead
-     *
+     * 
      * @param catchBlock
      */
     @Deprecated
-    public CatchClause setCatchBlock(final BlockStmt catchBlock) {
-        this.catchBlock = catchBlock;
-        setAsParentNodeOf(this.catchBlock);
+	public CatchClause setCatchBlock(final BlockStmt catchBlock) {
+		this.catchBlock = catchBlock;
+		setAsParentNodeOf(this.catchBlock);
         return this;
-    }
+	}
 
-    public CatchClause setParam(final Parameter param) {
-        this.param = param;
-        setAsParentNodeOf(this.param);
+	public CatchClause setParam(final Parameter param) {
+		this.param = param;
+		setAsParentNodeOf(this.param);
         return this;
-    }
+	}
 
     @Override
     public BlockStmt getBody() {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ContinueStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ContinueStmt.java
index d067aebd54..4ba7faa7b6 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ContinueStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ContinueStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -30,36 +30,34 @@
  */
 public final class ContinueStmt extends Statement {
 
-    private String id;
+	private String id;
 
-    public ContinueStmt() {
-    }
+	public ContinueStmt() {
+	}
 
-    public ContinueStmt(final String id) {
-        this.id = id;
-    }
+	public ContinueStmt(final String id) {
+		this.id = id;
+	}
 
-    public ContinueStmt(Range range, final String id) {
-        super(range);
-        this.id = id;
-    }
+	public ContinueStmt(Range range, final String id) {
+		super(range);
+		this.id = id;
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public String getId() {
-        return id;
-    }
+	public String getId() {
+		return id;
+	}
 
-    public ContinueStmt setId(final String id) {
-        this.id = id;
-        return this;
-    }
+	public ContinueStmt setId(final String id) {
+		this.id = id;
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/DoStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/DoStmt.java
index 33c398641c..8f293ecab0 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/DoStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/DoStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -32,53 +32,51 @@
  */
 public final class DoStmt extends Statement implements NodeWithBody<DoStmt> {
 
-    private Statement body;
+	private Statement body;
 
-    private Expression condition;
+	private Expression condition;
 
-    public DoStmt() {
-    }
+	public DoStmt() {
+	}
 
-    public DoStmt(final Statement body, final Expression condition) {
-        setBody(body);
-        setCondition(condition);
-    }
+	public DoStmt(final Statement body, final Expression condition) {
+		setBody(body);
+		setCondition(condition);
+	}
 
-    public DoStmt(Range range, final Statement body, final Expression condition) {
-        super(range);
-        setBody(body);
-        setCondition(condition);
-    }
+	public DoStmt(Range range, final Statement body, final Expression condition) {
+		super(range);
+		setBody(body);
+		setCondition(condition);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    @Override
+	@Override
     public Statement getBody() {
-        return body;
-    }
+		return body;
+	}
 
-    public Expression getCondition() {
-        return condition;
-    }
+	public Expression getCondition() {
+		return condition;
+	}
 
-    @Override
+	@Override
     public DoStmt setBody(final Statement body) {
-        this.body = body;
-        setAsParentNodeOf(this.body);
+		this.body = body;
+		setAsParentNodeOf(this.body);
         return this;
-    }
+	}
 
-    public DoStmt setCondition(final Expression condition) {
-        this.condition = condition;
-        setAsParentNodeOf(this.condition);
-        return this;
-    }
+	public DoStmt setCondition(final Expression condition) {
+		this.condition = condition;
+		setAsParentNodeOf(this.condition);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/EmptyStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/EmptyStmt.java
index d82bb631e0..00709806d4 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/EmptyStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/EmptyStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -30,20 +30,18 @@
  */
 public final class EmptyStmt extends Statement {
 
-    public EmptyStmt() {
-    }
+	public EmptyStmt() {
+	}
 
-    public EmptyStmt(Range range) {
-        super(range);
-    }
+	public EmptyStmt(Range range) {
+		super(range);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
index 7e82a58338..e29205b84e 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -41,69 +41,69 @@ public final class ExplicitConstructorInvocationStmt extends Statement implement
 
     private boolean isThis;
 
-    private Expression expr;
-
-    private List<Expression> args;
-
-    public ExplicitConstructorInvocationStmt() {
-    }
-
-    public ExplicitConstructorInvocationStmt(final boolean isThis,
-                                             final Expression expr, final List<Expression> args) {
-        setThis(isThis);
-        setExpr(expr);
-        setArgs(args);
-    }
-
-    public ExplicitConstructorInvocationStmt(Range range,
-                                             final List<Type<?>> typeArguments, final boolean isThis,
-                                             final Expression expr, final List<Expression> args) {
-        super(range);
-        setTypeArguments(typeArguments);
-        setThis(isThis);
-        setExpr(expr);
-        setArgs(args);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public List<Expression> getArgs() {
+	private Expression expr;
+
+	private List<Expression> args;
+
+	public ExplicitConstructorInvocationStmt() {
+	}
+
+	public ExplicitConstructorInvocationStmt(final boolean isThis,
+			final Expression expr, final List<Expression> args) {
+		setThis(isThis);
+		setExpr(expr);
+		setArgs(args);
+	}
+
+	public ExplicitConstructorInvocationStmt(Range range,
+	                                         final List<Type<?>> typeArguments, final boolean isThis,
+	                                         final Expression expr, final List<Expression> args) {
+		super(range);
+		setTypeArguments(typeArguments);
+		setThis(isThis);
+		setExpr(expr);
+		setArgs(args);
+	}
+
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public List<Expression> getArgs() {
         args = ensureNotNull(args);
         return args;
-    }
-
-    public Expression getExpr() {
-        return expr;
-    }
-
-    public boolean isThis() {
-        return isThis;
-    }
-
-    public ExplicitConstructorInvocationStmt setArgs(final List<Expression> args) {
-        this.args = args;
-        setAsParentNodeOf(this.args);
-        return this;
-    }
-
-    public ExplicitConstructorInvocationStmt setExpr(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-        return this;
-    }
-
-    public ExplicitConstructorInvocationStmt setThis(final boolean isThis) {
-        this.isThis = isThis;
-        return this;
-    }
+	}
+
+	public Expression getExpr() {
+		return expr;
+	}
+
+	public boolean isThis() {
+		return isThis;
+	}
+
+	public ExplicitConstructorInvocationStmt setArgs(final List<Expression> args) {
+		this.args = args;
+		setAsParentNodeOf(this.args);
+		return this;
+	}
+
+	public ExplicitConstructorInvocationStmt setExpr(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+		return this;
+	}
+
+	public ExplicitConstructorInvocationStmt setThis(final boolean isThis) {
+		this.isThis = isThis;
+		return this;
+	}
 
     @Override
     public List<Type<?>> getTypeArguments() {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExpressionStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExpressionStmt.java
index a184a731af..72d8a2e945 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExpressionStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ExpressionStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -31,38 +31,36 @@
  */
 public final class ExpressionStmt extends Statement {
 
-    private Expression expr;
+	private Expression expr;
 
-    public ExpressionStmt() {
-    }
+	public ExpressionStmt() {
+	}
 
-    public ExpressionStmt(final Expression expr) {
-        setExpression(expr);
-    }
+	public ExpressionStmt(final Expression expr) {
+		setExpression(expr);
+	}
 
-    public ExpressionStmt(Range range,
-                          final Expression expr) {
-        super(range);
-        setExpression(expr);
-    }
+	public ExpressionStmt(Range range,
+	                      final Expression expr) {
+		super(range);
+		setExpression(expr);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getExpression() {
-        return expr;
-    }
+	public Expression getExpression() {
+		return expr;
+	}
 
-    public ExpressionStmt setExpression(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-        return this;
-    }
+	public ExpressionStmt setExpression(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForStmt.java
index 6e5596c7de..52baddb7b4 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -36,86 +36,86 @@
  */
 public final class ForStmt extends Statement implements NodeWithBody<ForStmt> {
 
-    private List<Expression> init;
+	private List<Expression> init;
 
-    private Expression compare;
+	private Expression compare;
 
-    private List<Expression> update;
+	private List<Expression> update;
 
-    private Statement body;
+	private Statement body;
 
-    public ForStmt() {
-    }
+	public ForStmt() {
+	}
 
-    public ForStmt(final List<Expression> init, final Expression compare,
-                   final List<Expression> update, final Statement body) {
-        setCompare(compare);
-        setInit(init);
-        setUpdate(update);
-        setBody(body);
-    }
+	public ForStmt(final List<Expression> init, final Expression compare,
+			final List<Expression> update, final Statement body) {
+		setCompare(compare);
+		setInit(init);
+		setUpdate(update);
+		setBody(body);
+	}
 
-    public ForStmt(Range range,
-                   final List<Expression> init, final Expression compare,
-                   final List<Expression> update, final Statement body) {
-        super(range);
-        setCompare(compare);
-        setInit(init);
-        setUpdate(update);
-        setBody(body);
-    }
+	public ForStmt(Range range,
+	               final List<Expression> init, final Expression compare,
+	               final List<Expression> update, final Statement body) {
+		super(range);
+		setCompare(compare);
+		setInit(init);
+		setUpdate(update);
+		setBody(body);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    @Override
+	@Override
     public Statement getBody() {
-        return body;
-    }
+		return body;
+	}
 
-    public Expression getCompare() {
-        return compare;
-    }
+	public Expression getCompare() {
+		return compare;
+	}
 
-    public List<Expression> getInit() {
+	public List<Expression> getInit() {
         init = ensureNotNull(init);
         return init;
-    }
+	}
 
-    public List<Expression> getUpdate() {
+	public List<Expression> getUpdate() {
         update = ensureNotNull(update);
         return update;
-    }
+	}
 
-    @Override
+	@Override
     public ForStmt setBody(final Statement body) {
-        this.body = body;
-        setAsParentNodeOf(this.body);
-        return this;
-    }
-
-    public ForStmt setCompare(final Expression compare) {
-        this.compare = compare;
-        setAsParentNodeOf(this.compare);
-        return this;
-    }
-
-    public ForStmt setInit(final List<Expression> init) {
-        this.init = init;
-        setAsParentNodeOf(this.init);
-        return this;
-    }
-
-    public ForStmt setUpdate(final List<Expression> update) {
-        this.update = update;
-        setAsParentNodeOf(this.update);
+		this.body = body;
+		setAsParentNodeOf(this.body);
         return this;
-    }
+	}
+
+	public ForStmt setCompare(final Expression compare) {
+		this.compare = compare;
+		setAsParentNodeOf(this.compare);
+		return this;
+	}
+
+	public ForStmt setInit(final List<Expression> init) {
+		this.init = init;
+		setAsParentNodeOf(this.init);
+		return this;
+	}
+
+	public ForStmt setUpdate(final List<Expression> update) {
+		this.update = update;
+		setAsParentNodeOf(this.update);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForeachStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForeachStmt.java
index 2351c6923c..3a94572b0b 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForeachStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ForeachStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -34,34 +34,34 @@
  */
 public final class ForeachStmt extends Statement implements NodeWithBody<ForeachStmt> {
 
-    private VariableDeclarationExpr var;
+	private VariableDeclarationExpr var;
 
-    private Expression iterable;
+	private Expression iterable;
 
-    private Statement body;
+	private Statement body;
 
-    public ForeachStmt() {
-    }
+	public ForeachStmt() {
+	}
 
-    public ForeachStmt(final VariableDeclarationExpr var,
-                       final Expression iterable, final Statement body) {
-        setVariable(var);
-        setIterable(iterable);
-        setBody(body);
-    }
+	public ForeachStmt(final VariableDeclarationExpr var,
+			final Expression iterable, final Statement body) {
+		setVariable(var);
+		setIterable(iterable);
+		setBody(body);
+	}
 
-    public ForeachStmt(Range range,
-                       final VariableDeclarationExpr var, final Expression iterable,
-                       final Statement body) {
-        super(range);
-        setVariable(var);
-        setIterable(iterable);
-        setBody(body);
-    }
+	public ForeachStmt(Range range,
+	                   final VariableDeclarationExpr var, final Expression iterable,
+	                   final Statement body) {
+		super(range);
+		setVariable(var);
+		setIterable(iterable);
+		setBody(body);
+	}
 
     /**
      * Will create a {@link NameExpr} with the iterable param
-     *
+     * 
      * @param var
      * @param iterable
      * @param body
@@ -73,44 +73,44 @@ public ForeachStmt(VariableDeclarationExpr var, String iterable, BlockStmt body)
     }
 
     @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    @Override
+	@Override
     public Statement getBody() {
-        return body;
-    }
+		return body;
+	}
 
-    public Expression getIterable() {
-        return iterable;
-    }
+	public Expression getIterable() {
+		return iterable;
+	}
 
-    public VariableDeclarationExpr getVariable() {
-        return var;
-    }
+	public VariableDeclarationExpr getVariable() {
+		return var;
+	}
 
-    @Override
+	@Override
     public ForeachStmt setBody(final Statement body) {
-        this.body = body;
-        setAsParentNodeOf(this.body);
-        return this;
-    }
-
-    public ForeachStmt setIterable(final Expression iterable) {
-        this.iterable = iterable;
-        setAsParentNodeOf(this.iterable);
-        return this;
-    }
-
-    public ForeachStmt setVariable(final VariableDeclarationExpr var) {
-        this.var = var;
-        setAsParentNodeOf(this.var);
+		this.body = body;
+		setAsParentNodeOf(this.body);
         return this;
-    }
+	}
+
+	public ForeachStmt setIterable(final Expression iterable) {
+		this.iterable = iterable;
+		setAsParentNodeOf(this.iterable);
+		return this;
+	}
+
+	public ForeachStmt setVariable(final VariableDeclarationExpr var) {
+		this.var = var;
+		setAsParentNodeOf(this.var);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/IfStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/IfStmt.java
index f7126a9e61..ace3ec8a5c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/IfStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/IfStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -31,66 +31,64 @@
  */
 public final class IfStmt extends Statement {
 
-    private Expression condition;
-
-    private Statement thenStmt;
-
-    private Statement elseStmt;
-
-    public IfStmt() {
-    }
-
-    public IfStmt(final Expression condition, final Statement thenStmt, final Statement elseStmt) {
-        setCondition(condition);
-        setThenStmt(thenStmt);
-        setElseStmt(elseStmt);
-    }
-
-    public IfStmt(Range range,
-                  final Expression condition, final Statement thenStmt, final Statement elseStmt) {
-        super(range);
-        setCondition(condition);
-        setThenStmt(thenStmt);
-        setElseStmt(elseStmt);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public Expression getCondition() {
-        return condition;
-    }
-
-    public Statement getElseStmt() {
-        return elseStmt;
-    }
-
-    public Statement getThenStmt() {
-        return thenStmt;
-    }
-
-    public IfStmt setCondition(final Expression condition) {
-        this.condition = condition;
-        setAsParentNodeOf(this.condition);
-        return this;
-    }
-
-    public IfStmt setElseStmt(final Statement elseStmt) {
-        this.elseStmt = elseStmt;
-        setAsParentNodeOf(this.elseStmt);
-        return this;
-    }
-
-    public IfStmt setThenStmt(final Statement thenStmt) {
-        this.thenStmt = thenStmt;
-        setAsParentNodeOf(this.thenStmt);
-        return this;
-    }
+	private Expression condition;
+
+	private Statement thenStmt;
+
+	private Statement elseStmt;
+
+	public IfStmt() {
+	}
+
+	public IfStmt(final Expression condition, final Statement thenStmt, final Statement elseStmt) {
+		setCondition(condition);
+		setThenStmt(thenStmt);
+		setElseStmt(elseStmt);
+	}
+
+	public IfStmt(Range range,
+	              final Expression condition, final Statement thenStmt, final Statement elseStmt) {
+		super(range);
+		setCondition(condition);
+		setThenStmt(thenStmt);
+		setElseStmt(elseStmt);
+	}
+
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public Expression getCondition() {
+		return condition;
+	}
+
+	public Statement getElseStmt() {
+		return elseStmt;
+	}
+
+	public Statement getThenStmt() {
+		return thenStmt;
+	}
+
+	public IfStmt setCondition(final Expression condition) {
+		this.condition = condition;
+		setAsParentNodeOf(this.condition);
+		return this;
+	}
+
+	public IfStmt setElseStmt(final Statement elseStmt) {
+		this.elseStmt = elseStmt;
+		setAsParentNodeOf(this.elseStmt);
+		return this;
+	}
+
+	public IfStmt setThenStmt(final Statement thenStmt) {
+		this.thenStmt = thenStmt;
+		setAsParentNodeOf(this.thenStmt);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/LabeledStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/LabeledStmt.java
index dae9f95ff9..ded1ad8d89 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/LabeledStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/LabeledStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -30,50 +30,48 @@
  */
 public final class LabeledStmt extends Statement {
 
-    private String label;
+	private String label;
 
-    private Statement stmt;
+	private Statement stmt;
 
-    public LabeledStmt() {
-    }
+	public LabeledStmt() {
+	}
 
-    public LabeledStmt(final String label, final Statement stmt) {
-        setLabel(label);
-        setStmt(stmt);
-    }
+	public LabeledStmt(final String label, final Statement stmt) {
+		setLabel(label);
+		setStmt(stmt);
+	}
 
-    public LabeledStmt(Range range, final String label, final Statement stmt) {
-        super(range);
-        setLabel(label);
-        setStmt(stmt);
-    }
+	public LabeledStmt(Range range, final String label, final Statement stmt) {
+		super(range);
+		setLabel(label);
+		setStmt(stmt);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public String getLabel() {
-        return label;
-    }
+	public String getLabel() {
+		return label;
+	}
 
-    public Statement getStmt() {
-        return stmt;
-    }
+	public Statement getStmt() {
+		return stmt;
+	}
 
-    public LabeledStmt setLabel(final String label) {
-        this.label = label;
-        return this;
-    }
+	public LabeledStmt setLabel(final String label) {
+		this.label = label;
+		return this;
+	}
 
-    public LabeledStmt setStmt(final Statement stmt) {
-        this.stmt = stmt;
-        setAsParentNodeOf(this.stmt);
-        return this;
-    }
+	public LabeledStmt setStmt(final Statement stmt) {
+		this.stmt = stmt;
+		setAsParentNodeOf(this.stmt);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ReturnStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ReturnStmt.java
index 8d48dc35e2..6ce31d0bfb 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ReturnStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ReturnStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -32,23 +32,23 @@
  */
 public final class ReturnStmt extends Statement {
 
-    private Expression expr;
+	private Expression expr;
 
-    public ReturnStmt() {
-    }
+	public ReturnStmt() {
+	}
 
-    public ReturnStmt(final Expression expr) {
-        setExpr(expr);
-    }
+	public ReturnStmt(final Expression expr) {
+		setExpr(expr);
+	}
 
-    public ReturnStmt(Range range, final Expression expr) {
-        super(range);
-        setExpr(expr);
-    }
+	public ReturnStmt(Range range, final Expression expr) {
+		super(range);
+		setExpr(expr);
+	}
 
     /**
      * Will create a NameExpr with the string param
-     *
+     * 
      * @param expr
      */
     public ReturnStmt(String expr) {
@@ -57,21 +57,20 @@ public ReturnStmt(String expr) {
 
     @Override
     public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getExpr() {
-        return expr;
-    }
+	public Expression getExpr() {
+		return expr;
+	}
 
-    public ReturnStmt setExpr(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-        return this;
-    }
+	public ReturnStmt setExpr(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/Statement.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/Statement.java
index 3aa9caec7b..eacfcc4167 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/Statement.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/Statement.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -29,11 +29,11 @@
  */
 public abstract class Statement extends Node {
 
-    public Statement() {
-    }
+	public Statement() {
+	}
 
-    public Statement(final Range range) {
-        super(range);
-    }
+	public Statement(final Range range) {
+		super(range);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchEntryStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
index c75a0b134d..e17e20e94c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -36,55 +36,55 @@
  */
 public final class SwitchEntryStmt extends Statement implements NodeWithStatements<SwitchEntryStmt> {
 
-    private Expression label;
+	private Expression label;
 
-    private List<Statement> stmts;
+	private List<Statement> stmts;
 
-    public SwitchEntryStmt() {
-    }
+	public SwitchEntryStmt() {
+	}
 
-    public SwitchEntryStmt(final Expression label, final List<Statement> stmts) {
-        setLabel(label);
-        setStmts(stmts);
-    }
+	public SwitchEntryStmt(final Expression label, final List<Statement> stmts) {
+		setLabel(label);
+		setStmts(stmts);
+	}
 
-    public SwitchEntryStmt(Range range, final Expression label,
-                           final List<Statement> stmts) {
-        super(range);
-        setLabel(label);
-        setStmts(stmts);
-    }
+	public SwitchEntryStmt(Range range, final Expression label,
+	                       final List<Statement> stmts) {
+		super(range);
+		setLabel(label);
+		setStmts(stmts);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getLabel() {
-        return label;
-    }
+	public Expression getLabel() {
+		return label;
+	}
 
-    @Override
+	@Override
     public List<Statement> getStmts() {
         stmts = ensureNotNull(stmts);
         return stmts;
-    }
+	}
 
-    public SwitchEntryStmt setLabel(final Expression label) {
-        this.label = label;
-        setAsParentNodeOf(this.label);
-        return this;
-    }
+	public SwitchEntryStmt setLabel(final Expression label) {
+		this.label = label;
+		setAsParentNodeOf(this.label);
+		return this;
+	}
 
-    @Override
+	@Override
     public SwitchEntryStmt setStmts(final List<Statement> stmts) {
-        this.stmts = stmts;
-        setAsParentNodeOf(this.stmts);
+		this.stmts = stmts;
+		setAsParentNodeOf(this.stmts);
         return this;
-    }
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchStmt.java
index 5e2313145b..c909394b2b 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SwitchStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -35,54 +35,54 @@
  */
 public final class SwitchStmt extends Statement {
 
-    private Expression selector;
+	private Expression selector;
 
-    private List<SwitchEntryStmt> entries;
+	private List<SwitchEntryStmt> entries;
 
-    public SwitchStmt() {
-    }
+	public SwitchStmt() {
+	}
 
-    public SwitchStmt(final Expression selector,
-                      final List<SwitchEntryStmt> entries) {
-        setSelector(selector);
-        setEntries(entries);
-    }
+	public SwitchStmt(final Expression selector,
+			final List<SwitchEntryStmt> entries) {
+		setSelector(selector);
+		setEntries(entries);
+	}
 
-    public SwitchStmt(Range range, final Expression selector,
-                      final List<SwitchEntryStmt> entries) {
-        super(range);
-        setSelector(selector);
-        setEntries(entries);
-    }
+	public SwitchStmt(Range range, final Expression selector,
+	                  final List<SwitchEntryStmt> entries) {
+		super(range);
+		setSelector(selector);
+		setEntries(entries);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public List<SwitchEntryStmt> getEntries() {
+	public List<SwitchEntryStmt> getEntries() {
         entries = ensureNotNull(entries);
         return entries;
-    }
-
-    public Expression getSelector() {
-        return selector;
-    }
-
-    public SwitchStmt setEntries(final List<SwitchEntryStmt> entries) {
-        this.entries = entries;
-        setAsParentNodeOf(this.entries);
-        return this;
-    }
-
-    public SwitchStmt setSelector(final Expression selector) {
-        this.selector = selector;
-        setAsParentNodeOf(this.selector);
-        return this;
-    }
+	}
+
+	public Expression getSelector() {
+		return selector;
+	}
+
+	public SwitchStmt setEntries(final List<SwitchEntryStmt> entries) {
+		this.entries = entries;
+		setAsParentNodeOf(this.entries);
+		return this;
+	}
+
+	public SwitchStmt setSelector(final Expression selector) {
+		this.selector = selector;
+		setAsParentNodeOf(this.selector);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SynchronizedStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SynchronizedStmt.java
index 05c2bd38d6..1a9d2db5d7 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SynchronizedStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/SynchronizedStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -62,8 +62,8 @@ public <A> void accept(final VoidVisitor<A> v, final A arg) {
     }
 
     /**
-     * @return
      * @deprecated use {@link #getBody()}
+     * @return
      */
     @Deprecated
     public BlockStmt getBlock() {
@@ -75,8 +75,8 @@ public Expression getExpr() {
     }
 
     /**
-     * @param block
      * @deprecated Use {@link #setBody(BlockStmt)} instead
+     * @param block
      */
     @Deprecated
     public SynchronizedStmt setBlock(final BlockStmt block) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ThrowStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ThrowStmt.java
index ceb8cb3978..180fdd04cd 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ThrowStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/ThrowStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -31,37 +31,35 @@
  */
 public final class ThrowStmt extends Statement {
 
-    private Expression expr;
+	private Expression expr;
 
-    public ThrowStmt() {
-    }
+	public ThrowStmt() {
+	}
 
-    public ThrowStmt(final Expression expr) {
-        setExpr(expr);
-    }
+	public ThrowStmt(final Expression expr) {
+		setExpr(expr);
+	}
 
-    public ThrowStmt(Range range, final Expression expr) {
-        super(range);
-        setExpr(expr);
-    }
+	public ThrowStmt(Range range, final Expression expr) {
+		super(range);
+		setExpr(expr);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getExpr() {
-        return expr;
-    }
+	public Expression getExpr() {
+		return expr;
+	}
 
-    public ThrowStmt setExpr(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-        return this;
-    }
+	public ThrowStmt setExpr(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TryStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TryStmt.java
index 5c54beebce..4688454b4d 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TryStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TryStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -34,83 +34,83 @@
  * @author Julio Vilmar Gesser
  */
 public final class TryStmt extends Statement {
+	
+	private List<VariableDeclarationExpr> resources;
 
-    private List<VariableDeclarationExpr> resources;
+	private BlockStmt tryBlock;
 
-    private BlockStmt tryBlock;
+	private List<CatchClause> catchs;
 
-    private List<CatchClause> catchs;
+	private BlockStmt finallyBlock;
 
-    private BlockStmt finallyBlock;
+	public TryStmt() {
+	}
 
-    public TryStmt() {
-    }
+	public TryStmt(final BlockStmt tryBlock, final List<CatchClause> catchs,
+			final BlockStmt finallyBlock) {
+		setTryBlock(tryBlock);
+		setCatchs(catchs);
+		setFinallyBlock(finallyBlock);
+	}
 
-    public TryStmt(final BlockStmt tryBlock, final List<CatchClause> catchs,
-                   final BlockStmt finallyBlock) {
-        setTryBlock(tryBlock);
-        setCatchs(catchs);
-        setFinallyBlock(finallyBlock);
-    }
+	public TryStmt(Range range, List<VariableDeclarationExpr> resources,
+	               final BlockStmt tryBlock, final List<CatchClause> catchs, final BlockStmt finallyBlock) {
+		super(range);
+		setResources(resources);
+		setTryBlock(tryBlock);
+		setCatchs(catchs);
+		setFinallyBlock(finallyBlock);
+	}
 
-    public TryStmt(Range range, List<VariableDeclarationExpr> resources,
-                   final BlockStmt tryBlock, final List<CatchClause> catchs, final BlockStmt finallyBlock) {
-        super(range);
-        setResources(resources);
-        setTryBlock(tryBlock);
-        setCatchs(catchs);
-        setFinallyBlock(finallyBlock);
-    }
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public List<CatchClause> getCatchs() {
+	public List<CatchClause> getCatchs() {
         catchs = ensureNotNull(catchs);
         return catchs;
-    }
-
-    public BlockStmt getFinallyBlock() {
-        return finallyBlock;
-    }
+	}
 
-    public BlockStmt getTryBlock() {
-        return tryBlock;
-    }
+	public BlockStmt getFinallyBlock() {
+		return finallyBlock;
+	}
 
-    public List<VariableDeclarationExpr> getResources() {
+	public BlockStmt getTryBlock() {
+		return tryBlock;
+	}
+	
+	public List<VariableDeclarationExpr> getResources() {
         resources = ensureNotNull(resources);
         return resources;
-    }
-
-    public TryStmt setCatchs(final List<CatchClause> catchs) {
-        this.catchs = catchs;
-        setAsParentNodeOf(this.catchs);
-        return this;
-    }
-
-    public TryStmt setFinallyBlock(final BlockStmt finallyBlock) {
-        this.finallyBlock = finallyBlock;
-        setAsParentNodeOf(this.finallyBlock);
-        return this;
-    }
-
-    public TryStmt setTryBlock(final BlockStmt tryBlock) {
-        this.tryBlock = tryBlock;
-        setAsParentNodeOf(this.tryBlock);
-        return this;
-    }
-
-    public TryStmt setResources(List<VariableDeclarationExpr> resources) {
-        this.resources = resources;
-        setAsParentNodeOf(this.resources);
-        return this;
-    }
+	}
+
+	public TryStmt setCatchs(final List<CatchClause> catchs) {
+		this.catchs = catchs;
+		setAsParentNodeOf(this.catchs);
+		return this;
+	}
+
+	public TryStmt setFinallyBlock(final BlockStmt finallyBlock) {
+		this.finallyBlock = finallyBlock;
+		setAsParentNodeOf(this.finallyBlock);
+		return this;
+	}
+
+	public TryStmt setTryBlock(final BlockStmt tryBlock) {
+		this.tryBlock = tryBlock;
+		setAsParentNodeOf(this.tryBlock);
+		return this;
+	}
+	
+	public TryStmt setResources(List<VariableDeclarationExpr> resources) {
+		this.resources = resources;
+		setAsParentNodeOf(this.resources);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
index b9412eeaab..a9f83bf785 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -31,37 +31,35 @@
  */
 public final class TypeDeclarationStmt extends Statement {
 
-    private TypeDeclaration typeDecl;
+	private TypeDeclaration typeDecl;
 
-    public TypeDeclarationStmt() {
-    }
+	public TypeDeclarationStmt() {
+	}
 
-    public TypeDeclarationStmt(final TypeDeclaration typeDecl) {
-        setTypeDeclaration(typeDecl);
-    }
+	public TypeDeclarationStmt(final TypeDeclaration typeDecl) {
+		setTypeDeclaration(typeDecl);
+	}
 
-    public TypeDeclarationStmt(Range range, final TypeDeclaration typeDecl) {
-        super(range);
-        setTypeDeclaration(typeDecl);
-    }
+	public TypeDeclarationStmt(Range range, final TypeDeclaration typeDecl) {
+		super(range);
+		setTypeDeclaration(typeDecl);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public TypeDeclaration getTypeDeclaration() {
-        return typeDecl;
-    }
+	public TypeDeclaration getTypeDeclaration() {
+		return typeDecl;
+	}
 
-    public TypeDeclarationStmt setTypeDeclaration(final TypeDeclaration typeDecl) {
-        this.typeDecl = typeDecl;
-        setAsParentNodeOf(this.typeDecl);
-        return this;
-    }
+	public TypeDeclarationStmt setTypeDeclaration(final TypeDeclaration typeDecl) {
+		this.typeDecl = typeDecl;
+		setAsParentNodeOf(this.typeDecl);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/WhileStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/WhileStmt.java
index 4f3b4f7cf8..b843494a40 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/WhileStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/stmt/WhileStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.Range;
@@ -32,53 +32,51 @@
  */
 public final class WhileStmt extends Statement implements NodeWithBody<WhileStmt> {
 
-    private Expression condition;
+	private Expression condition;
 
-    private Statement body;
+	private Statement body;
 
-    public WhileStmt() {
-    }
+	public WhileStmt() {
+	}
 
-    public WhileStmt(final Expression condition, final Statement body) {
-        setCondition(condition);
-        setBody(body);
-    }
+	public WhileStmt(final Expression condition, final Statement body) {
+		setCondition(condition);
+		setBody(body);
+	}
 
-    public WhileStmt(Range range, final Expression condition, final Statement body) {
-        super(range);
-        setCondition(condition);
-        setBody(body);
-    }
+	public WhileStmt(Range range, final Expression condition, final Statement body) {
+		super(range);
+		setCondition(condition);
+		setBody(body);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    @Override
+	@Override
     public Statement getBody() {
-        return body;
-    }
+		return body;
+	}
 
-    public Expression getCondition() {
-        return condition;
-    }
+	public Expression getCondition() {
+		return condition;
+	}
 
-    @Override
+	@Override
     public WhileStmt setBody(final Statement body) {
-        this.body = body;
-        setAsParentNodeOf(this.body);
+		this.body = body;
+		setAsParentNodeOf(this.body);
         return this;
-    }
+	}
 
-    public WhileStmt setCondition(final Expression condition) {
-        this.condition = condition;
-        setAsParentNodeOf(this.condition);
-        return this;
-    }
+	public WhileStmt setCondition(final Expression condition) {
+		this.condition = condition;
+		setAsParentNodeOf(this.condition);
+		return this;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ArrayType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ArrayType.java
index f425bdabf0..babf2a5d75 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ArrayType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ArrayType.java
@@ -30,13 +30,11 @@ public ArrayType(Range range, Type componentType, List<AnnotationExpr> annotatio
         setAnnotations(annotations);
     }
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+    @Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
         return v.visit(this, arg);
     }
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+    @Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
         v.visit(this, arg);
     }
 
@@ -81,7 +79,7 @@ public static Pair<Type, List<ArrayBracketPair>> unwrapArrayTypes(Type type) {
         }
         return new Pair<>(type, arrayBracketPairs);
     }
-
+    
     public static ArrayType arrayOf(Type type, AnnotationExpr... annotations) {
         return new ArrayType(type, Arrays.asList(annotations));
     }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ClassOrInterfaceType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ClassOrInterfaceType.java
index ea989585b4..ac308940da 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ClassOrInterfaceType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ClassOrInterfaceType.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -35,8 +35,8 @@
 /**
  * @author Julio Vilmar Gesser
  */
-public final class ClassOrInterfaceType extends ReferenceType<ClassOrInterfaceType> implements
-        NodeWithName<ClassOrInterfaceType>,
+public final class ClassOrInterfaceType extends ReferenceType<ClassOrInterfaceType> implements 
+        NodeWithName<ClassOrInterfaceType>, 
         NodeWithAnnotations<ClassOrInterfaceType>,
         NodeWithTypeArguments<ClassOrInterfaceType> {
 
@@ -65,13 +65,11 @@ public ClassOrInterfaceType(final Range range, final ClassOrInterfaceType scope,
         setTypeArguments(typeArguments);
     }
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+    @Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
         return v.visit(this, arg);
     }
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
+    @Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
         v.visit(this, arg);
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/IntersectionType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/IntersectionType.java
index 9c78ba5c8e..029d465378 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/IntersectionType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/IntersectionType.java
@@ -10,10 +10,10 @@
 /**
  * Represents a set of types. A given value of this type has to be assignable to at all of the element types.
  * As of Java 8 it is used in casts or while expressing bounds for generic types.
- * <p>
+ *
  * For example:
  * public class A&gt;T extends Serializable &amp; Cloneable&lt; { }
- * <p>
+ *
  * Or:
  * void foo((Serializable &amp; Cloneable)myObject);
  *
@@ -49,7 +49,7 @@ public List<ReferenceType> getElements() {
 
     public IntersectionType setElements(List<ReferenceType> elements) {
         if (this.elements != null) {
-            for (ReferenceType element : elements) {
+            for (ReferenceType element : elements){
                 element.setParentNode(null);
             }
         }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/PrimitiveType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/PrimitiveType.java
index 523dafe94a..29299a4257 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/PrimitiveType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/PrimitiveType.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import com.github.javaparser.Range;
@@ -35,86 +35,83 @@
  */
 public final class PrimitiveType extends Type<PrimitiveType> implements NodeWithAnnotations<PrimitiveType> {
 
-    public static final PrimitiveType BYTE_TYPE = new PrimitiveType(Primitive.Byte);
-
-    public static final PrimitiveType SHORT_TYPE = new PrimitiveType(Primitive.Short);
+	public static final PrimitiveType BYTE_TYPE = new PrimitiveType(Primitive.Byte);
 
-    public static final PrimitiveType INT_TYPE = new PrimitiveType(Primitive.Int);
+	public static final PrimitiveType SHORT_TYPE = new PrimitiveType(Primitive.Short);
 
-    public static final PrimitiveType LONG_TYPE = new PrimitiveType(Primitive.Long);
+	public static final PrimitiveType INT_TYPE = new PrimitiveType(Primitive.Int);
 
-    public static final PrimitiveType FLOAT_TYPE = new PrimitiveType(Primitive.Float);
+	public static final PrimitiveType LONG_TYPE = new PrimitiveType(Primitive.Long);
 
-    public static final PrimitiveType DOUBLE_TYPE = new PrimitiveType(Primitive.Double);
+	public static final PrimitiveType FLOAT_TYPE = new PrimitiveType(Primitive.Float);
 
-    public static final PrimitiveType BOOLEAN_TYPE = new PrimitiveType(Primitive.Boolean);
+	public static final PrimitiveType DOUBLE_TYPE = new PrimitiveType(Primitive.Double);
 
-    public static final PrimitiveType CHAR_TYPE = new PrimitiveType(Primitive.Char);
+	public static final PrimitiveType BOOLEAN_TYPE = new PrimitiveType(Primitive.Boolean);
 
-    public enum Primitive {
-        Boolean("Boolean"),
-        Char("Character"),
-        Byte("Byte"),
-        Short("Short"),
-        Int("Integer"),
-        Long("Long"),
-        Float("Float"),
-        Double("Double");
+	public static final PrimitiveType CHAR_TYPE = new PrimitiveType(Primitive.Char);
 
-        final String nameOfBoxedType;
+	public enum Primitive {
+		Boolean ("Boolean"),
+		Char    ("Character"),
+		Byte    ("Byte"),
+		Short   ("Short"),
+		Int     ("Integer"),
+		Long    ("Long"),
+		Float   ("Float"),
+		Double  ("Double");
 
-        public ClassOrInterfaceType toBoxedType() {
-            return new ClassOrInterfaceType(nameOfBoxedType);
-        }
+		final String nameOfBoxedType;
 
-        Primitive(String nameOfBoxedType) {
-            this.nameOfBoxedType = nameOfBoxedType;
-        }
-    }
+		public ClassOrInterfaceType toBoxedType() {
+			return new ClassOrInterfaceType(nameOfBoxedType);
+		}
 
-    static final HashMap<String, Primitive> unboxMap = new HashMap<>();
+		Primitive(String nameOfBoxedType) {
+			this.nameOfBoxedType = nameOfBoxedType;
+		}
+	}
 
-    static {
-        for (Primitive unboxedType : Primitive.values()) {
-            unboxMap.put(unboxedType.nameOfBoxedType, unboxedType);
-        }
-    }
+	static final HashMap<String, Primitive> unboxMap = new HashMap<>();
+	static {
+		for(Primitive unboxedType : Primitive.values()) {
+			unboxMap.put(unboxedType.nameOfBoxedType, unboxedType);
+		}
+	}
 
-    private Primitive type;
+	private Primitive type;
 
-    public PrimitiveType() {
-    }
+	public PrimitiveType() {
+	}
 
-    public PrimitiveType(final Primitive type) {
-        this.type = type;
-    }
+	public PrimitiveType(final Primitive type) {
+		this.type = type;
+	}
 
-    public PrimitiveType(Range range, final Primitive type) {
-        super(range);
-        setType(type);
-    }
+	public PrimitiveType(Range range, final Primitive type) {
+		super(range);
+		setType(type);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Primitive getType() {
-        return type;
-    }
+	public Primitive getType() {
+		return type;
+	}
 
-    public ClassOrInterfaceType toBoxedType() {
-        return type.toBoxedType();
-    }
+	public ClassOrInterfaceType toBoxedType() {
+		return type.toBoxedType();
+	}
 
-    public PrimitiveType setType(final Primitive type) {
-        this.type = type;
-        return this;
-    }
+	public PrimitiveType setType(final Primitive type) {
+		this.type = type;
+		return this;
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ReferenceType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ReferenceType.java
index d41eb1439d..1a4666b4f3 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ReferenceType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/ReferenceType.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import com.github.javaparser.Range;
@@ -29,9 +29,9 @@
 public abstract class ReferenceType<T extends ReferenceType> extends Type<T> {
 
     public ReferenceType() {
-    }
+	}
 
-    public ReferenceType(final Range range) {
-        super(range);
-    }
+	public ReferenceType(final Range range) {
+		super(range);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/Type.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/Type.java
index 2f433bee82..6c043557ae 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/Type.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/Type.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import com.github.javaparser.Range;
@@ -40,14 +40,14 @@ public abstract class Type<T extends Type> extends Node {
     public Type() {
     }
 
-    public Type(List<AnnotationExpr> annotation) {
+    public Type(List<AnnotationExpr> annotation){
         this.annotations = annotation;
     }
 
     public Type(Range range) {
         super(range);
     }
-
+    
     public Type(Range range, List<AnnotationExpr> annotations) {
         super(range);
         setAnnotations(annotations);
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/TypeParameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/TypeParameter.java
index d6a9f5bbaa..bfec9c9365 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/TypeParameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/TypeParameter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import com.github.javaparser.Range;
@@ -42,89 +42,88 @@
  * TypeParameter ::= <IDENTIFIER> ( "extends" }{@link ClassOrInterfaceType}{@code ( "&" }{@link ClassOrInterfaceType}{@code )* )?
  * }
  * </pre>
- *
  * @author Julio Vilmar Gesser
  */
 public final class TypeParameter extends ReferenceType<TypeParameter> implements NodeWithName<TypeParameter> {
 
-    private String name;
+	private String name;
 
     private List<AnnotationExpr> annotations;
 
-    private List<ClassOrInterfaceType> typeBound;
-
-    public TypeParameter() {
-    }
-
-    public TypeParameter(final String name, final List<ClassOrInterfaceType> typeBound) {
-        setName(name);
-        setTypeBound(typeBound);
-    }
-
-    public TypeParameter(Range range, final String name, final List<ClassOrInterfaceType> typeBound) {
-        super(range);
-        setName(name);
-        setTypeBound(typeBound);
-    }
-
-    public TypeParameter(Range range, String name, List<ClassOrInterfaceType> typeBound, List<AnnotationExpr> annotations) {
-        this(range, name, typeBound);
-        setTypeBound(typeBound);
-        setAnnotations(annotations);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    /**
-     * Return the name of the paramenter.
-     *
-     * @return the name of the paramenter
-     */
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Return the list of {@link ClassOrInterfaceType} that this parameter
-     * extends. Return <code>null</code> null if there are no type.
-     *
-     * @return list of types that this paramente extends or <code>null</code>
-     */
-    public List<ClassOrInterfaceType> getTypeBound() {
+	private List<ClassOrInterfaceType> typeBound;
+
+	public TypeParameter() {
+	}
+
+	public TypeParameter(final String name, final List<ClassOrInterfaceType> typeBound) {
+		setName(name);
+		setTypeBound(typeBound);
+	}
+
+	public TypeParameter(Range range, final String name, final List<ClassOrInterfaceType> typeBound) {
+		super(range);
+		setName(name);
+		setTypeBound(typeBound);
+	}
+
+	public TypeParameter(Range range, String name, List<ClassOrInterfaceType> typeBound, List<AnnotationExpr> annotations) {
+		this(range, name, typeBound);
+		setTypeBound(typeBound);
+		setAnnotations(annotations);
+	}
+
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	/**
+	 * Return the name of the paramenter.
+	 * 
+	 * @return the name of the paramenter
+	 */
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Return the list of {@link ClassOrInterfaceType} that this parameter
+	 * extends. Return <code>null</code> null if there are no type.
+	 * 
+	 * @return list of types that this paramente extends or <code>null</code>
+	 */
+	public List<ClassOrInterfaceType> getTypeBound() {
         typeBound = ensureNotNull(typeBound);
         return typeBound;
-    }
-
-    /**
-     * Sets the name of this type parameter.
-     *
-     * @param name the name to set
-     */
+	}
+
+	/**
+	 * Sets the name of this type parameter.
+	 * 
+	 * @param name
+	 *            the name to set
+	 */
     @Override
     public TypeParameter setName(final String name) {
-        this.name = name;
+		this.name = name;
         return this;
-    }
-
-    /**
-     * Sets the list o types.
-     *
-     * @param typeBound the typeBound to set
-     */
-    public TypeParameter setTypeBound(final List<ClassOrInterfaceType> typeBound) {
-        this.typeBound = typeBound;
-        setAsParentNodeOf(typeBound);
-        return this;
-    }
+	}
+
+	/**
+	 * Sets the list o types.
+	 * 
+	 * @param typeBound
+	 *            the typeBound to set
+	 */
+	public TypeParameter setTypeBound(final List<ClassOrInterfaceType> typeBound) {
+		this.typeBound = typeBound;
+		setAsParentNodeOf(typeBound);
+		return this;
+	}
 
     public List<AnnotationExpr> getAnnotations() {
         annotations = ensureNotNull(annotations);
@@ -133,7 +132,7 @@ public List<AnnotationExpr> getAnnotations() {
 
     public TypeParameter setAnnotations(List<AnnotationExpr> annotations) {
         this.annotations = annotations;
-        setAsParentNodeOf(this.annotations);
-        return this;
+	    setAsParentNodeOf(this.annotations);
+		return this;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnionType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnionType.java
index fddbf035b4..74894af0fd 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnionType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnionType.java
@@ -31,7 +31,7 @@ public List<ReferenceType> getElements() {
 
     public UnionType setElements(List<ReferenceType> elements) {
         if (this.elements != null) {
-            for (ReferenceType element : elements) {
+            for (ReferenceType element : elements){
                 element.setParentNode(null);
             }
         }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnknownType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnknownType.java
index cfaf6b8c3e..b76c5962c7 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnknownType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/UnknownType.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import com.github.javaparser.ast.expr.AnnotationExpr;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/VoidType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/VoidType.java
index f1bbf67d24..d5f7273cb8 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/VoidType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/VoidType.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import com.github.javaparser.Range;
@@ -31,23 +31,21 @@
  */
 public final class VoidType extends Type<VoidType> implements NodeWithAnnotations<VoidType> {
 
-    public static final VoidType VOID_TYPE = new VoidType();
+	public static final VoidType VOID_TYPE = new VoidType();
 
-    public VoidType() {
-    }
+	public VoidType() {
+	}
 
-    public VoidType(Range range) {
-        super(range);
-    }
+	public VoidType(Range range) {
+		super(range);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/WildcardType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/WildcardType.java
index e7e19b6e9f..d1e49bc0b2 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/WildcardType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/type/WildcardType.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import com.github.javaparser.Range;
@@ -31,57 +31,55 @@
  */
 public final class WildcardType extends Type<WildcardType> implements NodeWithAnnotations<WildcardType> {
 
-    private ReferenceType ext;
+	private ReferenceType ext;
 
-    private ReferenceType sup;
+	private ReferenceType sup;
 
-    public WildcardType() {
-    }
+	public WildcardType() {
+	}
 
-    public WildcardType(final ReferenceType ext) {
-        setExtends(ext);
-    }
+	public WildcardType(final ReferenceType ext) {
+		setExtends(ext);
+	}
 
-    public WildcardType(final ReferenceType ext, final ReferenceType sup) {
-        setExtends(ext);
-        setSuper(sup);
-    }
+	public WildcardType(final ReferenceType ext, final ReferenceType sup) {
+		setExtends(ext);
+		setSuper(sup);
+	}
 
-    public WildcardType(final Range range,
-                        final ReferenceType ext, final ReferenceType sup) {
-        super(range);
-        setExtends(ext);
-        setSuper(sup);
-    }
+	public WildcardType(final Range range,
+			final ReferenceType ext, final ReferenceType sup) {
+		super(range);
+		setExtends(ext);
+		setSuper(sup);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public ReferenceType getExtends() {
-        return ext;
-    }
+	public ReferenceType getExtends() {
+		return ext;
+	}
 
-    public ReferenceType getSuper() {
-        return sup;
-    }
+	public ReferenceType getSuper() {
+		return sup;
+	}
 
-    public WildcardType setExtends(final ReferenceType ext) {
-        this.ext = ext;
-        setAsParentNodeOf(this.ext);
-        return this;
-    }
+	public WildcardType setExtends(final ReferenceType ext) {
+		this.ext = ext;
+		setAsParentNodeOf(this.ext);
+		return this;
+	}
 
-    public WildcardType setSuper(final ReferenceType sup) {
-        this.sup = sup;
-        setAsParentNodeOf(this.sup);
-        return this;
-    }
+	public WildcardType setSuper(final ReferenceType sup) {
+		this.sup = sup;
+		setAsParentNodeOf(this.sup);
+		return this;
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/CloneVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/CloneVisitor.java
index 9ce436eb36..33ca0e02a7 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/CloneVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/CloneVisitor.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import java.util.ArrayList;
@@ -109,47 +109,47 @@
 
 public class CloneVisitor implements GenericVisitor<Node, Object> {
 
-    @Override
-    public Node visit(CompilationUnit _n, Object _arg) {
-        PackageDeclaration package_ = cloneNodes(_n.getPackage(), _arg);
-        List<ImportDeclaration> imports = visit(_n.getImports(), _arg);
+	@Override
+	public Node visit(CompilationUnit _n, Object _arg) {
+		PackageDeclaration package_ = cloneNodes(_n.getPackage(), _arg);
+		List<ImportDeclaration> imports = visit(_n.getImports(), _arg);
         List<TypeDeclaration<?>> types = visit(_n.getTypes(), _arg);
 
-        return new CompilationUnit(
-                _n.getRange(),
-                package_, imports, types
-        );
-    }
-
-    @Override
-    public Node visit(PackageDeclaration _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        NameExpr name = cloneNodes(_n.getName(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        PackageDeclaration r = new PackageDeclaration(
-                _n.getRange(),
-                annotations, name
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ImportDeclaration _n, Object _arg) {
-        NameExpr name = cloneNodes(_n.getName(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ImportDeclaration r = new ImportDeclaration(
-                _n.getRange(),
-                name, _n.isStatic(), _n.isAsterisk()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(TypeParameter _n, Object _arg) {
+		return new CompilationUnit(
+				_n.getRange(),
+				package_, imports, types
+		);
+	}
+
+	@Override
+	public Node visit(PackageDeclaration _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		NameExpr name = cloneNodes(_n.getName(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		PackageDeclaration r = new PackageDeclaration(
+				_n.getRange(),
+				annotations, name
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ImportDeclaration _n, Object _arg) {
+		NameExpr name = cloneNodes(_n.getName(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ImportDeclaration r = new ImportDeclaration(
+				_n.getRange(),
+				name, _n.isStatic(), _n.isAsterisk()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(TypeParameter _n, Object _arg) {
         List<ClassOrInterfaceType> typeBound = visit(_n.getTypeBound(), _arg);
 
         List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
@@ -158,1121 +158,1121 @@ public Node visit(TypeParameter _n, Object _arg) {
 
         Comment comment = cloneNodes(_n.getComment(), _arg);
         r.setComment(comment);
-        return r;
-    }
+		return r;
+	}
 
-    @Override
-    public Node visit(LineComment _n, Object _arg) {
-        return new LineComment(_n.getRange(), _n.getContent());
-    }
+	@Override
+	public Node visit(LineComment _n, Object _arg) {
+		return new LineComment(_n.getRange(), _n.getContent());
+	}
 
-    @Override
-    public Node visit(BlockComment _n, Object _arg) {
-        return new BlockComment(_n.getRange(), _n.getContent());
-    }
+	@Override
+	public Node visit(BlockComment _n, Object _arg) {
+		return new BlockComment(_n.getRange(), _n.getContent());
+	}
 
-    @Override
-    public Node visit(ClassOrInterfaceDeclaration _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        List<TypeParameter> typeParameters = visit(_n.getTypeParameters(), _arg);
-        List<ClassOrInterfaceType> extendsList = visit(_n.getExtends(), _arg);
-        List<ClassOrInterfaceType> implementsList = visit(_n.getImplements(), _arg);
+	@Override
+	public Node visit(ClassOrInterfaceDeclaration _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<TypeParameter> typeParameters = visit(_n.getTypeParameters(), _arg);
+		List<ClassOrInterfaceType> extendsList = visit(_n.getExtends(), _arg);
+		List<ClassOrInterfaceType> implementsList = visit(_n.getImplements(), _arg);
         List<BodyDeclaration<?>> members = visit(_n.getMembers(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ClassOrInterfaceDeclaration r = new ClassOrInterfaceDeclaration(
-                _n.getRange(),
-                _n.getModifiers(), annotations, _n.isInterface(), _n.getName(), typeParameters, extendsList, implementsList, members
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(EnumDeclaration _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        List<ClassOrInterfaceType> implementsList = visit(_n.getImplements(), _arg);
-        List<EnumConstantDeclaration> entries = visit(_n.getEntries(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ClassOrInterfaceDeclaration r = new ClassOrInterfaceDeclaration(
+				_n.getRange(),
+				_n.getModifiers(), annotations, _n.isInterface(), _n.getName(), typeParameters, extendsList, implementsList, members
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(EnumDeclaration _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<ClassOrInterfaceType> implementsList = visit(_n.getImplements(), _arg);
+		List<EnumConstantDeclaration> entries = visit(_n.getEntries(), _arg);
         List<BodyDeclaration<?>> members = visit(_n.getMembers(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        EnumDeclaration r = new EnumDeclaration(
-                _n.getRange(),
-                _n.getModifiers(), annotations, _n.getName(), implementsList, entries, members
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(EmptyTypeDeclaration _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        EmptyTypeDeclaration r = new EmptyTypeDeclaration(
-                _n.getRange()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(EnumConstantDeclaration _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        List<Expression> args = visit(_n.getArgs(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		EnumDeclaration r = new EnumDeclaration(
+				_n.getRange(),
+				 _n.getModifiers(), annotations, _n.getName(), implementsList, entries, members
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(EmptyTypeDeclaration _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		EmptyTypeDeclaration r = new EmptyTypeDeclaration(
+				_n.getRange()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(EnumConstantDeclaration _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<Expression> args = visit(_n.getArgs(), _arg);
         List<BodyDeclaration<?>> classBody = visit(_n.getClassBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        EnumConstantDeclaration r = new EnumConstantDeclaration(
-                _n.getRange(),
-                annotations, _n.getName(), args, classBody
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(AnnotationDeclaration _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		EnumConstantDeclaration r = new EnumConstantDeclaration(
+				_n.getRange(),
+				 annotations, _n.getName(), args, classBody
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(AnnotationDeclaration _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
         List<BodyDeclaration<?>> members = visit(_n.getMembers(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        AnnotationDeclaration r = new AnnotationDeclaration(
-                _n.getRange(),
-                _n.getModifiers(), annotations, _n.getName(), members
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(AnnotationMemberDeclaration _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        Type<?> type_ = cloneNodes(_n.getType(), _arg);
-        Expression defaultValue = cloneNodes(_n.getDefaultValue(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        AnnotationMemberDeclaration r = new AnnotationMemberDeclaration(
-                _n.getRange(),
-                _n.getModifiers(), annotations, type_, _n.getName(), defaultValue
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(FieldDeclaration _n, Object _arg) {
-        List<AnnotationExpr> annotations_ = visit(_n.getAnnotations(), _arg);
-        Type<?> elementType_ = cloneNodes(_n.getElementType(), _arg);
-        List<VariableDeclarator> variables_ = visit(_n.getVariables(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		AnnotationDeclaration r = new AnnotationDeclaration(
+				_n.getRange(),
+				 _n.getModifiers(), annotations, _n.getName(), members
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(AnnotationMemberDeclaration _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		Type<?> type_ = cloneNodes(_n.getType(), _arg);
+		Expression defaultValue = cloneNodes(_n.getDefaultValue(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		AnnotationMemberDeclaration r = new AnnotationMemberDeclaration(
+				_n.getRange(),
+				 _n.getModifiers(), annotations, type_, _n.getName(), defaultValue
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(FieldDeclaration _n, Object _arg) {
+		List<AnnotationExpr> annotations_ = visit(_n.getAnnotations(), _arg);
+		Type<?> elementType_ = cloneNodes(_n.getElementType(), _arg);
+		List<VariableDeclarator> variables_ = visit(_n.getVariables(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
         List<ArrayBracketPair> arrayBracketPairsAfterType_ = visit(_n.getArrayBracketPairsAfterElementType(), _arg);
 
         FieldDeclaration r = new FieldDeclaration(
-                _n.getRange(),
-                _n.getModifiers(),
-                annotations_,
-                elementType_,
+				_n.getRange(),
+				 _n.getModifiers(), 
+                annotations_, 
+                elementType_, 
                 variables_,
                 arrayBracketPairsAfterType_
-
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(VariableDeclarator _n, Object _arg) {
-        VariableDeclaratorId id = cloneNodes(_n.getId(), _arg);
-        Expression init = cloneNodes(_n.getInit(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        VariableDeclarator r = new VariableDeclarator(
-                _n.getRange(),
-                id, init
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(VariableDeclaratorId _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-        List<ArrayBracketPair> arrayBracketPairsAfterId_ = visit(_n.getArrayBracketPairsAfterId(), _arg);
-
-        VariableDeclaratorId r = new VariableDeclaratorId(
-                _n.getRange(),
-                _n.getName(),
-                arrayBracketPairsAfterId_
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ConstructorDeclaration _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        List<TypeParameter> typeParameters = visit(_n.getTypeParameters(), _arg);
-        List<Parameter> parameters = visit(_n.getParameters(), _arg);
-        List<ReferenceType> throws_ = visit(_n.getThrows(), _arg);
-        BlockStmt block = cloneNodes(_n.getBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ConstructorDeclaration r = new ConstructorDeclaration(
-                _n.getRange(),
-                _n.getModifiers(), annotations, typeParameters, _n.getName(), parameters, throws_, block
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(MethodDeclaration _n, Object _arg) {
-        List<AnnotationExpr> annotations_ = visit(_n.getAnnotations(), _arg);
-        List<TypeParameter> typeParameters_ = visit(_n.getTypeParameters(), _arg);
-        Type<?> type_ = cloneNodes(_n.getElementType(), _arg);
+                
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(VariableDeclarator _n, Object _arg) {
+		VariableDeclaratorId id = cloneNodes(_n.getId(), _arg);
+		Expression init = cloneNodes(_n.getInit(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		VariableDeclarator r = new VariableDeclarator(
+				_n.getRange(),
+				id, init
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(VariableDeclaratorId _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+		List<ArrayBracketPair> arrayBracketPairsAfterId_ = visit(_n.getArrayBracketPairsAfterId(), _arg);
+
+		VariableDeclaratorId r = new VariableDeclaratorId(
+				_n.getRange(),
+				_n.getName(),
+				arrayBracketPairsAfterId_
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ConstructorDeclaration _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<TypeParameter> typeParameters = visit(_n.getTypeParameters(), _arg);
+		List<Parameter> parameters = visit(_n.getParameters(), _arg);
+		List<ReferenceType> throws_ = visit(_n.getThrows(), _arg);
+		BlockStmt block = cloneNodes(_n.getBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ConstructorDeclaration r = new ConstructorDeclaration(
+				_n.getRange(),
+				 _n.getModifiers(), annotations, typeParameters, _n.getName(), parameters, throws_, block
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(MethodDeclaration _n, Object _arg) {
+		List<AnnotationExpr> annotations_ = visit(_n.getAnnotations(), _arg);
+		List<TypeParameter> typeParameters_ = visit(_n.getTypeParameters(), _arg);
+		Type<?> type_ = cloneNodes(_n.getElementType(), _arg);
         NameExpr nameExpr_ = cloneNodes(_n.getNameExpr(), _arg);
         List<Parameter> parameters_ = visit(_n.getParameters(), _arg);
-        List<ReferenceType> throws_ = visit(_n.getThrows(), _arg);
-        BlockStmt block_ = cloneNodes(_n.getBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-        List<ArrayBracketPair> arrayBracketPairsAfterElementType_ = visit(_n.getArrayBracketPairsAfterElementType(), _arg);
-        List<ArrayBracketPair> arrayBracketPairsAfterParameterList_ = visit(_n.getArrayBracketPairsAfterParameterList(), _arg);
-
-        MethodDeclaration r = new MethodDeclaration(
-                _n.getRange(),
-                _n.getModifiers(),
-                annotations_,
-                typeParameters_,
+		List<ReferenceType> throws_ = visit(_n.getThrows(), _arg);
+		BlockStmt block_ = cloneNodes(_n.getBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+		List<ArrayBracketPair> arrayBracketPairsAfterElementType_ = visit(_n.getArrayBracketPairsAfterElementType(), _arg);
+		List<ArrayBracketPair> arrayBracketPairsAfterParameterList_ = visit(_n.getArrayBracketPairsAfterParameterList(), _arg);
+
+		MethodDeclaration r = new MethodDeclaration(
+				_n.getRange(),
+				 _n.getModifiers(), 
+                annotations_, 
+                typeParameters_, 
                 type_,
                 arrayBracketPairsAfterElementType_,
-                nameExpr_,
-                parameters_,
-                arrayBracketPairsAfterParameterList_,
-                throws_,
+                nameExpr_, 
+                parameters_, 
+                arrayBracketPairsAfterParameterList_, 
+                throws_, 
                 block_
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(Parameter _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        Type<?> type_ = cloneNodes(_n.getElementType(), _arg);
-        VariableDeclaratorId id = cloneNodes(_n.getId(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(Parameter _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		Type<?> type_ = cloneNodes(_n.getElementType(), _arg);
+		VariableDeclaratorId id = cloneNodes(_n.getId(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
         List<ArrayBracketPair> arrayBracketPairsAfterType_ = visit(_n.getArrayBracketPairsAfterElementType(), _arg);
 
         Parameter r = new Parameter(
-                _n.getRange(),
-                _n.getModifiers(),
-                annotations,
+				_n.getRange(),
+				_n.getModifiers(), 
+                annotations, 
                 type_,
                 arrayBracketPairsAfterType_,
-                _n.isVarArgs(),
+                _n.isVarArgs(), 
                 id
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(EmptyMemberDeclaration _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        EmptyMemberDeclaration r = new EmptyMemberDeclaration(
-                _n.getRange()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(InitializerDeclaration _n, Object _arg) {
-        BlockStmt block = cloneNodes(_n.getBlock(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        InitializerDeclaration r = new InitializerDeclaration(
-                _n.getRange(),
-                _n.isStatic(), block
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(JavadocComment _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-        JavadocComment r = new JavadocComment(
-                _n.getRange(),
-                _n.getContent()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ClassOrInterfaceType _n, Object _arg) {
-        ClassOrInterfaceType scope = cloneNodes(_n.getScope(), _arg);
-        List<Type<?>> typeArguments_ = visit(_n.getTypeArguments(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ClassOrInterfaceType r = new ClassOrInterfaceType(
-                _n.getRange(),
-                scope,
-                _n.getName(),
-                _n.getTypeArguments()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(PrimitiveType _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-
-        PrimitiveType r = new PrimitiveType(
-                _n.getRange(),
-                _n.getType()
-        );
-        r.setComment(comment);
-        r.setAnnotations(annotations);
-        return r;
-    }
-
-    @Override
-    public Node visit(ArrayType _n, Object _arg) {
-        List<AnnotationExpr> ann = visit(_n.getAnnotations(), _arg);
-        Type<?> type_ = cloneNodes(_n.getComponentType(), _arg);
-
-        ArrayType r = new ArrayType(_n.getRange(), type_, ann);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ArrayCreationLevel _n, Object _arg) {
-        List<AnnotationExpr> ann = visit(_n.getAnnotations(), _arg);
-        Expression dimension_ = cloneNodes(_n.getDimension(), _arg);
-
-        ArrayCreationLevel r = new ArrayCreationLevel(_n.getRange(), dimension_, ann);
-
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(EmptyMemberDeclaration _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		EmptyMemberDeclaration r = new EmptyMemberDeclaration(
+				_n.getRange()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(InitializerDeclaration _n, Object _arg) {
+		BlockStmt block = cloneNodes(_n.getBlock(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		InitializerDeclaration r = new InitializerDeclaration(
+				_n.getRange(),
+				 _n.isStatic(), block
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(JavadocComment _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+		JavadocComment r = new JavadocComment(
+				_n.getRange(),
+				_n.getContent()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ClassOrInterfaceType _n, Object _arg) {
+		ClassOrInterfaceType scope = cloneNodes(_n.getScope(), _arg);
+		List<Type<?>> typeArguments_ = visit(_n.getTypeArguments(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ClassOrInterfaceType r = new ClassOrInterfaceType(
+				_n.getRange(),
+				scope,
+				_n.getName(),
+				_n.getTypeArguments()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(PrimitiveType _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+
+		PrimitiveType r = new PrimitiveType(
+				_n.getRange(),
+				_n.getType()
+		);
+		r.setComment(comment);
+		r.setAnnotations(annotations);
+		return r;
+	}
+
+	@Override
+	public Node visit(ArrayType _n, Object _arg) {
+		List<AnnotationExpr> ann = visit(_n.getAnnotations(), _arg);
+		Type<?> type_ = cloneNodes(_n.getComponentType(), _arg);
+
+		ArrayType r = new ArrayType(_n.getRange(), type_, ann);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ArrayCreationLevel _n, Object _arg) {
+		List<AnnotationExpr> ann = visit(_n.getAnnotations(), _arg);
+		Expression dimension_ = cloneNodes(_n.getDimension(), _arg);
+
+		ArrayCreationLevel r = new ArrayCreationLevel(_n.getRange(), dimension_, ann);
+
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
     public Node visit(IntersectionType _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
         List<ReferenceType> elements = visit(_n.getElements(), _arg);
 
         IntersectionType r = new IntersectionType(_n.getRange(), elements);
         Comment comment = cloneNodes(_n.getComment(), _arg);
         r.setComment(comment);
-        r.setAnnotations(annotations);
+		r.setAnnotations(annotations);
         return r;
     }
 
     @Override
     public Node visit(UnionType _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
         List<ReferenceType> elements = visit(_n.getElements(), _arg);
 
         UnionType r = new UnionType(_n.getRange(),
                 elements);
         Comment comment = cloneNodes(_n.getComment(), _arg);
         r.setComment(comment);
-        r.setAnnotations(annotations);
-        return r;
-    }
-
-    @Override
-    public Node visit(VoidType _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        VoidType r = new VoidType(_n.getRange());
-        r.setAnnotations(annotations);
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(WildcardType _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        ReferenceType ext = cloneNodes(_n.getExtends(), _arg);
-        ReferenceType sup = cloneNodes(_n.getSuper(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        WildcardType r = new WildcardType(
-                _n.getRange(),
-                ext, sup
-        );
-        r.setComment(comment);
-        r.setAnnotations(annotations);
-        return r;
-    }
-
-    @Override
-    public Node visit(UnknownType _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        UnknownType r = new UnknownType();
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ArrayAccessExpr _n, Object _arg) {
-        Expression name = cloneNodes(_n.getName(), _arg);
-        Expression index = cloneNodes(_n.getIndex(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ArrayAccessExpr r = new ArrayAccessExpr(
-                _n.getRange(),
-                name, index
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ArrayCreationExpr _n, Object _arg) {
-        Type<?> type_ = cloneNodes(_n.getType(), _arg);
-        List<ArrayCreationLevel> levels_ = visit(_n.getLevels(), _arg);
-        ArrayInitializerExpr initializer_ = cloneNodes(_n.getInitializer(), _arg);
-
-        ArrayCreationExpr r = new ArrayCreationExpr(_n.getRange(), type_, levels_, initializer_);
-
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ArrayInitializerExpr _n, Object _arg) {
-        List<Expression> values = visit(_n.getValues(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ArrayInitializerExpr r = new ArrayInitializerExpr(
-                _n.getRange(),
-                values
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(AssignExpr _n, Object _arg) {
-        Expression target = cloneNodes(_n.getTarget(), _arg);
-        Expression value = cloneNodes(_n.getValue(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        AssignExpr r = new AssignExpr(
-                _n.getRange(),
-                target, value, _n.getOperator());
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(BinaryExpr _n, Object _arg) {
-        Expression left = cloneNodes(_n.getLeft(), _arg);
-        Expression right = cloneNodes(_n.getRight(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        BinaryExpr r = new BinaryExpr(
-                _n.getRange(),
-                left, right, _n.getOperator()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(CastExpr _n, Object _arg) {
-        Type<?> type_ = cloneNodes(_n.getType(), _arg);
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        CastExpr r = new CastExpr(
-                _n.getRange(),
-                type_, expr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ClassExpr _n, Object _arg) {
-        Type<?> type_ = cloneNodes(_n.getType(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ClassExpr r = new ClassExpr(
-                _n.getRange(),
-                type_
-        );
-        r.setComment(comment);
-        return r;
-    }
+		r.setAnnotations(annotations);
+        return r;
+    }
+
+	@Override
+	public Node visit(VoidType _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		VoidType r = new VoidType(_n.getRange());
+		r.setAnnotations(annotations);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(WildcardType _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		ReferenceType ext = cloneNodes(_n.getExtends(), _arg);
+		ReferenceType sup = cloneNodes(_n.getSuper(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		WildcardType r = new WildcardType(
+				_n.getRange(),
+				ext, sup
+		);
+		r.setComment(comment);
+		r.setAnnotations(annotations);
+		return r;
+	}
+
+	@Override
+	public Node visit(UnknownType _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		UnknownType r = new UnknownType();
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ArrayAccessExpr _n, Object _arg) {
+		Expression name = cloneNodes(_n.getName(), _arg);
+		Expression index = cloneNodes(_n.getIndex(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ArrayAccessExpr r = new ArrayAccessExpr(
+				_n.getRange(),
+				name, index
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ArrayCreationExpr _n, Object _arg) {
+		Type<?> type_ = cloneNodes(_n.getType(), _arg);
+		List<ArrayCreationLevel> levels_ = visit(_n.getLevels(), _arg);
+		ArrayInitializerExpr initializer_ = cloneNodes(_n.getInitializer(), _arg);
+
+		ArrayCreationExpr r = new ArrayCreationExpr(_n.getRange(), type_, levels_, initializer_);
+
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+        r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ArrayInitializerExpr _n, Object _arg) {
+		List<Expression> values = visit(_n.getValues(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ArrayInitializerExpr r = new ArrayInitializerExpr(
+				_n.getRange(),
+				values
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(AssignExpr _n, Object _arg) {
+		Expression target = cloneNodes(_n.getTarget(), _arg);
+		Expression value = cloneNodes(_n.getValue(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		AssignExpr r = new AssignExpr(
+				_n.getRange(),
+				target, value, _n.getOperator());
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(BinaryExpr _n, Object _arg) {
+		Expression left = cloneNodes(_n.getLeft(), _arg);
+		Expression right = cloneNodes(_n.getRight(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		BinaryExpr r = new BinaryExpr(
+				_n.getRange(),
+				left, right, _n.getOperator()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(CastExpr _n, Object _arg) {
+		Type<?> type_ = cloneNodes(_n.getType(), _arg);
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		CastExpr r = new CastExpr(
+				_n.getRange(),
+				type_, expr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ClassExpr _n, Object _arg) {
+		Type<?> type_ = cloneNodes(_n.getType(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ClassExpr r = new ClassExpr(
+				_n.getRange(),
+				type_
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ConditionalExpr _n, Object _arg) {
+		Expression condition = cloneNodes(_n.getCondition(), _arg);
+		Expression thenExpr = cloneNodes(_n.getThenExpr(), _arg);
+		Expression elseExpr = cloneNodes(_n.getElseExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ConditionalExpr r = new ConditionalExpr(
+				_n.getRange(),
+				condition, thenExpr, elseExpr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(EnclosedExpr _n, Object _arg) {
+		Expression inner = cloneNodes(_n.getInner(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		EnclosedExpr r = new EnclosedExpr(
+				_n.getRange(),
+				inner
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(FieldAccessExpr _n, Object _arg) {
+		Expression scope_ = cloneNodes(_n.getScope(), _arg);
+		List<Type<?>> typeArguments_ = visit(_n.getTypeArguments(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		FieldAccessExpr r = new FieldAccessExpr(
+				_n.getRange(),
+				scope_, 
+                typeArguments_, 
+                _n.getField()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(InstanceOfExpr _n, Object _arg) {
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		Type<?> type_ = cloneNodes(_n.getType(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		InstanceOfExpr r = new InstanceOfExpr(
+				_n.getRange(),
+				expr, type_
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(StringLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+		StringLiteralExpr r = new StringLiteralExpr(
+				_n.getRange(),
+				_n.getValue()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(IntegerLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		IntegerLiteralExpr r = new IntegerLiteralExpr(
+				_n.getRange(),
+				_n.getValue()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(LongLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		LongLiteralExpr r = new LongLiteralExpr(
+				_n.getRange(),
+				_n.getValue()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(IntegerLiteralMinValueExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		IntegerLiteralMinValueExpr r = new IntegerLiteralMinValueExpr(_n.getRange());
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(LongLiteralMinValueExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		LongLiteralMinValueExpr r = new LongLiteralMinValueExpr(_n.getRange());
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(CharLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		CharLiteralExpr r = new CharLiteralExpr(
+				_n.getRange(),
+				_n.getValue()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(DoubleLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		DoubleLiteralExpr r = new DoubleLiteralExpr(
+				_n.getRange(),
+				_n.getValue()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(BooleanLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		BooleanLiteralExpr r = new BooleanLiteralExpr(
+				_n.getRange(),
+				_n.getValue()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(NullLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		NullLiteralExpr r = new NullLiteralExpr(_n.getRange());
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(MethodCallExpr _n, Object _arg) {
+		Expression scope_ = cloneNodes(_n.getScope(), _arg);
+		List<Type<?>> typeArguments_ = visit(_n.getTypeArguments(), _arg);
+		List<Expression> args_ = visit(_n.getArgs(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		MethodCallExpr r = new MethodCallExpr(
+				_n.getRange(),
+				scope_, 
+                typeArguments_, 
+                _n.getName(), 
+                args_
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(NameExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		NameExpr r = new NameExpr(
+				_n.getRange(),
+				_n.getName()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ObjectCreationExpr _n, Object _arg) {
+		Expression scope = cloneNodes(_n.getScope(), _arg);
+		ClassOrInterfaceType type_ = cloneNodes(_n.getType(), _arg);
+		List<Type<?>> typeArgs = visit(_n.getTypeArguments(), _arg);
+		List<Expression> args = visit(_n.getArgs(), _arg);
+        List<BodyDeclaration<?>> anonymousBody = visit(_n.getAnonymousClassBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ObjectCreationExpr r = new ObjectCreationExpr(
+				_n.getRange(),
+				scope, type_, typeArgs, args, anonymousBody
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(QualifiedNameExpr _n, Object _arg) {
+		NameExpr scope = cloneNodes(_n.getQualifier(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		QualifiedNameExpr r = new QualifiedNameExpr(
+				_n.getRange(),
+				scope, _n.getName()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ThisExpr _n, Object _arg) {
+		Expression classExpr = cloneNodes(_n.getClassExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ThisExpr r = new ThisExpr(
+				_n.getRange(),
+				classExpr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(SuperExpr _n, Object _arg) {
+		Expression classExpr = cloneNodes(_n.getClassExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		SuperExpr r = new SuperExpr(
+				_n.getRange(),
+				classExpr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(UnaryExpr _n, Object _arg) {
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		UnaryExpr r = new UnaryExpr(
+				_n.getRange(),
+				expr, _n.getOperator()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(VariableDeclarationExpr _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		Type<?> type_ = cloneNodes(_n.getElementType(), _arg);
+		List<VariableDeclarator> vars = visit(_n.getVariables(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+        List<ArrayBracketPair> arrayBracketPairsAfterType_ = visit(_n.getArrayBracketPairsAfterElementType(), _arg);
 
-    @Override
-    public Node visit(ConditionalExpr _n, Object _arg) {
-        Expression condition = cloneNodes(_n.getCondition(), _arg);
-        Expression thenExpr = cloneNodes(_n.getThenExpr(), _arg);
-        Expression elseExpr = cloneNodes(_n.getElseExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
+		VariableDeclarationExpr r = new VariableDeclarationExpr(
+				_n.getRange(),
+				_n.getModifiers(), 
+                annotations, 
+                type_, 
+                vars,
+                arrayBracketPairsAfterType_
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(MarkerAnnotationExpr _n, Object _arg) {
+		NameExpr name = cloneNodes(_n.getName(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		MarkerAnnotationExpr r = new MarkerAnnotationExpr(
+				_n.getRange(),
+				name
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(SingleMemberAnnotationExpr _n, Object _arg) {
+		NameExpr name = cloneNodes(_n.getName(), _arg);
+		Expression memberValue = cloneNodes(_n.getMemberValue(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		SingleMemberAnnotationExpr r = new SingleMemberAnnotationExpr(
+				_n.getRange(),
+				name, memberValue
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(NormalAnnotationExpr _n, Object _arg) {
+		NameExpr name = cloneNodes(_n.getName(), _arg);
+		List<MemberValuePair> pairs = visit(_n.getPairs(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		NormalAnnotationExpr r = new NormalAnnotationExpr(
+				_n.getRange(),
+				name, pairs
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(MemberValuePair _n, Object _arg) {
+		Expression value = cloneNodes(_n.getValue(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		MemberValuePair r = new MemberValuePair(
+				_n.getRange(),
+				_n.getName(), value
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ExplicitConstructorInvocationStmt _n, Object _arg) {
+		List<Type<?>> typeArguments_ = visit(_n.getTypeArguments(), _arg);
+		Expression expr_ = cloneNodes(_n.getExpr(), _arg);
+		List<Expression> args_ = visit(_n.getArgs(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ExplicitConstructorInvocationStmt r = new ExplicitConstructorInvocationStmt(
+				_n.getRange(),
+				typeArguments_, 
+                _n.isThis(), 
+                expr_, 
+                args_
+		);
+		r.setComment(comment);
+		return r;
+	}
 
-        ConditionalExpr r = new ConditionalExpr(
-                _n.getRange(),
-                condition, thenExpr, elseExpr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(EnclosedExpr _n, Object _arg) {
-        Expression inner = cloneNodes(_n.getInner(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        EnclosedExpr r = new EnclosedExpr(
-                _n.getRange(),
-                inner
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(FieldAccessExpr _n, Object _arg) {
-        Expression scope_ = cloneNodes(_n.getScope(), _arg);
-        List<Type<?>> typeArguments_ = visit(_n.getTypeArguments(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        FieldAccessExpr r = new FieldAccessExpr(
-                _n.getRange(),
-                scope_,
-                typeArguments_,
-                _n.getField()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(InstanceOfExpr _n, Object _arg) {
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        Type<?> type_ = cloneNodes(_n.getType(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        InstanceOfExpr r = new InstanceOfExpr(
-                _n.getRange(),
-                expr, type_
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(StringLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-        StringLiteralExpr r = new StringLiteralExpr(
-                _n.getRange(),
-                _n.getValue()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(IntegerLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        IntegerLiteralExpr r = new IntegerLiteralExpr(
-                _n.getRange(),
-                _n.getValue()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(LongLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        LongLiteralExpr r = new LongLiteralExpr(
-                _n.getRange(),
-                _n.getValue()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(IntegerLiteralMinValueExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        IntegerLiteralMinValueExpr r = new IntegerLiteralMinValueExpr(_n.getRange());
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(LongLiteralMinValueExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        LongLiteralMinValueExpr r = new LongLiteralMinValueExpr(_n.getRange());
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(CharLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        CharLiteralExpr r = new CharLiteralExpr(
-                _n.getRange(),
-                _n.getValue()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(DoubleLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        DoubleLiteralExpr r = new DoubleLiteralExpr(
-                _n.getRange(),
-                _n.getValue()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(BooleanLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        BooleanLiteralExpr r = new BooleanLiteralExpr(
-                _n.getRange(),
-                _n.getValue()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(NullLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        NullLiteralExpr r = new NullLiteralExpr(_n.getRange());
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(MethodCallExpr _n, Object _arg) {
-        Expression scope_ = cloneNodes(_n.getScope(), _arg);
-        List<Type<?>> typeArguments_ = visit(_n.getTypeArguments(), _arg);
-        List<Expression> args_ = visit(_n.getArgs(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        MethodCallExpr r = new MethodCallExpr(
-                _n.getRange(),
-                scope_,
-                typeArguments_,
-                _n.getName(),
-                args_
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(NameExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        NameExpr r = new NameExpr(
-                _n.getRange(),
-                _n.getName()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ObjectCreationExpr _n, Object _arg) {
-        Expression scope = cloneNodes(_n.getScope(), _arg);
-        ClassOrInterfaceType type_ = cloneNodes(_n.getType(), _arg);
-        List<Type<?>> typeArgs = visit(_n.getTypeArguments(), _arg);
-        List<Expression> args = visit(_n.getArgs(), _arg);
-        List<BodyDeclaration<?>> anonymousBody = visit(_n.getAnonymousClassBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ObjectCreationExpr r = new ObjectCreationExpr(
-                _n.getRange(),
-                scope, type_, typeArgs, args, anonymousBody
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(QualifiedNameExpr _n, Object _arg) {
-        NameExpr scope = cloneNodes(_n.getQualifier(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        QualifiedNameExpr r = new QualifiedNameExpr(
-                _n.getRange(),
-                scope, _n.getName()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ThisExpr _n, Object _arg) {
-        Expression classExpr = cloneNodes(_n.getClassExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ThisExpr r = new ThisExpr(
-                _n.getRange(),
-                classExpr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(SuperExpr _n, Object _arg) {
-        Expression classExpr = cloneNodes(_n.getClassExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        SuperExpr r = new SuperExpr(
-                _n.getRange(),
-                classExpr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(UnaryExpr _n, Object _arg) {
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        UnaryExpr r = new UnaryExpr(
-                _n.getRange(),
-                expr, _n.getOperator()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(VariableDeclarationExpr _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        Type<?> type_ = cloneNodes(_n.getElementType(), _arg);
-        List<VariableDeclarator> vars = visit(_n.getVariables(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-        List<ArrayBracketPair> arrayBracketPairsAfterType_ = visit(_n.getArrayBracketPairsAfterElementType(), _arg);
-
-        VariableDeclarationExpr r = new VariableDeclarationExpr(
-                _n.getRange(),
-                _n.getModifiers(),
-                annotations,
-                type_,
-                vars,
-                arrayBracketPairsAfterType_
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(MarkerAnnotationExpr _n, Object _arg) {
-        NameExpr name = cloneNodes(_n.getName(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        MarkerAnnotationExpr r = new MarkerAnnotationExpr(
-                _n.getRange(),
-                name
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(SingleMemberAnnotationExpr _n, Object _arg) {
-        NameExpr name = cloneNodes(_n.getName(), _arg);
-        Expression memberValue = cloneNodes(_n.getMemberValue(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        SingleMemberAnnotationExpr r = new SingleMemberAnnotationExpr(
-                _n.getRange(),
-                name, memberValue
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(NormalAnnotationExpr _n, Object _arg) {
-        NameExpr name = cloneNodes(_n.getName(), _arg);
-        List<MemberValuePair> pairs = visit(_n.getPairs(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        NormalAnnotationExpr r = new NormalAnnotationExpr(
-                _n.getRange(),
-                name, pairs
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(MemberValuePair _n, Object _arg) {
-        Expression value = cloneNodes(_n.getValue(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        MemberValuePair r = new MemberValuePair(
-                _n.getRange(),
-                _n.getName(), value
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ExplicitConstructorInvocationStmt _n, Object _arg) {
-        List<Type<?>> typeArguments_ = visit(_n.getTypeArguments(), _arg);
-        Expression expr_ = cloneNodes(_n.getExpr(), _arg);
-        List<Expression> args_ = visit(_n.getArgs(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ExplicitConstructorInvocationStmt r = new ExplicitConstructorInvocationStmt(
-                _n.getRange(),
-                typeArguments_,
-                _n.isThis(),
-                expr_,
-                args_
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(TypeDeclarationStmt _n, Object _arg) {
+	@Override
+	public Node visit(TypeDeclarationStmt _n, Object _arg) {
         TypeDeclaration<?> typeDecl = cloneNodes(_n.getTypeDeclaration(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        TypeDeclarationStmt r = new TypeDeclarationStmt(
-                _n.getRange(),
-                typeDecl
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(AssertStmt _n, Object _arg) {
-        Expression check = cloneNodes(_n.getCheck(), _arg);
-        Expression message = cloneNodes(_n.getMessage(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        AssertStmt r = new AssertStmt(
-                _n.getRange(),
-                check, message
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(BlockStmt _n, Object _arg) {
-        List<Statement> stmts = visit(_n.getStmts(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        BlockStmt r = new BlockStmt(
-                _n.getRange(),
-                stmts
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(LabeledStmt _n, Object _arg) {
-        Statement stmt = cloneNodes(_n.getStmt(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        LabeledStmt r = new LabeledStmt(
-                _n.getRange(),
-                _n.getLabel(), stmt
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(EmptyStmt _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        EmptyStmt r = new EmptyStmt(_n.getRange());
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ExpressionStmt _n, Object _arg) {
-        Expression expr = cloneNodes(_n.getExpression(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ExpressionStmt r = new ExpressionStmt(
-                _n.getRange(),
-                expr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(SwitchStmt _n, Object _arg) {
-        Expression selector = cloneNodes(_n.getSelector(), _arg);
-        List<SwitchEntryStmt> entries = visit(_n.getEntries(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        SwitchStmt r = new SwitchStmt(
-                _n.getRange(),
-                selector, entries
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(SwitchEntryStmt _n, Object _arg) {
-        Expression label = cloneNodes(_n.getLabel(), _arg);
-        List<Statement> stmts = visit(_n.getStmts(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        SwitchEntryStmt r = new SwitchEntryStmt(
-                _n.getRange(),
-                label, stmts
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(BreakStmt _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        BreakStmt r = new BreakStmt(
-                _n.getRange(),
-                _n.getId()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ReturnStmt _n, Object _arg) {
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ReturnStmt r = new ReturnStmt(
-                _n.getRange(),
-                expr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(IfStmt _n, Object _arg) {
-        Expression condition = cloneNodes(_n.getCondition(), _arg);
-        Statement thenStmt = cloneNodes(_n.getThenStmt(), _arg);
-        Statement elseStmt = cloneNodes(_n.getElseStmt(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        IfStmt r = new IfStmt(
-                _n.getRange(),
-                condition, thenStmt, elseStmt
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(WhileStmt _n, Object _arg) {
-        Expression condition = cloneNodes(_n.getCondition(), _arg);
-        Statement body = cloneNodes(_n.getBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        WhileStmt r = new WhileStmt(
-                _n.getRange(),
-                condition, body
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ContinueStmt _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ContinueStmt r = new ContinueStmt(
-                _n.getRange(),
-                _n.getId()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(DoStmt _n, Object _arg) {
-        Statement body = cloneNodes(_n.getBody(), _arg);
-        Expression condition = cloneNodes(_n.getCondition(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        DoStmt r = new DoStmt(
-                _n.getRange(),
-                body, condition
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ForeachStmt _n, Object _arg) {
-        VariableDeclarationExpr var = cloneNodes(_n.getVariable(), _arg);
-        Expression iterable = cloneNodes(_n.getIterable(), _arg);
-        Statement body = cloneNodes(_n.getBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ForeachStmt r = new ForeachStmt(
-                _n.getRange(),
-                var, iterable, body
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ForStmt _n, Object _arg) {
-        List<Expression> init = visit(_n.getInit(), _arg);
-        Expression compare = cloneNodes(_n.getCompare(), _arg);
-        List<Expression> update = visit(_n.getUpdate(), _arg);
-        Statement body = cloneNodes(_n.getBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ForStmt r = new ForStmt(
-                _n.getRange(),
-                init, compare, update, body
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ThrowStmt _n, Object _arg) {
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ThrowStmt r = new ThrowStmt(
-                _n.getRange(),
-                expr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(SynchronizedStmt _n, Object _arg) {
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        BlockStmt block = cloneNodes(_n.getBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        SynchronizedStmt r = new SynchronizedStmt(
-                _n.getRange(),
-                expr, block
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(TryStmt _n, Object _arg) {
-        List<VariableDeclarationExpr> resources = visit(_n.getResources(), _arg);
-        BlockStmt tryBlock = cloneNodes(_n.getTryBlock(), _arg);
-        List<CatchClause> catchs = visit(_n.getCatchs(), _arg);
-        BlockStmt finallyBlock = cloneNodes(_n.getFinallyBlock(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        TryStmt r = new TryStmt(
-                _n.getRange(),
-                resources, tryBlock, catchs, finallyBlock
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(CatchClause _n, Object _arg) {
-        Parameter param = cloneNodes(_n.getParam(), _arg);
-        BlockStmt catchBlock = cloneNodes(_n.getBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        CatchClause r = new CatchClause(
-                _n.getRange(),
-                param.getModifiers(), param.getAnnotations(), param.getElementType(), param.getId(), catchBlock
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(LambdaExpr _n, Object _arg) {
-
-        List<Parameter> lambdaParameters = visit(_n.getParameters(), _arg);
-
-        Statement body = cloneNodes(_n.getBody(), _arg);
-
-        return new LambdaExpr(_n.getRange(), lambdaParameters, body,
-                _n.isParametersEnclosed());
-    }
-
-    @Override
-    public Node visit(MethodReferenceExpr _n, Object arg) {
-
-        Expression scope = cloneNodes(_n.getScope(), arg);
-
-        return new MethodReferenceExpr(_n.getRange(), scope,
-                _n.getTypeArguments(), _n.getIdentifier());
-    }
-
-    @Override
-    public Node visit(TypeExpr n, Object arg) {
-
-        Type<?> t = cloneNodes(n.getType(), arg);
-
-        return new TypeExpr(n.getRange(), t);
-    }
-
-    @Override
-    public Node visit(ArrayBracketPair _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-
-        return new ArrayBracketPair(_n.getRange(), annotations);
-    }
-
-    public <T extends Node> List<T> visit(List<T> _nodes, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		TypeDeclarationStmt r = new TypeDeclarationStmt(
+				_n.getRange(),
+				typeDecl
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(AssertStmt _n, Object _arg) {
+		Expression check = cloneNodes(_n.getCheck(), _arg);
+		Expression message = cloneNodes(_n.getMessage(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		AssertStmt r = new AssertStmt(
+				_n.getRange(),
+				check, message
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(BlockStmt _n, Object _arg) {
+		List<Statement> stmts = visit(_n.getStmts(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		BlockStmt r = new BlockStmt(
+				_n.getRange(),
+				stmts
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(LabeledStmt _n, Object _arg) {
+		Statement stmt = cloneNodes(_n.getStmt(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		LabeledStmt r = new LabeledStmt(
+				_n.getRange(),
+				_n.getLabel(), stmt
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(EmptyStmt _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		EmptyStmt r = new EmptyStmt(_n.getRange());
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ExpressionStmt _n, Object _arg) {
+		Expression expr = cloneNodes(_n.getExpression(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ExpressionStmt r = new ExpressionStmt(
+				_n.getRange(),
+				expr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(SwitchStmt _n, Object _arg) {
+		Expression selector = cloneNodes(_n.getSelector(), _arg);
+		List<SwitchEntryStmt> entries = visit(_n.getEntries(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		SwitchStmt r = new SwitchStmt(
+				_n.getRange(),
+				selector, entries
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(SwitchEntryStmt _n, Object _arg) {
+		Expression label = cloneNodes(_n.getLabel(), _arg);
+		List<Statement> stmts = visit(_n.getStmts(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		SwitchEntryStmt r = new SwitchEntryStmt(
+				_n.getRange(),
+				label, stmts
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(BreakStmt _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		BreakStmt r = new BreakStmt(
+				_n.getRange(),
+				_n.getId()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ReturnStmt _n, Object _arg) {
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ReturnStmt r = new ReturnStmt(
+				_n.getRange(),
+				expr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(IfStmt _n, Object _arg) {
+		Expression condition = cloneNodes(_n.getCondition(), _arg);
+		Statement thenStmt = cloneNodes(_n.getThenStmt(), _arg);
+		Statement elseStmt = cloneNodes(_n.getElseStmt(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		IfStmt r = new IfStmt(
+				_n.getRange(),
+				condition, thenStmt, elseStmt
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(WhileStmt _n, Object _arg) {
+		Expression condition = cloneNodes(_n.getCondition(), _arg);
+		Statement body = cloneNodes(_n.getBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		WhileStmt r = new WhileStmt(
+				_n.getRange(),
+				condition, body
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ContinueStmt _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ContinueStmt r = new ContinueStmt(
+				_n.getRange(),
+				_n.getId()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(DoStmt _n, Object _arg) {
+		Statement body = cloneNodes(_n.getBody(), _arg);
+		Expression condition = cloneNodes(_n.getCondition(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		DoStmt r = new DoStmt(
+				_n.getRange(),
+				body, condition
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ForeachStmt _n, Object _arg) {
+		VariableDeclarationExpr var = cloneNodes(_n.getVariable(), _arg);
+		Expression iterable = cloneNodes(_n.getIterable(), _arg);
+		Statement body = cloneNodes(_n.getBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ForeachStmt r = new ForeachStmt(
+				_n.getRange(),
+				var, iterable, body
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ForStmt _n, Object _arg) {
+		List<Expression> init = visit(_n.getInit(), _arg);
+		Expression compare = cloneNodes(_n.getCompare(), _arg);
+		List<Expression> update = visit(_n.getUpdate(), _arg);
+		Statement body = cloneNodes(_n.getBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ForStmt r = new ForStmt(
+				_n.getRange(),
+				init, compare, update, body
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ThrowStmt _n, Object _arg) {
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ThrowStmt r = new ThrowStmt(
+				_n.getRange(),
+				expr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(SynchronizedStmt _n, Object _arg) {
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		BlockStmt block = cloneNodes(_n.getBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		SynchronizedStmt r = new SynchronizedStmt(
+				_n.getRange(),
+				expr, block
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(TryStmt _n, Object _arg) {
+		List<VariableDeclarationExpr> resources = visit(_n.getResources(),_arg);
+		BlockStmt tryBlock = cloneNodes(_n.getTryBlock(), _arg);
+		List<CatchClause> catchs = visit(_n.getCatchs(), _arg);
+		BlockStmt finallyBlock = cloneNodes(_n.getFinallyBlock(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		TryStmt r = new TryStmt(
+				_n.getRange(),
+				resources, tryBlock, catchs, finallyBlock
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(CatchClause _n, Object _arg) {
+		Parameter param = cloneNodes(_n.getParam(), _arg);
+		BlockStmt catchBlock = cloneNodes(_n.getBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		CatchClause r = new CatchClause(
+				_n.getRange(),
+				param.getModifiers(), param.getAnnotations(), param.getElementType(), param.getId(), catchBlock
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(LambdaExpr _n, Object _arg) {
+
+		List<Parameter> lambdaParameters = visit(_n.getParameters(), _arg);
+
+		Statement body = cloneNodes(_n.getBody(), _arg);
+
+		return new LambdaExpr(_n.getRange(), lambdaParameters, body,
+				_n.isParametersEnclosed());
+	}
+
+	@Override
+	public Node visit(MethodReferenceExpr _n, Object arg) {
+
+		Expression scope = cloneNodes(_n.getScope(), arg);
+
+		return new MethodReferenceExpr(_n.getRange(), scope,
+				_n.getTypeArguments(), _n.getIdentifier());
+	}
+
+	@Override
+	public Node visit(TypeExpr n, Object arg) {
+
+		Type<?> t = cloneNodes(n.getType(), arg);
+
+		return new TypeExpr(n.getRange(), t);
+	}
+
+	@Override
+	public Node visit(ArrayBracketPair _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+
+		return new ArrayBracketPair(_n.getRange(), annotations);
+	}
+
+	public <T extends Node> List<T> visit(List<T> _nodes, Object _arg) {
         if (_nodes == null)
             return null;
         List<T> r = new ArrayList<>(_nodes.size());
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/DumpVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/DumpVisitor.java
index 214a183060..569f395161 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/DumpVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/DumpVisitor.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -49,381 +49,381 @@
  */
 public class DumpVisitor implements VoidVisitor<Object> {
 
-    private boolean printComments;
-
-    public DumpVisitor() {
-        this(true);
-    }
-
-    public DumpVisitor(boolean printComments) {
-        this.printComments = printComments;
-    }
-
-    public static class SourcePrinter {
-
-        private final String indentation;
-
-        public SourcePrinter(final String indentation) {
-            this.indentation = indentation;
-        }
-
-        private int level = 0;
-
-        private boolean indented = false;
-
-        private final StringBuilder buf = new StringBuilder();
-
-        public void indent() {
-            level++;
-        }
-
-        public void unindent() {
-            level--;
-        }
-
-        private void makeIndent() {
-            for (int i = 0; i < level; i++) {
-                buf.append(indentation);
-            }
-        }
-
-        public void print(final String arg) {
-            if (!indented) {
-                makeIndent();
-                indented = true;
-            }
-            buf.append(arg);
-        }
-
-        public void printLn(final String arg) {
-            print(arg);
-            printLn();
-        }
-
-        public void printLn() {
-            buf.append(EOL);
-            indented = false;
-        }
-
-        public String getSource() {
-            return buf.toString();
-        }
-
-        @Override
-        public String toString() {
-            return getSource();
-        }
-    }
-
-    private final SourcePrinter printer = createSourcePrinter();
-
-    protected SourcePrinter createSourcePrinter() {
-        return new SourcePrinter("    ");
-    }
-
-    public String getSource() {
-        return printer.getSource();
-    }
-
-    private void printModifiers(final EnumSet<Modifier> modifiers) {
-        if (modifiers.size() > 0)
-            printer.print(modifiers.stream().map(Modifier::getLib).collect(Collectors.joining(" ")) + " ");
-    }
-
-    private void printMembers(final List<BodyDeclaration<?>> members, final Object arg) {
-        for (final BodyDeclaration<?> member : members) {
-            printer.printLn();
-            member.accept(this, arg);
-            printer.printLn();
-        }
-    }
-
-    private void printMemberAnnotations(final List<AnnotationExpr> annotations, final Object arg) {
-        if (!isNullOrEmpty(annotations)) {
-            for (final AnnotationExpr a : annotations) {
-                a.accept(this, arg);
-                printer.printLn();
-            }
-        }
-    }
-
-    private void printAnnotations(final List<AnnotationExpr> annotations, boolean prefixWithASpace, final Object arg) {
-        if (!isNullOrEmpty(annotations)) {
-            if (prefixWithASpace) {
-                printer.print(" ");
-            }
-            for (AnnotationExpr annotation : annotations) {
-                annotation.accept(this, arg);
-                printer.print(" ");
-            }
-        }
-    }
-
-    private void printTypeArgs(final NodeWithTypeArguments<?> nodeWithTypeArguments, final Object arg) {
-        List<Type<?>> typeArguments = nodeWithTypeArguments.getTypeArguments();
-        if (!isNullOrEmpty(typeArguments)) {
-            printer.print("<");
-            for (final Iterator<Type<?>> i = typeArguments.iterator(); i.hasNext(); ) {
-                final Type<?> t = i.next();
-                t.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-            printer.print(">");
-        }
-    }
-
-    private void printTypeParameters(final List<TypeParameter> args, final Object arg) {
-        if (!isNullOrEmpty(args)) {
-            printer.print("<");
-            for (final Iterator<TypeParameter> i = args.iterator(); i.hasNext(); ) {
-                final TypeParameter t = i.next();
-                t.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-            printer.print(">");
-        }
-    }
-
-    private void printArguments(final List<Expression> args, final Object arg) {
-        printer.print("(");
-        if (!isNullOrEmpty(args)) {
-            for (final Iterator<Expression> i = args.iterator(); i.hasNext(); ) {
-                final Expression e = i.next();
-                e.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print(")");
-    }
-
-    private void printJavaComment(final Comment javacomment, final Object arg) {
-        if (javacomment != null) {
-            javacomment.accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final CompilationUnit n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-
-        if (n.getPackage() != null) {
-            n.getPackage().accept(this, arg);
-        }
-
-        if (!isNullOrEmpty(n.getImports())) {
-            for (final ImportDeclaration i : n.getImports()) {
-                i.accept(this, arg);
-            }
-            printer.printLn();
-        }
-
-        if (!isNullOrEmpty(n.getTypes())) {
-            for (final Iterator<TypeDeclaration<?>> i = n.getTypes().iterator(); i.hasNext(); ) {
-                i.next().accept(this, arg);
-                printer.printLn();
-                if (i.hasNext()) {
-                    printer.printLn();
-                }
-            }
-        }
-
-        printOrphanCommentsEnding(n);
-    }
-
-    @Override
-    public void visit(final PackageDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printAnnotations(n.getAnnotations(), false, arg);
-        printer.print("package ");
-        n.getName().accept(this, arg);
-        printer.printLn(";");
-        printer.printLn();
-
-        printOrphanCommentsEnding(n);
-    }
-
-    @Override
-    public void visit(final NameExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getName());
-
-        printOrphanCommentsEnding(n);
-    }
-
-    @Override
-    public void visit(final QualifiedNameExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getQualifier().accept(this, arg);
-        printer.print(".");
-        printer.print(n.getName());
-
-        printOrphanCommentsEnding(n);
-    }
-
-    @Override
-    public void visit(final ImportDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (!n.isEmptyImportDeclaration()) {
-            printer.print("import ");
-            if (n.isStatic()) {
-                printer.print("static ");
-            }
-            n.getName().accept(this, arg);
-            if (n.isAsterisk()) {
-                printer.print(".*");
-            }
-        }
-        printer.printLn(";");
-
-        printOrphanCommentsEnding(n);
-    }
-
-    @Override
-    public void visit(final ClassOrInterfaceDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-
-        if (n.isInterface()) {
-            printer.print("interface ");
-        } else {
-            printer.print("class ");
-        }
-
-        printer.print(n.getName());
-
-        printTypeParameters(n.getTypeParameters(), arg);
-
-        if (!isNullOrEmpty(n.getExtends())) {
-            printer.print(" extends ");
-            for (final Iterator<ClassOrInterfaceType> i = n.getExtends().iterator(); i.hasNext(); ) {
-                final ClassOrInterfaceType c = i.next();
-                c.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-
-        if (!isNullOrEmpty(n.getImplements())) {
-            printer.print(" implements ");
-            for (final Iterator<ClassOrInterfaceType> i = n.getImplements().iterator(); i.hasNext(); ) {
-                final ClassOrInterfaceType c = i.next();
-                c.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-
-        printer.printLn(" {");
-        printer.indent();
-        if (!isNullOrEmpty(n.getMembers())) {
-            printMembers(n.getMembers(), arg);
-        }
-
-        printOrphanCommentsEnding(n);
-
-        printer.unindent();
-        printer.print("}");
-    }
-
-    @Override
-    public void visit(final EmptyTypeDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(";");
-
-        printOrphanCommentsEnding(n);
-    }
-
-    @Override
-    public void visit(final JavadocComment n, final Object arg) {
-        printer.print("/**");
-        printer.print(n.getContent());
-        printer.printLn("*/");
-    }
-
-    @Override
-    public void visit(final ClassOrInterfaceType n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-
-        if (n.getScope() != null) {
-            n.getScope().accept(this, arg);
-            printer.print(".");
-        }
-        for (AnnotationExpr ae : n.getAnnotations()) {
-            ae.accept(this, arg);
-            printer.print(" ");
-        }
-
-        printer.print(n.getName());
-
-        if (n.isUsingDiamondOperator()) {
-            printer.print("<>");
-        } else {
-            printTypeArgs(n, arg);
-        }
-    }
-
-    @Override
-    public void visit(final TypeParameter n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        for (AnnotationExpr ann : n.getAnnotations()) {
-            ann.accept(this, arg);
-            printer.print(" ");
-        }
-        printer.print(n.getName());
-        if (!isNullOrEmpty(n.getTypeBound())) {
-            printer.print(" extends ");
-            for (final Iterator<ClassOrInterfaceType> i = n.getTypeBound().iterator(); i.hasNext(); ) {
-                final ClassOrInterfaceType c = i.next();
-                c.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(" & ");
-                }
-            }
-        }
-    }
-
-    @Override
-    public void visit(final PrimitiveType n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printAnnotations(n.getAnnotations(), true, arg);
-        switch (n.getType()) {
-            case Boolean:
-                printer.print("boolean");
-                break;
-            case Byte:
-                printer.print("byte");
-                break;
-            case Char:
-                printer.print("char");
-                break;
-            case Double:
-                printer.print("double");
-                break;
-            case Float:
-                printer.print("float");
-                break;
-            case Int:
-                printer.print("int");
-                break;
-            case Long:
-                printer.print("long");
-                break;
-            case Short:
-                printer.print("short");
-                break;
-        }
-    }
-
-    @Override
+	private boolean printComments;
+
+	public DumpVisitor() {
+		this(true);
+	}
+
+	public DumpVisitor(boolean printComments) {
+		this.printComments = printComments;
+	}
+
+	public static class SourcePrinter {
+
+		private final String indentation;
+
+		public SourcePrinter(final String indentation) {
+			this.indentation = indentation;
+		}
+
+		private int level = 0;
+
+		private boolean indented = false;
+
+		private final StringBuilder buf = new StringBuilder();
+
+		public void indent() {
+			level++;
+		}
+
+		public void unindent() {
+			level--;
+		}
+
+		private void makeIndent() {
+			for (int i = 0; i < level; i++) {
+				buf.append(indentation);
+			}
+		}
+
+		public void print(final String arg) {
+			if (!indented) {
+				makeIndent();
+				indented = true;
+			}
+			buf.append(arg);
+		}
+
+		public void printLn(final String arg) {
+			print(arg);
+			printLn();
+		}
+
+		public void printLn() {
+			buf.append(EOL);
+			indented = false;
+		}
+
+		public String getSource() {
+			return buf.toString();
+		}
+
+		@Override
+		public String toString() {
+			return getSource();
+		}
+	}
+
+	private final SourcePrinter printer = createSourcePrinter();
+
+	protected SourcePrinter createSourcePrinter() {
+		return new SourcePrinter("    ");
+	}
+
+	public String getSource() {
+		return printer.getSource();
+	}
+
+	private void printModifiers(final EnumSet<Modifier> modifiers) {
+		if (modifiers.size() > 0)
+			printer.print(modifiers.stream().map(Modifier::getLib).collect(Collectors.joining(" ")) + " ");
+	}
+
+	private void printMembers(final List<BodyDeclaration<?>> members, final Object arg) {
+		for (final BodyDeclaration<?> member : members) {
+			printer.printLn();
+			member.accept(this, arg);
+			printer.printLn();
+		}
+	}
+
+	private void printMemberAnnotations(final List<AnnotationExpr> annotations, final Object arg) {
+		if (!isNullOrEmpty(annotations)) {
+			for (final AnnotationExpr a : annotations) {
+				a.accept(this, arg);
+				printer.printLn();
+			}
+		}
+	}
+
+	private void printAnnotations(final List<AnnotationExpr> annotations, boolean prefixWithASpace, final Object arg) {
+		if (!isNullOrEmpty(annotations)) {
+			if(prefixWithASpace){
+				printer.print(" ");
+			}
+			for (AnnotationExpr annotation : annotations) {
+				annotation.accept(this, arg);
+				printer.print(" ");
+			}
+		}
+	}
+
+	private void printTypeArgs(final NodeWithTypeArguments<?> nodeWithTypeArguments, final Object arg) {
+		List<Type<?>> typeArguments = nodeWithTypeArguments.getTypeArguments();
+		if (!isNullOrEmpty(typeArguments)) {
+			printer.print("<");
+			for (final Iterator<Type<?>> i = typeArguments.iterator(); i.hasNext(); ) {
+				final Type<?> t = i.next();
+				t.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+			printer.print(">");
+		}
+	}
+
+	private void printTypeParameters(final List<TypeParameter> args, final Object arg) {
+		if (!isNullOrEmpty(args)) {
+			printer.print("<");
+			for (final Iterator<TypeParameter> i = args.iterator(); i.hasNext(); ) {
+				final TypeParameter t = i.next();
+				t.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+			printer.print(">");
+		}
+	}
+
+	private void printArguments(final List<Expression> args, final Object arg) {
+		printer.print("(");
+		if (!isNullOrEmpty(args)) {
+			for (final Iterator<Expression> i = args.iterator(); i.hasNext(); ) {
+				final Expression e = i.next();
+				e.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print(")");
+	}
+
+	private void printJavaComment(final Comment javacomment, final Object arg) {
+		if (javacomment != null) {
+			javacomment.accept(this, arg);
+		}
+	}
+
+	@Override
+	public void visit(final CompilationUnit n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+
+		if (n.getPackage() != null) {
+			n.getPackage().accept(this, arg);
+		}
+
+		if (!isNullOrEmpty(n.getImports())) {
+			for (final ImportDeclaration i : n.getImports()) {
+				i.accept(this, arg);
+			}
+			printer.printLn();
+		}
+
+		if (!isNullOrEmpty(n.getTypes())) {
+			for (final Iterator<TypeDeclaration<?>> i = n.getTypes().iterator(); i.hasNext(); ) {
+				i.next().accept(this, arg);
+				printer.printLn();
+				if (i.hasNext()) {
+					printer.printLn();
+				}
+			}
+		}
+
+		printOrphanCommentsEnding(n);
+	}
+
+	@Override
+	public void visit(final PackageDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printAnnotations(n.getAnnotations(), false, arg);
+		printer.print("package ");
+		n.getName().accept(this, arg);
+		printer.printLn(";");
+		printer.printLn();
+
+		printOrphanCommentsEnding(n);
+	}
+
+	@Override
+	public void visit(final NameExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getName());
+
+		printOrphanCommentsEnding(n);
+	}
+
+	@Override
+	public void visit(final QualifiedNameExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getQualifier().accept(this, arg);
+		printer.print(".");
+		printer.print(n.getName());
+
+		printOrphanCommentsEnding(n);
+	}
+
+	@Override
+	public void visit(final ImportDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (!n.isEmptyImportDeclaration()) {
+			printer.print("import ");
+			if (n.isStatic()) {
+				printer.print("static ");
+			}
+			n.getName().accept(this, arg);
+			if (n.isAsterisk()) {
+				printer.print(".*");
+			}
+		}
+		printer.printLn(";");
+
+		printOrphanCommentsEnding(n);
+	}
+
+	@Override
+	public void visit(final ClassOrInterfaceDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+
+		if (n.isInterface()) {
+			printer.print("interface ");
+		} else {
+			printer.print("class ");
+		}
+
+		printer.print(n.getName());
+
+		printTypeParameters(n.getTypeParameters(), arg);
+
+		if (!isNullOrEmpty(n.getExtends())) {
+			printer.print(" extends ");
+			for (final Iterator<ClassOrInterfaceType> i = n.getExtends().iterator(); i.hasNext(); ) {
+				final ClassOrInterfaceType c = i.next();
+				c.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+
+		if (!isNullOrEmpty(n.getImplements())) {
+			printer.print(" implements ");
+			for (final Iterator<ClassOrInterfaceType> i = n.getImplements().iterator(); i.hasNext(); ) {
+				final ClassOrInterfaceType c = i.next();
+				c.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+
+		printer.printLn(" {");
+		printer.indent();
+		if (!isNullOrEmpty(n.getMembers())) {
+			printMembers(n.getMembers(), arg);
+		}
+
+		printOrphanCommentsEnding(n);
+
+		printer.unindent();
+		printer.print("}");
+	}
+
+	@Override
+	public void visit(final EmptyTypeDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(";");
+
+		printOrphanCommentsEnding(n);
+	}
+
+	@Override
+	public void visit(final JavadocComment n, final Object arg) {
+		printer.print("/**");
+		printer.print(n.getContent());
+		printer.printLn("*/");
+	}
+
+	@Override
+	public void visit(final ClassOrInterfaceType n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+
+		if (n.getScope() != null) {
+			n.getScope().accept(this, arg);
+			printer.print(".");
+		}
+		for (AnnotationExpr ae : n.getAnnotations()) {
+			ae.accept(this, arg);
+			printer.print(" ");
+		}
+
+		printer.print(n.getName());
+
+		if (n.isUsingDiamondOperator()) {
+			printer.print("<>");
+		} else {
+			printTypeArgs(n, arg);
+		}
+	}
+
+	@Override
+	public void visit(final TypeParameter n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		for (AnnotationExpr ann : n.getAnnotations()) {
+			ann.accept(this, arg);
+			printer.print(" ");
+		}
+		printer.print(n.getName());
+		if (!isNullOrEmpty(n.getTypeBound())) {
+			printer.print(" extends ");
+			for (final Iterator<ClassOrInterfaceType> i = n.getTypeBound().iterator(); i.hasNext(); ) {
+				final ClassOrInterfaceType c = i.next();
+				c.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(" & ");
+				}
+			}
+		}
+	}
+
+	@Override
+	public void visit(final PrimitiveType n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printAnnotations(n.getAnnotations(), true, arg);
+		switch (n.getType()) {
+			case Boolean:
+				printer.print("boolean");
+				break;
+			case Byte:
+				printer.print("byte");
+				break;
+			case Char:
+				printer.print("char");
+				break;
+			case Double:
+				printer.print("double");
+				break;
+			case Float:
+				printer.print("float");
+				break;
+			case Int:
+				printer.print("int");
+				break;
+			case Long:
+				printer.print("long");
+				break;
+			case Short:
+				printer.print("short");
+				break;
+		}
+	}
+
+	@Override
     public void visit(final ArrayType n, final Object arg) {
         final List<ArrayType> arrayTypeBuffer = new LinkedList<>();
         Type type = n;
@@ -440,35 +440,34 @@ public void visit(final ArrayType n, final Object arg) {
         }
     }
 
-    @Override
-    public void visit(final ArrayCreationLevel n, final Object arg) {
-        printAnnotations(n.getAnnotations(), true, arg);
-        printer.print("[");
-        if (n.getDimension() != null) {
-            n.getDimension().accept(this, arg);
-        }
-        printer.print("]");
-    }
-
-    @Override
-    public void visit(final IntersectionType n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printAnnotations(n.getAnnotations(), false, arg);
-        boolean isFirst = true;
-        for (ReferenceType element : n.getElements()) {
-            element.accept(this, arg);
-            if (isFirst) {
-                isFirst = false;
-            } else {
-                printer.print(" & ");
-            }
-        }
-    }
-
-    @Override
-    public void visit(final UnionType n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printAnnotations(n.getAnnotations(), true, arg);
+	@Override
+	public void visit(final ArrayCreationLevel n, final Object arg) {
+		printAnnotations(n.getAnnotations(), true, arg);
+		printer.print("[");
+		if (n.getDimension() != null) {
+			n.getDimension().accept(this, arg);
+		}
+		printer.print("]");
+	}
+
+	@Override
+	public void visit(final IntersectionType n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printAnnotations(n.getAnnotations(), false, arg);
+		boolean isFirst = true;
+		for (ReferenceType element : n.getElements()) {
+			element.accept(this, arg);
+			if (isFirst) {
+				isFirst = false;
+			} else {
+				printer.print(" & ");
+			}
+		}
+	}
+
+    @Override public void visit(final UnionType n, final Object arg) {
+        printJavaComment(n.getComment(), arg);
+		printAnnotations(n.getAnnotations(), true, arg);
         boolean isFirst = true;
         for (ReferenceType element : n.getElements()) {
             if (isFirst) {
@@ -476,1170 +475,1170 @@ public void visit(final UnionType n, final Object arg) {
             } else {
                 printer.print(" | ");
             }
-            element.accept(this, arg);
-        }
-    }
-
-
-    @Override
-    public void visit(final WildcardType n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printAnnotations(n.getAnnotations(), false, arg);
-        printer.print("?");
-        if (n.getExtends() != null) {
-            printer.print(" extends ");
-            n.getExtends().accept(this, arg);
-        }
-        if (n.getSuper() != null) {
-            printer.print(" super ");
-            n.getSuper().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final UnknownType n, final Object arg) {
-        // Nothing to dump
-    }
-
-    @Override
-    public void visit(final FieldDeclaration n, final Object arg) {
-        printOrphanCommentsBeforeThisChildNode(n);
-
-        printJavaComment(n.getComment(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-        n.getElementType().accept(this, arg);
-        for (ArrayBracketPair pair : n.getArrayBracketPairsAfterElementType()) {
-            pair.accept(this, arg);
-        }
-
-        printer.print(" ");
-        for (final Iterator<VariableDeclarator> i = n.getVariables().iterator(); i.hasNext(); ) {
-            final VariableDeclarator var = i.next();
-            var.accept(this, arg);
-            if (i.hasNext()) {
-                printer.print(", ");
-            }
-        }
-
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final VariableDeclarator n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getId().accept(this, arg);
-        if (n.getInit() != null) {
-            printer.print(" = ");
-            n.getInit().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final VariableDeclaratorId n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getName());
-        for (ArrayBracketPair pair : n.getArrayBracketPairsAfterId()) {
-            pair.accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final ArrayInitializerExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("{");
-        if (!isNullOrEmpty(n.getValues())) {
-            printer.print(" ");
-            for (final Iterator<Expression> i = n.getValues().iterator(); i.hasNext(); ) {
-                final Expression expr = i.next();
-                expr.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-            printer.print(" ");
-        }
-        printer.print("}");
-    }
-
-    @Override
-    public void visit(final VoidType n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printAnnotations(n.getAnnotations(), false, arg);
-        printer.print("void");
-    }
-
-    @Override
-    public void visit(final ArrayAccessExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getName().accept(this, arg);
-        printer.print("[");
-        n.getIndex().accept(this, arg);
-        printer.print("]");
-    }
-
-    @Override
-    public void visit(final ArrayCreationExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("new ");
-        n.getType().accept(this, arg);
-        for (ArrayCreationLevel level : n.getLevels()) {
-            level.accept(this, arg);
-        }
-        if (n.getInitializer() != null) {
-            printer.print(" ");
-            n.getInitializer().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final AssignExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getTarget().accept(this, arg);
-        printer.print(" ");
-        switch (n.getOperator()) {
-            case assign:
-                printer.print("=");
-                break;
-            case and:
-                printer.print("&=");
-                break;
-            case or:
-                printer.print("|=");
-                break;
-            case xor:
-                printer.print("^=");
-                break;
-            case plus:
-                printer.print("+=");
-                break;
-            case minus:
-                printer.print("-=");
-                break;
-            case rem:
-                printer.print("%=");
-                break;
-            case slash:
-                printer.print("/=");
-                break;
-            case star:
-                printer.print("*=");
-                break;
-            case lShift:
-                printer.print("<<=");
-                break;
-            case rSignedShift:
-                printer.print(">>=");
-                break;
-            case rUnsignedShift:
-                printer.print(">>>=");
-                break;
-        }
-        printer.print(" ");
-        n.getValue().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final BinaryExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getLeft().accept(this, arg);
-        printer.print(" ");
-        switch (n.getOperator()) {
-            case or:
-                printer.print("||");
-                break;
-            case and:
-                printer.print("&&");
-                break;
-            case binOr:
-                printer.print("|");
-                break;
-            case binAnd:
-                printer.print("&");
-                break;
-            case xor:
-                printer.print("^");
-                break;
-            case equals:
-                printer.print("==");
-                break;
-            case notEquals:
-                printer.print("!=");
-                break;
-            case less:
-                printer.print("<");
-                break;
-            case greater:
-                printer.print(">");
-                break;
-            case lessEquals:
-                printer.print("<=");
-                break;
-            case greaterEquals:
-                printer.print(">=");
-                break;
-            case lShift:
-                printer.print("<<");
-                break;
-            case rSignedShift:
-                printer.print(">>");
-                break;
-            case rUnsignedShift:
-                printer.print(">>>");
-                break;
-            case plus:
-                printer.print("+");
-                break;
-            case minus:
-                printer.print("-");
-                break;
-            case times:
-                printer.print("*");
-                break;
-            case divide:
-                printer.print("/");
-                break;
-            case remainder:
-                printer.print("%");
-                break;
-        }
-        printer.print(" ");
-        n.getRight().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final CastExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("(");
-        n.getType().accept(this, arg);
-        printer.print(") ");
-        n.getExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ClassExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getType().accept(this, arg);
-        printer.print(".class");
-    }
-
-    @Override
-    public void visit(final ConditionalExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getCondition().accept(this, arg);
-        printer.print(" ? ");
-        n.getThenExpr().accept(this, arg);
-        printer.print(" : ");
-        n.getElseExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final EnclosedExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("(");
-        if (n.getInner() != null) {
-            n.getInner().accept(this, arg);
-        }
-        printer.print(")");
-    }
-
-    @Override
-    public void visit(final FieldAccessExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getScope().accept(this, arg);
-        printer.print(".");
-        printer.print(n.getField());
-    }
-
-    @Override
-    public void visit(final InstanceOfExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getExpr().accept(this, arg);
-        printer.print(" instanceof ");
-        n.getType().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final CharLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("'");
-        printer.print(n.getValue());
-        printer.print("'");
-    }
-
-    @Override
-    public void visit(final DoubleLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getValue());
-    }
-
-    @Override
-    public void visit(final IntegerLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getValue());
-    }
-
-    @Override
-    public void visit(final LongLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getValue());
-    }
-
-    @Override
-    public void visit(final IntegerLiteralMinValueExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getValue());
-    }
-
-    @Override
-    public void visit(final LongLiteralMinValueExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getValue());
-    }
-
-    @Override
-    public void visit(final StringLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("\"");
-        printer.print(n.getValue());
-        printer.print("\"");
-    }
-
-    @Override
-    public void visit(final BooleanLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(String.valueOf(n.getValue()));
-    }
-
-    @Override
-    public void visit(final NullLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("null");
-    }
-
-    @Override
-    public void visit(final ThisExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getClassExpr() != null) {
-            n.getClassExpr().accept(this, arg);
-            printer.print(".");
-        }
-        printer.print("this");
-    }
-
-    @Override
-    public void visit(final SuperExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getClassExpr() != null) {
-            n.getClassExpr().accept(this, arg);
-            printer.print(".");
-        }
-        printer.print("super");
-    }
-
-    @Override
-    public void visit(final MethodCallExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getScope() != null) {
-            n.getScope().accept(this, arg);
-            printer.print(".");
-        }
-        printTypeArgs(n, arg);
-        printer.print(n.getName());
-        printArguments(n.getArgs(), arg);
-    }
-
-    @Override
-    public void visit(final ObjectCreationExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getScope() != null) {
-            n.getScope().accept(this, arg);
-            printer.print(".");
-        }
-
-        printer.print("new ");
-
-        printTypeArgs(n, arg);
-        if (!isNullOrEmpty(n.getTypeArguments())) {
-            printer.print(" ");
-        }
-
-        n.getType().accept(this, arg);
-
-        printArguments(n.getArgs(), arg);
-
-        if (n.getAnonymousClassBody() != null) {
-            printer.printLn(" {");
-            printer.indent();
-            printMembers(n.getAnonymousClassBody(), arg);
-            printer.unindent();
-            printer.print("}");
-        }
-    }
-
-    @Override
-    public void visit(final UnaryExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        switch (n.getOperator()) {
-            case positive:
-                printer.print("+");
-                break;
-            case negative:
-                printer.print("-");
-                break;
-            case inverse:
-                printer.print("~");
-                break;
-            case not:
-                printer.print("!");
-                break;
-            case preIncrement:
-                printer.print("++");
-                break;
-            case preDecrement:
-                printer.print("--");
-                break;
-            default:
-        }
-
-        n.getExpr().accept(this, arg);
-
-        switch (n.getOperator()) {
-            case posIncrement:
-                printer.print("++");
-                break;
-            case posDecrement:
-                printer.print("--");
-                break;
-            default:
-        }
-    }
-
-    @Override
-    public void visit(final ConstructorDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-
-        printTypeParameters(n.getTypeParameters(), arg);
-        if (!n.getTypeParameters().isEmpty()) {
-            printer.print(" ");
-        }
-        printer.print(n.getName());
-
-        printer.print("(");
-        if (!n.getParameters().isEmpty()) {
-            for (final Iterator<Parameter> i = n.getParameters().iterator(); i.hasNext(); ) {
-                final Parameter p = i.next();
-                p.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print(")");
-
-        if (!isNullOrEmpty(n.getThrows())) {
-            printer.print(" throws ");
-            for (final Iterator<ReferenceType> i = n.getThrows().iterator(); i.hasNext(); ) {
-                final ReferenceType name = i.next();
-                name.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print(" ");
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final MethodDeclaration n, final Object arg) {
-        printOrphanCommentsBeforeThisChildNode(n);
-
-        printJavaComment(n.getComment(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-        if (n.isDefault()) {
-            printer.print("default ");
-        }
-        printTypeParameters(n.getTypeParameters(), arg);
-        if (!isNullOrEmpty(n.getTypeParameters())) {
-            printer.print(" ");
-        }
-
-        n.getElementType().accept(this, arg);
-        for (ArrayBracketPair pair : n.getArrayBracketPairsAfterElementType()) {
-            pair.accept(this, arg);
-        }
-        printer.print(" ");
-        printer.print(n.getName());
-
-        printer.print("(");
-        if (!isNullOrEmpty(n.getParameters())) {
-            for (final Iterator<Parameter> i = n.getParameters().iterator(); i.hasNext(); ) {
-                final Parameter p = i.next();
-                p.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print(")");
-
-        for (ArrayBracketPair pair : n.getArrayBracketPairsAfterParameterList()) {
-            pair.accept(this, arg);
-        }
-
-        if (!isNullOrEmpty(n.getThrows())) {
-            printer.print(" throws ");
-            for (final Iterator<ReferenceType> i = n.getThrows().iterator(); i.hasNext(); ) {
-                final ReferenceType name = i.next();
-                name.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        if (n.getBody() == null) {
-            printer.print(";");
-        } else {
-            printer.print(" ");
-            n.getBody().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final Parameter n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printAnnotations(n.getAnnotations(), false, arg);
-        printModifiers(n.getModifiers());
-        if (n.getElementType() != null) {
-            n.getElementType().accept(this, arg);
-        }
-        for (ArrayBracketPair pair : n.getArrayBracketPairsAfterElementType()) {
-            pair.accept(this, arg);
-        }
-        if (n.isVarArgs()) {
-            printer.print("...");
-        }
-        printer.print(" ");
-        n.getId().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ExplicitConstructorInvocationStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.isThis()) {
-            printTypeArgs(n, arg);
-            printer.print("this");
-        } else {
-            if (n.getExpr() != null) {
-                n.getExpr().accept(this, arg);
-                printer.print(".");
-            }
-            printTypeArgs(n, arg);
-            printer.print("super");
-        }
-        printArguments(n.getArgs(), arg);
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final VariableDeclarationExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printAnnotations(n.getAnnotations(), false, arg);
-        printModifiers(n.getModifiers());
-
-        n.getElementType().accept(this, arg);
-        for (ArrayBracketPair pair : n.getArrayBracketPairsAfterElementType()) {
-            pair.accept(this, arg);
-        }
-        printer.print(" ");
-
-        for (final Iterator<VariableDeclarator> i = n.getVariables().iterator(); i.hasNext(); ) {
-            final VariableDeclarator v = i.next();
-            v.accept(this, arg);
-            if (i.hasNext()) {
-                printer.print(", ");
-            }
-        }
-    }
-
-    @Override
-    public void visit(final TypeDeclarationStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getTypeDeclaration().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final AssertStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("assert ");
-        n.getCheck().accept(this, arg);
-        if (n.getMessage() != null) {
-            printer.print(" : ");
-            n.getMessage().accept(this, arg);
-        }
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final BlockStmt n, final Object arg) {
-        printOrphanCommentsBeforeThisChildNode(n);
-        printJavaComment(n.getComment(), arg);
-        printer.printLn("{");
-        if (n.getStmts() != null) {
-            printer.indent();
-            for (final Statement s : n.getStmts()) {
-                s.accept(this, arg);
-                printer.printLn();
-            }
-            printer.unindent();
-        }
-        printOrphanCommentsEnding(n);
-        printer.print("}");
-
-    }
-
-    @Override
-    public void visit(final LabeledStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getLabel());
-        printer.print(": ");
-        n.getStmt().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final EmptyStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final ExpressionStmt n, final Object arg) {
-        printOrphanCommentsBeforeThisChildNode(n);
-        printJavaComment(n.getComment(), arg);
-        n.getExpression().accept(this, arg);
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final SwitchStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("switch(");
-        n.getSelector().accept(this, arg);
-        printer.printLn(") {");
-        if (n.getEntries() != null) {
-            printer.indent();
-            for (final SwitchEntryStmt e : n.getEntries()) {
-                e.accept(this, arg);
-            }
-            printer.unindent();
-        }
-        printer.print("}");
-
-    }
-
-    @Override
-    public void visit(final SwitchEntryStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getLabel() != null) {
-            printer.print("case ");
-            n.getLabel().accept(this, arg);
-            printer.print(":");
-        } else {
-            printer.print("default:");
-        }
-        printer.printLn();
-        printer.indent();
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
-                s.accept(this, arg);
-                printer.printLn();
-            }
-        }
-        printer.unindent();
-    }
-
-    @Override
-    public void visit(final BreakStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("break");
-        if (n.getId() != null) {
-            printer.print(" ");
-            printer.print(n.getId());
-        }
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final ReturnStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("return");
-        if (n.getExpr() != null) {
-            printer.print(" ");
-            n.getExpr().accept(this, arg);
-        }
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final EnumDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-
-        printer.print("enum ");
-        printer.print(n.getName());
-
-        if (!n.getImplements().isEmpty()) {
-            printer.print(" implements ");
-            for (final Iterator<ClassOrInterfaceType> i = n.getImplements().iterator(); i.hasNext(); ) {
-                final ClassOrInterfaceType c = i.next();
-                c.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-
-        printer.printLn(" {");
-        printer.indent();
-        if (n.getEntries() != null) {
-            printer.printLn();
-            for (final Iterator<EnumConstantDeclaration> i = n.getEntries().iterator(); i.hasNext(); ) {
-                final EnumConstantDeclaration e = i.next();
-                e.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        if (!n.getMembers().isEmpty()) {
-            printer.printLn(";");
-            printMembers(n.getMembers(), arg);
-        } else {
-            if (!n.getEntries().isEmpty()) {
-                printer.printLn();
-            }
-        }
-        printer.unindent();
-        printer.print("}");
-    }
-
-    @Override
-    public void visit(final EnumConstantDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printer.print(n.getName());
-
-        if (!n.getArgs().isEmpty()) {
-            printArguments(n.getArgs(), arg);
-        }
-
-        if (!n.getClassBody().isEmpty()) {
-            printer.printLn(" {");
-            printer.indent();
-            printMembers(n.getClassBody(), arg);
-            printer.unindent();
-            printer.printLn("}");
-        }
-    }
-
-    @Override
-    public void visit(final EmptyMemberDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final InitializerDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.isStatic()) {
-            printer.print("static ");
-        }
-        n.getBlock().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final IfStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("if (");
-        n.getCondition().accept(this, arg);
-        final boolean thenBlock = n.getThenStmt() instanceof BlockStmt;
-        if (thenBlock) // block statement should start on the same line
-            printer.print(") ");
-        else {
-            printer.printLn(")");
-            printer.indent();
-        }
-        n.getThenStmt().accept(this, arg);
-        if (!thenBlock)
-            printer.unindent();
-        if (n.getElseStmt() != null) {
-            if (thenBlock)
-                printer.print(" ");
-            else
-                printer.printLn();
-            final boolean elseIf = n.getElseStmt() instanceof IfStmt;
-            final boolean elseBlock = n.getElseStmt() instanceof BlockStmt;
-            if (elseIf || elseBlock) // put chained if and start of block statement on a same level
-                printer.print("else ");
-            else {
-                printer.printLn("else");
-                printer.indent();
-            }
-            n.getElseStmt().accept(this, arg);
-            if (!(elseIf || elseBlock))
-                printer.unindent();
-        }
-    }
-
-    @Override
-    public void visit(final WhileStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("while (");
-        n.getCondition().accept(this, arg);
-        printer.print(") ");
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ContinueStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("continue");
-        if (n.getId() != null) {
-            printer.print(" ");
-            printer.print(n.getId());
-        }
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final DoStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("do ");
-        n.getBody().accept(this, arg);
-        printer.print(" while (");
-        n.getCondition().accept(this, arg);
-        printer.print(");");
-    }
-
-    @Override
-    public void visit(final ForeachStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("for (");
-        n.getVariable().accept(this, arg);
-        printer.print(" : ");
-        n.getIterable().accept(this, arg);
-        printer.print(") ");
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ForStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("for (");
-        if (n.getInit() != null) {
-            for (final Iterator<Expression> i = n.getInit().iterator(); i.hasNext(); ) {
-                final Expression e = i.next();
-                e.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print("; ");
-        if (n.getCompare() != null) {
-            n.getCompare().accept(this, arg);
-        }
-        printer.print("; ");
-        if (n.getUpdate() != null) {
-            for (final Iterator<Expression> i = n.getUpdate().iterator(); i.hasNext(); ) {
-                final Expression e = i.next();
-                e.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print(") ");
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ThrowStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("throw ");
-        n.getExpr().accept(this, arg);
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final SynchronizedStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("synchronized (");
-        n.getExpr().accept(this, arg);
-        printer.print(") ");
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final TryStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("try ");
-        if (!n.getResources().isEmpty()) {
-            printer.print("(");
-            Iterator<VariableDeclarationExpr> resources = n.getResources().iterator();
-            boolean first = true;
-            while (resources.hasNext()) {
-                visit(resources.next(), arg);
-                if (resources.hasNext()) {
-                    printer.print(";");
-                    printer.printLn();
-                    if (first) {
-                        printer.indent();
-                    }
-                }
-                first = false;
-            }
-            if (n.getResources().size() > 1) {
-                printer.unindent();
-            }
-            printer.print(") ");
-        }
-        n.getTryBlock().accept(this, arg);
-        if (n.getCatchs() != null) {
-            for (final CatchClause c : n.getCatchs()) {
-                c.accept(this, arg);
-            }
-        }
-        if (n.getFinallyBlock() != null) {
-            printer.print(" finally ");
-            n.getFinallyBlock().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final CatchClause n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(" catch (");
-        n.getParam().accept(this, arg);
-        printer.print(") ");
-        n.getBody().accept(this, arg);
-
-    }
-
-    @Override
-    public void visit(final AnnotationDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-
-        printer.print("@interface ");
-        printer.print(n.getName());
-        printer.printLn(" {");
-        printer.indent();
-        if (n.getMembers() != null) {
-            printMembers(n.getMembers(), arg);
-        }
-        printer.unindent();
-        printer.print("}");
-    }
-
-    @Override
-    public void visit(final AnnotationMemberDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-
-        n.getType().accept(this, arg);
-        printer.print(" ");
-        printer.print(n.getName());
-        printer.print("()");
-        if (n.getDefaultValue() != null) {
-            printer.print(" default ");
-            n.getDefaultValue().accept(this, arg);
-        }
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final MarkerAnnotationExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("@");
-        n.getName().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final SingleMemberAnnotationExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("@");
-        n.getName().accept(this, arg);
-        printer.print("(");
-        n.getMemberValue().accept(this, arg);
-        printer.print(")");
-    }
-
-    @Override
-    public void visit(final NormalAnnotationExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("@");
-        n.getName().accept(this, arg);
-        printer.print("(");
-        if (n.getPairs() != null) {
-            for (final Iterator<MemberValuePair> i = n.getPairs().iterator(); i.hasNext(); ) {
-                final MemberValuePair m = i.next();
-                m.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print(")");
-    }
-
-    @Override
-    public void visit(final MemberValuePair n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getName());
-        printer.print(" = ");
-        n.getValue().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final LineComment n, final Object arg) {
-        if (!this.printComments) {
-            return;
-        }
-        printer.print("//");
-        String tmp = n.getContent();
-        tmp = tmp.replace('\r', ' ');
-        tmp = tmp.replace('\n', ' ');
-        printer.printLn(tmp);
-    }
-
-    @Override
-    public void visit(final BlockComment n, final Object arg) {
-        if (!this.printComments) {
-            return;
-        }
-        printer.print("/*");
-        printer.print(n.getContent());
-        printer.printLn("*/");
-    }
-
-    @Override
-    public void visit(LambdaExpr n, Object arg) {
-        printJavaComment(n.getComment(), arg);
-
-        final List<Parameter> parameters = n.getParameters();
-        final boolean printPar = n.isParametersEnclosed();
-
-        if (printPar) {
-            printer.print("(");
-        }
-        if (parameters != null) {
-            for (Iterator<Parameter> i = parameters.iterator(); i.hasNext(); ) {
-                Parameter p = i.next();
-                p.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        if (printPar) {
-            printer.print(")");
-        }
-
-        printer.print(" -> ");
-        final Statement body = n.getBody();
-        if (body instanceof ExpressionStmt) {
-            // Print the expression directly
-            ((ExpressionStmt) body).getExpression().accept(this, arg);
-        } else {
-            body.accept(this, arg);
-        }
-    }
-
-
-    @Override
-    public void visit(MethodReferenceExpr n, Object arg) {
-        printJavaComment(n.getComment(), arg);
-        Expression scope = n.getScope();
-        String identifier = n.getIdentifier();
-        if (scope != null) {
-            n.getScope().accept(this, arg);
-        }
-
-        printer.print("::");
-        printTypeArgs(n, arg);
-        if (identifier != null) {
-            printer.print(identifier);
-        }
-
-    }
-
-    @Override
-    public void visit(TypeExpr n, Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getType() != null) {
-            n.getType().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(ArrayBracketPair arrayBracketPair, Object arg) {
-        printAnnotations(arrayBracketPair.getAnnotations(), true, arg);
-        printer.print("[]");
-    }
-
-    private void printOrphanCommentsBeforeThisChildNode(final Node node) {
-        if (node instanceof Comment) return;
-
-        Node parent = node.getParentNode();
-        if (parent == null) return;
-        List<Node> everything = new LinkedList<>();
-        everything.addAll(parent.getChildrenNodes());
-        sortByBeginPosition(everything);
-        int positionOfTheChild = -1;
-        for (int i = 0; i < everything.size(); i++) {
-            if (everything.get(i) == node) positionOfTheChild = i;
-        }
-        if (positionOfTheChild == -1) throw new RuntimeException("My index not found!!! " + node);
-        int positionOfPreviousChild = -1;
-        for (int i = positionOfTheChild - 1; i >= 0 && positionOfPreviousChild == -1; i--) {
-            if (!(everything.get(i) instanceof Comment)) positionOfPreviousChild = i;
-        }
-        for (int i = positionOfPreviousChild + 1; i < positionOfTheChild; i++) {
-            Node nodeToPrint = everything.get(i);
-            if (!(nodeToPrint instanceof Comment))
-                throw new RuntimeException("Expected comment, instead " + nodeToPrint.getClass() + ". Position of previous child: " + positionOfPreviousChild + ", position of child " + positionOfTheChild);
-            nodeToPrint.accept(this, null);
-        }
-    }
-
-
-    private void printOrphanCommentsEnding(final Node node) {
-        List<Node> everything = new LinkedList<>();
-        everything.addAll(node.getChildrenNodes());
-        sortByBeginPosition(everything);
-        if (everything.isEmpty()) {
-            return;
-        }
-
-        int commentsAtEnd = 0;
-        boolean findingComments = true;
-        while (findingComments && commentsAtEnd < everything.size()) {
-            Node last = everything.get(everything.size() - 1 - commentsAtEnd);
-            findingComments = (last instanceof Comment);
-            if (findingComments) {
-                commentsAtEnd++;
-            }
-        }
-        for (int i = 0; i < commentsAtEnd; i++) {
-            everything.get(everything.size() - commentsAtEnd + i).accept(this, null);
-        }
-    }
+	        element.accept(this, arg);
+        }
+    }
+
+
+	@Override
+	public void visit(final WildcardType n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printAnnotations(n.getAnnotations(), false, arg);
+		printer.print("?");
+		if (n.getExtends() != null) {
+			printer.print(" extends ");
+			n.getExtends().accept(this, arg);
+		}
+		if (n.getSuper() != null) {
+			printer.print(" super ");
+			n.getSuper().accept(this, arg);
+		}
+	}
+
+	@Override
+	public void visit(final UnknownType n, final Object arg) {
+		// Nothing to dump
+	}
+
+	@Override
+	public void visit(final FieldDeclaration n, final Object arg) {
+		printOrphanCommentsBeforeThisChildNode(n);
+
+		printJavaComment(n.getComment(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+		n.getElementType().accept(this, arg);
+		for(ArrayBracketPair pair: n.getArrayBracketPairsAfterElementType()){
+			pair.accept(this, arg);
+		}
+
+		printer.print(" ");
+		for (final Iterator<VariableDeclarator> i = n.getVariables().iterator(); i.hasNext(); ) {
+			final VariableDeclarator var = i.next();
+			var.accept(this, arg);
+			if (i.hasNext()) {
+				printer.print(", ");
+			}
+		}
+
+		printer.print(";");
+	}
+
+	@Override
+	public void visit(final VariableDeclarator n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getId().accept(this, arg);
+		if (n.getInit() != null) {
+			printer.print(" = ");
+			n.getInit().accept(this, arg);
+		}
+	}
+
+	@Override
+	public void visit(final VariableDeclaratorId n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getName());
+		for(ArrayBracketPair pair: n.getArrayBracketPairsAfterId()){
+			pair.accept(this, arg);
+		}
+	}
+
+	@Override
+	public void visit(final ArrayInitializerExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("{");
+		if (!isNullOrEmpty(n.getValues())) {
+			printer.print(" ");
+			for (final Iterator<Expression> i = n.getValues().iterator(); i.hasNext(); ) {
+				final Expression expr = i.next();
+				expr.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+			printer.print(" ");
+		}
+		printer.print("}");
+	}
+
+	@Override
+	public void visit(final VoidType n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printAnnotations(n.getAnnotations(), false, arg);
+		printer.print("void");
+	}
+
+	@Override
+	public void visit(final ArrayAccessExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getName().accept(this, arg);
+		printer.print("[");
+		n.getIndex().accept(this, arg);
+		printer.print("]");
+	}
+
+	@Override
+	public void visit(final ArrayCreationExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("new ");
+		n.getType().accept(this, arg);
+		for (ArrayCreationLevel level : n.getLevels()) {
+			level.accept(this, arg);
+		}
+		if (n.getInitializer() != null) {
+			printer.print(" ");
+			n.getInitializer().accept(this, arg);
+		}
+	}
+
+	@Override
+	public void visit(final AssignExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getTarget().accept(this, arg);
+		printer.print(" ");
+		switch (n.getOperator()) {
+			case assign:
+				printer.print("=");
+				break;
+			case and:
+				printer.print("&=");
+				break;
+			case or:
+				printer.print("|=");
+				break;
+			case xor:
+				printer.print("^=");
+				break;
+			case plus:
+				printer.print("+=");
+				break;
+			case minus:
+				printer.print("-=");
+				break;
+			case rem:
+				printer.print("%=");
+				break;
+			case slash:
+				printer.print("/=");
+				break;
+			case star:
+				printer.print("*=");
+				break;
+			case lShift:
+				printer.print("<<=");
+				break;
+			case rSignedShift:
+				printer.print(">>=");
+				break;
+			case rUnsignedShift:
+				printer.print(">>>=");
+				break;
+		}
+		printer.print(" ");
+		n.getValue().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final BinaryExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getLeft().accept(this, arg);
+		printer.print(" ");
+		switch (n.getOperator()) {
+			case or:
+				printer.print("||");
+				break;
+			case and:
+				printer.print("&&");
+				break;
+			case binOr:
+				printer.print("|");
+				break;
+			case binAnd:
+				printer.print("&");
+				break;
+			case xor:
+				printer.print("^");
+				break;
+			case equals:
+				printer.print("==");
+				break;
+			case notEquals:
+				printer.print("!=");
+				break;
+			case less:
+				printer.print("<");
+				break;
+			case greater:
+				printer.print(">");
+				break;
+			case lessEquals:
+				printer.print("<=");
+				break;
+			case greaterEquals:
+				printer.print(">=");
+				break;
+			case lShift:
+				printer.print("<<");
+				break;
+			case rSignedShift:
+				printer.print(">>");
+				break;
+			case rUnsignedShift:
+				printer.print(">>>");
+				break;
+			case plus:
+				printer.print("+");
+				break;
+			case minus:
+				printer.print("-");
+				break;
+			case times:
+				printer.print("*");
+				break;
+			case divide:
+				printer.print("/");
+				break;
+			case remainder:
+				printer.print("%");
+				break;
+		}
+		printer.print(" ");
+		n.getRight().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final CastExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("(");
+		n.getType().accept(this, arg);
+		printer.print(") ");
+		n.getExpr().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final ClassExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getType().accept(this, arg);
+		printer.print(".class");
+	}
+
+	@Override
+	public void visit(final ConditionalExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getCondition().accept(this, arg);
+		printer.print(" ? ");
+		n.getThenExpr().accept(this, arg);
+		printer.print(" : ");
+		n.getElseExpr().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final EnclosedExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("(");
+		if (n.getInner() != null) {
+			n.getInner().accept(this, arg);
+		}
+		printer.print(")");
+	}
+
+	@Override
+	public void visit(final FieldAccessExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getScope().accept(this, arg);
+		printer.print(".");
+		printer.print(n.getField());
+	}
+
+	@Override
+	public void visit(final InstanceOfExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getExpr().accept(this, arg);
+		printer.print(" instanceof ");
+		n.getType().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final CharLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("'");
+		printer.print(n.getValue());
+		printer.print("'");
+	}
+
+	@Override
+	public void visit(final DoubleLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getValue());
+	}
+
+	@Override
+	public void visit(final IntegerLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getValue());
+	}
+
+	@Override
+	public void visit(final LongLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getValue());
+	}
+
+	@Override
+	public void visit(final IntegerLiteralMinValueExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getValue());
+	}
+
+	@Override
+	public void visit(final LongLiteralMinValueExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getValue());
+	}
+
+	@Override
+	public void visit(final StringLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("\"");
+		printer.print(n.getValue());
+		printer.print("\"");
+	}
+
+	@Override
+	public void visit(final BooleanLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(String.valueOf(n.getValue()));
+	}
+
+	@Override
+	public void visit(final NullLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("null");
+	}
+
+	@Override
+	public void visit(final ThisExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getClassExpr() != null) {
+			n.getClassExpr().accept(this, arg);
+			printer.print(".");
+		}
+		printer.print("this");
+	}
+
+	@Override
+	public void visit(final SuperExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getClassExpr() != null) {
+			n.getClassExpr().accept(this, arg);
+			printer.print(".");
+		}
+		printer.print("super");
+	}
+
+	@Override
+	public void visit(final MethodCallExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getScope() != null) {
+			n.getScope().accept(this, arg);
+			printer.print(".");
+		}
+		printTypeArgs(n, arg);
+		printer.print(n.getName());
+		printArguments(n.getArgs(), arg);
+	}
+
+	@Override
+	public void visit(final ObjectCreationExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getScope() != null) {
+			n.getScope().accept(this, arg);
+			printer.print(".");
+		}
+
+		printer.print("new ");
+
+		printTypeArgs(n, arg);
+		if (!isNullOrEmpty(n.getTypeArguments())) {
+			printer.print(" ");
+		}
+
+		n.getType().accept(this, arg);
+
+		printArguments(n.getArgs(), arg);
+
+		if (n.getAnonymousClassBody() != null) {
+			printer.printLn(" {");
+			printer.indent();
+			printMembers(n.getAnonymousClassBody(), arg);
+			printer.unindent();
+			printer.print("}");
+		}
+	}
+
+	@Override
+	public void visit(final UnaryExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		switch (n.getOperator()) {
+			case positive:
+				printer.print("+");
+				break;
+			case negative:
+				printer.print("-");
+				break;
+			case inverse:
+				printer.print("~");
+				break;
+			case not:
+				printer.print("!");
+				break;
+			case preIncrement:
+				printer.print("++");
+				break;
+			case preDecrement:
+				printer.print("--");
+				break;
+			default:
+		}
+
+		n.getExpr().accept(this, arg);
+
+		switch (n.getOperator()) {
+			case posIncrement:
+				printer.print("++");
+				break;
+			case posDecrement:
+				printer.print("--");
+				break;
+			default:
+		}
+	}
+
+	@Override
+	public void visit(final ConstructorDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+
+		printTypeParameters(n.getTypeParameters(), arg);
+		if (!n.getTypeParameters().isEmpty()) {
+			printer.print(" ");
+		}
+		printer.print(n.getName());
+
+		printer.print("(");
+		if (!n.getParameters().isEmpty()) {
+			for (final Iterator<Parameter> i = n.getParameters().iterator(); i.hasNext(); ) {
+				final Parameter p = i.next();
+				p.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print(")");
+
+		if (!isNullOrEmpty(n.getThrows())) {
+			printer.print(" throws ");
+			for (final Iterator<ReferenceType> i = n.getThrows().iterator(); i.hasNext(); ) {
+				final ReferenceType name = i.next();
+				name.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print(" ");
+		n.getBody().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final MethodDeclaration n, final Object arg) {
+		printOrphanCommentsBeforeThisChildNode(n);
+
+		printJavaComment(n.getComment(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+		if (n.isDefault()) {
+			printer.print("default ");
+		}
+		printTypeParameters(n.getTypeParameters(), arg);
+		if (!isNullOrEmpty(n.getTypeParameters())) {
+			printer.print(" ");
+		}
+
+		n.getElementType().accept(this, arg);
+		for(ArrayBracketPair pair: n.getArrayBracketPairsAfterElementType()){
+			pair.accept(this, arg);
+		}
+		printer.print(" ");
+		printer.print(n.getName());
+
+		printer.print("(");
+		if (!isNullOrEmpty(n.getParameters())) {
+			for (final Iterator<Parameter> i = n.getParameters().iterator(); i.hasNext(); ) {
+				final Parameter p = i.next();
+				p.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print(")");
+
+		for(ArrayBracketPair pair: n.getArrayBracketPairsAfterParameterList()){
+			pair.accept(this, arg);
+		}
+
+		if (!isNullOrEmpty(n.getThrows())) {
+			printer.print(" throws ");
+			for (final Iterator<ReferenceType> i = n.getThrows().iterator(); i.hasNext(); ) {
+				final ReferenceType name = i.next();
+				name.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		if (n.getBody() == null) {
+			printer.print(";");
+		} else {
+			printer.print(" ");
+			n.getBody().accept(this, arg);
+		}
+	}
+
+	@Override
+	public void visit(final Parameter n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printAnnotations(n.getAnnotations(), false, arg);
+		printModifiers(n.getModifiers());
+		if (n.getElementType() != null) {
+			n.getElementType().accept(this, arg);
+		}
+		for(ArrayBracketPair pair: n.getArrayBracketPairsAfterElementType()){
+			pair.accept(this, arg);
+		}
+		if (n.isVarArgs()) {
+			printer.print("...");
+		}
+		printer.print(" ");
+		n.getId().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final ExplicitConstructorInvocationStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.isThis()) {
+			printTypeArgs(n, arg);
+			printer.print("this");
+		} else {
+			if (n.getExpr() != null) {
+				n.getExpr().accept(this, arg);
+				printer.print(".");
+			}
+			printTypeArgs(n, arg);
+			printer.print("super");
+		}
+		printArguments(n.getArgs(), arg);
+		printer.print(";");
+	}
+
+	@Override
+	public void visit(final VariableDeclarationExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printAnnotations(n.getAnnotations(), false, arg);
+		printModifiers(n.getModifiers());
+
+		n.getElementType().accept(this, arg);
+		for(ArrayBracketPair pair: n.getArrayBracketPairsAfterElementType()){
+			pair.accept(this, arg);
+		}
+		printer.print(" ");
+
+		for (final Iterator<VariableDeclarator> i = n.getVariables().iterator(); i.hasNext(); ) {
+			final VariableDeclarator v = i.next();
+			v.accept(this, arg);
+			if (i.hasNext()) {
+				printer.print(", ");
+			}
+		}
+	}
+
+	@Override
+	public void visit(final TypeDeclarationStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getTypeDeclaration().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final AssertStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("assert ");
+		n.getCheck().accept(this, arg);
+		if (n.getMessage() != null) {
+			printer.print(" : ");
+			n.getMessage().accept(this, arg);
+		}
+		printer.print(";");
+	}
+
+	@Override
+	public void visit(final BlockStmt n, final Object arg) {
+		printOrphanCommentsBeforeThisChildNode(n);
+		printJavaComment(n.getComment(), arg);
+		printer.printLn("{");
+		if (n.getStmts() != null) {
+			printer.indent();
+			for (final Statement s : n.getStmts()) {
+				s.accept(this, arg);
+				printer.printLn();
+			}
+			printer.unindent();
+		}
+		printOrphanCommentsEnding(n);
+		printer.print("}");
+
+	}
+
+	@Override
+	public void visit(final LabeledStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getLabel());
+		printer.print(": ");
+		n.getStmt().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final EmptyStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(";");
+	}
+
+	@Override
+	public void visit(final ExpressionStmt n, final Object arg) {
+		printOrphanCommentsBeforeThisChildNode(n);
+		printJavaComment(n.getComment(), arg);
+		n.getExpression().accept(this, arg);
+		printer.print(";");
+	}
+
+	@Override
+	public void visit(final SwitchStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("switch(");
+		n.getSelector().accept(this, arg);
+		printer.printLn(") {");
+		if (n.getEntries() != null) {
+			printer.indent();
+			for (final SwitchEntryStmt e : n.getEntries()) {
+				e.accept(this, arg);
+			}
+			printer.unindent();
+		}
+		printer.print("}");
+
+	}
+
+	@Override
+	public void visit(final SwitchEntryStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getLabel() != null) {
+			printer.print("case ");
+			n.getLabel().accept(this, arg);
+			printer.print(":");
+		} else {
+			printer.print("default:");
+		}
+		printer.printLn();
+		printer.indent();
+		if (n.getStmts() != null) {
+			for (final Statement s : n.getStmts()) {
+				s.accept(this, arg);
+				printer.printLn();
+			}
+		}
+		printer.unindent();
+	}
+
+	@Override
+	public void visit(final BreakStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("break");
+		if (n.getId() != null) {
+			printer.print(" ");
+			printer.print(n.getId());
+		}
+		printer.print(";");
+	}
+
+	@Override
+	public void visit(final ReturnStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("return");
+		if (n.getExpr() != null) {
+			printer.print(" ");
+			n.getExpr().accept(this, arg);
+		}
+		printer.print(";");
+	}
+
+	@Override
+	public void visit(final EnumDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+
+		printer.print("enum ");
+		printer.print(n.getName());
+
+		if (!n.getImplements().isEmpty()) {
+			printer.print(" implements ");
+			for (final Iterator<ClassOrInterfaceType> i = n.getImplements().iterator(); i.hasNext(); ) {
+				final ClassOrInterfaceType c = i.next();
+				c.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+
+		printer.printLn(" {");
+		printer.indent();
+		if (n.getEntries() != null) {
+			printer.printLn();
+			for (final Iterator<EnumConstantDeclaration> i = n.getEntries().iterator(); i.hasNext(); ) {
+				final EnumConstantDeclaration e = i.next();
+				e.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		if (!n.getMembers().isEmpty()) {
+			printer.printLn(";");
+			printMembers(n.getMembers(), arg);
+		} else {
+			if (!n.getEntries().isEmpty()) {
+				printer.printLn();
+			}
+		}
+		printer.unindent();
+		printer.print("}");
+	}
+
+	@Override
+	public void visit(final EnumConstantDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printer.print(n.getName());
+
+		if (!n.getArgs().isEmpty()) {
+			printArguments(n.getArgs(), arg);
+		}
+
+		if (!n.getClassBody().isEmpty()) {
+			printer.printLn(" {");
+			printer.indent();
+			printMembers(n.getClassBody(), arg);
+			printer.unindent();
+			printer.printLn("}");
+		}
+	}
+
+	@Override
+	public void visit(final EmptyMemberDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(";");
+	}
+
+	@Override
+	public void visit(final InitializerDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.isStatic()) {
+			printer.print("static ");
+		}
+		n.getBlock().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final IfStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("if (");
+		n.getCondition().accept(this, arg);
+		final boolean thenBlock = n.getThenStmt() instanceof BlockStmt;
+		if (thenBlock) // block statement should start on the same line
+			printer.print(") ");
+		else {
+			printer.printLn(")");
+			printer.indent();
+		}
+		n.getThenStmt().accept(this, arg);
+		if (!thenBlock)
+			printer.unindent();
+		if (n.getElseStmt() != null) {
+			if (thenBlock)
+				printer.print(" ");
+			else
+				printer.printLn();
+			final boolean elseIf = n.getElseStmt() instanceof IfStmt;
+			final boolean elseBlock = n.getElseStmt() instanceof BlockStmt;
+			if (elseIf || elseBlock) // put chained if and start of block statement on a same level
+				printer.print("else ");
+			else {
+				printer.printLn("else");
+				printer.indent();
+			}
+			n.getElseStmt().accept(this, arg);
+			if (!(elseIf || elseBlock))
+				printer.unindent();
+		}
+	}
+
+	@Override
+	public void visit(final WhileStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("while (");
+		n.getCondition().accept(this, arg);
+		printer.print(") ");
+		n.getBody().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final ContinueStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("continue");
+		if (n.getId() != null) {
+			printer.print(" ");
+			printer.print(n.getId());
+		}
+		printer.print(";");
+	}
+
+	@Override
+	public void visit(final DoStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("do ");
+		n.getBody().accept(this, arg);
+		printer.print(" while (");
+		n.getCondition().accept(this, arg);
+		printer.print(");");
+	}
+
+	@Override
+	public void visit(final ForeachStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("for (");
+		n.getVariable().accept(this, arg);
+		printer.print(" : ");
+		n.getIterable().accept(this, arg);
+		printer.print(") ");
+		n.getBody().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final ForStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("for (");
+		if (n.getInit() != null) {
+			for (final Iterator<Expression> i = n.getInit().iterator(); i.hasNext(); ) {
+				final Expression e = i.next();
+				e.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print("; ");
+		if (n.getCompare() != null) {
+			n.getCompare().accept(this, arg);
+		}
+		printer.print("; ");
+		if (n.getUpdate() != null) {
+			for (final Iterator<Expression> i = n.getUpdate().iterator(); i.hasNext(); ) {
+				final Expression e = i.next();
+				e.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print(") ");
+		n.getBody().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final ThrowStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("throw ");
+		n.getExpr().accept(this, arg);
+		printer.print(";");
+	}
+
+	@Override
+	public void visit(final SynchronizedStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("synchronized (");
+		n.getExpr().accept(this, arg);
+		printer.print(") ");
+		n.getBody().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final TryStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("try ");
+		if (!n.getResources().isEmpty()) {
+			printer.print("(");
+			Iterator<VariableDeclarationExpr> resources = n.getResources().iterator();
+			boolean first = true;
+			while (resources.hasNext()) {
+				visit(resources.next(), arg);
+				if (resources.hasNext()) {
+					printer.print(";");
+					printer.printLn();
+					if (first) {
+						printer.indent();
+					}
+				}
+				first = false;
+			}
+			if (n.getResources().size() > 1) {
+				printer.unindent();
+			}
+			printer.print(") ");
+		}
+		n.getTryBlock().accept(this, arg);
+		if (n.getCatchs() != null) {
+			for (final CatchClause c : n.getCatchs()) {
+				c.accept(this, arg);
+			}
+		}
+		if (n.getFinallyBlock() != null) {
+			printer.print(" finally ");
+			n.getFinallyBlock().accept(this, arg);
+		}
+	}
+
+	@Override
+	public void visit(final CatchClause n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(" catch (");
+		n.getParam().accept(this, arg);
+		printer.print(") ");
+		n.getBody().accept(this, arg);
+
+	}
+
+	@Override
+	public void visit(final AnnotationDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+
+		printer.print("@interface ");
+		printer.print(n.getName());
+		printer.printLn(" {");
+		printer.indent();
+		if (n.getMembers() != null) {
+			printMembers(n.getMembers(), arg);
+		}
+		printer.unindent();
+		printer.print("}");
+	}
+
+	@Override
+	public void visit(final AnnotationMemberDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+
+		n.getType().accept(this, arg);
+		printer.print(" ");
+		printer.print(n.getName());
+		printer.print("()");
+		if (n.getDefaultValue() != null) {
+			printer.print(" default ");
+			n.getDefaultValue().accept(this, arg);
+		}
+		printer.print(";");
+	}
+
+	@Override
+	public void visit(final MarkerAnnotationExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("@");
+		n.getName().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final SingleMemberAnnotationExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("@");
+		n.getName().accept(this, arg);
+		printer.print("(");
+		n.getMemberValue().accept(this, arg);
+		printer.print(")");
+	}
+
+	@Override
+	public void visit(final NormalAnnotationExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("@");
+		n.getName().accept(this, arg);
+		printer.print("(");
+		if (n.getPairs() != null) {
+			for (final Iterator<MemberValuePair> i = n.getPairs().iterator(); i.hasNext(); ) {
+				final MemberValuePair m = i.next();
+				m.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print(")");
+	}
+
+	@Override
+	public void visit(final MemberValuePair n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getName());
+		printer.print(" = ");
+		n.getValue().accept(this, arg);
+	}
+
+	@Override
+	public void visit(final LineComment n, final Object arg) {
+		if (!this.printComments) {
+			return;
+		}
+		printer.print("//");
+		String tmp = n.getContent();
+		tmp = tmp.replace('\r', ' ');
+		tmp = tmp.replace('\n', ' ');
+		printer.printLn(tmp);
+	}
+
+	@Override
+	public void visit(final BlockComment n, final Object arg) {
+		if (!this.printComments) {
+			return;
+		}
+		printer.print("/*");
+		printer.print(n.getContent());
+		printer.printLn("*/");
+	}
+
+	@Override
+	public void visit(LambdaExpr n, Object arg) {
+		printJavaComment(n.getComment(), arg);
+
+		final List<Parameter> parameters = n.getParameters();
+		final boolean printPar = n.isParametersEnclosed();
+
+		if (printPar) {
+			printer.print("(");
+		}
+		if (parameters != null) {
+			for (Iterator<Parameter> i = parameters.iterator(); i.hasNext(); ) {
+				Parameter p = i.next();
+				p.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		if (printPar) {
+			printer.print(")");
+		}
+
+		printer.print(" -> ");
+		final Statement body = n.getBody();
+		if (body instanceof ExpressionStmt) {
+			// Print the expression directly
+			((ExpressionStmt) body).getExpression().accept(this, arg);
+		} else {
+			body.accept(this, arg);
+		}
+	}
+
+
+	@Override
+	public void visit(MethodReferenceExpr n, Object arg) {
+		printJavaComment(n.getComment(), arg);
+		Expression scope = n.getScope();
+		String identifier = n.getIdentifier();
+		if (scope != null) {
+			n.getScope().accept(this, arg);
+		}
+
+		printer.print("::");
+		printTypeArgs(n, arg);
+		if (identifier != null) {
+			printer.print(identifier);
+		}
+
+	}
+
+	@Override
+	public void visit(TypeExpr n, Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getType() != null) {
+			n.getType().accept(this, arg);
+		}
+	}
+
+	@Override
+	public void visit(ArrayBracketPair arrayBracketPair, Object arg) {
+		printAnnotations(arrayBracketPair.getAnnotations(), true, arg);
+		printer.print("[]");
+	}
+
+	private void printOrphanCommentsBeforeThisChildNode(final Node node) {
+		if (node instanceof Comment) return;
+
+		Node parent = node.getParentNode();
+		if (parent == null) return;
+		List<Node> everything = new LinkedList<>();
+		everything.addAll(parent.getChildrenNodes());
+		sortByBeginPosition(everything);
+		int positionOfTheChild = -1;
+		for (int i = 0; i < everything.size(); i++) {
+			if (everything.get(i) == node) positionOfTheChild = i;
+		}
+		if (positionOfTheChild == -1) throw new RuntimeException("My index not found!!! " + node);
+		int positionOfPreviousChild = -1;
+		for (int i = positionOfTheChild - 1; i >= 0 && positionOfPreviousChild == -1; i--) {
+			if (!(everything.get(i) instanceof Comment)) positionOfPreviousChild = i;
+		}
+		for (int i = positionOfPreviousChild + 1; i < positionOfTheChild; i++) {
+			Node nodeToPrint = everything.get(i);
+			if (!(nodeToPrint instanceof Comment))
+				throw new RuntimeException("Expected comment, instead " + nodeToPrint.getClass() + ". Position of previous child: " + positionOfPreviousChild + ", position of child " + positionOfTheChild);
+			nodeToPrint.accept(this, null);
+		}
+	}
+
+
+	private void printOrphanCommentsEnding(final Node node) {
+		List<Node> everything = new LinkedList<>();
+		everything.addAll(node.getChildrenNodes());
+		sortByBeginPosition(everything);
+		if (everything.isEmpty()) {
+			return;
+		}
+
+		int commentsAtEnd = 0;
+		boolean findingComments = true;
+		while (findingComments && commentsAtEnd < everything.size()) {
+			Node last = everything.get(everything.size() - 1 - commentsAtEnd);
+			findingComments = (last instanceof Comment);
+			if (findingComments) {
+				commentsAtEnd++;
+			}
+		}
+		for (int i = 0; i < commentsAtEnd; i++) {
+			everything.get(everything.size() - commentsAtEnd + i).accept(this, null);
+		}
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/EqualsVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/EqualsVisitor.java
index 327c197887..e10184ce9c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/EqualsVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/EqualsVisitor.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import java.util.List;
@@ -105,15 +105,15 @@
  */
 public class EqualsVisitor implements GenericVisitor<Boolean, Node> {
 
-    private static final EqualsVisitor SINGLETON = new EqualsVisitor();
+	private static final EqualsVisitor SINGLETON = new EqualsVisitor();
 
-    public static boolean equals(final Node n1, final Node n2) {
-        return SINGLETON.nodeEquals(n1, n2);
-    }
+	public static boolean equals(final Node n1, final Node n2) {
+		return SINGLETON.nodeEquals(n1, n2);
+	}
 
-    private EqualsVisitor() {
-        // hide constructor
-    }
+	private EqualsVisitor() {
+		// hide constructor
+	}
 
     /**
      * Check for equality that can be applied to each kind of node,
@@ -123,1423 +123,1345 @@ private boolean commonNodeEquality(Node n1, Node n2) {
         if (!nodeEquals(n1.getComment(), n2.getComment())) {
             return false;
         }
-        return nodesEquals(n1.getOrphanComments(), n2.getOrphanComments());
-    }
+		return nodesEquals(n1.getOrphanComments(), n2.getOrphanComments());
+	}
+
+	private <T extends Node> boolean nodesEquals(final List<T> nodes1, final List<T> nodes2) {
+		if (nodes1 == null) {
+			return nodes2 == null;
+		} else if (nodes2 == null) {
+			return false;
+		}
+		if (nodes1.size() != nodes2.size()) {
+			return false;
+		}
+		for (int i = 0; i < nodes1.size(); i++) {
+			if (!nodeEquals(nodes1.get(i), nodes2.get(i))) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private <T extends Node> boolean nodeEquals(final T n1, final T n2) {
+		if (n1 == n2) {
+			return true;
+		}
+		if (n1 == null || n2 == null) {
+			return false;
+		}
+		if (n1.getClass() != n2.getClass()) {
+			return false;
+		}
+        if (!commonNodeEquality(n1, n2)){
+            return false;
+        }
+		return n1.accept(this, n2);
+	}
+
+	private boolean objEquals(final Object n1, final Object n2) {
+		if (n1 == n2) {
+			return true;
+		}
+		if (n1 == null || n2 == null) {
+			return false;
+		}
+		return n1.equals(n2);
+	}
+
+	@Override public Boolean visit(final CompilationUnit n1, final Node arg) {
+		final CompilationUnit n2 = (CompilationUnit) arg;
+
+		if (!nodeEquals(n1.getPackage(), n2.getPackage())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getImports(), n2.getImports())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getTypes(), n2.getTypes())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getComments(), n2.getComments())) {
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override public Boolean visit(final PackageDeclaration n1, final Node arg) {
+		final PackageDeclaration n2 = (PackageDeclaration) arg;
+
+		if (!nodeEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override public Boolean visit(final ImportDeclaration n1, final Node arg) {
+		final ImportDeclaration n2 = (ImportDeclaration) arg;
+
+		if (!nodeEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override public Boolean visit(final TypeParameter n1, final Node arg) {
+		final TypeParameter n2 = (TypeParameter) arg;
+
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getTypeBound(), n2.getTypeBound())) {
+			return false;
+		}
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override public Boolean visit(final LineComment n1, final Node arg) {
+		final LineComment n2 = (LineComment) arg;
+
+		if (!objEquals(n1.getContent(), n2.getContent())) {
+			return false;
+		}
 
-    private <T extends Node> boolean nodesEquals(final List<T> nodes1, final List<T> nodes2) {
-        if (nodes1 == null) {
-            return nodes2 == null;
-        } else if (nodes2 == null) {
-            return false;
-        }
-        if (nodes1.size() != nodes2.size()) {
-            return false;
-        }
-        for (int i = 0; i < nodes1.size(); i++) {
-            if (!nodeEquals(nodes1.get(i), nodes2.get(i))) {
-                return false;
-            }
-        }
-        return true;
-    }
+        if (!objEquals(n1.getBegin().line, n2.getBegin().line)) {
+      		return false;
+      	}
 
-    private <T extends Node> boolean nodeEquals(final T n1, final T n2) {
-        if (n1 == n2) {
-            return true;
-        }
-        if (n1 == null || n2 == null) {
-            return false;
-        }
-        if (n1.getClass() != n2.getClass()) {
-            return false;
-        }
-        if (!commonNodeEquality(n1, n2)) {
-            return false;
-        }
-        return n1.accept(this, n2);
-    }
+		return true;
+	}
 
-    private boolean objEquals(final Object n1, final Object n2) {
-        if (n1 == n2) {
-            return true;
-        }
-        if (n1 == null || n2 == null) {
-            return false;
-        }
-        return n1.equals(n2);
-    }
+	@Override public Boolean visit(final BlockComment n1, final Node arg) {
+		final BlockComment n2 = (BlockComment) arg;
 
-    @Override
-    public Boolean visit(final CompilationUnit n1, final Node arg) {
-        final CompilationUnit n2 = (CompilationUnit) arg;
+		if (!objEquals(n1.getContent(), n2.getContent())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getPackage(), n2.getPackage())) {
-            return false;
-        }
+        if (!objEquals(n1.getBegin().line, n2.getBegin().line)) {
+      			return false;
+      	}
 
-        if (!nodesEquals(n1.getImports(), n2.getImports())) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!nodesEquals(n1.getTypes(), n2.getTypes())) {
-            return false;
-        }
+	@Override public Boolean visit(final ClassOrInterfaceDeclaration n1, final Node arg) {
+		final ClassOrInterfaceDeclaration n2 = (ClassOrInterfaceDeclaration) arg;
 
-        if (!nodesEquals(n1.getComments(), n2.getComments())) {
-            return false;
-        }
+		// javadoc are checked at CompilationUnit
 
-        return true;
-    }
+        if (!n1.getModifiers().equals(n2.getModifiers())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final PackageDeclaration n1, final Node arg) {
-        final PackageDeclaration n2 = (PackageDeclaration) arg;
+		if (n1.isInterface() != n2.isInterface()) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getTypeParameters(), n2.getTypeParameters())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final ImportDeclaration n1, final Node arg) {
-        final ImportDeclaration n2 = (ImportDeclaration) arg;
+		if (!nodesEquals(n1.getExtends(), n2.getExtends())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getImplements(), n2.getImplements())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getMembers(), n2.getMembers())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final TypeParameter n1, final Node arg) {
-        final TypeParameter n2 = (TypeParameter) arg;
+		return true;
+	}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+	@Override public Boolean visit(final EnumDeclaration n1, final Node arg) {
+		final EnumDeclaration n2 = (EnumDeclaration) arg;
 
-        if (!nodesEquals(n1.getTypeBound(), n2.getTypeBound())) {
-            return false;
-        }
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
-        return true;
-    }
+		// javadoc are checked at CompilationUnit
 
-    @Override
-    public Boolean visit(final LineComment n1, final Node arg) {
-        final LineComment n2 = (LineComment) arg;
+        if (!n1.getModifiers().equals(n2.getModifiers())) {
+			return false;
+		}
 
-        if (!objEquals(n1.getContent(), n2.getContent())) {
-            return false;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        if (!objEquals(n1.getBegin().line, n2.getBegin().line)) {
-            return false;
-        }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getImplements(), n2.getImplements())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final BlockComment n1, final Node arg) {
-        final BlockComment n2 = (BlockComment) arg;
+		if (!nodesEquals(n1.getEntries(), n2.getEntries())) {
+			return false;
+		}
 
-        if (!objEquals(n1.getContent(), n2.getContent())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getMembers(), n2.getMembers())) {
+			return false;
+		}
 
-        if (!objEquals(n1.getBegin().line, n2.getBegin().line)) {
-            return false;
-        }
+		return true;
+	}
 
-        return true;
-    }
+	@Override public Boolean visit(final EmptyTypeDeclaration n1, final Node arg) {
+		return true;
+	}
 
-    @Override
-    public Boolean visit(final ClassOrInterfaceDeclaration n1, final Node arg) {
-        final ClassOrInterfaceDeclaration n2 = (ClassOrInterfaceDeclaration) arg;
+	@Override public Boolean visit(final EnumConstantDeclaration n1, final Node arg) {
+		final EnumConstantDeclaration n2 = (EnumConstantDeclaration) arg;
 
-        // javadoc are checked at CompilationUnit
+		// javadoc are checked at CompilationUnit
 
-        if (!n1.getModifiers().equals(n2.getModifiers())) {
-            return false;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        if (n1.isInterface() != n2.isInterface()) {
-            return false;
-        }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getClassBody(), n2.getClassBody())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getTypeParameters(), n2.getTypeParameters())) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!nodesEquals(n1.getExtends(), n2.getExtends())) {
-            return false;
-        }
+	@Override public Boolean visit(final AnnotationDeclaration n1, final Node arg) {
+		final AnnotationDeclaration n2 = (AnnotationDeclaration) arg;
 
-        if (!nodesEquals(n1.getImplements(), n2.getImplements())) {
-            return false;
-        }
+		// javadoc are checked at CompilationUnit
 
-        if (!nodesEquals(n1.getMembers(), n2.getMembers())) {
-            return false;
-        }
+        if (!n1.getModifiers().equals(n2.getModifiers())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final EnumDeclaration n1, final Node arg) {
-        final EnumDeclaration n2 = (EnumDeclaration) arg;
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
 
-        // javadoc are checked at CompilationUnit
+		if (!nodesEquals(n1.getMembers(), n2.getMembers())) {
+			return false;
+		}
 
-        if (!n1.getModifiers().equals(n2.getModifiers())) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+	@Override public Boolean visit(final AnnotationMemberDeclaration n1, final Node arg) {
+		final AnnotationMemberDeclaration n2 = (AnnotationMemberDeclaration) arg;
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+		// javadoc are checked at CompilationUnit
 
-        if (!nodesEquals(n1.getImplements(), n2.getImplements())) {
-            return false;
-        }
+        if (!n1.getModifiers().equals(n2.getModifiers())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getEntries(), n2.getEntries())) {
-            return false;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getMembers(), n2.getMembers())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodeEquals(n1.getDefaultValue(), n2.getDefaultValue())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final EmptyTypeDeclaration n1, final Node arg) {
-        return true;
-    }
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final EnumConstantDeclaration n1, final Node arg) {
-        final EnumConstantDeclaration n2 = (EnumConstantDeclaration) arg;
+		return true;
+	}
 
-        // javadoc are checked at CompilationUnit
+	@Override public Boolean visit(final FieldDeclaration n1, final Node arg) {
+		final FieldDeclaration n2 = (FieldDeclaration) arg;
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+		// javadoc are checked at CompilationUnit
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+        if (!n1.getModifiers().equals(n2.getModifiers())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getClassBody(), n2.getClassBody())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getElementType(), n2.getElementType())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getVariables(), n2.getVariables())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final AnnotationDeclaration n1, final Node arg) {
-        final AnnotationDeclaration n2 = (AnnotationDeclaration) arg;
+		if(!nodesEquals(n1.getArrayBracketPairsAfterElementType(), n2.getArrayBracketPairsAfterElementType())){
+			return false;
+		}
+		
+		return true;
+	}
 
-        // javadoc are checked at CompilationUnit
+	@Override public Boolean visit(final VariableDeclarator n1, final Node arg) {
+		final VariableDeclarator n2 = (VariableDeclarator) arg;
 
-        if (!n1.getModifiers().equals(n2.getModifiers())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getId(), n2.getId())) {
+			return false;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getInit(), n2.getInit())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!nodesEquals(n1.getMembers(), n2.getMembers())) {
-            return false;
-        }
+	@Override public Boolean visit(final VariableDeclaratorId n1, final Node arg) {
+		final VariableDeclaratorId n2 = (VariableDeclaratorId) arg;
 
-        return true;
-    }
+		if(!nodesEquals(n1.getArrayBracketPairsAfterId(), n2.getArrayBracketPairsAfterId())){
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final AnnotationMemberDeclaration n1, final Node arg) {
-        final AnnotationMemberDeclaration n2 = (AnnotationMemberDeclaration) arg;
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        // javadoc are checked at CompilationUnit
+		return true;
+	}
+
+	@Override public Boolean visit(final ConstructorDeclaration n1, final Node arg) {
+		final ConstructorDeclaration n2 = (ConstructorDeclaration) arg;
+
+		// javadoc are checked at CompilationUnit
 
         if (!n1.getModifiers().equals(n2.getModifiers())) {
-            return false;
-        }
+			return false;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getDefaultValue(), n2.getDefaultValue())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getParameters(), n2.getParameters())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getThrows(), n2.getThrows())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final FieldDeclaration n1, final Node arg) {
-        final FieldDeclaration n2 = (FieldDeclaration) arg;
+		if (!nodesEquals(n1.getTypeParameters(), n2.getTypeParameters())) {
+			return false;
+		}
 
-        // javadoc are checked at CompilationUnit
+		return true;
+	}
 
-        if (!n1.getModifiers().equals(n2.getModifiers())) {
-            return false;
-        }
+	@Override public Boolean visit(final MethodDeclaration n1, final Node arg) {
+		final MethodDeclaration n2 = (MethodDeclaration) arg;
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+		// javadoc are checked at CompilationUnit
 
-        if (!nodeEquals(n1.getElementType(), n2.getElementType())) {
-            return false;
-        }
+        if (!n1.getModifiers().equals(n2.getModifiers())) {
+			return false;
+		}
+
+		if(!nodesEquals(n1.getArrayBracketPairsAfterElementType(), n2.getArrayBracketPairsAfterElementType())){
+			return false;
+		}
+
+		if(!nodesEquals(n1.getArrayBracketPairsAfterParameterList(), n2.getArrayBracketPairsAfterParameterList())){
+			return false;
+		}
+
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
+
+		if (!nodeEquals(n1.getElementType(), n2.getElementType())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getParameters(), n2.getParameters())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getThrows(), n2.getThrows())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getTypeParameters(), n2.getTypeParameters())) {
+			return false;
+		}
+		if(n1.isDefault() != n2.isDefault()){
+			return false;
+		}
+		return true;
+	}
+	
+	@Override public Boolean visit(final Parameter n1, final Node arg) {
+		final Parameter n2 = (Parameter) arg;
+		if (!nodeEquals(n1.getElementType(), n2.getElementType())) {
+			return false;
+		}
+
+		if(!nodesEquals(n1.getArrayBracketPairsAfterElementType(), n2.getArrayBracketPairsAfterElementType())){
+			return false;
+		}
+
+		if (!n1.getModifiers().equals(n2.getModifiers())) {
+			return false;
+		}
+
+		if (!nodeEquals(n1.getId(), n2.getId())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+
+		return true;
+	}
+	
+	@Override public Boolean visit(final EmptyMemberDeclaration n1, final Node arg) {
+		return true;
+	}
+
+	@Override public Boolean visit(final InitializerDeclaration n1, final Node arg) {
+		final InitializerDeclaration n2 = (InitializerDeclaration) arg;
+
+		if (!nodeEquals(n1.getBlock(), n2.getBlock())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override public Boolean visit(final JavadocComment n1, final Node arg) {
+		final JavadocComment n2 = (JavadocComment) arg;
+
+		if (!objEquals(n1.getContent(), n2.getContent())) {
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override public Boolean visit(final ClassOrInterfaceType n1, final Node arg) {
+		final ClassOrInterfaceType n2 = (ClassOrInterfaceType) arg;
+
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
+
+		if (!nodeEquals(n1.getScope(), n2.getScope())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getTypeArguments(), n2.getTypeArguments())) {
+			return false;
+		}
+
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override public Boolean visit(final PrimitiveType n1, final Node arg) {
+		final PrimitiveType n2 = (PrimitiveType) arg;
+
+		if (n1.getType() != n2.getType()) {
+			return false;
+		}
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public Boolean visit(ArrayType n1, Node arg) {
+		final ArrayType n2 = (ArrayType) arg;
+
+		if (!nodeEquals(n1.getComponentType(), n2.getComponentType())) {
+			return false;
+		}
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public Boolean visit(ArrayCreationLevel n1, Node arg) {
+		final ArrayCreationLevel n2 = (ArrayCreationLevel) arg;
+
+		if (!nodeEquals(n1.getDimension(), n2.getDimension())) {
+			return false;
+		}
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+		return true;
+	}
+
+	@Override public Boolean visit(final IntersectionType n1, final Node arg) {
+        final IntersectionType n2 = (IntersectionType) arg;
 
-        if (!nodesEquals(n1.getVariables(), n2.getVariables())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+
+        List<ReferenceType> n1Elements = n1.getElements();
+        List<ReferenceType> n2Elements = n2.getElements();
 
-        if (!nodesEquals(n1.getArrayBracketPairsAfterElementType(), n2.getArrayBracketPairsAfterElementType())) {
+        if (n1Elements !=null && n2Elements != null) {
+            if(n1Elements.size() != n2Elements.size()){
+                return false;
+            }
+            else{
+                int i = 0;
+                for(ReferenceType aux: n1Elements){
+                    if(aux.accept(this, n2Elements.get(i))) {
+                        return false;
+                    }
+                    i++;
+                }
+            }
+        }  else if (n1Elements != n2Elements){
             return false;
         }
-
         return true;
     }
 
-    @Override
-    public Boolean visit(final VariableDeclarator n1, final Node arg) {
-        final VariableDeclarator n2 = (VariableDeclarator) arg;
+    @Override public Boolean visit(final UnionType n1, final Node arg) {
+        final UnionType n2 = (UnionType) arg;
 
-        if (!nodeEquals(n1.getId(), n2.getId())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+
+        List<ReferenceType> n1Elements = n1.getElements();
+        List<ReferenceType> n2Elements = n2.getElements();
 
-        if (!nodeEquals(n1.getInit(), n2.getInit())) {
+        if (n1Elements !=null && n2Elements != null) {
+            if(n1Elements.size() != n2Elements.size()){
+                return false;
+            }
+            else{
+                int i = 0;
+                for(ReferenceType aux: n1Elements){
+                    if(aux.accept(this, n2Elements.get(i))) {
+                        return false;
+                    }
+                    i++;
+                }
+            }
+        }  else if (n1Elements != n2Elements){
             return false;
         }
-
         return true;
     }
 
-    @Override
-    public Boolean visit(final VariableDeclaratorId n1, final Node arg) {
-        final VariableDeclaratorId n2 = (VariableDeclaratorId) arg;
+	@Override
+	public Boolean visit(VoidType n1, Node arg) {
+		VoidType n2 = (VoidType) arg;
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+		return true;
+	}
 
-        if (!nodesEquals(n1.getArrayBracketPairsAfterId(), n2.getArrayBracketPairsAfterId())) {
-            return false;
-        }
+	@Override public Boolean visit(final WildcardType n1, final Node arg) {
+		final WildcardType n2 = (WildcardType) arg;
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getExtends(), n2.getExtends())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodeEquals(n1.getSuper(), n2.getSuper())) {
+			return false;
+		}
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
+		return true;
+	}
 
-    @Override
-    public Boolean visit(final ConstructorDeclaration n1, final Node arg) {
-        final ConstructorDeclaration n2 = (ConstructorDeclaration) arg;
+	@Override public Boolean visit(final UnknownType n1, final Node arg) {
+		return true;
+	}
 
-        // javadoc are checked at CompilationUnit
+	@Override public Boolean visit(final ArrayAccessExpr n1, final Node arg) {
+		final ArrayAccessExpr n2 = (ArrayAccessExpr) arg;
 
-        if (!n1.getModifiers().equals(n2.getModifiers())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getIndex(), n2.getIndex())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return false;
-        }
+	@Override public Boolean visit(final ArrayCreationExpr n1, final Node arg) {
+		final ArrayCreationExpr n2 = (ArrayCreationExpr) arg;
 
-        if (!nodesEquals(n1.getParameters(), n2.getParameters())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getThrows(), n2.getThrows())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getLevels(), n2.getLevels())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getTypeParameters(), n2.getTypeParameters())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getInitializer(), n2.getInitializer())) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    @Override
-    public Boolean visit(final MethodDeclaration n1, final Node arg) {
-        final MethodDeclaration n2 = (MethodDeclaration) arg;
+	@Override public Boolean visit(final ArrayInitializerExpr n1, final Node arg) {
+		final ArrayInitializerExpr n2 = (ArrayInitializerExpr) arg;
 
-        // javadoc are checked at CompilationUnit
+		if (!nodesEquals(n1.getValues(), n2.getValues())) {
+			return false;
+		}
 
-        if (!n1.getModifiers().equals(n2.getModifiers())) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!nodesEquals(n1.getArrayBracketPairsAfterElementType(), n2.getArrayBracketPairsAfterElementType())) {
-            return false;
-        }
+	@Override public Boolean visit(final AssignExpr n1, final Node arg) {
+		final AssignExpr n2 = (AssignExpr) arg;
 
-        if (!nodesEquals(n1.getArrayBracketPairsAfterParameterList(), n2.getArrayBracketPairsAfterParameterList())) {
-            return false;
-        }
+		if (n1.getOperator() != n2.getOperator()) {
+			return false;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getTarget(), n2.getTarget())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getElementType(), n2.getElementType())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getValue(), n2.getValue())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return false;
-        }
+	@Override public Boolean visit(final BinaryExpr n1, final Node arg) {
+		final BinaryExpr n2 = (BinaryExpr) arg;
 
-        if (!nodesEquals(n1.getParameters(), n2.getParameters())) {
-            return false;
-        }
+		if (n1.getOperator() != n2.getOperator()) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getThrows(), n2.getThrows())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getLeft(), n2.getLeft())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getTypeParameters(), n2.getTypeParameters())) {
-            return false;
-        }
-        if (n1.isDefault() != n2.isDefault()) {
-            return false;
-        }
-        return true;
-    }
+		if (!nodeEquals(n1.getRight(), n2.getRight())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final Parameter n1, final Node arg) {
-        final Parameter n2 = (Parameter) arg;
-        if (!nodeEquals(n1.getElementType(), n2.getElementType())) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!nodesEquals(n1.getArrayBracketPairsAfterElementType(), n2.getArrayBracketPairsAfterElementType())) {
-            return false;
-        }
+	@Override public Boolean visit(final CastExpr n1, final Node arg) {
+		final CastExpr n2 = (CastExpr) arg;
 
-        if (!n1.getModifiers().equals(n2.getModifiers())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getId(), n2.getId())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+		return true;
+	}
 
-        return true;
-    }
+	@Override public Boolean visit(final ClassExpr n1, final Node arg) {
+		final ClassExpr n2 = (ClassExpr) arg;
 
-    @Override
-    public Boolean visit(final EmptyMemberDeclaration n1, final Node arg) {
-        return true;
-    }
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final InitializerDeclaration n1, final Node arg) {
-        final InitializerDeclaration n2 = (InitializerDeclaration) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getBlock(), n2.getBlock())) {
-            return false;
-        }
+	@Override public Boolean visit(final ConditionalExpr n1, final Node arg) {
+		final ConditionalExpr n2 = (ConditionalExpr) arg;
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodeEquals(n1.getThenExpr(), n2.getThenExpr())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final JavadocComment n1, final Node arg) {
-        final JavadocComment n2 = (JavadocComment) arg;
+		if (!nodeEquals(n1.getElseExpr(), n2.getElseExpr())) {
+			return false;
+		}
 
-        if (!objEquals(n1.getContent(), n2.getContent())) {
-            return false;
-        }
+		return true;
+	}
 
-        return true;
-    }
+	@Override public Boolean visit(final EnclosedExpr n1, final Node arg) {
+		final EnclosedExpr n2 = (EnclosedExpr) arg;
 
-    @Override
-    public Boolean visit(final ClassOrInterfaceType n1, final Node arg) {
-        final ClassOrInterfaceType n2 = (ClassOrInterfaceType) arg;
+		if (!nodeEquals(n1.getInner(), n2.getInner())) {
+			return false;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!nodeEquals(n1.getScope(), n2.getScope())) {
-            return false;
-        }
+	@Override public Boolean visit(final FieldAccessExpr n1, final Node arg) {
+		final FieldAccessExpr n2 = (FieldAccessExpr) arg;
 
-        if (!nodesEquals(n1.getTypeArguments(), n2.getTypeArguments())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getScope(), n2.getScope())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+		if (!objEquals(n1.getField(), n2.getField())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getTypeArguments(), n2.getTypeArguments())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final PrimitiveType n1, final Node arg) {
-        final PrimitiveType n2 = (PrimitiveType) arg;
+		return true;
+	}
 
-        if (n1.getType() != n2.getType()) {
-            return false;
-        }
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
-        return true;
-    }
+	@Override public Boolean visit(final InstanceOfExpr n1, final Node arg) {
+		final InstanceOfExpr n2 = (InstanceOfExpr) arg;
 
-    @Override
-    public Boolean visit(ArrayType n1, Node arg) {
-        final ArrayType n2 = (ArrayType) arg;
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getComponentType(), n2.getComponentType())) {
-            return false;
-        }
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
-        return true;
-    }
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(ArrayCreationLevel n1, Node arg) {
-        final ArrayCreationLevel n2 = (ArrayCreationLevel) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getDimension(), n2.getDimension())) {
-            return false;
-        }
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
-        return true;
-    }
+	@Override public Boolean visit(final StringLiteralExpr n1, final Node arg) {
+		final StringLiteralExpr n2 = (StringLiteralExpr) arg;
 
-    @Override
-    public Boolean visit(final IntersectionType n1, final Node arg) {
-        final IntersectionType n2 = (IntersectionType) arg;
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+		return true;
+	}
 
-        List<ReferenceType> n1Elements = n1.getElements();
-        List<ReferenceType> n2Elements = n2.getElements();
+	@Override public Boolean visit(final IntegerLiteralExpr n1, final Node arg) {
+		final IntegerLiteralExpr n2 = (IntegerLiteralExpr) arg;
 
-        if (n1Elements != null && n2Elements != null) {
-            if (n1Elements.size() != n2Elements.size()) {
-                return false;
-            } else {
-                int i = 0;
-                for (ReferenceType aux : n1Elements) {
-                    if (aux.accept(this, n2Elements.get(i))) {
-                        return false;
-                    }
-                    i++;
-                }
-            }
-        } else if (n1Elements != n2Elements) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final UnionType n1, final Node arg) {
-        final UnionType n2 = (UnionType) arg;
-
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
-
-        List<ReferenceType> n1Elements = n1.getElements();
-        List<ReferenceType> n2Elements = n2.getElements();
-
-        if (n1Elements != null && n2Elements != null) {
-            if (n1Elements.size() != n2Elements.size()) {
-                return false;
-            } else {
-                int i = 0;
-                for (ReferenceType aux : n1Elements) {
-                    if (aux.accept(this, n2Elements.get(i))) {
-                        return false;
-                    }
-                    i++;
-                }
-            }
-        } else if (n1Elements != n2Elements) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean visit(VoidType n1, Node arg) {
-        VoidType n2 = (VoidType) arg;
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final WildcardType n1, final Node arg) {
-        final WildcardType n2 = (WildcardType) arg;
-
-        if (!nodeEquals(n1.getExtends(), n2.getExtends())) {
-            return false;
-        }
-
-        if (!nodeEquals(n1.getSuper(), n2.getSuper())) {
-            return false;
-        }
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final UnknownType n1, final Node arg) {
-        return true;
-    }
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final ArrayAccessExpr n1, final Node arg) {
-        final ArrayAccessExpr n2 = (ArrayAccessExpr) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+	@Override public Boolean visit(final LongLiteralExpr n1, final Node arg) {
+		final LongLiteralExpr n2 = (LongLiteralExpr) arg;
 
-        if (!nodeEquals(n1.getIndex(), n2.getIndex())) {
-            return false;
-        }
-
-        return true;
-    }
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final ArrayCreationExpr n1, final Node arg) {
-        final ArrayCreationExpr n2 = (ArrayCreationExpr) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return false;
-        }
+	@Override public Boolean visit(final IntegerLiteralMinValueExpr n1, final Node arg) {
+		final IntegerLiteralMinValueExpr n2 = (IntegerLiteralMinValueExpr) arg;
 
-        if (!nodesEquals(n1.getLevels(), n2.getLevels())) {
-            return false;
-        }
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getInitializer(), n2.getInitializer())) {
-            return false;
-        }
+		return true;
+	}
 
-        return true;
-    }
+	@Override public Boolean visit(final LongLiteralMinValueExpr n1, final Node arg) {
+		final LongLiteralMinValueExpr n2 = (LongLiteralMinValueExpr) arg;
 
-    @Override
-    public Boolean visit(final ArrayInitializerExpr n1, final Node arg) {
-        final ArrayInitializerExpr n2 = (ArrayInitializerExpr) arg;
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getValues(), n2.getValues())) {
-            return false;
-        }
+		return true;
+	}
 
-        return true;
-    }
+	@Override public Boolean visit(final CharLiteralExpr n1, final Node arg) {
+		final CharLiteralExpr n2 = (CharLiteralExpr) arg;
 
-    @Override
-    public Boolean visit(final AssignExpr n1, final Node arg) {
-        final AssignExpr n2 = (AssignExpr) arg;
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return false;
+		}
 
-        if (n1.getOperator() != n2.getOperator()) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!nodeEquals(n1.getTarget(), n2.getTarget())) {
-            return false;
-        }
-
-        if (!nodeEquals(n1.getValue(), n2.getValue())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final BinaryExpr n1, final Node arg) {
-        final BinaryExpr n2 = (BinaryExpr) arg;
-
-        if (n1.getOperator() != n2.getOperator()) {
-            return false;
-        }
-
-        if (!nodeEquals(n1.getLeft(), n2.getLeft())) {
-            return false;
-        }
-
-        if (!nodeEquals(n1.getRight(), n2.getRight())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final CastExpr n1, final Node arg) {
-        final CastExpr n2 = (CastExpr) arg;
-
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return false;
-        }
-
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final ClassExpr n1, final Node arg) {
-        final ClassExpr n2 = (ClassExpr) arg;
-
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final ConditionalExpr n1, final Node arg) {
-        final ConditionalExpr n2 = (ConditionalExpr) arg;
-
-        if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
-            return false;
-        }
-
-        if (!nodeEquals(n1.getThenExpr(), n2.getThenExpr())) {
-            return false;
-        }
-
-        if (!nodeEquals(n1.getElseExpr(), n2.getElseExpr())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final EnclosedExpr n1, final Node arg) {
-        final EnclosedExpr n2 = (EnclosedExpr) arg;
-
-        if (!nodeEquals(n1.getInner(), n2.getInner())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final FieldAccessExpr n1, final Node arg) {
-        final FieldAccessExpr n2 = (FieldAccessExpr) arg;
-
-        if (!nodeEquals(n1.getScope(), n2.getScope())) {
-            return false;
-        }
-
-        if (!objEquals(n1.getField(), n2.getField())) {
-            return false;
-        }
-
-        if (!nodesEquals(n1.getTypeArguments(), n2.getTypeArguments())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final InstanceOfExpr n1, final Node arg) {
-        final InstanceOfExpr n2 = (InstanceOfExpr) arg;
-
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return false;
-        }
-
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final StringLiteralExpr n1, final Node arg) {
-        final StringLiteralExpr n2 = (StringLiteralExpr) arg;
-
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final IntegerLiteralExpr n1, final Node arg) {
-        final IntegerLiteralExpr n2 = (IntegerLiteralExpr) arg;
-
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final LongLiteralExpr n1, final Node arg) {
-        final LongLiteralExpr n2 = (LongLiteralExpr) arg;
-
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final IntegerLiteralMinValueExpr n1, final Node arg) {
-        final IntegerLiteralMinValueExpr n2 = (IntegerLiteralMinValueExpr) arg;
-
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final LongLiteralMinValueExpr n1, final Node arg) {
-        final LongLiteralMinValueExpr n2 = (LongLiteralMinValueExpr) arg;
-
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final CharLiteralExpr n1, final Node arg) {
-        final CharLiteralExpr n2 = (CharLiteralExpr) arg;
-
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public Boolean visit(final DoubleLiteralExpr n1, final Node arg) {
-        final DoubleLiteralExpr n2 = (DoubleLiteralExpr) arg;
-
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return false;
-        }
-
-        return true;
-    }
+	@Override public Boolean visit(final DoubleLiteralExpr n1, final Node arg) {
+		final DoubleLiteralExpr n2 = (DoubleLiteralExpr) arg;
 
-    @Override
-    public Boolean visit(final BooleanLiteralExpr n1, final Node arg) {
-        final BooleanLiteralExpr n2 = (BooleanLiteralExpr) arg;
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return false;
+		}
 
-        if (n1.getValue() != n2.getValue()) {
-            return false;
-        }
+		return true;
+	}
 
-        return true;
-    }
+	@Override public Boolean visit(final BooleanLiteralExpr n1, final Node arg) {
+		final BooleanLiteralExpr n2 = (BooleanLiteralExpr) arg;
 
-    @Override
-    public Boolean visit(final NullLiteralExpr n1, final Node arg) {
-        return true;
-    }
+		if (n1.getValue() != n2.getValue()) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final MethodCallExpr n1, final Node arg) {
-        final MethodCallExpr n2 = (MethodCallExpr) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getScope(), n2.getScope())) {
-            return false;
-        }
+	@Override public Boolean visit(final NullLiteralExpr n1, final Node arg) {
+		return true;
+	}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+	@Override public Boolean visit(final MethodCallExpr n1, final Node arg) {
+		final MethodCallExpr n2 = (MethodCallExpr) arg;
 
-        if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getScope(), n2.getScope())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getTypeArguments(), n2.getTypeArguments())) {
-            return false;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final NameExpr n1, final Node arg) {
-        final NameExpr n2 = (NameExpr) arg;
+		if (!nodesEquals(n1.getTypeArguments(), n2.getTypeArguments())) {
+			return false;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+		return true;
+	}
 
-        return true;
-    }
+	@Override public Boolean visit(final NameExpr n1, final Node arg) {
+		final NameExpr n2 = (NameExpr) arg;
 
-    @Override
-    public Boolean visit(final ObjectCreationExpr n1, final Node arg) {
-        final ObjectCreationExpr n2 = (ObjectCreationExpr) arg;
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getScope(), n2.getScope())) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return false;
-        }
+	@Override public Boolean visit(final ObjectCreationExpr n1, final Node arg) {
+		final ObjectCreationExpr n2 = (ObjectCreationExpr) arg;
 
-        if (!nodesEquals(n1.getAnonymousClassBody(), n2.getAnonymousClassBody())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getScope(), n2.getScope())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getTypeArguments(), n2.getTypeArguments())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getAnonymousClassBody(), n2.getAnonymousClassBody())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final QualifiedNameExpr n1, final Node arg) {
-        final QualifiedNameExpr n2 = (QualifiedNameExpr) arg;
+		if (!nodesEquals(n1.getTypeArguments(), n2.getTypeArguments())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getQualifier(), n2.getQualifier())) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+	@Override public Boolean visit(final QualifiedNameExpr n1, final Node arg) {
+		final QualifiedNameExpr n2 = (QualifiedNameExpr) arg;
 
-        return true;
-    }
+		if (!nodeEquals(n1.getQualifier(), n2.getQualifier())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final ThisExpr n1, final Node arg) {
-        final ThisExpr n2 = (ThisExpr) arg;
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getClassExpr(), n2.getClassExpr())) {
-            return false;
-        }
+		return true;
+	}
 
-        return true;
-    }
+	@Override public Boolean visit(final ThisExpr n1, final Node arg) {
+		final ThisExpr n2 = (ThisExpr) arg;
 
-    @Override
-    public Boolean visit(final SuperExpr n1, final Node arg) {
-        final SuperExpr n2 = (SuperExpr) arg;
+		if (!nodeEquals(n1.getClassExpr(), n2.getClassExpr())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getClassExpr(), n2.getClassExpr())) {
-            return false;
-        }
+		return true;
+	}
 
-        return true;
-    }
+	@Override public Boolean visit(final SuperExpr n1, final Node arg) {
+		final SuperExpr n2 = (SuperExpr) arg;
 
-    @Override
-    public Boolean visit(final UnaryExpr n1, final Node arg) {
-        final UnaryExpr n2 = (UnaryExpr) arg;
+		if (!nodeEquals(n1.getClassExpr(), n2.getClassExpr())) {
+			return false;
+		}
 
-        if (n1.getOperator() != n2.getOperator()) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return false;
-        }
+	@Override public Boolean visit(final UnaryExpr n1, final Node arg) {
+		final UnaryExpr n2 = (UnaryExpr) arg;
 
-        return true;
-    }
+		if (n1.getOperator() != n2.getOperator()) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final VariableDeclarationExpr n1, final Node arg) {
-        final VariableDeclarationExpr n2 = (VariableDeclarationExpr) arg;
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return false;
+		}
 
-        if (!n1.getModifiers().equals(n2.getModifiers())) {
-            return false;
-        }
+		return true;
+	}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+	@Override public Boolean visit(final VariableDeclarationExpr n1, final Node arg) {
+		final VariableDeclarationExpr n2 = (VariableDeclarationExpr) arg;
 
-        if (!nodeEquals(n1.getElementType(), n2.getElementType())) {
-            return false;
-        }
+        if (!n1.getModifiers().equals(n2.getModifiers())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getVariables(), n2.getVariables())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getArrayBracketPairsAfterElementType(), n2.getArrayBracketPairsAfterElementType())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getElementType(), n2.getElementType())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getVariables(), n2.getVariables())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final MarkerAnnotationExpr n1, final Node arg) {
-        final MarkerAnnotationExpr n2 = (MarkerAnnotationExpr) arg;
+		if(!nodesEquals(n1.getArrayBracketPairsAfterElementType(), n2.getArrayBracketPairsAfterElementType())){
+			return false;
+		}
+		
+		return true;
+	}
 
-        if (!nodeEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+	@Override public Boolean visit(final MarkerAnnotationExpr n1, final Node arg) {
+		final MarkerAnnotationExpr n2 = (MarkerAnnotationExpr) arg;
 
-        return true;
-    }
+		if (!nodeEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final SingleMemberAnnotationExpr n1, final Node arg) {
-        final SingleMemberAnnotationExpr n2 = (SingleMemberAnnotationExpr) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+	@Override public Boolean visit(final SingleMemberAnnotationExpr n1, final Node arg) {
+		final SingleMemberAnnotationExpr n2 = (SingleMemberAnnotationExpr) arg;
 
-        if (!nodeEquals(n1.getMemberValue(), n2.getMemberValue())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodeEquals(n1.getMemberValue(), n2.getMemberValue())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final NormalAnnotationExpr n1, final Node arg) {
-        final NormalAnnotationExpr n2 = (NormalAnnotationExpr) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+	@Override public Boolean visit(final NormalAnnotationExpr n1, final Node arg) {
+		final NormalAnnotationExpr n2 = (NormalAnnotationExpr) arg;
 
-        if (!nodesEquals(n1.getPairs(), n2.getPairs())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getPairs(), n2.getPairs())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final MemberValuePair n1, final Node arg) {
-        final MemberValuePair n2 = (MemberValuePair) arg;
+		return true;
+	}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return false;
-        }
+	@Override public Boolean visit(final MemberValuePair n1, final Node arg) {
+		final MemberValuePair n2 = (MemberValuePair) arg;
 
-        if (!nodeEquals(n1.getValue(), n2.getValue())) {
-            return false;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodeEquals(n1.getValue(), n2.getValue())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final ExplicitConstructorInvocationStmt n1, final Node arg) {
-        final ExplicitConstructorInvocationStmt n2 = (ExplicitConstructorInvocationStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return false;
-        }
+	@Override public Boolean visit(final ExplicitConstructorInvocationStmt n1, final Node arg) {
+		final ExplicitConstructorInvocationStmt n2 = (ExplicitConstructorInvocationStmt) arg;
 
-        if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getTypeArguments(), n2.getTypeArguments())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getTypeArguments(), n2.getTypeArguments())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final TypeDeclarationStmt n1, final Node arg) {
-        final TypeDeclarationStmt n2 = (TypeDeclarationStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getTypeDeclaration(), n2.getTypeDeclaration())) {
-            return false;
-        }
+	@Override public Boolean visit(final TypeDeclarationStmt n1, final Node arg) {
+		final TypeDeclarationStmt n2 = (TypeDeclarationStmt) arg;
 
-        return true;
-    }
+		if (!nodeEquals(n1.getTypeDeclaration(), n2.getTypeDeclaration())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final AssertStmt n1, final Node arg) {
-        final AssertStmt n2 = (AssertStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getCheck(), n2.getCheck())) {
-            return false;
-        }
+	@Override public Boolean visit(final AssertStmt n1, final Node arg) {
+		final AssertStmt n2 = (AssertStmt) arg;
 
-        if (!nodeEquals(n1.getMessage(), n2.getMessage())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getCheck(), n2.getCheck())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodeEquals(n1.getMessage(), n2.getMessage())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final BlockStmt n1, final Node arg) {
-        final BlockStmt n2 = (BlockStmt) arg;
+		return true;
+	}
 
-        if (!nodesEquals(n1.getStmts(), n2.getStmts())) {
-            return false;
-        }
+	@Override public Boolean visit(final BlockStmt n1, final Node arg) {
+		final BlockStmt n2 = (BlockStmt) arg;
 
-        return true;
-    }
+		if (!nodesEquals(n1.getStmts(), n2.getStmts())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final LabeledStmt n1, final Node arg) {
-        final LabeledStmt n2 = (LabeledStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getStmt(), n2.getStmt())) {
-            return false;
-        }
+	@Override public Boolean visit(final LabeledStmt n1, final Node arg) {
+		final LabeledStmt n2 = (LabeledStmt) arg;
 
-        return true;
-    }
+		if (!nodeEquals(n1.getStmt(), n2.getStmt())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final EmptyStmt n1, final Node arg) {
-        return true;
-    }
+		return true;
+	}
 
-    @Override
-    public Boolean visit(final ExpressionStmt n1, final Node arg) {
-        final ExpressionStmt n2 = (ExpressionStmt) arg;
+	@Override public Boolean visit(final EmptyStmt n1, final Node arg) {
+		return true;
+	}
 
-        if (!nodeEquals(n1.getExpression(), n2.getExpression())) {
-            return false;
-        }
+	@Override public Boolean visit(final ExpressionStmt n1, final Node arg) {
+		final ExpressionStmt n2 = (ExpressionStmt) arg;
 
-        return true;
-    }
+		if (!nodeEquals(n1.getExpression(), n2.getExpression())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final SwitchStmt n1, final Node arg) {
-        final SwitchStmt n2 = (SwitchStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getSelector(), n2.getSelector())) {
-            return false;
-        }
+	@Override public Boolean visit(final SwitchStmt n1, final Node arg) {
+		final SwitchStmt n2 = (SwitchStmt) arg;
 
-        if (!nodesEquals(n1.getEntries(), n2.getEntries())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getSelector(), n2.getSelector())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getEntries(), n2.getEntries())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final SwitchEntryStmt n1, final Node arg) {
-        final SwitchEntryStmt n2 = (SwitchEntryStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getLabel(), n2.getLabel())) {
-            return false;
-        }
+	@Override public Boolean visit(final SwitchEntryStmt n1, final Node arg) {
+		final SwitchEntryStmt n2 = (SwitchEntryStmt) arg;
 
-        if (!nodesEquals(n1.getStmts(), n2.getStmts())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getLabel(), n2.getLabel())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodesEquals(n1.getStmts(), n2.getStmts())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final BreakStmt n1, final Node arg) {
-        final BreakStmt n2 = (BreakStmt) arg;
+		return true;
+	}
 
-        if (!objEquals(n1.getId(), n2.getId())) {
-            return false;
-        }
+	@Override public Boolean visit(final BreakStmt n1, final Node arg) {
+		final BreakStmt n2 = (BreakStmt) arg;
 
-        return true;
-    }
+		if (!objEquals(n1.getId(), n2.getId())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final ReturnStmt n1, final Node arg) {
-        final ReturnStmt n2 = (ReturnStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return false;
-        }
+	@Override public Boolean visit(final ReturnStmt n1, final Node arg) {
+		final ReturnStmt n2 = (ReturnStmt) arg;
 
-        return true;
-    }
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final IfStmt n1, final Node arg) {
-        final IfStmt n2 = (IfStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
-            return false;
-        }
+	@Override public Boolean visit(final IfStmt n1, final Node arg) {
+		final IfStmt n2 = (IfStmt) arg;
 
-        if (!nodeEquals(n1.getThenStmt(), n2.getThenStmt())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getElseStmt(), n2.getElseStmt())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getThenStmt(), n2.getThenStmt())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodeEquals(n1.getElseStmt(), n2.getElseStmt())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final WhileStmt n1, final Node arg) {
-        final WhileStmt n2 = (WhileStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
-            return false;
-        }
+	@Override public Boolean visit(final WhileStmt n1, final Node arg) {
+		final WhileStmt n2 = (WhileStmt) arg;
 
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final ContinueStmt n1, final Node arg) {
-        final ContinueStmt n2 = (ContinueStmt) arg;
+		return true;
+	}
 
-        if (!objEquals(n1.getId(), n2.getId())) {
-            return false;
-        }
+	@Override public Boolean visit(final ContinueStmt n1, final Node arg) {
+		final ContinueStmt n2 = (ContinueStmt) arg;
 
-        return true;
-    }
+		if (!objEquals(n1.getId(), n2.getId())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final DoStmt n1, final Node arg) {
-        final DoStmt n2 = (DoStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return false;
-        }
+	@Override public Boolean visit(final DoStmt n1, final Node arg) {
+		final DoStmt n2 = (DoStmt) arg;
 
-        if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final ForeachStmt n1, final Node arg) {
-        final ForeachStmt n2 = (ForeachStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getVariable(), n2.getVariable())) {
-            return false;
-        }
+	@Override public Boolean visit(final ForeachStmt n1, final Node arg) {
+		final ForeachStmt n2 = (ForeachStmt) arg;
 
-        if (!nodeEquals(n1.getIterable(), n2.getIterable())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getVariable(), n2.getVariable())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getIterable(), n2.getIterable())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final ForStmt n1, final Node arg) {
-        final ForStmt n2 = (ForStmt) arg;
+		return true;
+	}
 
-        if (!nodesEquals(n1.getInit(), n2.getInit())) {
-            return false;
-        }
+	@Override public Boolean visit(final ForStmt n1, final Node arg) {
+		final ForStmt n2 = (ForStmt) arg;
 
-        if (!nodeEquals(n1.getCompare(), n2.getCompare())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getInit(), n2.getInit())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getUpdate(), n2.getUpdate())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getCompare(), n2.getCompare())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getUpdate(), n2.getUpdate())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final ThrowStmt n1, final Node arg) {
-        final ThrowStmt n2 = (ThrowStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return false;
-        }
+	@Override public Boolean visit(final ThrowStmt n1, final Node arg) {
+		final ThrowStmt n2 = (ThrowStmt) arg;
 
-        return true;
-    }
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final SynchronizedStmt n1, final Node arg) {
-        final SynchronizedStmt n2 = (SynchronizedStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return false;
-        }
+	@Override public Boolean visit(final SynchronizedStmt n1, final Node arg) {
+		final SynchronizedStmt n2 = (SynchronizedStmt) arg;
 
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return false;
+		}
 
-        return true;
-    }
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return false;
+		}
 
-    @Override
-    public Boolean visit(final TryStmt n1, final Node arg) {
-        final TryStmt n2 = (TryStmt) arg;
+		return true;
+	}
 
-        if (!nodeEquals(n1.getTryBlock(), n2.getTryBlock())) {
-            return false;
-        }
+	@Override public Boolean visit(final TryStmt n1, final Node arg) {
+		final TryStmt n2 = (TryStmt) arg;
 
-        if (!nodesEquals(n1.getCatchs(), n2.getCatchs())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getTryBlock(), n2.getTryBlock())) {
+			return false;
+		}
 
-        if (!nodesEquals(n1.getResources(), n2.getResources())) {
-            return false;
-        }
+		if (!nodesEquals(n1.getCatchs(), n2.getCatchs())) {
+			return false;
+		}
+		
+		if(!nodesEquals(n1.getResources(), n2.getResources())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getFinallyBlock(), n2.getFinallyBlock())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getFinallyBlock(), n2.getFinallyBlock())) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
-    @Override
-    public Boolean visit(final CatchClause n1, final Node arg) {
-        final CatchClause n2 = (CatchClause) arg;
+	@Override public Boolean visit(final CatchClause n1, final Node arg) {
+		final CatchClause n2 = (CatchClause) arg;
 
-        if (!nodeEquals(n1.getParam(), n2.getParam())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getParam(), n2.getParam())) {
+			return false;
+		}
 
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return false;
-        }
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 
     @Override
     public Boolean visit(LambdaExpr n1, Node arg) {
@@ -1547,7 +1469,7 @@ public Boolean visit(LambdaExpr n1, Node arg) {
         if (!nodesEquals(n1.getParameters(), n2.getParameters())) {
             return false;
         }
-        if (n1.isParametersEnclosed() != n2.isParametersEnclosed()) {
+        if(n1.isParametersEnclosed() != n2.isParametersEnclosed()){
             return false;
         }
         if (!nodeEquals(n1.getBody(), n2.getBody())) {
@@ -1562,7 +1484,7 @@ public Boolean visit(MethodReferenceExpr n1, Node arg) {
         if (!nodeEquals(n1.getScope(), n2.getScope())) {
             return false;
         }
-        if (!nodesEquals(n1.getTypeArguments(), n2.getTypeArguments())) {
+	    if (!nodesEquals(n1.getTypeArguments(), n2.getTypeArguments())) {
             return false;
         }
         if (!objEquals(n1.getIdentifier(), n2.getIdentifier())) {
@@ -1580,13 +1502,13 @@ public Boolean visit(TypeExpr n, Node arg) {
         return true;
     }
 
-    @Override
-    public Boolean visit(ArrayBracketPair n1, Node arg) {
-        ArrayBracketPair n2 = (ArrayBracketPair) arg;
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return false;
-        }
+	@Override
+	public Boolean visit(ArrayBracketPair n1, Node arg) {
+		ArrayBracketPair n2 = (ArrayBracketPair) arg;
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return false;
+		}
 
-        return true;
-    }
+		return true;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitor.java
index d71ce1bbe3..9f4e9bc7fa 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitor.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import com.github.javaparser.ast.*;
@@ -66,186 +66,186 @@
 
 /**
  * A visitor that has a return value.
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public interface GenericVisitor<R, A> {
 
-    //- Compilation Unit ----------------------------------
-
-    R visit(CompilationUnit n, A arg);
-
-    R visit(PackageDeclaration n, A arg);
+	//- Compilation Unit ----------------------------------
 
-    R visit(ImportDeclaration n, A arg);
+	R visit(CompilationUnit n, A arg);
 
-    R visit(TypeParameter n, A arg);
+	R visit(PackageDeclaration n, A arg);
 
-    R visit(LineComment n, A arg);
+	R visit(ImportDeclaration n, A arg);
 
-    R visit(BlockComment n, A arg);
+	R visit(TypeParameter n, A arg);
 
-    //- Body ----------------------------------------------
+	R visit(LineComment n, A arg);
 
-    R visit(ClassOrInterfaceDeclaration n, A arg);
+	R visit(BlockComment n, A arg);
 
-    R visit(EnumDeclaration n, A arg);
+	//- Body ----------------------------------------------
 
-    R visit(EmptyTypeDeclaration n, A arg);
+	R visit(ClassOrInterfaceDeclaration n, A arg);
 
-    R visit(EnumConstantDeclaration n, A arg);
+	R visit(EnumDeclaration n, A arg);
 
-    R visit(AnnotationDeclaration n, A arg);
+	R visit(EmptyTypeDeclaration n, A arg);
 
-    R visit(AnnotationMemberDeclaration n, A arg);
+	R visit(EnumConstantDeclaration n, A arg);
 
-    R visit(FieldDeclaration n, A arg);
+	R visit(AnnotationDeclaration n, A arg);
 
-    R visit(VariableDeclarator n, A arg);
+	R visit(AnnotationMemberDeclaration n, A arg);
 
-    R visit(VariableDeclaratorId n, A arg);
+	R visit(FieldDeclaration n, A arg);
 
-    R visit(ConstructorDeclaration n, A arg);
+	R visit(VariableDeclarator n, A arg);
 
-    R visit(MethodDeclaration n, A arg);
+	R visit(VariableDeclaratorId n, A arg);
 
-    R visit(Parameter n, A arg);
+	R visit(ConstructorDeclaration n, A arg);
 
-    R visit(EmptyMemberDeclaration n, A arg);
+	R visit(MethodDeclaration n, A arg);
 
-    R visit(InitializerDeclaration n, A arg);
+	R visit(Parameter n, A arg);
+	
+	R visit(EmptyMemberDeclaration n, A arg);
 
-    R visit(JavadocComment n, A arg);
+	R visit(InitializerDeclaration n, A arg);
 
-    //- Type ----------------------------------------------
+	R visit(JavadocComment n, A arg);
 
-    R visit(ClassOrInterfaceType n, A arg);
+	//- Type ----------------------------------------------
 
-    R visit(PrimitiveType n, A arg);
+	R visit(ClassOrInterfaceType n, A arg);
 
-    R visit(ArrayType n, A arg);
+	R visit(PrimitiveType n, A arg);
 
-    R visit(ArrayCreationLevel n, A arg);
+	R visit(ArrayType n, A arg);
+	
+	R visit(ArrayCreationLevel n, A arg);
 
     R visit(IntersectionType n, A arg);
 
     R visit(UnionType n, A arg);
 
-    R visit(VoidType n, A arg);
+	R visit(VoidType n, A arg);
 
-    R visit(WildcardType n, A arg);
+	R visit(WildcardType n, A arg);
 
-    R visit(UnknownType n, A arg);
+	R visit(UnknownType n, A arg);
 
-    //- Expression ----------------------------------------
+	//- Expression ----------------------------------------
 
-    R visit(ArrayAccessExpr n, A arg);
+	R visit(ArrayAccessExpr n, A arg);
 
-    R visit(ArrayCreationExpr n, A arg);
+	R visit(ArrayCreationExpr n, A arg);
 
-    R visit(ArrayInitializerExpr n, A arg);
+	R visit(ArrayInitializerExpr n, A arg);
 
-    R visit(AssignExpr n, A arg);
+	R visit(AssignExpr n, A arg);
 
-    R visit(BinaryExpr n, A arg);
+	R visit(BinaryExpr n, A arg);
 
-    R visit(CastExpr n, A arg);
+	R visit(CastExpr n, A arg);
 
-    R visit(ClassExpr n, A arg);
+	R visit(ClassExpr n, A arg);
 
-    R visit(ConditionalExpr n, A arg);
+	R visit(ConditionalExpr n, A arg);
 
-    R visit(EnclosedExpr n, A arg);
+	R visit(EnclosedExpr n, A arg);
 
-    R visit(FieldAccessExpr n, A arg);
+	R visit(FieldAccessExpr n, A arg);
 
-    R visit(InstanceOfExpr n, A arg);
+	R visit(InstanceOfExpr n, A arg);
 
-    R visit(StringLiteralExpr n, A arg);
+	R visit(StringLiteralExpr n, A arg);
 
-    R visit(IntegerLiteralExpr n, A arg);
+	R visit(IntegerLiteralExpr n, A arg);
 
-    R visit(LongLiteralExpr n, A arg);
+	R visit(LongLiteralExpr n, A arg);
 
-    R visit(IntegerLiteralMinValueExpr n, A arg);
+	R visit(IntegerLiteralMinValueExpr n, A arg);
 
-    R visit(LongLiteralMinValueExpr n, A arg);
+	R visit(LongLiteralMinValueExpr n, A arg);
 
-    R visit(CharLiteralExpr n, A arg);
+	R visit(CharLiteralExpr n, A arg);
 
-    R visit(DoubleLiteralExpr n, A arg);
+	R visit(DoubleLiteralExpr n, A arg);
 
-    R visit(BooleanLiteralExpr n, A arg);
+	R visit(BooleanLiteralExpr n, A arg);
 
-    R visit(NullLiteralExpr n, A arg);
+	R visit(NullLiteralExpr n, A arg);
 
-    R visit(MethodCallExpr n, A arg);
+	R visit(MethodCallExpr n, A arg);
 
-    R visit(NameExpr n, A arg);
+	R visit(NameExpr n, A arg);
 
-    R visit(ObjectCreationExpr n, A arg);
+	R visit(ObjectCreationExpr n, A arg);
 
-    R visit(QualifiedNameExpr n, A arg);
+	R visit(QualifiedNameExpr n, A arg);
 
-    R visit(ThisExpr n, A arg);
+	R visit(ThisExpr n, A arg);
 
-    R visit(SuperExpr n, A arg);
+	R visit(SuperExpr n, A arg);
 
-    R visit(UnaryExpr n, A arg);
+	R visit(UnaryExpr n, A arg);
 
-    R visit(VariableDeclarationExpr n, A arg);
+	R visit(VariableDeclarationExpr n, A arg);
 
-    R visit(MarkerAnnotationExpr n, A arg);
+	R visit(MarkerAnnotationExpr n, A arg);
 
-    R visit(SingleMemberAnnotationExpr n, A arg);
+	R visit(SingleMemberAnnotationExpr n, A arg);
 
-    R visit(NormalAnnotationExpr n, A arg);
+	R visit(NormalAnnotationExpr n, A arg);
 
-    R visit(MemberValuePair n, A arg);
+	R visit(MemberValuePair n, A arg);
 
-    //- Statements ----------------------------------------
+	//- Statements ----------------------------------------
 
-    R visit(ExplicitConstructorInvocationStmt n, A arg);
+	R visit(ExplicitConstructorInvocationStmt n, A arg);
 
-    R visit(TypeDeclarationStmt n, A arg);
+	R visit(TypeDeclarationStmt n, A arg);
 
-    R visit(AssertStmt n, A arg);
+	R visit(AssertStmt n, A arg);
 
-    R visit(BlockStmt n, A arg);
+	R visit(BlockStmt n, A arg);
 
-    R visit(LabeledStmt n, A arg);
+	R visit(LabeledStmt n, A arg);
 
-    R visit(EmptyStmt n, A arg);
+	R visit(EmptyStmt n, A arg);
 
-    R visit(ExpressionStmt n, A arg);
+	R visit(ExpressionStmt n, A arg);
 
-    R visit(SwitchStmt n, A arg);
+	R visit(SwitchStmt n, A arg);
 
-    R visit(SwitchEntryStmt n, A arg);
+	R visit(SwitchEntryStmt n, A arg);
 
-    R visit(BreakStmt n, A arg);
+	R visit(BreakStmt n, A arg);
 
-    R visit(ReturnStmt n, A arg);
+	R visit(ReturnStmt n, A arg);
 
-    R visit(IfStmt n, A arg);
+	R visit(IfStmt n, A arg);
 
-    R visit(WhileStmt n, A arg);
+	R visit(WhileStmt n, A arg);
 
-    R visit(ContinueStmt n, A arg);
+	R visit(ContinueStmt n, A arg);
 
-    R visit(DoStmt n, A arg);
+	R visit(DoStmt n, A arg);
 
-    R visit(ForeachStmt n, A arg);
+	R visit(ForeachStmt n, A arg);
 
-    R visit(ForStmt n, A arg);
+	R visit(ForStmt n, A arg);
 
-    R visit(ThrowStmt n, A arg);
+	R visit(ThrowStmt n, A arg);
 
-    R visit(SynchronizedStmt n, A arg);
+	R visit(SynchronizedStmt n, A arg);
 
-    R visit(TryStmt n, A arg);
+	R visit(TryStmt n, A arg);
 
-    R visit(CatchClause n, A arg);
+	R visit(CatchClause n, A arg);
 
     R visit(LambdaExpr n, A arg);
 
@@ -253,5 +253,5 @@ public interface GenericVisitor<R, A> {
 
     R visit(TypeExpr n, A arg);
 
-    R visit(ArrayBracketPair arrayBracketPair, A arg);
+	R visit(ArrayBracketPair arrayBracketPair, A arg);
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
index a1890e45de..af01fdffba 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import com.github.javaparser.ast.*;
@@ -38,54 +38,1188 @@
  */
 public abstract class GenericVisitorAdapter<R, A> implements GenericVisitor<R, A> {
 
-    @Override
-    public R visit(final AnnotationDeclaration n, final A arg) {
-        visitComment(n, arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getMembers() != null) {
+	@Override
+	public R visit(final AnnotationDeclaration n, final A arg) {
+		visitComment(n, arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getMembers() != null) {
             for (final BodyDeclaration<?> member : n.getMembers()) {
-                {
-                    R result = member.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final AnnotationMemberDeclaration n, final A arg) {
-        visitComment(n, arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
+				{
+					R result = member.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final AnnotationMemberDeclaration n, final A arg) {
+		visitComment(n, arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getDefaultValue() != null) {
+			{
+				R result = n.getDefaultValue().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ArrayAccessExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getName().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getIndex().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ArrayCreationExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		for(ArrayCreationLevel level: n.getLevels()){
+			R result = level.accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getInitializer() != null) {
+			R result = n.getInitializer().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ArrayInitializerExpr n, final A arg) {
+		visitComment(n, arg);
+		if (n.getValues() != null) {
+			for (final Expression expr : n.getValues()) {
+				{
+					R result = expr.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final AssertStmt n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getCheck().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getMessage() != null) {
+			{
+				R result = n.getMessage().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final AssignExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getTarget().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getValue().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final BinaryExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getLeft().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getRight().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final BlockStmt n, final A arg) {
+		visitComment(n, arg);
+		if (n.getStmts() != null) {
+			for (final Statement s : n.getStmts()) {
+				{
+					R result = s.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+
+	}
+
+	@Override
+	public R visit(final BooleanLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final BreakStmt n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final CastExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getExpr().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final CatchClause n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getParam().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getBody().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+
+	}
+
+	@Override
+	public R visit(final CharLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final ClassExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ClassOrInterfaceDeclaration n, final A arg) {
+		visitComment(n, arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getTypeParameters() != null) {
+			for (final TypeParameter t : n.getTypeParameters()) {
+				{
+					R result = t.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getExtends() != null) {
+			for (final ClassOrInterfaceType c : n.getExtends()) {
+				{
+					R result = c.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+
+		if (n.getImplements() != null) {
+			for (final ClassOrInterfaceType c : n.getImplements()) {
+				{
+					R result = c.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getMembers() != null) {
+            for (final BodyDeclaration<?> member : n.getMembers()) {
+				{
+					R result = member.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ClassOrInterfaceType n, final A arg) {
+		visitComment(n, arg);
+		for (final AnnotationExpr a : n.getAnnotations()) {
+			R result = a.accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getScope() != null) {
+			{
+				R result = n.getScope().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getTypeArguments() != null) {
+			for (Type<?> type : n.getTypeArguments()) {
+				R result = type.accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final CompilationUnit n, final A arg) {
+		visitComment(n, arg);
+		if (n.getPackage() != null) {
+			{
+				R result = n.getPackage().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getImports() != null) {
+			for (final ImportDeclaration i : n.getImports()) {
+				{
+					R result = i.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getTypes() != null) {
+            for (final TypeDeclaration<?> typeDeclaration : n.getTypes()) {
+				{
+					R result = typeDeclaration.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ConditionalExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getCondition().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getThenExpr().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getElseExpr().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ConstructorDeclaration n, final A arg) {
+		visitComment(n, arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getTypeParameters() != null) {
+			for (final TypeParameter t : n.getTypeParameters()) {
+				{
+					R result = t.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getParameters() != null) {
+			for (final Parameter p : n.getParameters()) {
+				{
+					R result = p.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getThrows() != null) {
+			for (final ReferenceType name : n.getThrows()) {
+				{
+					R result = name.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getBody().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ContinueStmt n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final DoStmt n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getBody().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getCondition().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final DoubleLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final EmptyMemberDeclaration n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final EmptyStmt n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final EmptyTypeDeclaration n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final EnclosedExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getInner().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final EnumConstantDeclaration n, final A arg) {
+		visitComment(n, arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getClassBody() != null) {
+            for (final BodyDeclaration<?> member : n.getClassBody()) {
+				{
+					R result = member.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final EnumDeclaration n, final A arg) {
+		visitComment(n, arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getImplements() != null) {
+			for (final ClassOrInterfaceType c : n.getImplements()) {
+				{
+					R result = c.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getEntries() != null) {
+			for (final EnumConstantDeclaration e : n.getEntries()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getMembers() != null) {
+            for (final BodyDeclaration<?> member : n.getMembers()) {
+				{
+					R result = member.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ExplicitConstructorInvocationStmt n, final A arg) {
+		visitComment(n, arg);
+		if (!n.isThis() && n.getExpr() != null) {
+			{
+				R result = n.getExpr().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getTypeArguments() != null) {
+			for (Type<?> type : n.getTypeArguments()) {
+				R result = type.accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ExpressionStmt n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getExpression().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final FieldAccessExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getScope().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+        {
+            if (n.getTypeArguments() != null) {
+                for (Type<?> type : n.getTypeArguments()) {
+                    R result = type.accept(this, arg);
                     if (result != null) {
                         return result;
                     }
                 }
             }
         }
+		return null;
+	}
+
+	@Override
+	public R visit(final FieldDeclaration n, final A arg) {
+		visitComment(n, arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getElementType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		for (final VariableDeclarator var : n.getVariables()) {
+			{
+				R result = var.accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ForeachStmt n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getVariable().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getIterable().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getBody().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ForStmt n, final A arg) {
+		visitComment(n, arg);
+		if (n.getInit() != null) {
+			for (final Expression e : n.getInit()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getCompare() != null) {
+			{
+				R result = n.getCompare().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getUpdate() != null) {
+			for (final Expression e : n.getUpdate()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getBody().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final IfStmt n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getCondition().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getThenStmt().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getElseStmt() != null) {
+			{
+				R result = n.getElseStmt().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ImportDeclaration n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getName().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final InitializerDeclaration n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getBlock().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final InstanceOfExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getExpr().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final IntegerLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final IntegerLiteralMinValueExpr n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final JavadocComment n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final LabeledStmt n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getStmt().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final LongLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final LongLiteralMinValueExpr n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final MarkerAnnotationExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getName().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final MemberValuePair n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getValue().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final MethodCallExpr n, final A arg) {
+		visitComment(n, arg);
+		if (n.getScope() != null) {
+			{
+				R result = n.getScope().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getTypeArguments() != null) {
+			for (Type<?> type : n.getTypeArguments()) {
+				R result = type.accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final MethodDeclaration n, final A arg) {
+		visitComment(n, arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getTypeParameters() != null) {
+			for (final TypeParameter t : n.getTypeParameters()) {
+				{
+					R result = t.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getElementType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getParameters() != null) {
+			for (final Parameter p : n.getParameters()) {
+				{
+					R result = p.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getThrows() != null) {
+			for (final ReferenceType name : n.getThrows()) {
+				{
+					R result = name.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getBody() != null) {
+			{
+				R result = n.getBody().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final NameExpr n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final NormalAnnotationExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getName().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getPairs() != null) {
+			for (final MemberValuePair m : n.getPairs()) {
+				{
+					R result = m.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final NullLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final ObjectCreationExpr n, final A arg) {
+		visitComment(n, arg);
+		if (n.getScope() != null) {
+			{
+				R result = n.getScope().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getTypeArguments() != null) {
+			for (Type<?> type : n.getTypeArguments()) {
+				R result = type.accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getAnonymousClassBody() != null) {
+            for (final BodyDeclaration<?> member : n.getAnonymousClassBody()) {
+				{
+					R result = member.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final PackageDeclaration n, final A arg) {
+		visitComment(n, arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getName().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final Parameter n, final A arg) {
+		visitComment(n, arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getElementType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getId().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public R visit(final PrimitiveType n, final A arg) {
+		visitComment(n, arg);
+		for (final AnnotationExpr a : n.getAnnotations()) {
+			R result = a.accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final QualifiedNameExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getQualifier().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(ArrayType n, A arg) {
+		visitComment(n, arg);
+		for (final AnnotationExpr a : n.getAnnotations()) {
+			R result = a.accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getComponentType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(ArrayCreationLevel n, A arg) {
+		visitComment(n, arg);
+		for (final AnnotationExpr a : n.getAnnotations()) {
+			R result = a.accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			if(n.getDimension()!=null) {
+				R result = n.getDimension().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+    public R visit(final IntersectionType n, final A arg) {
+		visitComment(n, arg);
+		for (final AnnotationExpr a : n.getAnnotations()) {
+			R result = a.accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
         {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getDefaultValue() != null) {
-            {
-                R result = n.getDefaultValue().accept(this, arg);
+            for (ReferenceType element : n.getElements()) {
+                R result = element.accept(this, arg);
                 if (result != null) {
                     return result;
                 }
@@ -95,75 +1229,17 @@ public R visit(final AnnotationMemberDeclaration n, final A arg) {
     }
 
     @Override
-    public R visit(final ArrayAccessExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getName().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getIndex().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ArrayCreationExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        for (ArrayCreationLevel level : n.getLevels()) {
-            R result = level.accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getInitializer() != null) {
-            R result = n.getInitializer().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ArrayInitializerExpr n, final A arg) {
-        visitComment(n, arg);
-        if (n.getValues() != null) {
-            for (final Expression expr : n.getValues()) {
-                {
-                    R result = expr.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final AssertStmt n, final A arg) {
-        visitComment(n, arg);
+    public R visit(final UnionType n, final A arg) {
+		visitComment(n, arg);
+		for (final AnnotationExpr a : n.getAnnotations()) {
+			R result = a.accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
         {
-            R result = n.getCheck().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getMessage() != null) {
-            {
-                R result = n.getMessage().accept(this, arg);
+            for (ReferenceType element : n.getElements()) {
+                R result = element.accept(this, arg);
                 if (result != null) {
                     return result;
                 }
@@ -172,1506 +1248,430 @@ public R visit(final AssertStmt n, final A arg) {
         return null;
     }
 
-    @Override
-    public R visit(final AssignExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getTarget().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getValue().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final BinaryExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getLeft().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getRight().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final BlockStmt n, final A arg) {
-        visitComment(n, arg);
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
-                {
-                    R result = s.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-
-    }
-
-    @Override
-    public R visit(final BooleanLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final BreakStmt n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final CastExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getExpr().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final CatchClause n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getParam().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getBody().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-
-    }
+	@Override
+	public R visit(final ReturnStmt n, final A arg) {
+		visitComment(n, arg);
+		if (n.getExpr() != null) {
+			{
+				R result = n.getExpr().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final SingleMemberAnnotationExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getName().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getMemberValue().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final StringLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final SuperExpr n, final A arg) {
+		visitComment(n, arg);
+		if (n.getClassExpr() != null) {
+			{
+				R result = n.getClassExpr().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final SwitchEntryStmt n, final A arg) {
+		visitComment(n, arg);
+		if (n.getLabel() != null) {
+			{
+				R result = n.getLabel().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getStmts() != null) {
+			for (final Statement s : n.getStmts()) {
+				{
+					R result = s.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final SwitchStmt n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getSelector().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getEntries() != null) {
+			for (final SwitchEntryStmt e : n.getEntries()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+
+	}
+
+	@Override
+	public R visit(final SynchronizedStmt n, final A arg) {
+		visitComment(n, arg);
+		{
+			if (n.getExpr() != null) {
+			    R result = n.getExpr().accept(this, arg);
+			    if (result != null) {
+				    return result;
+			    }
+			}
+		}
+		{
+			R result = n.getBody().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ThisExpr n, final A arg) {
+		visitComment(n, arg);
+		if (n.getClassExpr() != null) {
+			{
+				R result = n.getClassExpr().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ThrowStmt n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getExpr().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final TryStmt n, final A arg) {
+		visitComment(n, arg);
+		if (n.getResources() != null) {
+			for (final VariableDeclarationExpr v : n.getResources()) {
+				{
+					R result = v.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getTryBlock().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getCatchs() != null) {
+			for (final CatchClause c : n.getCatchs()) {
+				{
+					R result = c.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getFinallyBlock() != null) {
+			{
+				R result = n.getFinallyBlock().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final TypeDeclarationStmt n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getTypeDeclaration().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final TypeParameter n, final A arg) {
+		visitComment(n, arg);
+		if (n.getTypeBound() != null) {
+			for (final ClassOrInterfaceType c : n.getTypeBound()) {
+				{
+					R result = c.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final UnaryExpr n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getExpr().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final UnknownType n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final VariableDeclarationExpr n, final A arg) {
+		visitComment(n, arg);
+		for (final AnnotationExpr a : n.getAnnotations()) {
+			R result = a.accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getElementType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		for (final VariableDeclarator v : n.getVariables()) {
+			{
+				R result = v.accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final VariableDeclarator n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getId().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getInit() != null) {
+			{
+				R result = n.getInit().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final VariableDeclaratorId n, final A arg) {
+		visitComment(n, arg);
+		return null;
+	}
+
+	@Override
+	public R visit(final VoidType n, final A arg) {
+		visitComment(n, arg);
+		for (final AnnotationExpr a : n.getAnnotations()) {
+			R result = a.accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final WhileStmt n, final A arg) {
+		visitComment(n, arg);
+		{
+			R result = n.getCondition().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getBody().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final WildcardType n, final A arg) {
+		visitComment(n, arg);
+		for (final AnnotationExpr a : n.getAnnotations()) {
+			R result = a.accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getExtends() != null) {
+			{
+				R result = n.getExtends().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getSuper() != null) {
+			{
+				R result = n.getSuper().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
 
     @Override
-    public R visit(final CharLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return null;
+    public R visit(LambdaExpr n, A arg) {
+		visitComment(n, arg);
+		if (n.getParameters() != null) {
+			for (final Parameter a : n.getParameters()) {
+				R result = a.accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getBody() != null) {
+			R result = n.getBody().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
     }
 
     @Override
-    public R visit(final ClassExpr n, final A arg) {
+    public R visit(MethodReferenceExpr n, A arg) {
         visitComment(n, arg);
         {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ClassOrInterfaceDeclaration n, final A arg) {
-        visitComment(n, arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getTypeParameters() != null) {
-            for (final TypeParameter t : n.getTypeParameters()) {
-                {
-                    R result = t.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getExtends() != null) {
-            for (final ClassOrInterfaceType c : n.getExtends()) {
-                {
-                    R result = c.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-
-        if (n.getImplements() != null) {
-            for (final ClassOrInterfaceType c : n.getImplements()) {
-                {
-                    R result = c.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getMembers() != null) {
-            for (final BodyDeclaration<?> member : n.getMembers()) {
-                {
-                    R result = member.accept(this, arg);
+            if (n.getTypeArguments() != null) {
+                for (Type<?> type : n.getTypeArguments()) {
+                    R result = type.accept(this, arg);
                     if (result != null) {
                         return result;
                     }
                 }
             }
         }
-        return null;
-    }
-
-    @Override
-    public R visit(final ClassOrInterfaceType n, final A arg) {
-        visitComment(n, arg);
-        for (final AnnotationExpr a : n.getAnnotations()) {
-            R result = a.accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
         if (n.getScope() != null) {
-            {
-                R result = n.getScope().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getTypeArguments() != null) {
-            for (Type<?> type : n.getTypeArguments()) {
-                R result = type.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final CompilationUnit n, final A arg) {
-        visitComment(n, arg);
-        if (n.getPackage() != null) {
-            {
-                R result = n.getPackage().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getImports() != null) {
-            for (final ImportDeclaration i : n.getImports()) {
-                {
-                    R result = i.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getTypes() != null) {
-            for (final TypeDeclaration<?> typeDeclaration : n.getTypes()) {
-                {
-                    R result = typeDeclaration.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ConditionalExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getCondition().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getThenExpr().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getElseExpr().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ConstructorDeclaration n, final A arg) {
-        visitComment(n, arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getTypeParameters() != null) {
-            for (final TypeParameter t : n.getTypeParameters()) {
-                {
-                    R result = t.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getParameters() != null) {
-            for (final Parameter p : n.getParameters()) {
-                {
-                    R result = p.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getThrows() != null) {
-            for (final ReferenceType name : n.getThrows()) {
-                {
-                    R result = name.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getBody().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ContinueStmt n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final DoStmt n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getBody().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getCondition().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final DoubleLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final EmptyMemberDeclaration n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final EmptyStmt n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final EmptyTypeDeclaration n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final EnclosedExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getInner().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final EnumConstantDeclaration n, final A arg) {
-        visitComment(n, arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getClassBody() != null) {
-            for (final BodyDeclaration<?> member : n.getClassBody()) {
-                {
-                    R result = member.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final EnumDeclaration n, final A arg) {
-        visitComment(n, arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getImplements() != null) {
-            for (final ClassOrInterfaceType c : n.getImplements()) {
-                {
-                    R result = c.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getEntries() != null) {
-            for (final EnumConstantDeclaration e : n.getEntries()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getMembers() != null) {
-            for (final BodyDeclaration<?> member : n.getMembers()) {
-                {
-                    R result = member.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ExplicitConstructorInvocationStmt n, final A arg) {
-        visitComment(n, arg);
-        if (!n.isThis() && n.getExpr() != null) {
-            {
-                R result = n.getExpr().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getTypeArguments() != null) {
-            for (Type<?> type : n.getTypeArguments()) {
-                R result = type.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ExpressionStmt n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getExpression().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final FieldAccessExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getScope().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            if (n.getTypeArguments() != null) {
-                for (Type<?> type : n.getTypeArguments()) {
-                    R result = type.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final FieldDeclaration n, final A arg) {
-        visitComment(n, arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getElementType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        for (final VariableDeclarator var : n.getVariables()) {
-            {
-                R result = var.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ForeachStmt n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getVariable().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getIterable().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getBody().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ForStmt n, final A arg) {
-        visitComment(n, arg);
-        if (n.getInit() != null) {
-            for (final Expression e : n.getInit()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getCompare() != null) {
-            {
-                R result = n.getCompare().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getUpdate() != null) {
-            for (final Expression e : n.getUpdate()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getBody().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final IfStmt n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getCondition().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getThenStmt().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getElseStmt() != null) {
-            {
-                R result = n.getElseStmt().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ImportDeclaration n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getName().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final InitializerDeclaration n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getBlock().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final InstanceOfExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getExpr().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final IntegerLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final IntegerLiteralMinValueExpr n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final JavadocComment n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final LabeledStmt n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getStmt().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final LongLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final LongLiteralMinValueExpr n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final MarkerAnnotationExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getName().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final MemberValuePair n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getValue().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final MethodCallExpr n, final A arg) {
-        visitComment(n, arg);
-        if (n.getScope() != null) {
-            {
-                R result = n.getScope().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getTypeArguments() != null) {
-            for (Type<?> type : n.getTypeArguments()) {
-                R result = type.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final MethodDeclaration n, final A arg) {
-        visitComment(n, arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getTypeParameters() != null) {
-            for (final TypeParameter t : n.getTypeParameters()) {
-                {
-                    R result = t.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getElementType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getParameters() != null) {
-            for (final Parameter p : n.getParameters()) {
-                {
-                    R result = p.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getThrows() != null) {
-            for (final ReferenceType name : n.getThrows()) {
-                {
-                    R result = name.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getBody() != null) {
-            {
-                R result = n.getBody().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final NameExpr n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final NormalAnnotationExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getName().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getPairs() != null) {
-            for (final MemberValuePair m : n.getPairs()) {
-                {
-                    R result = m.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final NullLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final ObjectCreationExpr n, final A arg) {
-        visitComment(n, arg);
-        if (n.getScope() != null) {
-            {
-                R result = n.getScope().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getTypeArguments() != null) {
-            for (Type<?> type : n.getTypeArguments()) {
-                R result = type.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getAnonymousClassBody() != null) {
-            for (final BodyDeclaration<?> member : n.getAnonymousClassBody()) {
-                {
-                    R result = member.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final PackageDeclaration n, final A arg) {
-        visitComment(n, arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getName().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final Parameter n, final A arg) {
-        visitComment(n, arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getElementType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getId().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final PrimitiveType n, final A arg) {
-        visitComment(n, arg);
-        for (final AnnotationExpr a : n.getAnnotations()) {
-            R result = a.accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final QualifiedNameExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getQualifier().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(ArrayType n, A arg) {
-        visitComment(n, arg);
-        for (final AnnotationExpr a : n.getAnnotations()) {
-            R result = a.accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getComponentType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(ArrayCreationLevel n, A arg) {
-        visitComment(n, arg);
-        for (final AnnotationExpr a : n.getAnnotations()) {
-            R result = a.accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            if (n.getDimension() != null) {
-                R result = n.getDimension().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final IntersectionType n, final A arg) {
-        visitComment(n, arg);
-        for (final AnnotationExpr a : n.getAnnotations()) {
-            R result = a.accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            for (ReferenceType element : n.getElements()) {
-                R result = element.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final UnionType n, final A arg) {
-        visitComment(n, arg);
-        for (final AnnotationExpr a : n.getAnnotations()) {
-            R result = a.accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            for (ReferenceType element : n.getElements()) {
-                R result = element.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ReturnStmt n, final A arg) {
-        visitComment(n, arg);
-        if (n.getExpr() != null) {
-            {
-                R result = n.getExpr().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final SingleMemberAnnotationExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getName().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getMemberValue().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final StringLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final SuperExpr n, final A arg) {
-        visitComment(n, arg);
-        if (n.getClassExpr() != null) {
-            {
-                R result = n.getClassExpr().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final SwitchEntryStmt n, final A arg) {
-        visitComment(n, arg);
-        if (n.getLabel() != null) {
-            {
-                R result = n.getLabel().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
-                {
-                    R result = s.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final SwitchStmt n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getSelector().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getEntries() != null) {
-            for (final SwitchEntryStmt e : n.getEntries()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-
-    }
-
-    @Override
-    public R visit(final SynchronizedStmt n, final A arg) {
-        visitComment(n, arg);
-        {
-            if (n.getExpr() != null) {
-                R result = n.getExpr().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        {
-            R result = n.getBody().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ThisExpr n, final A arg) {
-        visitComment(n, arg);
-        if (n.getClassExpr() != null) {
-            {
-                R result = n.getClassExpr().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ThrowStmt n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getExpr().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final TryStmt n, final A arg) {
-        visitComment(n, arg);
-        if (n.getResources() != null) {
-            for (final VariableDeclarationExpr v : n.getResources()) {
-                {
-                    R result = v.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getTryBlock().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getCatchs() != null) {
-            for (final CatchClause c : n.getCatchs()) {
-                {
-                    R result = c.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getFinallyBlock() != null) {
-            {
-                R result = n.getFinallyBlock().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final TypeDeclarationStmt n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getTypeDeclaration().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final TypeParameter n, final A arg) {
-        visitComment(n, arg);
-        if (n.getTypeBound() != null) {
-            for (final ClassOrInterfaceType c : n.getTypeBound()) {
-                {
-                    R result = c.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final UnaryExpr n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getExpr().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final UnknownType n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final VariableDeclarationExpr n, final A arg) {
-        visitComment(n, arg);
-        for (final AnnotationExpr a : n.getAnnotations()) {
-            R result = a.accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getElementType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        for (final VariableDeclarator v : n.getVariables()) {
-            {
-                R result = v.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final VariableDeclarator n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getId().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getInit() != null) {
-            {
-                R result = n.getInit().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final VariableDeclaratorId n, final A arg) {
-        visitComment(n, arg);
-        return null;
-    }
-
-    @Override
-    public R visit(final VoidType n, final A arg) {
-        visitComment(n, arg);
-        for (final AnnotationExpr a : n.getAnnotations()) {
-            R result = a.accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final WhileStmt n, final A arg) {
-        visitComment(n, arg);
-        {
-            R result = n.getCondition().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getBody().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final WildcardType n, final A arg) {
-        visitComment(n, arg);
-        for (final AnnotationExpr a : n.getAnnotations()) {
-            R result = a.accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getExtends() != null) {
-            {
-                R result = n.getExtends().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getSuper() != null) {
-            {
-                R result = n.getSuper().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(LambdaExpr n, A arg) {
-        visitComment(n, arg);
-        if (n.getParameters() != null) {
-            for (final Parameter a : n.getParameters()) {
-                R result = a.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getBody() != null) {
-            R result = n.getBody().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(MethodReferenceExpr n, A arg) {
-        visitComment(n, arg);
-        {
-            if (n.getTypeArguments() != null) {
-                for (Type<?> type : n.getTypeArguments()) {
-                    R result = type.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getScope() != null) {
-            R result = n.getScope().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(TypeExpr n, A arg) {
-        visitComment(n, arg);
-        if (n.getType() != null) {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(ArrayBracketPair n, A arg) {
-        for (final AnnotationExpr a : n.getAnnotations()) {
-            {
-                R result = a.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final BlockComment n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final LineComment n, final A arg) {
-        return null;
-    }
-
-    private void visitComment(Node n, A arg) {
-        if (n.getComment() != null) {
-            Comment result = (Comment) n.getComment().accept(this, arg);
-            if (result != null) {
-                n.setComment(result);
-            }
-        }
-    }
+			R result = n.getScope().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+    }
+
+    @Override
+    public R visit(TypeExpr n, A arg){
+		visitComment(n, arg);
+		if (n.getType() != null) {
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+    }
+
+	@Override
+	public R visit(ArrayBracketPair n, A arg) {
+		for (final AnnotationExpr a : n.getAnnotations()) {
+			{
+				R result = a.accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final BlockComment n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final LineComment n, final A arg) {
+		return null;
+	}
+
+	private void visitComment(Node n, A arg) {
+		if(n.getComment()!=null){
+			Comment result = (Comment) n.getComment().accept(this, arg);
+			if(result!=null){
+				n.setComment(result);
+			}
+		}
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
index 0c0226c739..78b0e29317 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import java.util.List;
@@ -111,448 +111,418 @@
  * This visitor adapter can be used to save time when some specific nodes needs
  * to be changed. To do that just extend this class and override the methods
  * from the nodes who needs to be changed, returning the changed node.
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public class ModifierVisitorAdapter<A> implements GenericVisitor<Node, A> {
 
-    private void removeNulls(final List<?> list) {
-        for (int i = list.size() - 1; i >= 0; i--) {
-            if (list.get(i) == null) {
-                list.remove(i);
-            }
-        }
-    }
-
-    @Override
-    public Node visit(final AnnotationDeclaration n, final A arg) {
-        visitAnnotations(n, arg);
-        visitComment(n, arg);
+	private void removeNulls(final List<?> list) {
+		for (int i = list.size() - 1; i >= 0; i--) {
+			if (list.get(i) == null) {
+				list.remove(i);
+			}
+		}
+	}
+
+	@Override public Node visit(final AnnotationDeclaration n, final A arg) {
+		visitAnnotations(n, arg);
+		visitComment(n, arg);
         final List<BodyDeclaration<?>> members = n.getMembers();
-        if (members != null) {
-            for (int i = 0; i < members.size(); i++) {
+		if (members != null) {
+			for (int i = 0; i < members.size(); i++) {
                 members.set(i, (BodyDeclaration<?>) members.get(i).accept(this, arg));
-            }
-            removeNulls(members);
-        }
-        return n;
-    }
-
-    private void visitAnnotations(NodeWithAnnotations<?> n, A arg) {
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-    }
-
-    @Override
-    public Node visit(final AnnotationMemberDeclaration n, final A arg) {
-        visitComment(n, arg);
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        n.setType((Type) n.getType().accept(this, arg));
-        if (n.getDefaultValue() != null) {
-            n.setDefaultValue((Expression) n.getDefaultValue().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ArrayAccessExpr n, final A arg) {
-        visitComment(n, arg);
-        n.setName((Expression) n.getName().accept(this, arg));
-        n.setIndex((Expression) n.getIndex().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ArrayCreationExpr n, final A arg) {
-        visitComment(n, arg);
-        n.setType((Type) n.getType().accept(this, arg));
-
-        final List<ArrayCreationLevel> values = n.getLevels();
-        for (int i = 0; i < values.size(); i++) {
-            values.set(i, (ArrayCreationLevel) values.get(i).accept(this, arg));
-        }
-        removeNulls(values);
-
-        if (n.getInitializer() != null) {
-            n.setInitializer((ArrayInitializerExpr) n.getInitializer().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ArrayInitializerExpr n, final A arg) {
-        visitComment(n, arg);
-        if (n.getValues() != null) {
-            final List<Expression> values = n.getValues();
-            if (values != null) {
-                for (int i = 0; i < values.size(); i++) {
-                    values.set(i, (Expression) values.get(i).accept(this, arg));
-                }
-                removeNulls(values);
-            }
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final AssertStmt n, final A arg) {
-        visitComment(n, arg);
-        n.setCheck((Expression) n.getCheck().accept(this, arg));
-        if (n.getMessage() != null) {
-            n.setMessage((Expression) n.getMessage().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final AssignExpr n, final A arg) {
-        visitComment(n, arg);
-        final Expression target = (Expression) n.getTarget().accept(this, arg);
-        if (target == null) {
-            return null;
-        }
+			}
+			removeNulls(members);
+		}
+		return n;
+	}
+
+	private void visitAnnotations(NodeWithAnnotations<?> n, A arg) {
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+	}
+
+	@Override public Node visit(final AnnotationMemberDeclaration n, final A arg) {
+		visitComment(n, arg);
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		n.setType((Type) n.getType().accept(this, arg));
+		if (n.getDefaultValue() != null) {
+			n.setDefaultValue((Expression) n.getDefaultValue().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ArrayAccessExpr n, final A arg) {
+		visitComment(n, arg);
+		n.setName((Expression) n.getName().accept(this, arg));
+		n.setIndex((Expression) n.getIndex().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ArrayCreationExpr n, final A arg) {
+		visitComment(n, arg);
+		n.setType((Type) n.getType().accept(this, arg));
+
+		final List<ArrayCreationLevel> values = n.getLevels();
+		for (int i = 0; i < values.size(); i++) {
+			values.set(i, (ArrayCreationLevel) values.get(i).accept(this, arg));
+		}
+		removeNulls(values);
+
+		if (n.getInitializer() != null) {
+			n.setInitializer((ArrayInitializerExpr) n.getInitializer().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ArrayInitializerExpr n, final A arg) {
+		visitComment(n, arg);
+		if (n.getValues() != null) {
+			final List<Expression> values = n.getValues();
+			if (values != null) {
+				for (int i = 0; i < values.size(); i++) {
+					values.set(i, (Expression) values.get(i).accept(this, arg));
+				}
+				removeNulls(values);
+			}
+		}
+		return n;
+	}
+
+	@Override public Node visit(final AssertStmt n, final A arg) {
+		visitComment(n, arg);
+		n.setCheck((Expression) n.getCheck().accept(this, arg));
+		if (n.getMessage() != null) {
+			n.setMessage((Expression) n.getMessage().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final AssignExpr n, final A arg) {
+		visitComment(n, arg);
+		final Expression target = (Expression) n.getTarget().accept(this, arg);
+		if (target == null) {
+			return null;
+		}
         n.setTarget(target);
 
-        final Expression value = (Expression) n.getValue().accept(this, arg);
-        if (value == null) {
-            return null;
-        }
-        n.setValue(value);
-
-        return n;
-    }
-
-    @Override
-    public Node visit(final BinaryExpr n, final A arg) {
-        visitComment(n, arg);
-        final Expression left = (Expression) n.getLeft().accept(this, arg);
-        final Expression right = (Expression) n.getRight().accept(this, arg);
-        if (left == null) {
-            return right;
-        }
-        if (right == null) {
-            return left;
-        }
-        n.setLeft(left);
-        n.setRight(right);
-        return n;
-    }
-
-    @Override
-    public Node visit(final BlockStmt n, final A arg) {
-        visitComment(n, arg);
-        final List<Statement> stmts = n.getStmts();
-        if (stmts != null) {
-            for (int i = 0; i < stmts.size(); i++) {
-                stmts.set(i, (Statement) stmts.get(i).accept(this, arg));
-            }
-            removeNulls(stmts);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final BooleanLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final BreakStmt n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final CastExpr n, final A arg) {
-        visitComment(n, arg);
-        final Type type = (Type) n.getType().accept(this, arg);
-        final Expression expr = (Expression) n.getExpr().accept(this, arg);
-        if (type == null) {
-            return expr;
-        }
-        if (expr == null) {
-            return null;
-        }
-        n.setType(type);
-        n.setExpr(expr);
-        return n;
-    }
-
-    @Override
-    public Node visit(final CatchClause n, final A arg) {
-        visitComment(n, arg);
-        n.setParam((Parameter) n.getParam().accept(this, arg));
-        n.setBody((BlockStmt) n.getBody().accept(this, arg));
-        return n;
-
-    }
-
-    @Override
-    public Node visit(final CharLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final ClassExpr n, final A arg) {
-        visitComment(n, arg);
-        n.setType((Type) n.getType().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ClassOrInterfaceDeclaration n, final A arg) {
-        visitAnnotations(n, arg);
-        visitComment(n, arg);
-        final List<TypeParameter> typeParameters = n.getTypeParameters();
-        if (typeParameters != null) {
-            for (int i = 0; i < typeParameters.size(); i++) {
-                typeParameters.set(i, (TypeParameter) typeParameters.get(i).accept(this, arg));
-            }
-            removeNulls(typeParameters);
-        }
-        final List<ClassOrInterfaceType> extendz = n.getExtends();
-        if (extendz != null) {
-            for (int i = 0; i < extendz.size(); i++) {
-                extendz.set(i, (ClassOrInterfaceType) extendz.get(i).accept(this, arg));
-            }
-            removeNulls(extendz);
-        }
-        final List<ClassOrInterfaceType> implementz = n.getImplements();
-        if (implementz != null) {
-            for (int i = 0; i < implementz.size(); i++) {
-                implementz.set(i, (ClassOrInterfaceType) implementz.get(i).accept(this, arg));
-            }
-            removeNulls(implementz);
-        }
+		final Expression value = (Expression) n.getValue().accept(this, arg);
+		if (value == null) {
+			return null;
+		}
+		n.setValue(value);
+
+		return n;
+	}
+
+	@Override public Node visit(final BinaryExpr n, final A arg) {
+		visitComment(n, arg);
+		final Expression left = (Expression) n.getLeft().accept(this, arg);
+		final Expression right = (Expression) n.getRight().accept(this, arg);
+		if (left == null) {
+			return right;
+		}
+		if (right == null) {
+			return left;
+		}
+		n.setLeft(left);
+		n.setRight(right);
+		return n;
+	}
+
+	@Override public Node visit(final BlockStmt n, final A arg) {
+		visitComment(n, arg);
+		final List<Statement> stmts = n.getStmts();
+		if (stmts != null) {
+			for (int i = 0; i < stmts.size(); i++) {
+				stmts.set(i, (Statement) stmts.get(i).accept(this, arg));
+			}
+			removeNulls(stmts);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final BooleanLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final BreakStmt n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final CastExpr n, final A arg) {
+		visitComment(n, arg);
+		final Type type = (Type) n.getType().accept(this, arg);
+		final Expression expr = (Expression) n.getExpr().accept(this, arg);
+		if (type == null) {
+			return expr;
+		}
+		if (expr == null) {
+			return null;
+		}
+		n.setType(type);
+		n.setExpr(expr);
+		return n;
+	}
+
+	@Override public Node visit(final CatchClause n, final A arg) {
+		visitComment(n, arg);
+		n.setParam((Parameter)n.getParam().accept(this, arg));
+		n.setBody((BlockStmt) n.getBody().accept(this, arg));
+		return n;
+
+	}
+
+	@Override public Node visit(final CharLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final ClassExpr n, final A arg) {
+		visitComment(n, arg);
+		n.setType((Type) n.getType().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ClassOrInterfaceDeclaration n, final A arg) {
+		visitAnnotations(n, arg);
+		visitComment(n, arg);
+		final List<TypeParameter> typeParameters = n.getTypeParameters();
+		if (typeParameters != null) {
+			for (int i = 0; i < typeParameters.size(); i++) {
+				typeParameters.set(i, (TypeParameter) typeParameters.get(i).accept(this, arg));
+			}
+			removeNulls(typeParameters);
+		}
+		final List<ClassOrInterfaceType> extendz = n.getExtends();
+		if (extendz != null) {
+			for (int i = 0; i < extendz.size(); i++) {
+				extendz.set(i, (ClassOrInterfaceType) extendz.get(i).accept(this, arg));
+			}
+			removeNulls(extendz);
+		}
+		final List<ClassOrInterfaceType> implementz = n.getImplements();
+		if (implementz != null) {
+			for (int i = 0; i < implementz.size(); i++) {
+				implementz.set(i, (ClassOrInterfaceType) implementz.get(i).accept(this, arg));
+			}
+			removeNulls(implementz);
+		}
         final List<BodyDeclaration<?>> members = n.getMembers();
-        if (members != null) {
-            for (int i = 0; i < members.size(); i++) {
+		if (members != null) {
+			for (int i = 0; i < members.size(); i++) {
                 members.set(i, (BodyDeclaration<?>) members.get(i).accept(this, arg));
-            }
-            removeNulls(members);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ClassOrInterfaceType n, final A arg) {
-        visitComment(n, arg);
-        visitAnnotations(n, arg);
-        if (n.getScope() != null) {
-            n.setScope((ClassOrInterfaceType) n.getScope().accept(this, arg));
-        }
-        final List<Type<?>> typeArguments = n.getTypeArguments();
-        if (typeArguments != null) {
-            for (int i = 0; i < typeArguments.size(); i++) {
-                typeArguments.set(i, (Type<?>) typeArguments.get(i).accept(this, arg));
-            }
-            removeNulls(typeArguments);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final CompilationUnit n, final A arg) {
-        visitComment(n, arg);
-        if (n.getPackage() != null) {
-            n.setPackage((PackageDeclaration) n.getPackage().accept(this, arg));
-        }
-        final List<ImportDeclaration> imports = n.getImports();
-        if (imports != null) {
-            for (int i = 0; i < imports.size(); i++) {
-                imports.set(i, (ImportDeclaration) imports.get(i).accept(this, arg));
-            }
-            removeNulls(imports);
-        }
+			}
+			removeNulls(members);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ClassOrInterfaceType n, final A arg) {
+		visitComment(n, arg);
+		visitAnnotations(n, arg);
+		if (n.getScope() != null) {
+			n.setScope((ClassOrInterfaceType) n.getScope().accept(this, arg));
+		}
+		final List<Type<?>> typeArguments = n.getTypeArguments();
+		if (typeArguments != null) {
+			for (int i = 0; i < typeArguments.size(); i++) {
+				typeArguments.set(i, (Type<?>) typeArguments.get(i).accept(this, arg));
+			}
+			removeNulls(typeArguments);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final CompilationUnit n, final A arg) {
+		visitComment(n, arg);
+		if (n.getPackage() != null) {
+			n.setPackage((PackageDeclaration) n.getPackage().accept(this, arg));
+		}
+		final List<ImportDeclaration> imports = n.getImports();
+		if (imports != null) {
+			for (int i = 0; i < imports.size(); i++) {
+				imports.set(i, (ImportDeclaration) imports.get(i).accept(this, arg));
+			}
+			removeNulls(imports);
+		}
         final List<TypeDeclaration<?>> types = n.getTypes();
-        if (types != null) {
-            for (int i = 0; i < types.size(); i++) {
+		if (types != null) {
+			for (int i = 0; i < types.size(); i++) {
                 types.set(i, (TypeDeclaration<?>) types.get(i).accept(this, arg));
-            }
-            removeNulls(types);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ConditionalExpr n, final A arg) {
-        visitComment(n, arg);
-        n.setCondition((Expression) n.getCondition().accept(this, arg));
-        n.setThenExpr((Expression) n.getThenExpr().accept(this, arg));
-        n.setElseExpr((Expression) n.getElseExpr().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ConstructorDeclaration n, final A arg) {
-        visitComment(n, arg);
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        final List<TypeParameter> typeParameters = n.getTypeParameters();
-        if (typeParameters != null) {
-            for (int i = 0; i < typeParameters.size(); i++) {
-                typeParameters.set(i, (TypeParameter) typeParameters.get(i).accept(this, arg));
-            }
-            removeNulls(typeParameters);
-        }
-        final List<Parameter> parameters = n.getParameters();
-        if (parameters != null) {
-            for (int i = 0; i < parameters.size(); i++) {
-                parameters.set(i, (Parameter) parameters.get(i).accept(this, arg));
-            }
-            removeNulls(parameters);
-        }
-        final List<ReferenceType> throwz = n.getThrows();
-        if (throwz != null) {
-            for (int i = 0; i < throwz.size(); i++) {
-                throwz.set(i, (ReferenceType) throwz.get(i).accept(this, arg));
-            }
-            removeNulls(throwz);
-        }
-        n.setBody((BlockStmt) n.getBody().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ContinueStmt n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final DoStmt n, final A arg) {
-        visitComment(n, arg);
-        final Statement body = (Statement) n.getBody().accept(this, arg);
-        if (body == null) {
-            return null;
-        }
-        n.setBody(body);
-
-        final Expression condition = (Expression) n.getCondition().accept(this, arg);
-        if (condition == null) {
-            return null;
-        }
-        n.setCondition(condition);
-
-        return n;
-    }
-
-    @Override
-    public Node visit(final DoubleLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final EmptyMemberDeclaration n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final EmptyStmt n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final EmptyTypeDeclaration n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final EnclosedExpr n, final A arg) {
-        visitComment(n, arg);
-        n.setInner((Expression) n.getInner().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final EnumConstantDeclaration n, final A arg) {
-        visitComment(n, arg);
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        final List<Expression> args = n.getArgs();
-        if (args != null) {
-            for (int i = 0; i < args.size(); i++) {
-                args.set(i, (Expression) args.get(i).accept(this, arg));
-            }
-            removeNulls(args);
-        }
+			}
+			removeNulls(types);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ConditionalExpr n, final A arg) {
+		visitComment(n, arg);
+		n.setCondition((Expression) n.getCondition().accept(this, arg));
+		n.setThenExpr((Expression) n.getThenExpr().accept(this, arg));
+		n.setElseExpr((Expression) n.getElseExpr().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ConstructorDeclaration n, final A arg) {
+		visitComment(n, arg);
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		final List<TypeParameter> typeParameters = n.getTypeParameters();
+		if (typeParameters != null) {
+			for (int i = 0; i < typeParameters.size(); i++) {
+				typeParameters.set(i, (TypeParameter) typeParameters.get(i).accept(this, arg));
+			}
+			removeNulls(typeParameters);
+		}
+		final List<Parameter> parameters = n.getParameters();
+		if (parameters != null) {
+			for (int i = 0; i < parameters.size(); i++) {
+				parameters.set(i, (Parameter) parameters.get(i).accept(this, arg));
+			}
+			removeNulls(parameters);
+		}
+		final List<ReferenceType> throwz = n.getThrows();
+		if (throwz != null) {
+			for (int i = 0; i < throwz.size(); i++) {
+				throwz.set(i, (ReferenceType) throwz.get(i).accept(this, arg));
+			}
+			removeNulls(throwz);
+		}
+		n.setBody((BlockStmt) n.getBody().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ContinueStmt n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final DoStmt n, final A arg) {
+		visitComment(n, arg);
+		final Statement body = (Statement) n.getBody().accept(this, arg);
+		if (body == null) {
+			return null;
+		}
+		n.setBody(body);
+
+		final Expression condition = (Expression) n.getCondition().accept(this, arg);
+		if (condition == null) {
+			return null;
+		}
+		n.setCondition(condition);
+
+		return n;
+	}
+
+	@Override public Node visit(final DoubleLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final EmptyMemberDeclaration n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final EmptyStmt n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final EmptyTypeDeclaration n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final EnclosedExpr n, final A arg) {
+		visitComment(n, arg);
+		n.setInner((Expression) n.getInner().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final EnumConstantDeclaration n, final A arg) {
+		visitComment(n, arg);
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		final List<Expression> args = n.getArgs();
+		if (args != null) {
+			for (int i = 0; i < args.size(); i++) {
+				args.set(i, (Expression) args.get(i).accept(this, arg));
+			}
+			removeNulls(args);
+		}
         final List<BodyDeclaration<?>> classBody = n.getClassBody();
-        if (classBody != null) {
-            for (int i = 0; i < classBody.size(); i++) {
+		if (classBody != null) {
+			for (int i = 0; i < classBody.size(); i++) {
                 classBody.set(i, (BodyDeclaration<?>) classBody.get(i).accept(this, arg));
-            }
-            removeNulls(classBody);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final EnumDeclaration n, final A arg) {
-        visitComment(n, arg);
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        final List<ClassOrInterfaceType> implementz = n.getImplements();
-        if (implementz != null) {
-            for (int i = 0; i < implementz.size(); i++) {
-                implementz.set(i, (ClassOrInterfaceType) implementz.get(i).accept(this, arg));
-            }
-            removeNulls(implementz);
-        }
-        final List<EnumConstantDeclaration> entries = n.getEntries();
-        if (entries != null) {
-            for (int i = 0; i < entries.size(); i++) {
-                entries.set(i, (EnumConstantDeclaration) entries.get(i).accept(this, arg));
-            }
-            removeNulls(entries);
-        }
+			}
+			removeNulls(classBody);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final EnumDeclaration n, final A arg) {
+		visitComment(n, arg);
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		final List<ClassOrInterfaceType> implementz = n.getImplements();
+		if (implementz != null) {
+			for (int i = 0; i < implementz.size(); i++) {
+				implementz.set(i, (ClassOrInterfaceType) implementz.get(i).accept(this, arg));
+			}
+			removeNulls(implementz);
+		}
+		final List<EnumConstantDeclaration> entries = n.getEntries();
+		if (entries != null) {
+			for (int i = 0; i < entries.size(); i++) {
+				entries.set(i, (EnumConstantDeclaration) entries.get(i).accept(this, arg));
+			}
+			removeNulls(entries);
+		}
         final List<BodyDeclaration<?>> members = n.getMembers();
-        if (members != null) {
-            for (int i = 0; i < members.size(); i++) {
+		if (members != null) {
+			for (int i = 0; i < members.size(); i++) {
                 members.set(i, (BodyDeclaration<?>) members.get(i).accept(this, arg));
-            }
-            removeNulls(members);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ExplicitConstructorInvocationStmt n, final A arg) {
-        visitComment(n, arg);
-        if (!n.isThis() && n.getExpr() != null) {
-            n.setExpr((Expression) n.getExpr().accept(this, arg));
-        }
+			}
+			removeNulls(members);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ExplicitConstructorInvocationStmt n, final A arg) {
+		visitComment(n, arg);
+		if (!n.isThis() && n.getExpr() != null) {
+			n.setExpr((Expression) n.getExpr().accept(this, arg));
+		}
         final List<Type<?>> typeArguments = n.getTypeArguments();
         if (typeArguments != null) {
             for (int i = 0; i < typeArguments.size(); i++) {
@@ -560,191 +530,173 @@ public Node visit(final ExplicitConstructorInvocationStmt n, final A arg) {
             }
             removeNulls(typeArguments);
         }
-        final List<Expression> args = n.getArgs();
-        if (args != null) {
-            for (int i = 0; i < args.size(); i++) {
-                args.set(i, (Expression) args.get(i).accept(this, arg));
-            }
-            removeNulls(args);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ExpressionStmt n, final A arg) {
-        visitComment(n, arg);
-        final Expression expr = (Expression) n.getExpression().accept(this, arg);
-        if (expr == null) {
-            return null;
-        }
-        n.setExpression(expr);
-        return n;
-    }
-
-    @Override
-    public Node visit(final FieldAccessExpr n, final A arg) {
-        visitComment(n, arg);
-        final Expression scope = (Expression) n.getScope().accept(this, arg);
-        if (scope == null) {
-            return null;
-        }
-        n.setScope(scope);
-        return n;
-    }
-
-    @Override
-    public Node visit(final FieldDeclaration n, final A arg) {
-        visitComment(n, arg);
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        n.setElementType((Type) n.getElementType().accept(this, arg));
-        final List<VariableDeclarator> variables = n.getVariables();
-        for (int i = 0; i < variables.size(); i++) {
-            variables.set(i, (VariableDeclarator) variables.get(i).accept(this, arg));
-        }
-        removeNulls(variables);
-        return n;
-    }
-
-    @Override
-    public Node visit(final ForeachStmt n, final A arg) {
-        visitComment(n, arg);
-        n.setVariable((VariableDeclarationExpr) n.getVariable().accept(this, arg));
-        n.setIterable((Expression) n.getIterable().accept(this, arg));
-        n.setBody((Statement) n.getBody().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ForStmt n, final A arg) {
-        visitComment(n, arg);
-        final List<Expression> init = n.getInit();
-        if (init != null) {
-            for (int i = 0; i < init.size(); i++) {
-                init.set(i, (Expression) init.get(i).accept(this, arg));
-            }
-            removeNulls(init);
-        }
-        if (n.getCompare() != null) {
-            n.setCompare((Expression) n.getCompare().accept(this, arg));
-        }
-        final List<Expression> update = n.getUpdate();
-        if (update != null) {
-            for (int i = 0; i < update.size(); i++) {
-                update.set(i, (Expression) update.get(i).accept(this, arg));
-            }
-            removeNulls(update);
-        }
-        n.setBody((Statement) n.getBody().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final IfStmt n, final A arg) {
-        visitComment(n, arg);
-        final Expression condition = (Expression)
-                n.getCondition().accept(this, arg);
-        if (condition == null) {
-            return null;
-        }
-        n.setCondition(condition);
-        final Statement thenStmt = (Statement) n.getThenStmt().accept(this, arg);
-        if (thenStmt == null) {
-            // Remove the entire statement if the then-clause was removed.
-            // DumpVisitor, used for toString, has no null check for the
-            // then-clause.
-            return null;
-        }
-        n.setThenStmt(thenStmt);
-        if (n.getElseStmt() != null) {
-            n.setElseStmt((Statement) n.getElseStmt().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ImportDeclaration n, final A arg) {
-        visitComment(n, arg);
-        n.setName((NameExpr) n.getName().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final InitializerDeclaration n, final A arg) {
-        visitComment(n, arg);
-        n.setBlock((BlockStmt) n.getBlock().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final InstanceOfExpr n, final A arg) {
-        visitComment(n, arg);
-        n.setExpr((Expression) n.getExpr().accept(this, arg));
-        n.setType((Type) n.getType().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final IntegerLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final IntegerLiteralMinValueExpr n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final JavadocComment n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final LabeledStmt n, final A arg) {
-        visitComment(n, arg);
-        n.setStmt((Statement) n.getStmt().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final LongLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final LongLiteralMinValueExpr n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final MarkerAnnotationExpr n, final A arg) {
-        visitComment(n, arg);
-        n.setName((NameExpr) n.getName().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final MemberValuePair n, final A arg) {
-        visitComment(n, arg);
-        n.setValue((Expression) n.getValue().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final MethodCallExpr n, final A arg) {
-        visitComment(n, arg);
-        if (n.getScope() != null) {
-            n.setScope((Expression) n.getScope().accept(this, arg));
-        }
+		final List<Expression> args = n.getArgs();
+		if (args != null) {
+			for (int i = 0; i < args.size(); i++) {
+				args.set(i, (Expression) args.get(i).accept(this, arg));
+			}
+			removeNulls(args);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ExpressionStmt n, final A arg) {
+		visitComment(n, arg);
+		final Expression expr = (Expression) n.getExpression().accept(this, arg);
+		if (expr == null) {
+			return null;
+		}
+		n.setExpression(expr);
+		return n;
+	}
+
+	@Override public Node visit(final FieldAccessExpr n, final A arg) {
+		visitComment(n, arg);
+		final Expression scope = (Expression) n.getScope().accept(this, arg);
+		if (scope == null) {
+			return null;
+		}
+		n.setScope(scope);
+		return n;
+	}
+
+	@Override public Node visit(final FieldDeclaration n, final A arg) {
+		visitComment(n, arg);
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		n.setElementType((Type) n.getElementType().accept(this, arg));
+		final List<VariableDeclarator> variables = n.getVariables();
+		for (int i = 0; i < variables.size(); i++) {
+			variables.set(i, (VariableDeclarator) variables.get(i).accept(this, arg));
+		}
+		removeNulls(variables);
+		return n;
+	}
+
+	@Override public Node visit(final ForeachStmt n, final A arg) {
+		visitComment(n, arg);
+		n.setVariable((VariableDeclarationExpr) n.getVariable().accept(this, arg));
+		n.setIterable((Expression) n.getIterable().accept(this, arg));
+		n.setBody((Statement) n.getBody().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ForStmt n, final A arg) {
+		visitComment(n, arg);
+		final List<Expression> init = n.getInit();
+		if (init != null) {
+			for (int i = 0; i < init.size(); i++) {
+				init.set(i, (Expression) init.get(i).accept(this, arg));
+			}
+			removeNulls(init);
+		}
+		if (n.getCompare() != null) {
+			n.setCompare((Expression) n.getCompare().accept(this, arg));
+		}
+		final List<Expression> update = n.getUpdate();
+		if (update != null) {
+			for (int i = 0; i < update.size(); i++) {
+				update.set(i, (Expression) update.get(i).accept(this, arg));
+			}
+			removeNulls(update);
+		}
+		n.setBody((Statement) n.getBody().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final IfStmt n, final A arg) {
+		visitComment(n, arg);
+		final Expression condition = (Expression)
+			n.getCondition().accept(this, arg);
+		if (condition == null) {
+			return null;
+		}
+		n.setCondition(condition);
+		final Statement thenStmt = (Statement) n.getThenStmt().accept(this, arg);
+		if (thenStmt == null) {
+			// Remove the entire statement if the then-clause was removed.
+			// DumpVisitor, used for toString, has no null check for the
+			// then-clause.
+			return null;
+		}
+		n.setThenStmt(thenStmt);
+		if (n.getElseStmt() != null) {
+			n.setElseStmt((Statement) n.getElseStmt().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ImportDeclaration n, final A arg) {
+		visitComment(n, arg);
+		n.setName((NameExpr) n.getName().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final InitializerDeclaration n, final A arg) {
+		visitComment(n, arg);
+		n.setBlock((BlockStmt) n.getBlock().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final InstanceOfExpr n, final A arg) {
+		visitComment(n, arg);
+		n.setExpr((Expression) n.getExpr().accept(this, arg));
+		n.setType((Type) n.getType().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final IntegerLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final IntegerLiteralMinValueExpr n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final JavadocComment n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final LabeledStmt n, final A arg) {
+		visitComment(n, arg);
+		n.setStmt((Statement) n.getStmt().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final LongLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final LongLiteralMinValueExpr n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final MarkerAnnotationExpr n, final A arg) {
+		visitComment(n, arg);
+		n.setName((NameExpr) n.getName().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final MemberValuePair n, final A arg) {
+		visitComment(n, arg);
+		n.setValue((Expression) n.getValue().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final MethodCallExpr n, final A arg) {
+		visitComment(n, arg);
+		if (n.getScope() != null) {
+			n.setScope((Expression) n.getScope().accept(this, arg));
+		}
         final List<Type<?>> typeArguments = n.getTypeArguments();
         if (typeArguments != null) {
             for (int i = 0; i < typeArguments.size(); i++) {
@@ -752,86 +704,81 @@ public Node visit(final MethodCallExpr n, final A arg) {
             }
             removeNulls(typeArguments);
         }
-        final List<Expression> args = n.getArgs();
-        if (args != null) {
-            for (int i = 0; i < args.size(); i++) {
-                args.set(i, (Expression) args.get(i).accept(this, arg));
-            }
-            removeNulls(args);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final MethodDeclaration n, final A arg) {
-        visitComment(n, arg);
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        final List<TypeParameter> typeParameters = n.getTypeParameters();
-        if (typeParameters != null) {
-            for (int i = 0; i < typeParameters.size(); i++) {
-                typeParameters.set(i, (TypeParameter) typeParameters.get(i).accept(this, arg));
-            }
-            removeNulls(typeParameters);
-        }
-        n.setElementType((Type) n.getElementType().accept(this, arg));
-        final List<Parameter> parameters = n.getParameters();
-        if (parameters != null) {
-            for (int i = 0; i < parameters.size(); i++) {
-                parameters.set(i, (Parameter) parameters.get(i).accept(this, arg));
-            }
-            removeNulls(parameters);
-        }
-        final List<ReferenceType> throwz = n.getThrows();
-        if (throwz != null) {
-            for (int i = 0; i < throwz.size(); i++) {
-                throwz.set(i, (ReferenceType) throwz.get(i).accept(this, arg));
-            }
-            removeNulls(throwz);
-        }
-        if (n.getBody() != null) {
-            n.setBody((BlockStmt) n.getBody().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final NameExpr n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final NormalAnnotationExpr n, final A arg) {
-        visitComment(n, arg);
-        n.setName((NameExpr) n.getName().accept(this, arg));
-        final List<MemberValuePair> pairs = n.getPairs();
-        if (pairs != null) {
-            for (int i = 0; i < pairs.size(); i++) {
-                pairs.set(i, (MemberValuePair) pairs.get(i).accept(this, arg));
-            }
-            removeNulls(pairs);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final NullLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final ObjectCreationExpr n, final A arg) {
-        visitComment(n, arg);
-        if (n.getScope() != null) {
-            n.setScope((Expression) n.getScope().accept(this, arg));
-        }
+		final List<Expression> args = n.getArgs();
+		if (args != null) {
+			for (int i = 0; i < args.size(); i++) {
+				args.set(i, (Expression) args.get(i).accept(this, arg));
+			}
+			removeNulls(args);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final MethodDeclaration n, final A arg) {
+		visitComment(n, arg);
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		final List<TypeParameter> typeParameters = n.getTypeParameters();
+		if (typeParameters != null) {
+			for (int i = 0; i < typeParameters.size(); i++) {
+				typeParameters.set(i, (TypeParameter) typeParameters.get(i).accept(this, arg));
+			}
+			removeNulls(typeParameters);
+		}
+		n.setElementType((Type) n.getElementType().accept(this, arg));
+		final List<Parameter> parameters = n.getParameters();
+		if (parameters != null) {
+			for (int i = 0; i < parameters.size(); i++) {
+				parameters.set(i, (Parameter) parameters.get(i).accept(this, arg));
+			}
+			removeNulls(parameters);
+		}
+		final List<ReferenceType> throwz = n.getThrows();
+		if (throwz != null) {
+			for (int i = 0; i < throwz.size(); i++) {
+				throwz.set(i, (ReferenceType) throwz.get(i).accept(this, arg));
+			}
+			removeNulls(throwz);
+		}
+		if (n.getBody() != null) {
+			n.setBody((BlockStmt) n.getBody().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final NameExpr n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final NormalAnnotationExpr n, final A arg) {
+		visitComment(n, arg);
+		n.setName((NameExpr) n.getName().accept(this, arg));
+		final List<MemberValuePair> pairs = n.getPairs();
+		if (pairs != null) {
+			for (int i = 0; i < pairs.size(); i++) {
+				pairs.set(i, (MemberValuePair) pairs.get(i).accept(this, arg));
+			}
+			removeNulls(pairs);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final NullLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final ObjectCreationExpr n, final A arg) {
+		visitComment(n, arg);
+		if (n.getScope() != null) {
+			n.setScope((Expression) n.getScope().accept(this, arg));
+		}
         final List<Type<?>> typeArguments = n.getTypeArguments();
         if (typeArguments != null) {
             for (int i = 0; i < typeArguments.size(); i++) {
@@ -839,83 +786,79 @@ public Node visit(final ObjectCreationExpr n, final A arg) {
             }
             removeNulls(typeArguments);
         }
-        n.setType((ClassOrInterfaceType) n.getType().accept(this, arg));
-        final List<Expression> args = n.getArgs();
-        if (args != null) {
-            for (int i = 0; i < args.size(); i++) {
-                args.set(i, (Expression) args.get(i).accept(this, arg));
-            }
-            removeNulls(args);
-        }
+		n.setType((ClassOrInterfaceType) n.getType().accept(this, arg));
+		final List<Expression> args = n.getArgs();
+		if (args != null) {
+			for (int i = 0; i < args.size(); i++) {
+				args.set(i, (Expression) args.get(i).accept(this, arg));
+			}
+			removeNulls(args);
+		}
         final List<BodyDeclaration<?>> anonymousClassBody = n.getAnonymousClassBody();
-        if (anonymousClassBody != null) {
-            for (int i = 0; i < anonymousClassBody.size(); i++) {
+		if (anonymousClassBody != null) {
+			for (int i = 0; i < anonymousClassBody.size(); i++) {
                 anonymousClassBody.set(i, (BodyDeclaration<?>) anonymousClassBody.get(i).accept(this, arg));
-            }
-            removeNulls(anonymousClassBody);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final PackageDeclaration n, final A arg) {
-        visitComment(n, arg);
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        n.setName((NameExpr) n.getName().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final Parameter n, final A arg) {
-        visitComment(n, arg);
-        visitAnnotations(n, arg);
-        n.setId((VariableDeclaratorId) n.getId().accept(this, arg));
-        n.setElementType((Type) n.getElementType().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final PrimitiveType n, final A arg) {
-        visitComment(n, arg);
-        visitAnnotations(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final QualifiedNameExpr n, final A arg) {
-        visitComment(n, arg);
-        n.setQualifier((NameExpr) n.getQualifier().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(ArrayType n, A arg) {
-        visitComment(n, arg);
-        visitAnnotations(n, arg);
-        n.setComponentType((Type) n.getComponentType().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(ArrayCreationLevel n, A arg) {
-        visitComment(n, arg);
-        visitAnnotations(n, arg);
-        if (n.getDimension() != null) {
-            n.setDimension((Expression) n.getDimension().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
+			}
+			removeNulls(anonymousClassBody);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final PackageDeclaration n, final A arg) {
+		visitComment(n, arg);
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		n.setName((NameExpr) n.getName().accept(this, arg));
+		return n;
+	}
+	
+	@Override public Node visit(final Parameter n, final A arg) {
+		visitComment(n, arg);
+		visitAnnotations(n, arg);
+		n.setId((VariableDeclaratorId) n.getId().accept(this, arg));
+		n.setElementType((Type) n.getElementType().accept(this, arg));
+		return n;
+	}
+	
+	@Override public Node visit(final PrimitiveType n, final A arg) {
+		visitComment(n, arg);
+		visitAnnotations(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final QualifiedNameExpr n, final A arg) {
+		visitComment(n, arg);
+		n.setQualifier((NameExpr) n.getQualifier().accept(this, arg));
+		return n;
+	}
+
+	@Override
+	public Node visit(ArrayType n, A arg) {
+		visitComment(n, arg);
+		visitAnnotations(n, arg);
+		n.setComponentType((Type) n.getComponentType().accept(this, arg));
+		return n;
+	}
+
+	@Override
+	public Node visit(ArrayCreationLevel n, A arg) {
+		visitComment(n, arg);
+		visitAnnotations(n, arg);
+		if(n.getDimension()!=null) {
+			n.setDimension((Expression) n.getDimension().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override
     public Node visit(final IntersectionType n, final A arg) {
-        visitComment(n, arg);
-        visitAnnotations(n, arg);
+		visitComment(n, arg);
+		visitAnnotations(n, arg);
         final List<ReferenceType> elements = n.getElements();
         if (elements != null) {
             for (int i = 0; i < elements.size(); i++) {
@@ -928,9 +871,9 @@ public Node visit(final IntersectionType n, final A arg) {
 
     @Override
     public Node visit(final UnionType n, final A arg) {
-        visitComment(n, arg);
-        visitAnnotations(n, arg);
-        final List<ReferenceType> elements = n.getElements();
+		visitComment(n, arg);
+		visitAnnotations(n, arg);
+		final List<ReferenceType> elements = n.getElements();
         if (elements != null) {
             for (int i = 0; i < elements.size(); i++) {
                 elements.set(i, (ReferenceType) elements.get(i).accept(this, arg));
@@ -940,287 +883,267 @@ public Node visit(final UnionType n, final A arg) {
         return n;
     }
 
-    @Override
-    public Node visit(final ReturnStmt n, final A arg) {
-        visitComment(n, arg);
-        if (n.getExpr() != null) {
-            n.setExpr((Expression) n.getExpr().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final SingleMemberAnnotationExpr n, final A arg) {
-        visitComment(n, arg);
-        n.setName((NameExpr) n.getName().accept(this, arg));
-        n.setMemberValue((Expression) n.getMemberValue().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final StringLiteralExpr n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final SuperExpr n, final A arg) {
-        visitComment(n, arg);
-        if (n.getClassExpr() != null) {
-            n.setClassExpr((Expression) n.getClassExpr().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final SwitchEntryStmt n, final A arg) {
-        visitComment(n, arg);
-        if (n.getLabel() != null) {
-            n.setLabel((Expression) n.getLabel().accept(this, arg));
-        }
-        final List<Statement> stmts = n.getStmts();
-        if (stmts != null) {
-            for (int i = 0; i < stmts.size(); i++) {
-                stmts.set(i, (Statement) stmts.get(i).accept(this, arg));
-            }
-            removeNulls(stmts);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final SwitchStmt n, final A arg) {
-        visitComment(n, arg);
-        n.setSelector((Expression) n.getSelector().accept(this, arg));
-        final List<SwitchEntryStmt> entries = n.getEntries();
-        if (entries != null) {
-            for (int i = 0; i < entries.size(); i++) {
-                entries.set(i, (SwitchEntryStmt) entries.get(i).accept(this, arg));
-            }
-            removeNulls(entries);
-        }
-        return n;
-
-    }
-
-    @Override
-    public Node visit(final SynchronizedStmt n, final A arg) {
-        visitComment(n, arg);
-        n.setExpr((Expression) n.getExpr().accept(this, arg));
-        n.setBody((BlockStmt) n.getBody().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ThisExpr n, final A arg) {
-        visitComment(n, arg);
-        if (n.getClassExpr() != null) {
-            n.setClassExpr((Expression) n.getClassExpr().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ThrowStmt n, final A arg) {
-        visitComment(n, arg);
-        n.setExpr((Expression) n.getExpr().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final TryStmt n, final A arg) {
-        visitComment(n, arg);
-        final List<VariableDeclarationExpr> types = n.getResources();
-        for (int i = 0; i < types.size(); i++) {
-            n.getResources().set(i,
-                    (VariableDeclarationExpr) n.getResources().get(i).accept(this, arg));
-        }
-        n.setTryBlock((BlockStmt) n.getTryBlock().accept(this, arg));
-        final List<CatchClause> catchs = n.getCatchs();
-        if (catchs != null) {
-            for (int i = 0; i < catchs.size(); i++) {
-                catchs.set(i, (CatchClause) catchs.get(i).accept(this, arg));
-            }
-            removeNulls(catchs);
-        }
-        if (n.getFinallyBlock() != null) {
-            n.setFinallyBlock((BlockStmt) n.getFinallyBlock().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final TypeDeclarationStmt n, final A arg) {
-        visitComment(n, arg);
-        n.setTypeDeclaration((TypeDeclaration<?>) n.getTypeDeclaration().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final TypeParameter n, final A arg) {
-        visitComment(n, arg);
-        final List<ClassOrInterfaceType> typeBound = n.getTypeBound();
-        if (typeBound != null) {
-            for (int i = 0; i < typeBound.size(); i++) {
-                typeBound.set(i, (ClassOrInterfaceType) typeBound.get(i).accept(this, arg));
-            }
-            removeNulls(typeBound);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final UnaryExpr n, final A arg) {
-        visitComment(n, arg);
-        n.setExpr((Expression) n.getExpr().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final UnknownType n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final VariableDeclarationExpr n, final A arg) {
-        visitComment(n, arg);
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-
-        final Type type = (Type) n.getElementType().accept(this, arg);
-        if (type == null) {
-            return null;
-        }
-        n.setElementType(type);
-
-        final List<VariableDeclarator> vars = n.getVariables();
-        for (int i = 0; i < vars.size(); ) {
-            final VariableDeclarator decl = (VariableDeclarator)
-                    vars.get(i).accept(this, arg);
-            if (decl == null) {
-                vars.remove(i);
-            } else {
-                vars.set(i++, decl);
-            }
-        }
-        if (vars.isEmpty()) {
-            return null;
-        }
-
-        return n;
-    }
-
-    @Override
-    public Node visit(final VariableDeclarator n, final A arg) {
-        visitComment(n, arg);
-        final VariableDeclaratorId id = (VariableDeclaratorId)
-                n.getId().accept(this, arg);
-        if (id == null) {
-            return null;
-        }
-        n.setId(id);
-        if (n.getInit() != null) {
-            n.setInit((Expression) n.getInit().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final VariableDeclaratorId n, final A arg) {
-        visitComment(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final VoidType n, final A arg) {
-        visitComment(n, arg);
-        visitAnnotations(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final WhileStmt n, final A arg) {
-        visitComment(n, arg);
-        n.setCondition((Expression) n.getCondition().accept(this, arg));
-        n.setBody((Statement) n.getBody().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final WildcardType n, final A arg) {
-        visitComment(n, arg);
-        visitAnnotations(n, arg);
-        if (n.getExtends() != null) {
-            n.setExtends((ReferenceType) n.getExtends().accept(this, arg));
-        }
-        if (n.getSuper() != null) {
-            n.setSuper((ReferenceType) n.getSuper().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final LambdaExpr n, final A arg) {
-        visitComment(n, arg);
-        final List<Parameter> parameters = n.getParameters();
-        for (int i = 0; i < parameters.size(); i++) {
-            parameters.set(i, (Parameter) parameters.get(i).accept(this, arg));
-        }
-        removeNulls(parameters);
-        if (n.getBody() != null) {
-            n.setBody((Statement) n.getBody().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final MethodReferenceExpr n, final A arg) {
-        visitComment(n, arg);
-        final List<Type<?>> types = n.getTypeArguments();
-        for (int i = 0; i < types.size(); i++) {
-            n.getTypeArguments().set(i,
-                    (Type<?>) n.getTypeArguments().get(i).accept(this, arg));
-        }
-        if (n.getScope() != null) {
-            n.setScope((Expression) n.getScope().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final TypeExpr n, final A arg) {
-        visitComment(n, arg);
-        if (n.getType() != null) {
+	@Override public Node visit(final ReturnStmt n, final A arg) {
+		visitComment(n, arg);
+		if (n.getExpr() != null) {
+			n.setExpr((Expression) n.getExpr().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final SingleMemberAnnotationExpr n, final A arg) {
+		visitComment(n, arg);
+		n.setName((NameExpr) n.getName().accept(this, arg));
+		n.setMemberValue((Expression) n.getMemberValue().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final StringLiteralExpr n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final SuperExpr n, final A arg) {
+		visitComment(n, arg);
+		if (n.getClassExpr() != null) {
+			n.setClassExpr((Expression) n.getClassExpr().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final SwitchEntryStmt n, final A arg) {
+		visitComment(n, arg);
+		if (n.getLabel() != null) {
+			n.setLabel((Expression) n.getLabel().accept(this, arg));
+		}
+		final List<Statement> stmts = n.getStmts();
+		if (stmts != null) {
+			for (int i = 0; i < stmts.size(); i++) {
+				stmts.set(i, (Statement) stmts.get(i).accept(this, arg));
+			}
+			removeNulls(stmts);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final SwitchStmt n, final A arg) {
+		visitComment(n, arg);
+		n.setSelector((Expression) n.getSelector().accept(this, arg));
+		final List<SwitchEntryStmt> entries = n.getEntries();
+		if (entries != null) {
+			for (int i = 0; i < entries.size(); i++) {
+				entries.set(i, (SwitchEntryStmt) entries.get(i).accept(this, arg));
+			}
+			removeNulls(entries);
+		}
+		return n;
+
+	}
+
+	@Override public Node visit(final SynchronizedStmt n, final A arg) {
+		visitComment(n, arg);
+		n.setExpr((Expression) n.getExpr().accept(this, arg));
+		n.setBody((BlockStmt) n.getBody().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ThisExpr n, final A arg) {
+		visitComment(n, arg);
+		if (n.getClassExpr() != null) {
+			n.setClassExpr((Expression) n.getClassExpr().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ThrowStmt n, final A arg) {
+		visitComment(n, arg);
+		n.setExpr((Expression) n.getExpr().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final TryStmt n, final A arg) {
+		visitComment(n, arg);
+		final List<VariableDeclarationExpr> types = n.getResources();
+		for (int i = 0; i < types.size(); i++) {
+			n.getResources().set(i,
+					(VariableDeclarationExpr) n.getResources().get(i).accept(this, arg));
+		}
+		n.setTryBlock((BlockStmt) n.getTryBlock().accept(this, arg));
+		final List<CatchClause> catchs = n.getCatchs();
+		if (catchs != null) {
+			for (int i = 0; i < catchs.size(); i++) {
+				catchs.set(i, (CatchClause) catchs.get(i).accept(this, arg));
+			}
+			removeNulls(catchs);
+		}
+		if (n.getFinallyBlock() != null) {
+			n.setFinallyBlock((BlockStmt) n.getFinallyBlock().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final TypeDeclarationStmt n, final A arg) {
+		visitComment(n, arg);
+		n.setTypeDeclaration((TypeDeclaration<?>) n.getTypeDeclaration().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final TypeParameter n, final A arg) {
+		visitComment(n, arg);
+		final List<ClassOrInterfaceType> typeBound = n.getTypeBound();
+		if (typeBound != null) {
+			for (int i = 0; i < typeBound.size(); i++) {
+				typeBound.set(i, (ClassOrInterfaceType) typeBound.get(i).accept(this, arg));
+			}
+			removeNulls(typeBound);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final UnaryExpr n, final A arg) {
+		visitComment(n, arg);
+		n.setExpr((Expression) n.getExpr().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final UnknownType n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final VariableDeclarationExpr n, final A arg) {
+		visitComment(n, arg);
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+
+		final Type type = (Type) n.getElementType().accept(this, arg);
+		if (type == null) {
+			return null;
+		}
+		n.setElementType(type);
+
+		final List<VariableDeclarator> vars = n.getVariables();
+		for (int i = 0; i < vars.size();) {
+			final VariableDeclarator decl = (VariableDeclarator)
+				vars.get(i).accept(this, arg);
+			if (decl == null) {
+				vars.remove(i);
+			} else {
+				vars.set(i++, decl);
+			}
+		}
+		if (vars.isEmpty()) {
+			return null;
+		}
+
+		return n;
+	}
+
+	@Override public Node visit(final VariableDeclarator n, final A arg) {
+		visitComment(n, arg);
+		final VariableDeclaratorId id = (VariableDeclaratorId)
+			n.getId().accept(this, arg);
+		if (id == null) {
+			return null;
+		}
+		n.setId(id);
+		if (n.getInit() != null) {
+			n.setInit((Expression) n.getInit().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final VariableDeclaratorId n, final A arg) {
+		visitComment(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final VoidType n, final A arg) {
+		visitComment(n, arg);
+		visitAnnotations(n, arg);
+		return n;
+	}
+
+	@Override public Node visit(final WhileStmt n, final A arg) {
+		visitComment(n, arg);
+		n.setCondition((Expression) n.getCondition().accept(this, arg));
+		n.setBody((Statement) n.getBody().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final WildcardType n, final A arg) {
+		visitComment(n, arg);
+		visitAnnotations(n, arg);
+		if (n.getExtends() != null) {
+			n.setExtends((ReferenceType) n.getExtends().accept(this, arg));
+		}
+		if (n.getSuper() != null) {
+			n.setSuper((ReferenceType) n.getSuper().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override
+	public Node visit(final LambdaExpr n, final A arg) {
+		visitComment(n, arg);
+		final List<Parameter> parameters = n.getParameters();
+		for (int i = 0; i < parameters.size(); i++) {
+			parameters.set(i, (Parameter) parameters.get(i).accept(this, arg));
+		}
+		removeNulls(parameters);
+		if (n.getBody() != null) {
+			n.setBody((Statement) n.getBody().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override
+	public Node visit(final MethodReferenceExpr n, final A arg) {
+		visitComment(n, arg);
+		final List<Type<?>> types = n.getTypeArguments();
+		for (int i = 0; i < types.size(); i++) {
+			n.getTypeArguments().set(i,
+					(Type<?>) n.getTypeArguments().get(i).accept(this, arg));
+		}
+		if (n.getScope() != null) {
+			n.setScope((Expression)n.getScope().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override
+	public Node visit(final TypeExpr n, final A arg) {
+		visitComment(n, arg);
+		if (n.getType() != null) {
             n.setType((Type<?>) n.getType().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(ArrayBracketPair n, A arg) {
-        visitAnnotations(n, arg);
-        return n;
-    }
-
-    @Override
-    public Node visit(final BlockComment n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final LineComment n, final A arg) {
-        return n;
-    }
-
-    private void visitComment(Node n, final A arg) {
-        if (n != null && n.getComment() != null) {
-            n.setComment((Comment) n.getComment().accept(this, arg));
-        }
-    }
+		}
+		return n;
+	}
+
+	@Override
+	public Node visit(ArrayBracketPair n, A arg) {
+		visitAnnotations(n, arg);
+		return n;
+	}
+
+	@Override
+	public Node visit(final BlockComment n, final A arg) {
+		return n;
+	}
+
+	@Override
+	public Node visit(final LineComment n, final A arg) {
+		return n;
+	}
+
+	private void visitComment(Node n, final A arg) {
+		if (n != null && n.getComment() != null) {
+			n.setComment((Comment) n.getComment().accept(this, arg));
+		}
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/TreeVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/TreeVisitor.java
index 946230cc70..c1b7eaee61 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/TreeVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/TreeVisitor.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -28,17 +28,17 @@
  */
 public abstract class TreeVisitor {
 
-    /**
-     * https://en.wikipedia.org/wiki/Depth-first_search
-     *
-     * @param node the start node, and the first one that is passed to process(node).
-     */
-    public void visitDepthFirst(Node node) {
-        process(node);
-        for (Node child : node.getChildrenNodes()) {
-            visitDepthFirst(child);
-        }
-    }
+	/**
+	 * https://en.wikipedia.org/wiki/Depth-first_search
+	 *
+	 * @param node the start node, and the first one that is passed to process(node).
+	 */
+	public void visitDepthFirst(Node node) {
+		process(node);
+		for (Node child : node.getChildrenNodes()) {
+			visitDepthFirst(child);
+		}
+	}
 
-    public abstract void process(Node node);
+	public abstract void process(Node node);
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitor.java
index 2de6f91abe..ec1d0f6a61 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitor.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import com.github.javaparser.ast.*;
@@ -66,186 +66,186 @@
 
 /**
  * A visitor that does not return anything.
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public interface VoidVisitor<A> {
 
-    //- Compilation Unit ----------------------------------
-
-    void visit(CompilationUnit n, A arg);
-
-    void visit(PackageDeclaration n, A arg);
+	//- Compilation Unit ----------------------------------
 
-    void visit(ImportDeclaration n, A arg);
+	void visit(CompilationUnit n, A arg);
 
-    void visit(TypeParameter n, A arg);
+	void visit(PackageDeclaration n, A arg);
 
-    void visit(LineComment n, A arg);
+	void visit(ImportDeclaration n, A arg);
 
-    void visit(BlockComment n, A arg);
+	void visit(TypeParameter n, A arg);
 
-    //- Body ----------------------------------------------
+	void visit(LineComment n, A arg);
 
-    void visit(ClassOrInterfaceDeclaration n, A arg);
+	void visit(BlockComment n, A arg);
 
-    void visit(EnumDeclaration n, A arg);
+	//- Body ----------------------------------------------
 
-    void visit(EmptyTypeDeclaration n, A arg);
+	void visit(ClassOrInterfaceDeclaration n, A arg);
 
-    void visit(EnumConstantDeclaration n, A arg);
+	void visit(EnumDeclaration n, A arg);
 
-    void visit(AnnotationDeclaration n, A arg);
+	void visit(EmptyTypeDeclaration n, A arg);
 
-    void visit(AnnotationMemberDeclaration n, A arg);
+	void visit(EnumConstantDeclaration n, A arg);
 
-    void visit(FieldDeclaration n, A arg);
+	void visit(AnnotationDeclaration n, A arg);
 
-    void visit(VariableDeclarator n, A arg);
+	void visit(AnnotationMemberDeclaration n, A arg);
 
-    void visit(VariableDeclaratorId n, A arg);
+	void visit(FieldDeclaration n, A arg);
 
-    void visit(ConstructorDeclaration n, A arg);
+	void visit(VariableDeclarator n, A arg);
 
-    void visit(MethodDeclaration n, A arg);
+	void visit(VariableDeclaratorId n, A arg);
 
-    void visit(Parameter n, A arg);
+	void visit(ConstructorDeclaration n, A arg);
 
-    void visit(EmptyMemberDeclaration n, A arg);
+	void visit(MethodDeclaration n, A arg);
 
-    void visit(InitializerDeclaration n, A arg);
+	void visit(Parameter n, A arg);
+	
+	void visit(EmptyMemberDeclaration n, A arg);
 
-    void visit(JavadocComment n, A arg);
+	void visit(InitializerDeclaration n, A arg);
 
-    //- Type ----------------------------------------------
+	void visit(JavadocComment n, A arg);
 
-    void visit(ClassOrInterfaceType n, A arg);
+	//- Type ----------------------------------------------
 
-    void visit(PrimitiveType n, A arg);
+	void visit(ClassOrInterfaceType n, A arg);
 
-    void visit(ArrayType n, A arg);
+	void visit(PrimitiveType n, A arg);
 
-    void visit(ArrayCreationLevel n, A arg);
+	void visit(ArrayType n, A arg);
+	
+	void visit(ArrayCreationLevel n, A arg);
 
     void visit(IntersectionType n, A arg);
 
     void visit(UnionType n, A arg);
 
-    void visit(VoidType n, A arg);
+	void visit(VoidType n, A arg);
 
-    void visit(WildcardType n, A arg);
+	void visit(WildcardType n, A arg);
 
-    void visit(UnknownType n, A arg);
+	void visit(UnknownType n, A arg);
 
-    //- Expression ----------------------------------------
+	//- Expression ----------------------------------------
 
-    void visit(ArrayAccessExpr n, A arg);
+	void visit(ArrayAccessExpr n, A arg);
 
-    void visit(ArrayCreationExpr n, A arg);
+	void visit(ArrayCreationExpr n, A arg);
 
-    void visit(ArrayInitializerExpr n, A arg);
+	void visit(ArrayInitializerExpr n, A arg);
 
-    void visit(AssignExpr n, A arg);
+	void visit(AssignExpr n, A arg);
 
-    void visit(BinaryExpr n, A arg);
+	void visit(BinaryExpr n, A arg);
 
-    void visit(CastExpr n, A arg);
+	void visit(CastExpr n, A arg);
 
-    void visit(ClassExpr n, A arg);
+	void visit(ClassExpr n, A arg);
 
-    void visit(ConditionalExpr n, A arg);
+	void visit(ConditionalExpr n, A arg);
 
-    void visit(EnclosedExpr n, A arg);
+	void visit(EnclosedExpr n, A arg);
 
-    void visit(FieldAccessExpr n, A arg);
+	void visit(FieldAccessExpr n, A arg);
 
-    void visit(InstanceOfExpr n, A arg);
+	void visit(InstanceOfExpr n, A arg);
 
-    void visit(StringLiteralExpr n, A arg);
+	void visit(StringLiteralExpr n, A arg);
 
-    void visit(IntegerLiteralExpr n, A arg);
+	void visit(IntegerLiteralExpr n, A arg);
 
-    void visit(LongLiteralExpr n, A arg);
+	void visit(LongLiteralExpr n, A arg);
 
-    void visit(IntegerLiteralMinValueExpr n, A arg);
+	void visit(IntegerLiteralMinValueExpr n, A arg);
 
-    void visit(LongLiteralMinValueExpr n, A arg);
+	void visit(LongLiteralMinValueExpr n, A arg);
 
-    void visit(CharLiteralExpr n, A arg);
+	void visit(CharLiteralExpr n, A arg);
 
-    void visit(DoubleLiteralExpr n, A arg);
+	void visit(DoubleLiteralExpr n, A arg);
 
-    void visit(BooleanLiteralExpr n, A arg);
+	void visit(BooleanLiteralExpr n, A arg);
 
-    void visit(NullLiteralExpr n, A arg);
+	void visit(NullLiteralExpr n, A arg);
 
-    void visit(MethodCallExpr n, A arg);
+	void visit(MethodCallExpr n, A arg);
 
-    void visit(NameExpr n, A arg);
+	void visit(NameExpr n, A arg);
 
-    void visit(ObjectCreationExpr n, A arg);
+	void visit(ObjectCreationExpr n, A arg);
 
-    void visit(QualifiedNameExpr n, A arg);
+	void visit(QualifiedNameExpr n, A arg);
 
-    void visit(ThisExpr n, A arg);
+	void visit(ThisExpr n, A arg);
 
-    void visit(SuperExpr n, A arg);
+	void visit(SuperExpr n, A arg);
 
-    void visit(UnaryExpr n, A arg);
+	void visit(UnaryExpr n, A arg);
 
-    void visit(VariableDeclarationExpr n, A arg);
+	void visit(VariableDeclarationExpr n, A arg);
 
-    void visit(MarkerAnnotationExpr n, A arg);
+	void visit(MarkerAnnotationExpr n, A arg);
 
-    void visit(SingleMemberAnnotationExpr n, A arg);
+	void visit(SingleMemberAnnotationExpr n, A arg);
 
-    void visit(NormalAnnotationExpr n, A arg);
+	void visit(NormalAnnotationExpr n, A arg);
 
-    void visit(MemberValuePair n, A arg);
+	void visit(MemberValuePair n, A arg);
 
-    //- Statements ----------------------------------------
+	//- Statements ----------------------------------------
 
-    void visit(ExplicitConstructorInvocationStmt n, A arg);
+	void visit(ExplicitConstructorInvocationStmt n, A arg);
 
-    void visit(TypeDeclarationStmt n, A arg);
+	void visit(TypeDeclarationStmt n, A arg);
 
-    void visit(AssertStmt n, A arg);
+	void visit(AssertStmt n, A arg);
 
-    void visit(BlockStmt n, A arg);
+	void visit(BlockStmt n, A arg);
 
-    void visit(LabeledStmt n, A arg);
+	void visit(LabeledStmt n, A arg);
 
-    void visit(EmptyStmt n, A arg);
+	void visit(EmptyStmt n, A arg);
 
-    void visit(ExpressionStmt n, A arg);
+	void visit(ExpressionStmt n, A arg);
 
-    void visit(SwitchStmt n, A arg);
+	void visit(SwitchStmt n, A arg);
 
-    void visit(SwitchEntryStmt n, A arg);
+	void visit(SwitchEntryStmt n, A arg);
 
-    void visit(BreakStmt n, A arg);
+	void visit(BreakStmt n, A arg);
 
-    void visit(ReturnStmt n, A arg);
+	void visit(ReturnStmt n, A arg);
 
-    void visit(IfStmt n, A arg);
+	void visit(IfStmt n, A arg);
 
-    void visit(WhileStmt n, A arg);
+	void visit(WhileStmt n, A arg);
 
-    void visit(ContinueStmt n, A arg);
+	void visit(ContinueStmt n, A arg);
 
-    void visit(DoStmt n, A arg);
+	void visit(DoStmt n, A arg);
 
-    void visit(ForeachStmt n, A arg);
+	void visit(ForeachStmt n, A arg);
 
-    void visit(ForStmt n, A arg);
+	void visit(ForStmt n, A arg);
 
-    void visit(ThrowStmt n, A arg);
+	void visit(ThrowStmt n, A arg);
 
-    void visit(SynchronizedStmt n, A arg);
+	void visit(SynchronizedStmt n, A arg);
 
-    void visit(TryStmt n, A arg);
+	void visit(TryStmt n, A arg);
 
-    void visit(CatchClause n, A arg);
+	void visit(CatchClause n, A arg);
 
     void visit(LambdaExpr n, A arg);
 
@@ -253,5 +253,5 @@ public interface VoidVisitor<A> {
 
     void visit(TypeExpr n, A arg);
 
-    void visit(ArrayBracketPair arrayBracketPair, A arg);
+	void visit(ArrayBracketPair arrayBracketPair, A arg);
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
index 70c862a373..cab3ef4962 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import com.github.javaparser.ast.*;
@@ -89,754 +89,673 @@
  */
 public abstract class VoidVisitorAdapter<A> implements VoidVisitor<A> {
 
-    @Override
-    public void visit(final AnnotationDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        n.getNameExpr().accept(this, arg);
-        if (n.getMembers() != null) {
+	@Override public void visit(final AnnotationDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		n.getNameExpr().accept(this, arg);
+		if (n.getMembers() != null) {
             for (final BodyDeclaration<?> member : n.getMembers()) {
-                member.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final AnnotationMemberDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        n.getType().accept(this, arg);
-        if (n.getDefaultValue() != null) {
-            n.getDefaultValue().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final ArrayAccessExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getName().accept(this, arg);
-        n.getIndex().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ArrayCreationExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getType().accept(this, arg);
-        for (ArrayCreationLevel level : n.getLevels()) {
-            level.accept(this, arg);
-        }
-        if (n.getInitializer() != null) {
-            n.getInitializer().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final ArrayInitializerExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getValues() != null) {
-            for (final Expression expr : n.getValues()) {
-                expr.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final AssertStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getCheck().accept(this, arg);
-        if (n.getMessage() != null) {
-            n.getMessage().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final AssignExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getTarget().accept(this, arg);
-        n.getValue().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final BinaryExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getLeft().accept(this, arg);
-        n.getRight().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final BlockComment n, final A arg) {
-    }
-
-    @Override
-    public void visit(final BlockStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
-                s.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final BooleanLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final BreakStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final CastExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getType().accept(this, arg);
-        n.getExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final CatchClause n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getParam().accept(this, arg);
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final CharLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final ClassExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getType().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ClassOrInterfaceDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        n.getNameExpr().accept(this, arg);
-        for (final TypeParameter t : n.getTypeParameters()) {
-            t.accept(this, arg);
-        }
-        for (final ClassOrInterfaceType c : n.getExtends()) {
-            c.accept(this, arg);
-        }
-        for (final ClassOrInterfaceType c : n.getImplements()) {
-            c.accept(this, arg);
-        }
+				member.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final AnnotationMemberDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		n.getType().accept(this, arg);
+		if (n.getDefaultValue() != null) {
+			n.getDefaultValue().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final ArrayAccessExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getName().accept(this, arg);
+		n.getIndex().accept(this, arg);
+	}
+
+	@Override public void visit(final ArrayCreationExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getType().accept(this, arg);
+		for (ArrayCreationLevel level : n.getLevels()) {
+			level.accept(this, arg);
+		}
+		if (n.getInitializer() != null) {
+			n.getInitializer().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final ArrayInitializerExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getValues() != null) {
+			for (final Expression expr : n.getValues()) {
+				expr.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final AssertStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getCheck().accept(this, arg);
+		if (n.getMessage() != null) {
+			n.getMessage().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final AssignExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getTarget().accept(this, arg);
+		n.getValue().accept(this, arg);
+	}
+
+	@Override public void visit(final BinaryExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getLeft().accept(this, arg);
+		n.getRight().accept(this, arg);
+	}
+
+	@Override public void visit(final BlockComment n, final A arg) {
+	}
+
+	@Override public void visit(final BlockStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getStmts() != null) {
+			for (final Statement s : n.getStmts()) {
+				s.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final BooleanLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final BreakStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final CastExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getType().accept(this, arg);
+		n.getExpr().accept(this, arg);
+	}
+
+	@Override public void visit(final CatchClause n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getParam().accept(this, arg);
+		n.getBody().accept(this, arg);
+	}
+
+	@Override public void visit(final CharLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final ClassExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getType().accept(this, arg);
+	}
+
+	@Override public void visit(final ClassOrInterfaceDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		n.getNameExpr().accept(this, arg);
+		for (final TypeParameter t : n.getTypeParameters()) {
+			t.accept(this, arg);
+		}
+		for (final ClassOrInterfaceType c : n.getExtends()) {
+			c.accept(this, arg);
+		}
+		for (final ClassOrInterfaceType c : n.getImplements()) {
+			c.accept(this, arg);
+		}
         for (final BodyDeclaration<?> member : n.getMembers()) {
-            member.accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final ClassOrInterfaceType n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        if (n.getScope() != null) {
-            n.getScope().accept(this, arg);
-        }
-        if (n.getTypeArguments() != null) {
-            for (final Type t : n.getTypeArguments()) {
-                t.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final CompilationUnit n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getPackage() != null) {
-            n.getPackage().accept(this, arg);
-        }
-        if (n.getImports() != null) {
-            for (final ImportDeclaration i : n.getImports()) {
-                i.accept(this, arg);
-            }
-        }
-        if (n.getTypes() != null) {
+			member.accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final ClassOrInterfaceType n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		if (n.getScope() != null) {
+			n.getScope().accept(this, arg);
+		}
+		if (n.getTypeArguments() != null) {
+			for (final Type t : n.getTypeArguments()) {
+				t.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final CompilationUnit n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getPackage() != null) {
+			n.getPackage().accept(this, arg);
+		}
+		if (n.getImports() != null) {
+			for (final ImportDeclaration i : n.getImports()) {
+				i.accept(this, arg);
+			}
+		}
+		if (n.getTypes() != null) {
             for (final TypeDeclaration<?> typeDeclaration : n.getTypes()) {
-                typeDeclaration.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final ConditionalExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getCondition().accept(this, arg);
-        n.getThenExpr().accept(this, arg);
-        n.getElseExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ConstructorDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        if (n.getTypeParameters() != null) {
-            for (final TypeParameter t : n.getTypeParameters()) {
-                t.accept(this, arg);
-            }
-        }
-        n.getNameExpr().accept(this, arg);
-        if (n.getParameters() != null) {
-            for (final Parameter p : n.getParameters()) {
-                p.accept(this, arg);
-            }
-        }
-        if (n.getThrows() != null) {
-            for (final ReferenceType name : n.getThrows()) {
-                name.accept(this, arg);
-            }
-        }
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ContinueStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final DoStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getBody().accept(this, arg);
-        n.getCondition().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final DoubleLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final EmptyMemberDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final EmptyStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final EmptyTypeDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getNameExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final EnclosedExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getInner().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final EnumConstantDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                e.accept(this, arg);
-            }
-        }
-        if (n.getClassBody() != null) {
+				typeDeclaration.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final ConditionalExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getCondition().accept(this, arg);
+		n.getThenExpr().accept(this, arg);
+		n.getElseExpr().accept(this, arg);
+	}
+
+	@Override public void visit(final ConstructorDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		if (n.getTypeParameters() != null) {
+			for (final TypeParameter t : n.getTypeParameters()) {
+				t.accept(this, arg);
+			}
+		}
+		n.getNameExpr().accept(this, arg);
+		if (n.getParameters() != null) {
+			for (final Parameter p : n.getParameters()) {
+				p.accept(this, arg);
+			}
+		}
+		if (n.getThrows() != null) {
+			for (final ReferenceType name : n.getThrows()) {
+				name.accept(this, arg);
+			}
+		}
+		n.getBody().accept(this, arg);
+	}
+
+	@Override public void visit(final ContinueStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final DoStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getBody().accept(this, arg);
+		n.getCondition().accept(this, arg);
+	}
+
+	@Override public void visit(final DoubleLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final EmptyMemberDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final EmptyStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final EmptyTypeDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getNameExpr().accept(this, arg);
+	}
+
+	@Override public void visit(final EnclosedExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getInner().accept(this, arg);
+	}
+
+	@Override public void visit(final EnumConstantDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				e.accept(this, arg);
+			}
+		}
+		if (n.getClassBody() != null) {
             for (final BodyDeclaration<?> member : n.getClassBody()) {
-                member.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final EnumDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        n.getNameExpr().accept(this, arg);
-        if (n.getImplements() != null) {
-            for (final ClassOrInterfaceType c : n.getImplements()) {
-                c.accept(this, arg);
-            }
-        }
-        if (n.getEntries() != null) {
-            for (final EnumConstantDeclaration e : n.getEntries()) {
-                e.accept(this, arg);
-            }
-        }
-        if (n.getMembers() != null) {
+				member.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final EnumDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		n.getNameExpr().accept(this, arg);
+		if (n.getImplements() != null) {
+			for (final ClassOrInterfaceType c : n.getImplements()) {
+				c.accept(this, arg);
+			}
+		}
+		if (n.getEntries() != null) {
+			for (final EnumConstantDeclaration e : n.getEntries()) {
+				e.accept(this, arg);
+			}
+		}
+		if (n.getMembers() != null) {
             for (final BodyDeclaration<?> member : n.getMembers()) {
-                member.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final ExplicitConstructorInvocationStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (!n.isThis() && n.getExpr() != null) {
-            n.getExpr().accept(this, arg);
-        }
-        if (n.getTypeArguments() != null) {
-            for (final Type t : n.getTypeArguments()) {
-                t.accept(this, arg);
-            }
-        }
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                e.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final ExpressionStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getExpression().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final FieldAccessExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getScope().accept(this, arg);
-        n.getFieldExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final FieldDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        n.getElementType().accept(this, arg);
-        for (final VariableDeclarator var : n.getVariables()) {
-            var.accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final ForeachStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getVariable().accept(this, arg);
-        n.getIterable().accept(this, arg);
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ForStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getInit() != null) {
-            for (final Expression e : n.getInit()) {
-                e.accept(this, arg);
-            }
-        }
-        if (n.getCompare() != null) {
-            n.getCompare().accept(this, arg);
-        }
-        if (n.getUpdate() != null) {
-            for (final Expression e : n.getUpdate()) {
-                e.accept(this, arg);
-            }
-        }
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final IfStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getCondition().accept(this, arg);
-        n.getThenStmt().accept(this, arg);
-        if (n.getElseStmt() != null) {
-            n.getElseStmt().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final ImportDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getName().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final InitializerDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getBlock().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final InstanceOfExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getExpr().accept(this, arg);
-        n.getType().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final IntegerLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final IntegerLiteralMinValueExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final JavadocComment n, final A arg) {
-    }
-
-    @Override
-    public void visit(final LabeledStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getStmt().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final LineComment n, final A arg) {
-    }
-
-    @Override
-    public void visit(final LongLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final LongLiteralMinValueExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final MarkerAnnotationExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getName().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final MemberValuePair n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getValue().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final MethodCallExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getScope() != null) {
-            n.getScope().accept(this, arg);
-        }
-        if (n.getTypeArguments() != null) {
-            for (final Type t : n.getTypeArguments()) {
-                t.accept(this, arg);
-            }
-        }
-        n.getNameExpr().accept(this, arg);
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                e.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final MethodDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        if (n.getTypeParameters() != null) {
-            for (final TypeParameter t : n.getTypeParameters()) {
-                t.accept(this, arg);
-            }
-        }
-        n.getElementType().accept(this, arg);
-        n.getNameExpr().accept(this, arg);
-        if (n.getParameters() != null) {
-            for (final Parameter p : n.getParameters()) {
-                p.accept(this, arg);
-            }
-        }
-        if (n.getThrows() != null) {
-            for (final ReferenceType name : n.getThrows()) {
-                name.accept(this, arg);
-            }
-        }
-        if (n.getBody() != null) {
-            n.getBody().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final NameExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final NormalAnnotationExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getName().accept(this, arg);
-        if (n.getPairs() != null) {
-            for (final MemberValuePair m : n.getPairs()) {
-                m.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final NullLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final ObjectCreationExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getScope() != null) {
-            n.getScope().accept(this, arg);
-        }
-        if (n.getTypeArguments() != null) {
-            for (final Type t : n.getTypeArguments()) {
-                t.accept(this, arg);
-            }
-        }
-        n.getType().accept(this, arg);
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                e.accept(this, arg);
-            }
-        }
-        if (n.getAnonymousClassBody() != null) {
+				member.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final ExplicitConstructorInvocationStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (!n.isThis() && n.getExpr() != null) {
+			n.getExpr().accept(this, arg);
+		}
+		if (n.getTypeArguments() != null) {
+			for (final Type t : n.getTypeArguments()) {
+				t.accept(this, arg);
+			}
+		}
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				e.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final ExpressionStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getExpression().accept(this, arg);
+	}
+
+	@Override public void visit(final FieldAccessExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getScope().accept(this, arg);
+		n.getFieldExpr().accept(this, arg);
+	}
+
+	@Override public void visit(final FieldDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		n.getElementType().accept(this, arg);
+		for (final VariableDeclarator var : n.getVariables()) {
+			var.accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final ForeachStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getVariable().accept(this, arg);
+		n.getIterable().accept(this, arg);
+		n.getBody().accept(this, arg);
+	}
+
+	@Override public void visit(final ForStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getInit() != null) {
+			for (final Expression e : n.getInit()) {
+				e.accept(this, arg);
+			}
+		}
+		if (n.getCompare() != null) {
+			n.getCompare().accept(this, arg);
+		}
+		if (n.getUpdate() != null) {
+			for (final Expression e : n.getUpdate()) {
+				e.accept(this, arg);
+			}
+		}
+		n.getBody().accept(this, arg);
+	}
+
+	@Override public void visit(final IfStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getCondition().accept(this, arg);
+		n.getThenStmt().accept(this, arg);
+		if (n.getElseStmt() != null) {
+			n.getElseStmt().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final ImportDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getName().accept(this, arg);
+	}
+
+	@Override public void visit(final InitializerDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getBlock().accept(this, arg);
+	}
+
+	@Override public void visit(final InstanceOfExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getExpr().accept(this, arg);
+		n.getType().accept(this, arg);
+	}
+
+	@Override public void visit(final IntegerLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final IntegerLiteralMinValueExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final JavadocComment n, final A arg) {
+	}
+
+	@Override public void visit(final LabeledStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getStmt().accept(this, arg);
+	}
+
+	@Override public void visit(final LineComment n, final A arg) {
+	}
+
+	@Override public void visit(final LongLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final LongLiteralMinValueExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final MarkerAnnotationExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getName().accept(this, arg);
+	}
+
+	@Override public void visit(final MemberValuePair n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getValue().accept(this, arg);
+	}
+
+	@Override public void visit(final MethodCallExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getScope() != null) {
+			n.getScope().accept(this, arg);
+		}
+		if (n.getTypeArguments() != null) {
+			for (final Type t : n.getTypeArguments()) {
+				t.accept(this, arg);
+			}
+		}
+		n.getNameExpr().accept(this, arg);
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				e.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final MethodDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		if (n.getTypeParameters() != null) {
+			for (final TypeParameter t : n.getTypeParameters()) {
+				t.accept(this, arg);
+			}
+		}
+		n.getElementType().accept(this, arg);
+		n.getNameExpr().accept(this, arg);
+		if (n.getParameters() != null) {
+			for (final Parameter p : n.getParameters()) {
+				p.accept(this, arg);
+			}
+		}
+		if (n.getThrows() != null) {
+			for (final ReferenceType name : n.getThrows()) {
+				name.accept(this, arg);
+			}
+		}
+		if (n.getBody() != null) {
+			n.getBody().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final NameExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final NormalAnnotationExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getName().accept(this, arg);
+		if (n.getPairs() != null) {
+			for (final MemberValuePair m : n.getPairs()) {
+				m.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final NullLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final ObjectCreationExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getScope() != null) {
+			n.getScope().accept(this, arg);
+		}
+		if (n.getTypeArguments() != null) {
+			for (final Type t : n.getTypeArguments()) {
+				t.accept(this, arg);
+			}
+		}
+		n.getType().accept(this, arg);
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				e.accept(this, arg);
+			}
+		}
+		if (n.getAnonymousClassBody() != null) {
             for (final BodyDeclaration<?> member : n.getAnonymousClassBody()) {
-                member.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final PackageDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        n.getName().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final Parameter n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        n.getElementType().accept(this, arg);
-        n.getId().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final PrimitiveType n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-    }
-
-    @Override
-    public void visit(final QualifiedNameExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getQualifier().accept(this, arg);
-    }
-
-    @Override
-    public void visit(ArrayType n, A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        n.getComponentType().accept(this, arg);
-    }
-
-    @Override
-    public void visit(ArrayCreationLevel n, A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        if (n.getDimension() != null) {
-            n.getDimension().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final IntersectionType n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        for (ReferenceType element : n.getElements()) {
+				member.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final PackageDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		n.getName().accept(this, arg);
+	}
+
+	@Override public void visit(final Parameter n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		n.getElementType().accept(this, arg);
+		n.getId().accept(this, arg);
+	}
+	
+	@Override public void visit(final PrimitiveType n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+	}
+
+	@Override public void visit(final QualifiedNameExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getQualifier().accept(this, arg);
+	}
+
+	@Override
+	public void visit(ArrayType n, A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		n.getComponentType().accept(this, arg);
+	}
+
+	@Override
+	public void visit(ArrayCreationLevel n, A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		if(n.getDimension()!=null) {
+			n.getDimension().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final IntersectionType n, final A arg) {
+        visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		for (ReferenceType element : n.getElements()) {
             element.accept(this, arg);
         }
     }
 
-    @Override
-    public void visit(final UnionType n, final A arg) {
+    @Override public void visit(final UnionType n, final A arg) {
         visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        for (ReferenceType element : n.getElements()) {
+		visitAnnotations(n, arg);
+		for (ReferenceType element : n.getElements()) {
             element.accept(this, arg);
         }
     }
 
-    @Override
-    public void visit(final ReturnStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getExpr() != null) {
-            n.getExpr().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final SingleMemberAnnotationExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getName().accept(this, arg);
-        n.getMemberValue().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final StringLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final SuperExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getClassExpr() != null) {
-            n.getClassExpr().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final SwitchEntryStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getLabel() != null) {
-            n.getLabel().accept(this, arg);
-        }
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
-                s.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final SwitchStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getSelector().accept(this, arg);
-        if (n.getEntries() != null) {
-            for (final SwitchEntryStmt e : n.getEntries()) {
-                e.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final SynchronizedStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getExpr().accept(this, arg);
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ThisExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getClassExpr() != null) {
-            n.getClassExpr().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final ThrowStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final TryStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getResources() != null) {
-            for (final VariableDeclarationExpr v : n.getResources()) {
-                v.accept(this, arg);
-            }
-        }
-        n.getTryBlock().accept(this, arg);
-        if (n.getCatchs() != null) {
-            for (final CatchClause c : n.getCatchs()) {
-                c.accept(this, arg);
-            }
-        }
-        if (n.getFinallyBlock() != null) {
-            n.getFinallyBlock().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final TypeDeclarationStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getTypeDeclaration().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final TypeParameter n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getTypeBound() != null) {
-            for (final ClassOrInterfaceType c : n.getTypeBound()) {
-                c.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final UnaryExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final UnknownType n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final VariableDeclarationExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        n.getElementType().accept(this, arg);
-        for (final VariableDeclarator v : n.getVariables()) {
-            v.accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final VariableDeclarator n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getId().accept(this, arg);
-        if (n.getInit() != null) {
-            n.getInit().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final VariableDeclaratorId n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final VoidType n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-
-    }
-
-    @Override
-    public void visit(final WhileStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getCondition().accept(this, arg);
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final WildcardType n, final A arg) {
-        visitComment(n.getComment(), arg);
-        visitAnnotations(n, arg);
-        if (n.getExtends() != null) {
-            n.getExtends().accept(this, arg);
-        }
-        if (n.getSuper() != null) {
-            n.getSuper().accept(this, arg);
-        }
-    }
+	@Override public void visit(final ReturnStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getExpr() != null) {
+			n.getExpr().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final SingleMemberAnnotationExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getName().accept(this, arg);
+		n.getMemberValue().accept(this, arg);
+	}
+
+	@Override public void visit(final StringLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final SuperExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getClassExpr() != null) {
+			n.getClassExpr().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final SwitchEntryStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getLabel() != null) {
+			n.getLabel().accept(this, arg);
+		}
+		if (n.getStmts() != null) {
+			for (final Statement s : n.getStmts()) {
+				s.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final SwitchStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getSelector().accept(this, arg);
+		if (n.getEntries() != null) {
+			for (final SwitchEntryStmt e : n.getEntries()) {
+				e.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final SynchronizedStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getExpr().accept(this, arg);
+		n.getBody().accept(this, arg);
+	}
+
+	@Override public void visit(final ThisExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getClassExpr() != null) {
+			n.getClassExpr().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final ThrowStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getExpr().accept(this, arg);
+	}
+
+	@Override public void visit(final TryStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getResources() != null) {
+			for (final VariableDeclarationExpr v : n.getResources()) {
+				v.accept(this, arg);
+			}
+		}
+		n.getTryBlock().accept(this, arg);
+		if (n.getCatchs() != null) {
+			for (final CatchClause c : n.getCatchs()) {
+				c.accept(this, arg);
+			}
+		}
+		if (n.getFinallyBlock() != null) {
+			n.getFinallyBlock().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final TypeDeclarationStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getTypeDeclaration().accept(this, arg);
+	}
+
+	@Override public void visit(final TypeParameter n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getTypeBound() != null) {
+			for (final ClassOrInterfaceType c : n.getTypeBound()) {
+				c.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final UnaryExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getExpr().accept(this, arg);
+	}
+
+	@Override public void visit(final UnknownType n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final VariableDeclarationExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		n.getElementType().accept(this, arg);
+		for (final VariableDeclarator v : n.getVariables()) {
+			v.accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final VariableDeclarator n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getId().accept(this, arg);
+		if (n.getInit() != null) {
+			n.getInit().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final VariableDeclaratorId n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final VoidType n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+
+	}
+
+	@Override public void visit(final WhileStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getCondition().accept(this, arg);
+		n.getBody().accept(this, arg);
+	}
+
+	@Override public void visit(final WildcardType n, final A arg) {
+		visitComment(n.getComment(), arg);
+		visitAnnotations(n, arg);
+		if (n.getExtends() != null) {
+			n.getExtends().accept(this, arg);
+		}
+		if (n.getSuper() != null) {
+			n.getSuper().accept(this, arg);
+		}
+	}
 
     @Override
     public void visit(LambdaExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
+		visitComment(n.getComment(), arg);
         if (n.getParameters() != null) {
             for (final Parameter a : n.getParameters()) {
                 a.accept(this, arg);
@@ -849,12 +768,12 @@ public void visit(LambdaExpr n, final A arg) {
 
     @Override
     public void visit(MethodReferenceExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getTypeArguments() != null) {
-            for (final Type t : n.getTypeArguments()) {
-                t.accept(this, arg);
-            }
-        }
+		visitComment(n.getComment(), arg);
+		if (n.getTypeArguments() != null) {
+			for (final Type t : n.getTypeArguments()) {
+				t.accept(this, arg);
+			}
+		}
         if (n.getScope() != null) {
             n.getScope().accept(this, arg);
         }
@@ -862,26 +781,26 @@ public void visit(MethodReferenceExpr n, final A arg) {
 
     @Override
     public void visit(TypeExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
+		visitComment(n.getComment(), arg);
         if (n.getType() != null) {
             n.getType().accept(this, arg);
         }
     }
 
-    @Override
-    public void visit(ArrayBracketPair n, A arg) {
-        visitAnnotations(n, arg);
-    }
+	@Override
+	public void visit(ArrayBracketPair n, A arg) {
+		visitAnnotations(n, arg);
+	}
 
-    private void visitComment(final Comment n, final A arg) {
-        if (n != null) {
-            n.accept(this, arg);
-        }
-    }
+	private void visitComment(final Comment n, final A arg) {
+		if (n != null) {
+			n.accept(this, arg);
+		}
+	}
 
-    private void visitAnnotations(NodeWithAnnotations<?> n, A arg) {
-        for (AnnotationExpr annotation : n.getAnnotations()) {
-            annotation.accept(this, arg);
-        }
-    }
+	private void visitAnnotations(NodeWithAnnotations<?> n, A arg) {
+		for (AnnotationExpr annotation : n.getAnnotations()) {
+			annotation.accept(this, arg);
+		}
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/ClassUtils.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/ClassUtils.java
index 1b2319d26f..4769868123 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/ClassUtils.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/ClassUtils.java
@@ -8,7 +8,6 @@ public class ClassUtils {
      * Maps primitive {@code Class}es to their corresponding wrapper {@code Class}.
      */
     private static final Map<Class<?>, Class<?>> primitiveWrapperMap = new HashMap<Class<?>, Class<?>>();
-
     static {
         primitiveWrapperMap.put(Boolean.TYPE, Boolean.class);
         primitiveWrapperMap.put(Byte.TYPE, Byte.class);
@@ -25,7 +24,6 @@ public class ClassUtils {
      * Maps wrapper {@code Class}es to their corresponding primitive types.
      */
     private static final Map<Class<?>, Class<?>> wrapperPrimitiveMap = new HashMap<Class<?>, Class<?>>();
-
     static {
         for (final Class<?> primitiveClass : primitiveWrapperMap.keySet()) {
             final Class<?> wrapperClass = primitiveWrapperMap.get(primitiveClass);
@@ -40,10 +38,11 @@ public class ClassUtils {
      * {@link Character},
      * {@link Short}, {@link Integer}, {@link Long}, {@link Double}, {@link Float}).
      *
-     * @param type The class to query or null.
+     * @param type
+     *            The class to query or null.
      * @return true if the given {@code type} is a primitive or primitive wrapper ({@link Boolean}, {@link Byte},
-     * {@link Character},
-     * {@link Short}, {@link Integer}, {@link Long}, {@link Double}, {@link Float}).
+     *         {@link Character},
+     *         {@link Short}, {@link Integer}, {@link Long}, {@link Double}, {@link Float}).
      */
     public static boolean isPrimitiveOrWrapper(final Class<?> type) {
         if (type == null) {
@@ -57,10 +56,11 @@ public static boolean isPrimitiveOrWrapper(final Class<?> type) {
      * {@link Short},
      * {@link Integer}, {@link Long}, {@link Double}, {@link Float}).
      *
-     * @param type The class to query or null.
+     * @param type
+     *            The class to query or null.
      * @return true if the given {@code type} is a primitive wrapper ({@link Boolean}, {@link Byte}, {@link Character},
-     * {@link Short},
-     * {@link Integer}, {@link Long}, {@link Double}, {@link Float}).
+     *         {@link Short},
+     *         {@link Integer}, {@link Long}, {@link Double}, {@link Float}).
      * @since 3.1
      */
     public static boolean isPrimitiveWrapper(final Class<?> type) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Pair.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Pair.java
index cf459b6041..40ce85d832 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Pair.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Pair.java
@@ -2,16 +2,15 @@
 
 /**
  * Simply a pair of objects.
- *
  * @param <A> type of object a.
  * @param <B> type of object b.
  */
 public class Pair<A, B> {
-    public final A a;
-    public final B b;
+	public final A a;
+	public final B b;
 
-    public Pair(A a, B b) {
-        this.a = a;
-        this.b = b;
-    }
+	public Pair(A a, B b) {
+		this.a = a;
+		this.b = b;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/PositionUtils.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/PositionUtils.java
index 742a35b819..e1ecf190eb 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/PositionUtils.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/PositionUtils.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2016 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.utils;
 
 import static java.lang.Integer.signum;
@@ -42,19 +42,19 @@ private PositionUtils() {
         // prevent instantiation
     }
 
-    public static <T extends Node> void sortByBeginPosition(List<T> nodes) {
+    public static <T extends Node> void sortByBeginPosition(List<T> nodes){
         sortByBeginPosition(nodes, false);
     }
 
-    public static <T extends Node> void sortByBeginPosition(List<T> nodes, final boolean ignoringAnnotations) {
+    public static <T extends Node> void sortByBeginPosition(List<T> nodes, final boolean ignoringAnnotations){
         Collections.sort(nodes, (o1, o2) -> PositionUtils.compare(o1, o2, ignoringAnnotations));
     }
 
-    public static boolean areInOrder(Node a, Node b) {
+    public static boolean areInOrder(Node a, Node b){
         return areInOrder(a, b, false);
     }
 
-    public static boolean areInOrder(Node a, Node b, boolean ignoringAnnotations) {
+    public static boolean areInOrder(Node a, Node b, boolean ignoringAnnotations){
         return compare(a, b, ignoringAnnotations) <= 0;
     }
 
@@ -68,7 +68,7 @@ private static int compare(Node a, Node b, boolean ignoringAnnotations) {
             }
         }
 
-        int signLine = signum(a.getBegin().line - b.getBegin().line);
+        int signLine = signum( a.getBegin().line - b.getBegin().line );
         if (signLine == 0) {
             return signum(a.getBegin().column - b.getBegin().column);
         } else {
@@ -77,14 +77,14 @@ private static int compare(Node a, Node b, boolean ignoringAnnotations) {
     }
 
     public static AnnotationExpr getLastAnnotation(Node node) {
-        if (node instanceof NodeWithAnnotations) {
+        if (node instanceof NodeWithAnnotations){
             List<AnnotationExpr> annotations = new LinkedList<>();
             annotations.addAll(((NodeWithAnnotations<?>) node).getAnnotations());
-            if (annotations.isEmpty()) {
+            if (annotations.isEmpty()){
                 return null;
             }
             sortByBeginPosition(annotations);
-            return annotations.get(annotations.size() - 1);
+            return annotations.get(annotations.size()-1);
         } else {
             return null;
         }
@@ -106,26 +106,26 @@ private static Node beginNodeWithoutConsideringAnnotations(Node node) {
         } else if (node instanceof ClassOrInterfaceDeclaration) {
             ClassOrInterfaceDeclaration casted = (ClassOrInterfaceDeclaration) node;
             return casted.getNameExpr();
-        } else {
+        }  else {
             return node;
         }
     }
 
-    public static boolean nodeContains(Node container, Node contained, boolean ignoringAnnotations) {
-        if (!ignoringAnnotations || PositionUtils.getLastAnnotation(container) == null) {
+    public static boolean nodeContains(Node container, Node contained, boolean ignoringAnnotations){
+        if (!ignoringAnnotations || PositionUtils.getLastAnnotation(container)==null){
             return container.contains(contained);
         }
-        if (!container.contains(contained)) {
+        if (!container.contains(contained)){
             return false;
         }
         // if the node is contained, but it comes immediately after the annotations,
         // let's not consider it contained
-        if (container instanceof NodeWithAnnotations) {
+        if (container instanceof NodeWithAnnotations){
             int bl = beginLineWithoutConsideringAnnotation(container);
             int bc = beginColumnWithoutConsideringAnnotation(container);
-            if (bl > contained.getBegin().line) return false;
-            if (bl == contained.getBegin().line && bc > contained.getBegin().column) return false;
-            if (container.getEnd().line < contained.getEnd().line) return false;
+            if (bl>contained.getBegin().line) return false;
+            if (bl==contained.getBegin().line && bc>contained.getBegin().column) return false;
+            if (container.getEnd().line<contained.getEnd().line) return false;
             // TODO < or <= ?
             return !(container.getEnd().line == contained.getEnd().line && container.getEnd().column < contained.getEnd().column);
         }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Utils.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Utils.java
index 9fd2259852..b9320852d1 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Utils.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-core/com/github/javaparser/utils/Utils.java
@@ -34,75 +34,74 @@
  * @author Federico Tomassetti
  */
 public class Utils {
-    public static final String EOL = System.getProperty("line.separator");
-
-    public static <T> List<T> ensureNotNull(List<T> list) {
-        return list == null ? new ArrayList<T>() : list;
-    }
-
-    public static <E> boolean isNullOrEmpty(Collection<E> collection) {
-        return collection == null || collection.isEmpty();
-    }
-
-    public static <T> T assertNotNull(T o) {
-        if (o == null) {
-            throw new NullPointerException("Assertion failed.");
-        }
-        return o;
-    }
-
-    /**
-     * @return string with ASCII characters 10 and 13 replaced by the text "\n" and "\r".
-     */
-    public static String escapeEndOfLines(String string) {
-        StringBuilder escapedString = new StringBuilder();
-        for (char c : string.toCharArray()) {
-            switch (c) {
-                case '\n':
-                    escapedString.append("\\n");
-                    break;
-                case '\r':
-                    escapedString.append("\\r");
-                    break;
-                default:
-                    escapedString.append(c);
-            }
-        }
-        return escapedString.toString();
-    }
-
-    public static String readerToString(Reader reader) throws IOException {
-        final StringBuilder result = new StringBuilder();
-        final char[] buffer = new char[8 * 1024];
-        int numChars;
-
-        while ((numChars = reader.read(buffer, 0, buffer.length)) > 0) {
-            result.append(buffer, 0, numChars);
-        }
-
-        return result.toString();
-    }
-
-    public static String providerToString(Provider provider) throws IOException {
-        final StringBuilder result = new StringBuilder();
-        final char[] buffer = new char[8 * 1024];
-        int numChars;
-
-        while ((numChars = provider.read(buffer, 0, buffer.length)) != -1) {
-            result.append(buffer, 0, numChars);
-        }
-
-        return result.toString();
-    }
-
-    /**
-     * Puts varargs in a mutable list.
-     * This does not have the disadvantage of Arrays#asList that it has a static size.
-     */
-    public static <T> List<T> arrayToList(T[] array) {
-        List<T> list = new LinkedList<>();
-        Collections.addAll(list, array);
-        return list;
-    }
+	public static final String EOL = System.getProperty("line.separator");
+	public static <T> List<T> ensureNotNull(List<T> list) {
+		return list == null ? new ArrayList<T>() : list;
+	}
+
+	public static <E> boolean isNullOrEmpty(Collection<E> collection) {
+		return collection == null || collection.isEmpty();
+	}
+
+	public static <T> T assertNotNull(T o) {
+		if (o == null) {
+			throw new NullPointerException("Assertion failed.");
+		}
+		return o;
+	}
+
+	/**
+	 * @return string with ASCII characters 10 and 13 replaced by the text "\n" and "\r".
+	 */
+	public static String escapeEndOfLines(String string) {
+		StringBuilder escapedString = new StringBuilder();
+		for (char c : string.toCharArray()) {
+			switch (c) {
+				case '\n':
+					escapedString.append("\\n");
+					break;
+				case '\r':
+					escapedString.append("\\r");
+					break;
+				default:
+					escapedString.append(c);
+			}
+		}
+		return escapedString.toString();
+	}
+
+	public static String readerToString(Reader reader) throws IOException {
+		final StringBuilder result = new StringBuilder();
+		final char[] buffer = new char[8 * 1024];
+		int numChars;
+
+		while ((numChars = reader.read(buffer, 0, buffer.length)) > 0) {
+			result.append(buffer, 0, numChars);
+		}
+
+		return result.toString();
+	}
+
+	public static String providerToString(Provider provider) throws IOException {
+		final StringBuilder result = new StringBuilder();
+		final char[] buffer = new char[8 * 1024];
+		int numChars;
+
+		while ((numChars = provider.read(buffer, 0, buffer.length)) != -1) {
+			result.append(buffer, 0, numChars);
+		}
+
+		return result.toString();
+	}
+
+	/**
+	 * Puts varargs in a mutable list.
+     * This does not have the disadvantage of Arrays#asList that it has a static size. 
+	 */
+	public static <T> List<T> arrayToList(T[] array){
+		List<T> list = new LinkedList<>();
+		Collections.addAll(list, array);
+		return list;
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParser.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParser.java
index 5d1442b234..97ed881034 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParser.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParser.java
@@ -16,7 +16,6 @@
 
 import java.io.*;
 import java.util.*;
-
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.comments.*;
@@ -24,7 +23,6 @@
 import com.github.javaparser.ast.stmt.*;
 import com.github.javaparser.ast.type.*;
 import com.github.javaparser.utils.*;
-
 import static com.github.javaparser.ASTParser.*;
 import static com.github.javaparser.Range.*;
 import static com.github.javaparser.Position.*;
@@ -44,7 +42,7 @@ void reset(InputStream in, String encoding) throws IOException {
 
     private <T> List<T> add(List<T> list, T obj) {
         if (list == null) {
-            list = new LinkedList<T>();
+                list = new LinkedList<T>();
         }
         list.add(obj);
         return list;
@@ -52,23 +50,23 @@ private <T> List<T> add(List<T> list, T obj) {
 
     private <T> List<T> add(int pos, List<T> list, T obj) {
         if (list == null) {
-            list = new LinkedList<T>();
+                list = new LinkedList<T>();
         }
         list.add(pos, obj);
         return list;
     }
 
-    private class ModifierHolder {
-        final EnumSet<Modifier> modifiers;
-        final List<AnnotationExpr> annotations;
-        final Position begin;
+        private class ModifierHolder {
+                final EnumSet<Modifier> modifiers;
+                final List<AnnotationExpr> annotations;
+                final Position begin;
 
-        public ModifierHolder(Position begin, EnumSet<Modifier> modifiers, List<AnnotationExpr> annotations) {
-            this.begin = begin;
-            this.modifiers = modifiers;
-            this.annotations = annotations;
+                public ModifierHolder(Position begin, EnumSet<Modifier> modifiers, List<AnnotationExpr> annotations) {
+                        this.begin = begin;
+                        this.modifiers = modifiers;
+                        this.annotations = annotations;
+                }
         }
-    }
 
     public void addModifier(EnumSet<Modifier> modifiers, Modifier mod) {
         if (modifiers.contains(mod)) {
@@ -78,12 +76,12 @@ public void addModifier(EnumSet<Modifier> modifiers, Modifier mod) {
     }
 
     public void addMultipleModifier(EnumSet<Modifier> modifiers, EnumSet<Modifier> mods) {
-        if (mods == null)
+        if(mods == null)
             return;
-        for (Modifier m : mods)
+        for(Modifier m : mods)
             if (modifiers.contains(m))
                 addProblem("Duplicated modifier");
-        for (Modifier m : mods)
+        for(Modifier m : mods)
             modifiers.add(m);
     }
 
@@ -106,36 +104,36 @@ private void addProblem(String message) {
     }
 
     private Expression generateLambda(Expression ret, Statement lambdaBody) {
-        if (ret instanceof EnclosedExpr) {
-            Expression inner = ((EnclosedExpr) ret).getInner();
-            if (inner != null && inner instanceof NameExpr) {
-                VariableDeclaratorId id = new VariableDeclaratorId(inner.getRange(), ((NameExpr) inner).getName(), null);
+            if (ret instanceof EnclosedExpr) {
+                Expression inner = ((EnclosedExpr) ret).getInner();
+                if (inner != null && inner instanceof NameExpr) {
+                    VariableDeclaratorId id = new VariableDeclaratorId(inner.getRange(), ((NameExpr)inner).getName(), null);
+                    List<Parameter> params = add(null, new Parameter(ret.getRange(), EnumSet.noneOf(Modifier.class), null, new UnknownType(), null, false, id));
+                    ret = new LambdaExpr(range(ret.getBegin(), lambdaBody.getEnd()), params, lambdaBody, true);
+                } else {
+                    ret = new LambdaExpr(range(ret.getBegin(), lambdaBody.getEnd()), null, lambdaBody, true);
+                }
+            } else if (ret instanceof NameExpr) {
+                    VariableDeclaratorId id = new VariableDeclaratorId(ret.getRange(), ((NameExpr)ret).getName(), null);
                 List<Parameter> params = add(null, new Parameter(ret.getRange(), EnumSet.noneOf(Modifier.class), null, new UnknownType(), null, false, id));
-                ret = new LambdaExpr(range(ret.getBegin(), lambdaBody.getEnd()), params, lambdaBody, true);
-            } else {
-                ret = new LambdaExpr(range(ret.getBegin(), lambdaBody.getEnd()), null, lambdaBody, true);
-            }
-        } else if (ret instanceof NameExpr) {
-            VariableDeclaratorId id = new VariableDeclaratorId(ret.getRange(), ((NameExpr) ret).getName(), null);
-            List<Parameter> params = add(null, new Parameter(ret.getRange(), EnumSet.noneOf(Modifier.class), null, new UnknownType(), null, false, id));
-            ret = new LambdaExpr(ret.getRange(), params, lambdaBody, false);
-        } else if (ret instanceof LambdaExpr) {
-            ((LambdaExpr) ret).setBody(lambdaBody);
-            ret.setEnd(lambdaBody.getEnd());
+                ret = new LambdaExpr(ret.getRange(), params, lambdaBody, false);
+            } else if (ret instanceof LambdaExpr) {
+                ((LambdaExpr) ret).setBody(lambdaBody);
+                ret.setEnd(lambdaBody.getEnd());
         } else if (ret instanceof CastExpr) {
-            CastExpr castExpr = (CastExpr) ret;
+            CastExpr castExpr = (CastExpr)ret;
             Expression inner = generateLambda(castExpr.getExpr(), lambdaBody);
             castExpr.setExpr(inner);
-        } else {
-            addProblem("Failed to parse lambda expression! Please create an issue at https://github.com/javaparser/javaparser/issues");
-        }
-        return ret;
+            } else {
+                addProblem("Failed to parse lambda expression! Please create an issue at https://github.com/javaparser/javaparser/issues");
+            }
+            return ret;
     }
 
     private ArrayCreationExpr juggleArrayCreation(Range range, Type type, List<Expression> dimensions, List<List<AnnotationExpr>> arrayAnnotations, ArrayInitializerExpr arrayInitializerExpr) {
         List<ArrayCreationLevel> levels = new ArrayList<ArrayCreationLevel>();
 
-        for (int i = 0; i < arrayAnnotations.size(); i++) {
+        for(int i = 0; i < arrayAnnotations.size(); i++){
             levels.add(new ArrayCreationLevel(range, dimensions.get(i), arrayAnnotations.get(i)));
         }
         return new ArrayCreationExpr(range, type, levels, arrayInitializerExpr);
@@ -158,19 +156,15 @@ public static Token newToken(int kind, String image) {
     private static class RangedList<T> {
         Range range = Range.UNKNOWN;
         List<T> list;
-
         RangedList(List<T> list) {
             this.list = list;
         }
-
         void beginAt(Position begin) {
-            range = range.withBegin(begin);
+            range=range.withBegin(begin);
         }
-
         void endAt(Position end) {
-            range = range.withEnd(end);
+            range=range.withEnd(end);
         }
-
         void add(T t) {
             if (list == null) {
                 list = new LinkedList<T>();
@@ -180,11 +174,11 @@ void add(T t) {
     }
 
     private Position tokenBegin() {
-        return pos(token.beginLine, token.beginColumn);
+        return pos(token.beginLine,token.beginColumn);
     }
 
     private Position tokenEnd() {
-        return pos(token.endLine, token.endColumn);
+        return pos(token.endLine,token.endColumn);
     }
 
     private Range tokenRange() {
@@ -195,2688 +189,2599 @@ public static Range tokenRange(Token token) {
         return range(token.beginLine, token.beginColumn, token.endLine, token.endColumn);
     }
 
-    /*****************************************
-     * THE JAVA LANGUAGE GRAMMAR STARTS HERE *
-     *****************************************/
+/*****************************************
+ * THE JAVA LANGUAGE GRAMMAR STARTS HERE *
+ *****************************************/
 
-    /*
-     * Program structuring syntax follows.
-     */
-    final public CompilationUnit CompilationUnit() {
-        PackageDeclaration pakage = null;
+/*
+ * Program structuring syntax follows.
+ */
+  final public 
+CompilationUnit CompilationUnit() {PackageDeclaration pakage = null;
         List<ImportDeclaration> imports = null;
         ImportDeclaration in = null;
         List<TypeDeclaration<?>> types = null;
         TypeDeclaration tn = null;
         Position begin = INVALID;
-        if (jj_2_1(2147483647)) {
-            pakage = PackageDeclaration();
-            begin = begin.orIfInvalid(pakage.getBegin());
-        } else {
-            ;
-        }
-        label_1:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case IMPORT:
-                case SEMICOLON: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[0] = jj_gen;
-                    break label_1;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case IMPORT: {
-                    in = ImportDeclaration();
-                    begin = begin.orIfInvalid(in.getBegin());
-                    imports = add(imports, in);
-                    break;
-                }
-                case SEMICOLON: {
-                    in = EmptyImportDeclaration();
-                    begin = begin.orIfInvalid(in.getBegin());
-                    imports = add(imports, in);
-                    break;
-                }
-                default:
-                    jj_la1[1] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        label_2:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case ABSTRACT:
-                case CLASS:
-                case ENUM:
-                case FINAL:
-                case INTERFACE:
-                case NATIVE:
-                case PRIVATE:
-                case PROTECTED:
-                case PUBLIC:
-                case STATIC:
-                case STRICTFP:
-                case SYNCHRONIZED:
-                case TRANSIENT:
-                case VOLATILE:
-                case SEMICOLON:
-                case AT: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[2] = jj_gen;
-                    break label_2;
-            }
-            tn = TypeDeclaration();
-            begin = begin.orIfInvalid(tn.getBegin());
-            types = add(types, tn);
-        }
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case 0: {
-                jj_consume_token(0);
-                break;
-            }
-            case 156: {
-                jj_consume_token(156);
-                break;
-            }
-            default:
-                jj_la1[3] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return new CompilationUnit(begin.invalid() ? Range.UNKNOWN : range(begin, tokenEnd()), pakage, imports, types);
-    }
-
-    final public ImportDeclaration EmptyImportDeclaration() {
-        Position begin;
-        jj_consume_token(SEMICOLON);
-        begin = tokenBegin();
-        return ImportDeclaration.createEmptyDeclaration(range(begin, tokenEnd()));
-    }
-
-    final public PackageDeclaration PackageDeclaration() {
-        List<AnnotationExpr> annotations = null;
+    if (jj_2_1(2147483647)) {
+      pakage = PackageDeclaration();
+begin = begin.orIfInvalid(pakage.getBegin());
+    } else {
+      ;
+    }
+    label_1:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IMPORT:
+      case SEMICOLON:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[0] = jj_gen;
+        break label_1;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IMPORT:{
+        in = ImportDeclaration();
+begin = begin.orIfInvalid(in.getBegin()); imports = add(imports, in);
+        break;
+        }
+      case SEMICOLON:{
+        in = EmptyImportDeclaration();
+begin = begin.orIfInvalid(in.getBegin()); imports = add(imports, in);
+        break;
+        }
+      default:
+        jj_la1[1] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    label_2:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ABSTRACT:
+      case CLASS:
+      case ENUM:
+      case FINAL:
+      case INTERFACE:
+      case NATIVE:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case STATIC:
+      case STRICTFP:
+      case SYNCHRONIZED:
+      case TRANSIENT:
+      case VOLATILE:
+      case SEMICOLON:
+      case AT:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[2] = jj_gen;
+        break label_2;
+      }
+      tn = TypeDeclaration();
+begin = begin.orIfInvalid(tn.getBegin()); types = add(types, tn);
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case 0:{
+      jj_consume_token(0);
+      break;
+      }
+    case 156:{
+      jj_consume_token(156);
+      break;
+      }
+    default:
+      jj_la1[3] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return new CompilationUnit(begin.invalid() ? Range.UNKNOWN : range(begin, tokenEnd()), pakage, imports, types);
+  }
+
+  final public ImportDeclaration EmptyImportDeclaration() {Position begin;
+    jj_consume_token(SEMICOLON);
+begin = tokenBegin();
+return ImportDeclaration.createEmptyDeclaration(range(begin, tokenEnd()));
+  }
+
+  final public PackageDeclaration PackageDeclaration() {List<AnnotationExpr> annotations = null;
         NameExpr name;
         Position begin;
-        annotations = Annotations();
-        jj_consume_token(PACKAGE);
-        begin = tokenBegin();
-        name = Name();
-        jj_consume_token(SEMICOLON);
-        return new PackageDeclaration(range(begin, tokenEnd()), annotations, name);
-    }
-
-    final public ImportDeclaration ImportDeclaration() {
-        NameExpr name;
+    annotations = Annotations();
+    jj_consume_token(PACKAGE);
+begin = tokenBegin();
+    name = Name();
+    jj_consume_token(SEMICOLON);
+return new PackageDeclaration(range(begin, tokenEnd()), annotations, name);
+  }
+
+  final public ImportDeclaration ImportDeclaration() {NameExpr name;
         boolean isStatic = false;
         boolean isAsterisk = false;
         Position begin;
-        jj_consume_token(IMPORT);
-        begin = tokenBegin();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case STATIC: {
-                jj_consume_token(STATIC);
-                isStatic = true;
-                break;
-            }
-            default:
-                jj_la1[4] = jj_gen;
-                ;
-        }
-        name = Name();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case DOT: {
-                jj_consume_token(DOT);
-                jj_consume_token(STAR);
-                isAsterisk = true;
-                break;
-            }
-            default:
-                jj_la1[5] = jj_gen;
-                ;
-        }
-        jj_consume_token(SEMICOLON);
-        return new ImportDeclaration(range(begin, tokenEnd()), name, isStatic, isAsterisk);
-    }
-
-    /*
-     * Modifiers. We match all modifiers in a single rule to reduce the chances of
-     * syntax errors for simple modifier mistakes. It will also enable us to give
-     * better error messages.
-     */
-    final public ModifierHolder Modifiers() {
-        Position begin = INVALID;
-        EnumSet<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
-        List<AnnotationExpr> annotations = null;
-        AnnotationExpr ann;
-        label_3:
-        while (true) {
-            if (jj_2_2(2)) {
-                ;
-            } else {
-                break label_3;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case PUBLIC: {
-                    jj_consume_token(PUBLIC);
-                    addModifier(modifiers, Modifier.PUBLIC);
-                    begin = begin.orIfInvalid(tokenBegin());
-                    break;
-                }
-                case STATIC: {
-                    jj_consume_token(STATIC);
-                    addModifier(modifiers, Modifier.STATIC);
-                    begin = begin.orIfInvalid(tokenBegin());
-                    break;
-                }
-                case PROTECTED: {
-                    jj_consume_token(PROTECTED);
-                    addModifier(modifiers, Modifier.PROTECTED);
-                    begin = begin.orIfInvalid(tokenBegin());
-                    break;
-                }
-                case PRIVATE: {
-                    jj_consume_token(PRIVATE);
-                    addModifier(modifiers, Modifier.PRIVATE);
-                    begin = begin.orIfInvalid(tokenBegin());
-                    break;
-                }
-                case FINAL: {
-                    jj_consume_token(FINAL);
-                    addModifier(modifiers, Modifier.FINAL);
-                    begin = begin.orIfInvalid(tokenBegin());
-                    break;
-                }
-                case ABSTRACT: {
-                    jj_consume_token(ABSTRACT);
-                    addModifier(modifiers, Modifier.ABSTRACT);
-                    begin = begin.orIfInvalid(tokenBegin());
-                    break;
-                }
-                case SYNCHRONIZED: {
-                    jj_consume_token(SYNCHRONIZED);
-                    addModifier(modifiers, Modifier.SYNCHRONIZED);
-                    begin = begin.orIfInvalid(tokenBegin());
-                    break;
-                }
-                case NATIVE: {
-                    jj_consume_token(NATIVE);
-                    addModifier(modifiers, Modifier.NATIVE);
-                    begin = begin.orIfInvalid(tokenBegin());
-                    break;
-                }
-                case TRANSIENT: {
-                    jj_consume_token(TRANSIENT);
-                    addModifier(modifiers, Modifier.TRANSIENT);
-                    begin = begin.orIfInvalid(tokenBegin());
-                    break;
-                }
-                case VOLATILE: {
-                    jj_consume_token(VOLATILE);
-                    addModifier(modifiers, Modifier.VOLATILE);
-                    begin = begin.orIfInvalid(tokenBegin());
-                    break;
-                }
-                case STRICTFP: {
-                    jj_consume_token(STRICTFP);
-                    addModifier(modifiers, Modifier.STRICTFP);
-                    begin = begin.orIfInvalid(tokenBegin());
-                    break;
-                }
-                case AT: {
-                    ann = Annotation();
-                    annotations = add(annotations, ann);
-                    begin = begin.orIfInvalid(ann.getBegin());
-                    break;
-                }
-                default:
-                    jj_la1[6] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        return new ModifierHolder(begin, modifiers, annotations);
-    }
-
-    /*
-     * Declaration syntax follows.
-     */
-    final public TypeDeclaration TypeDeclaration() {
-        ModifierHolder modifier;
-        TypeDeclaration ret;
-
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case SEMICOLON: {
-                jj_consume_token(SEMICOLON);
-                ret = new EmptyTypeDeclaration(tokenRange());
-                break;
-            }
-            case ABSTRACT:
-            case CLASS:
-            case ENUM:
-            case FINAL:
-            case INTERFACE:
-            case NATIVE:
-            case PRIVATE:
-            case PROTECTED:
-            case PUBLIC:
-            case STATIC:
-            case STRICTFP:
-            case SYNCHRONIZED:
-            case TRANSIENT:
-            case VOLATILE:
-            case AT: {
-                modifier = Modifiers();
-                switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                    case CLASS:
-                    case INTERFACE: {
-                        ret = ClassOrInterfaceDeclaration(modifier);
-                        break;
-                    }
-                    case ENUM: {
-                        ret = EnumDeclaration(modifier);
-                        break;
-                    }
-                    case AT: {
-                        ret = AnnotationTypeDeclaration(modifier);
-                        break;
-                    }
-                    default:
-                        jj_la1[7] = jj_gen;
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                }
-                break;
-            }
-            default:
-                jj_la1[8] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return ret;
-    }
-
-    final public ClassOrInterfaceDeclaration ClassOrInterfaceDeclaration(ModifierHolder modifier) {
-        boolean isInterface = false;
-        NameExpr name;
-        RangedList<TypeParameter> typePar = new RangedList<TypeParameter>(null);
-        List<ClassOrInterfaceType> extList = null;
-        List<ClassOrInterfaceType> impList = null;
-        List<BodyDeclaration<?>> members;
-        Position begin = modifier.begin;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case CLASS: {
-                jj_consume_token(CLASS);
-                break;
-            }
-            case INTERFACE: {
-                jj_consume_token(INTERFACE);
-                isInterface = true;
-                break;
-            }
-            default:
-                jj_la1[9] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        begin = begin.orIfInvalid(tokenBegin());
-        name = Name();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case LT: {
-                typePar = TypeParameters();
-                break;
-            }
-            default:
-                jj_la1[10] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case EXTENDS: {
-                extList = ExtendsList(isInterface);
-                break;
-            }
-            default:
-                jj_la1[11] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case IMPLEMENTS: {
-                impList = ImplementsList(isInterface);
-                break;
-            }
-            default:
-                jj_la1[12] = jj_gen;
-                ;
-        }
-        members = ClassOrInterfaceBody(isInterface);
-        ClassOrInterfaceDeclaration tmp = new ClassOrInterfaceDeclaration(range(begin, tokenEnd()), modifier.modifiers, modifier.annotations, isInterface, null, typePar.list, extList, impList, members);
-        tmp.setNameExpr(name);
-        return tmp;
-    }
-
-    final public List<ClassOrInterfaceType> ExtendsList(boolean isInterface) {
-        boolean extendsMoreThanOne = false;
-        List<ClassOrInterfaceType> ret = new LinkedList<ClassOrInterfaceType>();
-        ClassOrInterfaceType cit;
-        jj_consume_token(EXTENDS);
-        cit = AnnotatedClassOrInterfaceType();
-        ret.add(cit);
-        label_4:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case COMMA: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[13] = jj_gen;
-                    break label_4;
-            }
-            jj_consume_token(COMMA);
-            cit = AnnotatedClassOrInterfaceType();
-            ret.add(cit);
-            extendsMoreThanOne = true;
-        }
-        if (extendsMoreThanOne && !isInterface)
-            addProblem("A class cannot extend more than one other class");
-        return ret;
-    }
+    jj_consume_token(IMPORT);
+begin = tokenBegin();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case STATIC:{
+      jj_consume_token(STATIC);
+isStatic = true;
+      break;
+      }
+    default:
+      jj_la1[4] = jj_gen;
+      ;
+    }
+    name = Name();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case DOT:{
+      jj_consume_token(DOT);
+      jj_consume_token(STAR);
+isAsterisk = true;
+      break;
+      }
+    default:
+      jj_la1[5] = jj_gen;
+      ;
+    }
+    jj_consume_token(SEMICOLON);
+return new ImportDeclaration(range(begin, tokenEnd()),name, isStatic, isAsterisk);
+  }
 
-    final public List<ClassOrInterfaceType> ImplementsList(boolean isInterface) {
-        List<ClassOrInterfaceType> ret = new LinkedList<ClassOrInterfaceType>();
-        ClassOrInterfaceType cit;
-        jj_consume_token(IMPLEMENTS);
-        cit = AnnotatedClassOrInterfaceType();
-        ret.add(cit);
-        label_5:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case COMMA: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[14] = jj_gen;
-                    break label_5;
-            }
-            jj_consume_token(COMMA);
-            cit = AnnotatedClassOrInterfaceType();
-            ret.add(cit);
-        }
-        if (isInterface)
-            addProblem("An interface cannot implement other interfaces");
-        return ret;
-    }
+/*
+ * Modifiers. We match all modifiers in a single rule to reduce the chances of
+ * syntax errors for simple modifier mistakes. It will also enable us to give
+ * better error messages.
+ */
+  final public 
+ModifierHolder Modifiers() {Position begin = INVALID;
+    EnumSet<Modifier> modifiers = EnumSet.noneOf(Modifier.class);
+    List<AnnotationExpr> annotations = null;
+    AnnotationExpr ann;
+    label_3:
+    while (true) {
+      if (jj_2_2(2)) {
+        ;
+      } else {
+        break label_3;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PUBLIC:{
+        jj_consume_token(PUBLIC);
+addModifier(modifiers, Modifier.PUBLIC); begin = begin.orIfInvalid(tokenBegin());
+        break;
+        }
+      case STATIC:{
+        jj_consume_token(STATIC);
+addModifier(modifiers, Modifier.STATIC); begin = begin.orIfInvalid(tokenBegin());
+        break;
+        }
+      case PROTECTED:{
+        jj_consume_token(PROTECTED);
+addModifier(modifiers, Modifier.PROTECTED); begin = begin.orIfInvalid(tokenBegin());
+        break;
+        }
+      case PRIVATE:{
+        jj_consume_token(PRIVATE);
+addModifier(modifiers, Modifier.PRIVATE); begin = begin.orIfInvalid(tokenBegin());
+        break;
+        }
+      case FINAL:{
+        jj_consume_token(FINAL);
+addModifier(modifiers, Modifier.FINAL); begin = begin.orIfInvalid(tokenBegin());
+        break;
+        }
+      case ABSTRACT:{
+        jj_consume_token(ABSTRACT);
+addModifier(modifiers, Modifier.ABSTRACT); begin = begin.orIfInvalid(tokenBegin());
+        break;
+        }
+      case SYNCHRONIZED:{
+        jj_consume_token(SYNCHRONIZED);
+addModifier(modifiers, Modifier.SYNCHRONIZED); begin = begin.orIfInvalid(tokenBegin());
+        break;
+        }
+      case NATIVE:{
+        jj_consume_token(NATIVE);
+addModifier(modifiers, Modifier.NATIVE); begin = begin.orIfInvalid(tokenBegin());
+        break;
+        }
+      case TRANSIENT:{
+        jj_consume_token(TRANSIENT);
+addModifier(modifiers, Modifier.TRANSIENT); begin = begin.orIfInvalid(tokenBegin());
+        break;
+        }
+      case VOLATILE:{
+        jj_consume_token(VOLATILE);
+addModifier(modifiers, Modifier.VOLATILE); begin = begin.orIfInvalid(tokenBegin());
+        break;
+        }
+      case STRICTFP:{
+        jj_consume_token(STRICTFP);
+addModifier(modifiers, Modifier.STRICTFP);  begin = begin.orIfInvalid(tokenBegin());
+        break;
+        }
+      case AT:{
+        ann = Annotation();
+annotations = add(annotations, ann); begin = begin.orIfInvalid(ann.getBegin());
+        break;
+        }
+      default:
+        jj_la1[6] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+return new ModifierHolder(begin, modifiers, annotations);
+  }
 
-    final public EnumDeclaration EnumDeclaration(ModifierHolder modifier) {
-        NameExpr name;
+/*
+ * Declaration syntax follows.
+ */
+  final public TypeDeclaration TypeDeclaration() {ModifierHolder modifier;
+   TypeDeclaration ret;
+
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case SEMICOLON:{
+      jj_consume_token(SEMICOLON);
+ret = new EmptyTypeDeclaration(tokenRange());
+      break;
+      }
+    case ABSTRACT:
+    case CLASS:
+    case ENUM:
+    case FINAL:
+    case INTERFACE:
+    case NATIVE:
+    case PRIVATE:
+    case PROTECTED:
+    case PUBLIC:
+    case STATIC:
+    case STRICTFP:
+    case SYNCHRONIZED:
+    case TRANSIENT:
+    case VOLATILE:
+    case AT:{
+      modifier = Modifiers();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case CLASS:
+      case INTERFACE:{
+        ret = ClassOrInterfaceDeclaration(modifier);
+        break;
+        }
+      case ENUM:{
+        ret = EnumDeclaration(modifier);
+        break;
+        }
+      case AT:{
+        ret = AnnotationTypeDeclaration(modifier);
+        break;
+        }
+      default:
+        jj_la1[7] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      break;
+      }
+    default:
+      jj_la1[8] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return ret;
+  }
+
+  final public ClassOrInterfaceDeclaration ClassOrInterfaceDeclaration(ModifierHolder modifier) {boolean isInterface = false;
+    NameExpr name;
+    RangedList<TypeParameter> typePar = new RangedList<TypeParameter>(null);
+    List<ClassOrInterfaceType> extList = null;
+    List<ClassOrInterfaceType> impList = null;
+    List<BodyDeclaration<?>> members;
+    Position begin = modifier.begin;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case CLASS:{
+      jj_consume_token(CLASS);
+      break;
+      }
+    case INTERFACE:{
+      jj_consume_token(INTERFACE);
+isInterface = true;
+      break;
+      }
+    default:
+      jj_la1[9] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+begin = begin.orIfInvalid(tokenBegin());
+    name = Name();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LT:{
+      typePar = TypeParameters();
+      break;
+      }
+    default:
+      jj_la1[10] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case EXTENDS:{
+      extList = ExtendsList(isInterface);
+      break;
+      }
+    default:
+      jj_la1[11] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IMPLEMENTS:{
+      impList = ImplementsList(isInterface);
+      break;
+      }
+    default:
+      jj_la1[12] = jj_gen;
+      ;
+    }
+    members = ClassOrInterfaceBody(isInterface);
+ClassOrInterfaceDeclaration tmp = new ClassOrInterfaceDeclaration(range(begin, tokenEnd()), modifier.modifiers, modifier.annotations, isInterface, null, typePar.list, extList, impList, members);
+    tmp.setNameExpr(name);
+    return tmp;
+  }
+
+  final public List<ClassOrInterfaceType> ExtendsList(boolean isInterface) {boolean extendsMoreThanOne = false;
+   List<ClassOrInterfaceType> ret = new LinkedList<ClassOrInterfaceType>();
+   ClassOrInterfaceType cit;
+    jj_consume_token(EXTENDS);
+    cit = AnnotatedClassOrInterfaceType();
+ret.add(cit);
+    label_4:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[13] = jj_gen;
+        break label_4;
+      }
+      jj_consume_token(COMMA);
+      cit = AnnotatedClassOrInterfaceType();
+ret.add(cit); extendsMoreThanOne = true;
+    }
+if (extendsMoreThanOne && !isInterface)
+         addProblem("A class cannot extend more than one other class");
+return ret;
+  }
+
+  final public List<ClassOrInterfaceType> ImplementsList(boolean isInterface) {List<ClassOrInterfaceType> ret = new LinkedList<ClassOrInterfaceType>();
+   ClassOrInterfaceType cit;
+    jj_consume_token(IMPLEMENTS);
+    cit = AnnotatedClassOrInterfaceType();
+ret.add(cit);
+    label_5:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[14] = jj_gen;
+        break label_5;
+      }
+      jj_consume_token(COMMA);
+      cit = AnnotatedClassOrInterfaceType();
+ret.add(cit);
+    }
+if (isInterface)
+         addProblem("An interface cannot implement other interfaces");
+return ret;
+  }
+
+  final public EnumDeclaration EnumDeclaration(ModifierHolder modifier) {NameExpr name;
         List<ClassOrInterfaceType> impList = null;
         EnumConstantDeclaration entry;
         List<EnumConstantDeclaration> entries = null;
         BodyDeclaration<?> member;
         List<BodyDeclaration<?>> members = null;
         Position begin = modifier.begin;
-        jj_consume_token(ENUM);
-        begin = begin.orIfInvalid(tokenBegin());
-        name = Name();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case IMPLEMENTS: {
-                impList = ImplementsList(false);
-                break;
-            }
-            default:
-                jj_la1[15] = jj_gen;
-                ;
-        }
-        jj_consume_token(LBRACE);
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case IDENTIFIER:
-            case AT: {
-                entries = new LinkedList<EnumConstantDeclaration>();
-                entry = EnumConstantDeclaration();
-                entries.add(entry);
-                label_6:
-                while (true) {
-                    if (jj_2_3(2)) {
-                        ;
-                    } else {
-                        break label_6;
-                    }
-                    jj_consume_token(COMMA);
-                    entry = EnumConstantDeclaration();
-                    entries.add(entry);
-                }
-                break;
-            }
-            default:
-                jj_la1[16] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case COMMA: {
-                jj_consume_token(COMMA);
-                break;
-            }
-            default:
-                jj_la1[17] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case SEMICOLON: {
-                jj_consume_token(SEMICOLON);
-                label_7:
-                while (true) {
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case ABSTRACT:
-                        case BOOLEAN:
-                        case BYTE:
-                        case CHAR:
-                        case CLASS:
-                        case _DEFAULT:
-                        case DOUBLE:
-                        case ENUM:
-                        case FINAL:
-                        case FLOAT:
-                        case INT:
-                        case INTERFACE:
-                        case LONG:
-                        case NATIVE:
-                        case PRIVATE:
-                        case PROTECTED:
-                        case PUBLIC:
-                        case SHORT:
-                        case STATIC:
-                        case STRICTFP:
-                        case SYNCHRONIZED:
-                        case TRANSIENT:
-                        case VOID:
-                        case VOLATILE:
-                        case IDENTIFIER:
-                        case LBRACE:
-                        case SEMICOLON:
-                        case AT:
-                        case LT: {
-                            ;
-                            break;
-                        }
-                        default:
-                            jj_la1[18] = jj_gen;
-                            break label_7;
-                    }
-                    member = ClassOrInterfaceBodyDeclaration(false);
-                    members = add(members, member);
-                }
-                break;
-            }
-            default:
-                jj_la1[19] = jj_gen;
-                ;
+    jj_consume_token(ENUM);
+begin = begin.orIfInvalid(tokenBegin());
+    name = Name();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IMPLEMENTS:{
+      impList = ImplementsList(false);
+      break;
+      }
+    default:
+      jj_la1[15] = jj_gen;
+      ;
+    }
+    jj_consume_token(LBRACE);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IDENTIFIER:
+    case AT:{
+entries = new LinkedList<EnumConstantDeclaration>();
+      entry = EnumConstantDeclaration();
+entries.add(entry);
+      label_6:
+      while (true) {
+        if (jj_2_3(2)) {
+          ;
+        } else {
+          break label_6;
         }
-        jj_consume_token(RBRACE);
-        EnumDeclaration tmp = new EnumDeclaration(range(begin, tokenEnd()), modifier.modifiers, modifier.annotations, null, impList, entries, members);
-        tmp.setNameExpr(name);
-        return tmp;
-    }
-
-    final public EnumConstantDeclaration EnumConstantDeclaration() {
-        List<AnnotationExpr> annotations = null;
+        jj_consume_token(COMMA);
+        entry = EnumConstantDeclaration();
+entries.add(entry);
+      }
+      break;
+      }
+    default:
+      jj_la1[16] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case COMMA:{
+      jj_consume_token(COMMA);
+      break;
+      }
+    default:
+      jj_la1[17] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case SEMICOLON:{
+      jj_consume_token(SEMICOLON);
+      label_7:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case ABSTRACT:
+        case BOOLEAN:
+        case BYTE:
+        case CHAR:
+        case CLASS:
+        case _DEFAULT:
+        case DOUBLE:
+        case ENUM:
+        case FINAL:
+        case FLOAT:
+        case INT:
+        case INTERFACE:
+        case LONG:
+        case NATIVE:
+        case PRIVATE:
+        case PROTECTED:
+        case PUBLIC:
+        case SHORT:
+        case STATIC:
+        case STRICTFP:
+        case SYNCHRONIZED:
+        case TRANSIENT:
+        case VOID:
+        case VOLATILE:
+        case IDENTIFIER:
+        case LBRACE:
+        case SEMICOLON:
+        case AT:
+        case LT:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[18] = jj_gen;
+          break label_7;
+        }
+        member = ClassOrInterfaceBodyDeclaration(false);
+members = add(members, member);
+      }
+      break;
+      }
+    default:
+      jj_la1[19] = jj_gen;
+      ;
+    }
+    jj_consume_token(RBRACE);
+EnumDeclaration tmp = new EnumDeclaration(range(begin, tokenEnd()), modifier.modifiers, modifier.annotations, null, impList, entries, members);
+      tmp.setNameExpr(name);
+      return tmp;
+  }
+
+  final public EnumConstantDeclaration EnumConstantDeclaration() {List<AnnotationExpr> annotations = null;
         AnnotationExpr ann;
         String name;
         List<Expression> args = null;
         List<BodyDeclaration<?>> classBody = null;
         Position begin = INVALID;
 
-        label_8:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case AT: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[20] = jj_gen;
-                    break label_8;
-            }
-            ann = Annotation();
-            annotations = add(annotations, ann);
-            begin = begin.orIfInvalid(ann.getBegin());
-        }
-        jj_consume_token(IDENTIFIER);
-        name = token.image;
-        begin = begin.orIfInvalid(tokenBegin());
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case LPAREN: {
-                args = Arguments();
-                break;
-            }
-            default:
-                jj_la1[21] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case LBRACE: {
-                classBody = ClassOrInterfaceBody(false);
-                break;
-            }
-            default:
-                jj_la1[22] = jj_gen;
-                ;
-        }
-        return new EnumConstantDeclaration(range(begin, tokenEnd()), annotations, name, args, classBody);
-    }
+    label_8:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case AT:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[20] = jj_gen;
+        break label_8;
+      }
+      ann = Annotation();
+annotations = add(annotations, ann); begin = begin.orIfInvalid(ann.getBegin());
+    }
+    jj_consume_token(IDENTIFIER);
+name = token.image; begin = begin.orIfInvalid(tokenBegin());
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LPAREN:{
+      args = Arguments();
+      break;
+      }
+    default:
+      jj_la1[21] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LBRACE:{
+      classBody = ClassOrInterfaceBody(false);
+      break;
+      }
+    default:
+      jj_la1[22] = jj_gen;
+      ;
+    }
+return new EnumConstantDeclaration(range(begin, tokenEnd()), annotations, name, args, classBody);
+  }
 
-    /**
-     * If the list inside the returned RangedList is null, there are no brackets.
-     * If it is empty, there are brackets, but nothing is in them <>.
-     * The normal case is that it contains TypeParameters, like <A, B, C>.
-     */
-    final public RangedList<TypeParameter> TypeParameters() {
-        RangedList<TypeParameter> ret = new RangedList<TypeParameter>(new LinkedList<TypeParameter>());
+/**
+ * If the list inside the returned RangedList is null, there are no brackets.
+ * If it is empty, there are brackets, but nothing is in them <>.
+ * The normal case is that it contains TypeParameters, like <A, B, C>.
+ */
+  final public RangedList<TypeParameter> TypeParameters() {RangedList<TypeParameter> ret = new RangedList<TypeParameter>(new LinkedList<TypeParameter>());
         TypeParameter tp;
         List<AnnotationExpr> annotations = null;
-        jj_consume_token(LT);
-        ret.beginAt(tokenBegin());
-        annotations = Annotations();
-        tp = TypeParameter();
-        ret.add(tp);
-        tp.setAnnotations(annotations);
-        annotations = null;
-        label_9:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case COMMA: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[23] = jj_gen;
-                    break label_9;
-            }
-            jj_consume_token(COMMA);
-            annotations = Annotations();
-            tp = TypeParameter();
-            ret.add(tp);
-            tp.setAnnotations(annotations);
-            annotations = null;
-        }
-        jj_consume_token(GT);
-        ret.endAt(tokenEnd());
-        return ret;
-    }
-
-    final public TypeParameter TypeParameter() {
-        String name;
+    jj_consume_token(LT);
+ret.beginAt(tokenBegin());
+    annotations = Annotations();
+    tp = TypeParameter();
+ret.add(tp); tp.setAnnotations(annotations); annotations = null;
+    label_9:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[23] = jj_gen;
+        break label_9;
+      }
+      jj_consume_token(COMMA);
+      annotations = Annotations();
+      tp = TypeParameter();
+ret.add(tp); tp.setAnnotations(annotations); annotations = null;
+    }
+    jj_consume_token(GT);
+ret.endAt(tokenEnd());
+return ret;
+  }
+
+  final public TypeParameter TypeParameter() {String name;
         List<ClassOrInterfaceType> typeBound = null;
         Position begin;
-        jj_consume_token(IDENTIFIER);
-        name = token.image;
-        begin = tokenBegin();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case EXTENDS: {
-                typeBound = TypeBound();
-                break;
-            }
-            default:
-                jj_la1[24] = jj_gen;
-                ;
-        }
-        return new TypeParameter(range(begin, tokenEnd()), name, typeBound);
-    }
-
-    final public List<ClassOrInterfaceType> TypeBound() {
-        List<ClassOrInterfaceType> ret = new LinkedList<ClassOrInterfaceType>();
+    jj_consume_token(IDENTIFIER);
+name = token.image; begin=tokenBegin();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case EXTENDS:{
+      typeBound = TypeBound();
+      break;
+      }
+    default:
+      jj_la1[24] = jj_gen;
+      ;
+    }
+return new TypeParameter(range(begin, tokenEnd()),name, typeBound);
+  }
+
+  final public List<ClassOrInterfaceType> TypeBound() {List<ClassOrInterfaceType> ret = new LinkedList<ClassOrInterfaceType>();
         ClassOrInterfaceType cit;
-        jj_consume_token(EXTENDS);
-        cit = AnnotatedClassOrInterfaceType();
-        ret.add(cit);
-        label_10:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case BIT_AND: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[25] = jj_gen;
-                    break label_10;
-            }
-            jj_consume_token(BIT_AND);
-            cit = AnnotatedClassOrInterfaceType();
-            ret.add(cit);
-        }
-        return ret;
-    }
-
-    final public List<BodyDeclaration<?>> ClassOrInterfaceBody(boolean isInterface) {
-        List<BodyDeclaration<?>> ret = new LinkedList<BodyDeclaration<?>>();
+    jj_consume_token(EXTENDS);
+    cit = AnnotatedClassOrInterfaceType();
+ret.add(cit);
+    label_10:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case BIT_AND:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[25] = jj_gen;
+        break label_10;
+      }
+      jj_consume_token(BIT_AND);
+      cit = AnnotatedClassOrInterfaceType();
+ret.add(cit);
+    }
+return ret;
+  }
+
+  final public List<BodyDeclaration<?>> ClassOrInterfaceBody(boolean isInterface) {List<BodyDeclaration<?>> ret = new LinkedList<BodyDeclaration<?>>();
         BodyDeclaration member;
-        jj_consume_token(LBRACE);
-        label_11:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case ABSTRACT:
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case CLASS:
-                case _DEFAULT:
-                case DOUBLE:
-                case ENUM:
-                case FINAL:
-                case FLOAT:
-                case INT:
-                case INTERFACE:
-                case LONG:
-                case NATIVE:
-                case PRIVATE:
-                case PROTECTED:
-                case PUBLIC:
-                case SHORT:
-                case STATIC:
-                case STRICTFP:
-                case SYNCHRONIZED:
-                case TRANSIENT:
-                case VOID:
-                case VOLATILE:
-                case IDENTIFIER:
-                case LBRACE:
-                case SEMICOLON:
-                case AT:
-                case LT: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[26] = jj_gen;
-                    break label_11;
+    jj_consume_token(LBRACE);
+    label_11:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ABSTRACT:
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case CLASS:
+      case _DEFAULT:
+      case DOUBLE:
+      case ENUM:
+      case FINAL:
+      case FLOAT:
+      case INT:
+      case INTERFACE:
+      case LONG:
+      case NATIVE:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case SHORT:
+      case STATIC:
+      case STRICTFP:
+      case SYNCHRONIZED:
+      case TRANSIENT:
+      case VOID:
+      case VOLATILE:
+      case IDENTIFIER:
+      case LBRACE:
+      case SEMICOLON:
+      case AT:
+      case LT:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[26] = jj_gen;
+        break label_11;
+      }
+      member = ClassOrInterfaceBodyDeclaration(isInterface);
+ret.add(member);
+    }
+    jj_consume_token(RBRACE);
+return ret;
+  }
+
+  final public BodyDeclaration<?> ClassOrInterfaceBodyDeclaration(boolean isInterface) {ModifierHolder modifier;
+   ModifierHolder modifier2 = null;
+   EnumSet<Modifier> aux = null;
+   BodyDeclaration<?> ret;
+   boolean isDefault = false;
+
+    if (jj_2_6(2)) {
+      ret = InitializerDeclaration();
+if (isInterface)
+                addProblem("An interface cannot have initializers");
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ABSTRACT:
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case CLASS:
+      case _DEFAULT:
+      case DOUBLE:
+      case ENUM:
+      case FINAL:
+      case FLOAT:
+      case INT:
+      case INTERFACE:
+      case LONG:
+      case NATIVE:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case SHORT:
+      case STATIC:
+      case STRICTFP:
+      case SYNCHRONIZED:
+      case TRANSIENT:
+      case VOID:
+      case VOLATILE:
+      case IDENTIFIER:
+      case AT:
+      case LT:{
+        modifier = Modifiers();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case _DEFAULT:{
+          jj_consume_token(_DEFAULT);
+          modifier2 = Modifiers();
+if(!isInterface)
+            {
+              addProblem("A class cannot have default members");
+            }
+            isDefault = true;
+          break;
+          }
+        default:
+          jj_la1[27] = jj_gen;
+          ;
+        }
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case CLASS:
+        case INTERFACE:{
+          ret = ClassOrInterfaceDeclaration(modifier);
+          break;
+          }
+        case ENUM:{
+          ret = EnumDeclaration(modifier);
+          break;
+          }
+        case AT:{
+          ret = AnnotationTypeDeclaration(modifier);
+          break;
+          }
+        default:
+          jj_la1[28] = jj_gen;
+          if (jj_2_4(2147483647)) {
+            ret = ConstructorDeclaration(modifier);
+          } else if (jj_2_5(2147483647)) {
+            ret = FieldDeclaration(modifier);
+          } else {
+            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+            case BOOLEAN:
+            case BYTE:
+            case CHAR:
+            case DOUBLE:
+            case FLOAT:
+            case INT:
+            case LONG:
+            case SHORT:
+            case VOID:
+            case IDENTIFIER:
+            case LT:{
+              ret = MethodDeclaration(modifier);
+if(isDefault && ret!= null && ((MethodDeclaration)ret).getBody() == null)
+                {
+                  addProblem("\"default\" methods must have a body");
+                }
+                ((MethodDeclaration)ret).setDefault(isDefault);
+                if(modifier2!= null)
+                {
+                  aux = modifier2.modifiers;
+                }
+                addMultipleModifier(modifier.modifiers, aux);
+                ((MethodDeclaration)ret).setModifiers(modifier.modifiers);
+              break;
+              }
+            default:
+              jj_la1[29] = jj_gen;
+              jj_consume_token(-1);
+              throw new ParseException();
             }
-            member = ClassOrInterfaceBodyDeclaration(isInterface);
-            ret.add(member);
+          }
         }
-        jj_consume_token(RBRACE);
-        return ret;
-    }
-
-    final public BodyDeclaration<?> ClassOrInterfaceBodyDeclaration(boolean isInterface) {
-        ModifierHolder modifier;
-        ModifierHolder modifier2 = null;
-        EnumSet<Modifier> aux = null;
-        BodyDeclaration<?> ret;
-        boolean isDefault = false;
-
-        if (jj_2_6(2)) {
-            ret = InitializerDeclaration();
-            if (isInterface)
-                addProblem("An interface cannot have initializers");
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case ABSTRACT:
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case CLASS:
-                case _DEFAULT:
-                case DOUBLE:
-                case ENUM:
-                case FINAL:
-                case FLOAT:
-                case INT:
-                case INTERFACE:
-                case LONG:
-                case NATIVE:
-                case PRIVATE:
-                case PROTECTED:
-                case PUBLIC:
-                case SHORT:
-                case STATIC:
-                case STRICTFP:
-                case SYNCHRONIZED:
-                case TRANSIENT:
-                case VOID:
-                case VOLATILE:
-                case IDENTIFIER:
-                case AT:
-                case LT: {
-                    modifier = Modifiers();
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case _DEFAULT: {
-                            jj_consume_token(_DEFAULT);
-                            modifier2 = Modifiers();
-                            if (!isInterface) {
-                                addProblem("A class cannot have default members");
-                            }
-                            isDefault = true;
-                            break;
-                        }
-                        default:
-                            jj_la1[27] = jj_gen;
-                            ;
-                    }
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case CLASS:
-                        case INTERFACE: {
-                            ret = ClassOrInterfaceDeclaration(modifier);
-                            break;
-                        }
-                        case ENUM: {
-                            ret = EnumDeclaration(modifier);
-                            break;
-                        }
-                        case AT: {
-                            ret = AnnotationTypeDeclaration(modifier);
-                            break;
-                        }
-                        default:
-                            jj_la1[28] = jj_gen;
-                            if (jj_2_4(2147483647)) {
-                                ret = ConstructorDeclaration(modifier);
-                            } else if (jj_2_5(2147483647)) {
-                                ret = FieldDeclaration(modifier);
-                            } else {
-                                switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                                    case BOOLEAN:
-                                    case BYTE:
-                                    case CHAR:
-                                    case DOUBLE:
-                                    case FLOAT:
-                                    case INT:
-                                    case LONG:
-                                    case SHORT:
-                                    case VOID:
-                                    case IDENTIFIER:
-                                    case LT: {
-                                        ret = MethodDeclaration(modifier);
-                                        if (isDefault && ret != null && ((MethodDeclaration) ret).getBody() == null) {
-                                            addProblem("\"default\" methods must have a body");
-                                        }
-                                        ((MethodDeclaration) ret).setDefault(isDefault);
-                                        if (modifier2 != null) {
-                                            aux = modifier2.modifiers;
-                                        }
-                                        addMultipleModifier(modifier.modifiers, aux);
-                                        ((MethodDeclaration) ret).setModifiers(modifier.modifiers);
-                                        break;
-                                    }
-                                    default:
-                                        jj_la1[29] = jj_gen;
-                                        jj_consume_token(-1);
-                                        throw new ParseException();
-                                }
-                            }
-                    }
-                    if (isDefault && !(ret instanceof MethodDeclaration)) {
-                        addProblem("Only methods can have the keyword \"default\".");
-                    }
-                    break;
-                }
-                case SEMICOLON: {
-                    jj_consume_token(SEMICOLON);
-                    ret = new EmptyMemberDeclaration(tokenRange());
-                    break;
-                }
-                default:
-                    jj_la1[30] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
+if(isDefault && ! (ret instanceof MethodDeclaration))
+            {
+              addProblem("Only methods can have the keyword \"default\".");
             }
+        break;
+        }
+      case SEMICOLON:{
+        jj_consume_token(SEMICOLON);
+ret = new EmptyMemberDeclaration(tokenRange());
+        break;
         }
-        return ret;
+      default:
+        jj_la1[30] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
     }
+return ret;
+  }
 
-    final public FieldDeclaration FieldDeclaration(ModifierHolder modifier) {
-        Type type;
+  final public FieldDeclaration FieldDeclaration(ModifierHolder modifier) {Type type;
         List<VariableDeclarator> variables = new LinkedList<VariableDeclarator>();
         VariableDeclarator val;
-        // Modifiers are already matched in the caller
-        type = Type();
-        val = VariableDeclarator();
-        variables.add(val);
-        label_12:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case COMMA: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[31] = jj_gen;
-                    break label_12;
-            }
-            jj_consume_token(COMMA);
-            val = VariableDeclarator();
-            variables.add(val);
-        }
-        jj_consume_token(SEMICOLON);
-        Position begin = modifier.begin.orIfInvalid(type.getBegin());
+    // Modifiers are already matched in the caller
+      type = Type();
+    val = VariableDeclarator();
+variables.add(val);
+    label_12:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[31] = jj_gen;
+        break label_12;
+      }
+      jj_consume_token(COMMA);
+      val = VariableDeclarator();
+variables.add(val);
+    }
+    jj_consume_token(SEMICOLON);
+Position begin = modifier.begin.orIfInvalid(type.getBegin());
         Pair<Type, List<ArrayBracketPair>> typeListPair = unwrapArrayTypes(type);
         return new FieldDeclaration(range(begin, tokenEnd()), modifier.modifiers, modifier.annotations, typeListPair.a, variables, typeListPair.b);
-    }
+  }
 
-    final public VariableDeclarator VariableDeclarator() {
-        VariableDeclaratorId id;
+  final public VariableDeclarator VariableDeclarator() {VariableDeclaratorId id;
         Expression init = null;
-        id = VariableDeclaratorId();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case ASSIGN: {
-                jj_consume_token(ASSIGN);
-                init = VariableInitializer();
-                break;
-            }
-            default:
-                jj_la1[32] = jj_gen;
-                ;
-        }
-        return new VariableDeclarator(range(id.getBegin(), tokenEnd()), id, init);
-    }
-
-    final public VariableDeclaratorId VariableDeclaratorId() {
-        String name;
+    id = VariableDeclaratorId();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ASSIGN:{
+      jj_consume_token(ASSIGN);
+      init = VariableInitializer();
+      break;
+      }
+    default:
+      jj_la1[32] = jj_gen;
+      ;
+    }
+return new  VariableDeclarator(range(id.getBegin(), tokenEnd()), id, init);
+  }
+
+  final public VariableDeclaratorId VariableDeclaratorId() {String name;
         Position begin;
         ArrayBracketPair arrayBracketPair;
         List<ArrayBracketPair> arrayBracketPairs = null;
-        jj_consume_token(IDENTIFIER);
-        name = token.image;
-        begin = tokenBegin();
-        label_13:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case LBRACKET:
-                case AT: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[33] = jj_gen;
-                    break label_13;
-            }
-            arrayBracketPair = ArrayBracketPair();
-            arrayBracketPairs = add(arrayBracketPairs, arrayBracketPair);
+    jj_consume_token(IDENTIFIER);
+name = token.image; begin=tokenBegin();
+    label_13:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LBRACKET:
+      case AT:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[33] = jj_gen;
+        break label_13;
+      }
+      arrayBracketPair = ArrayBracketPair();
+arrayBracketPairs=add(arrayBracketPairs, arrayBracketPair);
+    }
+return new VariableDeclaratorId(range(begin, tokenEnd()),name, arrayBracketPairs);
+  }
+
+  final public Expression VariableInitializer() {Expression ret;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LBRACE:{
+      ret = ArrayInitializer();
+      break;
+      }
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:{
+      ret = Expression();
+      break;
+      }
+    default:
+      jj_la1[34] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return ret;
+  }
+
+  final public ArrayInitializerExpr ArrayInitializer() {List<Expression> values = null;
+        Expression val;
+        Position begin;
+    jj_consume_token(LBRACE);
+begin=tokenBegin();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:{
+      val = VariableInitializer();
+values = add(values, val);
+      label_14:
+      while (true) {
+        if (jj_2_7(2)) {
+          ;
+        } else {
+          break label_14;
         }
-        return new VariableDeclaratorId(range(begin, tokenEnd()), name, arrayBracketPairs);
-    }
+        jj_consume_token(COMMA);
+        val = VariableInitializer();
+values = add(values, val);
+      }
+      break;
+      }
+    default:
+      jj_la1[35] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case COMMA:{
+      jj_consume_token(COMMA);
+      break;
+      }
+    default:
+      jj_la1[36] = jj_gen;
+      ;
+    }
+    jj_consume_token(RBRACE);
+return new ArrayInitializerExpr(range(begin, tokenEnd()), values);
+  }
+
+  final public MethodDeclaration MethodDeclaration(ModifierHolder modifier) {RangedList<TypeParameter> typeParameters = new RangedList<TypeParameter>(null);
+        Type type;
+        NameExpr name;
+        List<Parameter> parameters;
+        ArrayBracketPair arrayBracketPair;
+        List<ArrayBracketPair> arrayBracketPairs = null;
+        List<ReferenceType> throws_ = null;
+        BlockStmt block = null;
+        Position begin = modifier.begin;
+        ReferenceType throwType;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LT:{
+      typeParameters = TypeParameters();
+begin = begin.orIfInvalid(typeParameters.range.begin);
+      break;
+      }
+    default:
+      jj_la1[37] = jj_gen;
+      ;
+    }
+    type = ResultType();
+begin = begin.orIfInvalid(type.getBegin());
+    name = Name();
+    parameters = FormalParameters();
+    label_15:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LBRACKET:
+      case AT:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[38] = jj_gen;
+        break label_15;
+      }
+      arrayBracketPair = ArrayBracketPair();
+arrayBracketPairs=add(arrayBracketPairs, arrayBracketPair);
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case THROWS:{
+      jj_consume_token(THROWS);
+      throwType = ReferenceTypeWithAnnotations();
+throws_ = add(throws_, throwType);
+      label_16:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case COMMA:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[39] = jj_gen;
+          break label_16;
+        }
+        jj_consume_token(COMMA);
+        throwType = ReferenceTypeWithAnnotations();
+throws_ = add(throws_, throwType);
+      }
+      break;
+      }
+    default:
+      jj_la1[40] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LBRACE:{
+      block = Block();
+      break;
+      }
+    case SEMICOLON:{
+      jj_consume_token(SEMICOLON);
+      break;
+      }
+    default:
+      jj_la1[41] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+Pair<Type, List<ArrayBracketPair>> typeListPair = unwrapArrayTypes(type);
+        return new MethodDeclaration(range(begin, pos(token.endLine, token.endColumn)), modifier.modifiers, modifier.annotations, typeParameters.list, typeListPair.a, typeListPair.b, name, parameters, arrayBracketPairs, throws_, block);
+  }
 
-    final public Expression VariableInitializer() {
-        Expression ret;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case LBRACE: {
-                ret = ArrayInitializer();
-                break;
-            }
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS: {
-                ret = Expression();
-                break;
-            }
-            default:
-                jj_la1[34] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return ret;
-    }
-
-    final public ArrayInitializerExpr ArrayInitializer() {
-        List<Expression> values = null;
-        Expression val;
-        Position begin;
-        jj_consume_token(LBRACE);
-        begin = tokenBegin();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case LBRACE:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS: {
-                val = VariableInitializer();
-                values = add(values, val);
-                label_14:
-                while (true) {
-                    if (jj_2_7(2)) {
-                        ;
-                    } else {
-                        break label_14;
-                    }
-                    jj_consume_token(COMMA);
-                    val = VariableInitializer();
-                    values = add(values, val);
-                }
-                break;
-            }
-            default:
-                jj_la1[35] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case COMMA: {
-                jj_consume_token(COMMA);
-                break;
-            }
-            default:
-                jj_la1[36] = jj_gen;
-                ;
-        }
-        jj_consume_token(RBRACE);
-        return new ArrayInitializerExpr(range(begin, tokenEnd()), values);
-    }
-
-    final public MethodDeclaration MethodDeclaration(ModifierHolder modifier) {
-        RangedList<TypeParameter> typeParameters = new RangedList<TypeParameter>(null);
-        Type type;
-        NameExpr name;
-        List<Parameter> parameters;
-        ArrayBracketPair arrayBracketPair;
-        List<ArrayBracketPair> arrayBracketPairs = null;
-        List<ReferenceType> throws_ = null;
-        BlockStmt block = null;
-        Position begin = modifier.begin;
-        ReferenceType throwType;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case LT: {
-                typeParameters = TypeParameters();
-                begin = begin.orIfInvalid(typeParameters.range.begin);
-                break;
-            }
-            default:
-                jj_la1[37] = jj_gen;
-                ;
-        }
-        type = ResultType();
-        begin = begin.orIfInvalid(type.getBegin());
-        name = Name();
-        parameters = FormalParameters();
-        label_15:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case LBRACKET:
-                case AT: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[38] = jj_gen;
-                    break label_15;
-            }
-            arrayBracketPair = ArrayBracketPair();
-            arrayBracketPairs = add(arrayBracketPairs, arrayBracketPair);
-        }
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case THROWS: {
-                jj_consume_token(THROWS);
-                throwType = ReferenceTypeWithAnnotations();
-                throws_ = add(throws_, throwType);
-                label_16:
-                while (true) {
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case COMMA: {
-                            ;
-                            break;
-                        }
-                        default:
-                            jj_la1[39] = jj_gen;
-                            break label_16;
-                    }
-                    jj_consume_token(COMMA);
-                    throwType = ReferenceTypeWithAnnotations();
-                    throws_ = add(throws_, throwType);
-                }
-                break;
-            }
-            default:
-                jj_la1[40] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case LBRACE: {
-                block = Block();
-                break;
-            }
-            case SEMICOLON: {
-                jj_consume_token(SEMICOLON);
-                break;
-            }
-            default:
-                jj_la1[41] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        Pair<Type, List<ArrayBracketPair>> typeListPair = unwrapArrayTypes(type);
-        return new MethodDeclaration(range(begin, pos(token.endLine, token.endColumn)), modifier.modifiers, modifier.annotations, typeParameters.list, typeListPair.a, typeListPair.b, name, parameters, arrayBracketPairs, throws_, block);
-    }
-
-    final public ReferenceType ReferenceTypeWithAnnotations() {
-        List<AnnotationExpr> annotations;
-        ReferenceType type;
-        annotations = Annotations();
-        type = ReferenceType();
-        if (annotations != null) {
-            if (type.getAnnotations() != null) {
-                type.getAnnotations().addAll(annotations);
-            } else {
-                type.setAnnotations(annotations);
+  final public ReferenceType ReferenceTypeWithAnnotations() {List<AnnotationExpr> annotations;
+        ReferenceType type;
+    annotations = Annotations();
+    type = ReferenceType();
+if(annotations != null){
+            if (type.getAnnotations() != null) {
+                type.getAnnotations().addAll(annotations);
+            } else {
+                type.setAnnotations(annotations);
             }
         }
         return type;
-    }
+  }
 
-    final public List<Parameter> FormalParameters() {
-        List<Parameter> ret = null;
+  final public List<Parameter> FormalParameters() {List<Parameter> ret = null;
         Parameter par;
-        jj_consume_token(LPAREN);
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case ABSTRACT:
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FINAL:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NATIVE:
-            case PRIVATE:
-            case PROTECTED:
-            case PUBLIC:
-            case SHORT:
-            case STATIC:
-            case STRICTFP:
-            case SYNCHRONIZED:
-            case TRANSIENT:
-            case VOLATILE:
-            case IDENTIFIER:
-            case AT: {
-                par = FormalParameter();
-                ret = add(ret, par);
-                label_17:
-                while (true) {
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case COMMA: {
-                            ;
-                            break;
-                        }
-                        default:
-                            jj_la1[42] = jj_gen;
-                            break label_17;
-                    }
-                    jj_consume_token(COMMA);
-                    par = FormalParameter();
-                    ret = add(ret, par);
-                }
-                break;
-            }
-            default:
-                jj_la1[43] = jj_gen;
-                ;
+    jj_consume_token(LPAREN);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ABSTRACT:
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FINAL:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NATIVE:
+    case PRIVATE:
+    case PROTECTED:
+    case PUBLIC:
+    case SHORT:
+    case STATIC:
+    case STRICTFP:
+    case SYNCHRONIZED:
+    case TRANSIENT:
+    case VOLATILE:
+    case IDENTIFIER:
+    case AT:{
+      par = FormalParameter();
+ret = add(ret, par);
+      label_17:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case COMMA:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[42] = jj_gen;
+          break label_17;
         }
-        jj_consume_token(RPAREN);
-        return ret;
-    }
-
-    final public List<Parameter> FormalLambdaParameters() {
-        List<Parameter> ret = null;
-        Parameter par;
         jj_consume_token(COMMA);
         par = FormalParameter();
-        ret = add(ret, par);
-        label_18:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case COMMA: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[44] = jj_gen;
-                    break label_18;
-            }
-            jj_consume_token(COMMA);
-            par = FormalParameter();
-            ret = add(ret, par);
-        }
-        return ret;
-    }
-
-    final public List<Parameter> InferredLambdaParameters() {
-        List<Parameter> ret = null;
-        VariableDeclaratorId id;
-        jj_consume_token(COMMA);
-        id = VariableDeclaratorId();
-        ret = add(ret, new Parameter(range(id.getBegin(), id.getEnd()), EnumSet.noneOf(Modifier.class), null, new UnknownType(), null, false, id));
-        label_19:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case COMMA: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[45] = jj_gen;
-                    break label_19;
-            }
-            jj_consume_token(COMMA);
-            id = VariableDeclaratorId();
-            ret = add(ret, new Parameter(range(id.getBegin(), id.getEnd()), EnumSet.noneOf(Modifier.class), null, new UnknownType(), null, false, id));
-        }
-        return ret;
-    }
-
-    final public Parameter FormalParameter() {
-        ModifierHolder modifier;
+ret = add(ret, par);
+      }
+      break;
+      }
+    default:
+      jj_la1[43] = jj_gen;
+      ;
+    }
+    jj_consume_token(RPAREN);
+return ret;
+  }
+
+  final public List<Parameter> FormalLambdaParameters() {List<Parameter> ret = null;
+  Parameter par;
+    jj_consume_token(COMMA);
+    par = FormalParameter();
+ret = add(ret, par);
+    label_18:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[44] = jj_gen;
+        break label_18;
+      }
+      jj_consume_token(COMMA);
+      par = FormalParameter();
+ret = add(ret, par);
+    }
+return ret;
+  }
+
+  final public List<Parameter> InferredLambdaParameters() {List<Parameter> ret = null;
+  VariableDeclaratorId id;
+    jj_consume_token(COMMA);
+    id = VariableDeclaratorId();
+ret = add(ret, new Parameter(range(id.getBegin(), id.getEnd()), EnumSet.noneOf(Modifier.class), null, new UnknownType(), null, false, id));
+    label_19:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[45] = jj_gen;
+        break label_19;
+      }
+      jj_consume_token(COMMA);
+      id = VariableDeclaratorId();
+ret = add(ret, new Parameter(range(id.getBegin(), id.getEnd()), EnumSet.noneOf(Modifier.class), null, new UnknownType(), null, false, id));
+    }
+return ret;
+  }
+
+  final public Parameter FormalParameter() {ModifierHolder modifier;
         Type type;
         boolean isVarArg = false;
         VariableDeclaratorId id;
-        modifier = Modifiers();
-        type = Type();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case ELLIPSIS: {
-                jj_consume_token(ELLIPSIS);
-                isVarArg = true;
-                break;
-            }
-            default:
-                jj_la1[46] = jj_gen;
-                ;
-        }
-        id = VariableDeclaratorId();
-        Position begin = modifier.begin.orIfInvalid(type.getBegin());
+    modifier = Modifiers();
+    type = Type();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ELLIPSIS:{
+      jj_consume_token(ELLIPSIS);
+isVarArg = true;
+      break;
+      }
+    default:
+      jj_la1[46] = jj_gen;
+      ;
+    }
+    id = VariableDeclaratorId();
+Position begin = modifier.begin.orIfInvalid(type.getBegin());
         Pair<Type, List<ArrayBracketPair>> typeListPair = unwrapArrayTypes(type);
         return new Parameter(range(begin, tokenEnd()), modifier.modifiers, modifier.annotations, typeListPair.a, typeListPair.b, isVarArg, id);
-    }
+  }
 
-    final public ConstructorDeclaration ConstructorDeclaration(ModifierHolder modifier) {
-        RangedList<TypeParameter> typeParameters = new RangedList<TypeParameter>(null);
+  final public ConstructorDeclaration ConstructorDeclaration(ModifierHolder modifier) {RangedList<TypeParameter> typeParameters = new RangedList<TypeParameter>(null);
         NameExpr name;
         List<Parameter> parameters;
         List<ReferenceType> throws_ = null;
         ExplicitConstructorInvocationStmt exConsInv = null;
         List<Statement> stmts;
-        Position begin = modifier.begin;
+    Position begin = modifier.begin;
         Position blockBegin = INVALID;
         ReferenceType throwType;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case LT: {
-                typeParameters = TypeParameters();
-                begin = begin.orIfInvalid(typeParameters.range.begin);
-                break;
-            }
-            default:
-                jj_la1[47] = jj_gen;
-                ;
-        }
-        // Modifiers matched in the caller
-        name = SimpleName();
-        begin = begin.orIfInvalid(typeParameters.range.begin);
-        parameters = FormalParameters();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case THROWS: {
-                jj_consume_token(THROWS);
-                throwType = ReferenceTypeWithAnnotations();
-                throws_ = add(throws_, throwType);
-                label_20:
-                while (true) {
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case COMMA: {
-                            ;
-                            break;
-                        }
-                        default:
-                            jj_la1[48] = jj_gen;
-                            break label_20;
-                    }
-                    jj_consume_token(COMMA);
-                    throwType = ReferenceTypeWithAnnotations();
-                    throws_ = add(throws_, throwType);
-                }
-                break;
-            }
-            default:
-                jj_la1[49] = jj_gen;
-                ;
-        }
-        jj_consume_token(LBRACE);
-        blockBegin = tokenBegin();
-        if (jj_2_8(2147483647)) {
-            exConsInv = ExplicitConstructorInvocation();
-        } else {
-            ;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LT:{
+      typeParameters = TypeParameters();
+begin = begin.orIfInvalid(typeParameters.range.begin);
+      break;
+      }
+    default:
+      jj_la1[47] = jj_gen;
+      ;
+    }
+    // Modifiers matched in the caller
+      name = SimpleName();
+begin = begin.orIfInvalid(typeParameters.range.begin);
+    parameters = FormalParameters();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case THROWS:{
+      jj_consume_token(THROWS);
+      throwType = ReferenceTypeWithAnnotations();
+throws_ = add(throws_, throwType);
+      label_20:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case COMMA:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[48] = jj_gen;
+          break label_20;
         }
-        stmts = Statements();
-        jj_consume_token(RBRACE);
-        if (exConsInv != null) {
-            stmts = add(0, stmts, exConsInv);
+        jj_consume_token(COMMA);
+        throwType = ReferenceTypeWithAnnotations();
+throws_ = add(throws_, throwType);
+      }
+      break;
+      }
+    default:
+      jj_la1[49] = jj_gen;
+      ;
+    }
+    jj_consume_token(LBRACE);
+blockBegin=tokenBegin();
+    if (jj_2_8(2147483647)) {
+      exConsInv = ExplicitConstructorInvocation();
+    } else {
+      ;
+    }
+    stmts = Statements();
+    jj_consume_token(RBRACE);
+if (exConsInv != null) {
+                stmts = add(0, stmts, exConsInv);
         }
         ConstructorDeclaration tmp = new ConstructorDeclaration(range(begin, pos(token.endLine, token.endColumn)), modifier.modifiers, modifier.annotations, typeParameters.list, null, parameters, throws_, new BlockStmt(range(blockBegin, tokenEnd()), stmts));
-        tmp.setNameExpr(name);
-        return tmp;
-    }
+    tmp.setNameExpr(name);
+    return tmp;
+  }
 
-    final public ExplicitConstructorInvocationStmt ExplicitConstructorInvocation() {
-        boolean isThis = false;
+  final public ExplicitConstructorInvocationStmt ExplicitConstructorInvocation() {boolean isThis = false;
         List<Expression> args;
         Expression expr = null;
         RangedList<Type<?>> typeArgs = new RangedList<Type<?>>(null);
         Position begin = INVALID;
-        if (jj_2_10(2147483647)) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case LT: {
-                    typeArgs = TypeArguments();
-                    begin = typeArgs.range.begin;
-                    break;
-                }
-                default:
-                    jj_la1[50] = jj_gen;
-                    ;
-            }
-            jj_consume_token(THIS);
-            begin = begin.orIfInvalid(tokenBegin());
-            isThis = true;
-            args = Arguments();
-            jj_consume_token(SEMICOLON);
+    if (jj_2_10(2147483647)) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LT:{
+        typeArgs = TypeArguments();
+begin=typeArgs.range.begin;
+        break;
+        }
+      default:
+        jj_la1[50] = jj_gen;
+        ;
+      }
+      jj_consume_token(THIS);
+begin = begin.orIfInvalid(tokenBegin()); isThis = true;
+      args = Arguments();
+      jj_consume_token(SEMICOLON);
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NEW:
+      case NULL:
+      case SHORT:
+      case SUPER:
+      case THIS:
+      case TRUE:
+      case VOID:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LT:{
+        if (jj_2_9(2147483647)) {
+          expr = PrimaryExpressionWithoutSuperSuffix();
+          jj_consume_token(DOT);
+begin=expr.getBegin();
         } else {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FALSE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case NEW:
-                case NULL:
-                case SHORT:
-                case SUPER:
-                case THIS:
-                case TRUE:
-                case VOID:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case LT: {
-                    if (jj_2_9(2147483647)) {
-                        expr = PrimaryExpressionWithoutSuperSuffix();
-                        jj_consume_token(DOT);
-                        begin = expr.getBegin();
-                    } else {
-                        ;
-                    }
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case LT: {
-                            typeArgs = TypeArguments();
-                            begin = begin.orIfInvalid(typeArgs.range.begin);
-                            break;
-                        }
-                        default:
-                            jj_la1[51] = jj_gen;
-                            ;
-                    }
-                    jj_consume_token(SUPER);
-                    begin = begin.orIfInvalid(tokenBegin());
-                    args = Arguments();
-                    jj_consume_token(SEMICOLON);
-                    break;
-                }
-                default:
-                    jj_la1[52] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
+          ;
+        }
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case LT:{
+          typeArgs = TypeArguments();
+begin = begin.orIfInvalid(typeArgs.range.begin);
+          break;
+          }
+        default:
+          jj_la1[51] = jj_gen;
+          ;
+        }
+        jj_consume_token(SUPER);
+begin = begin.orIfInvalid(tokenBegin());
+        args = Arguments();
+        jj_consume_token(SEMICOLON);
+        break;
         }
-        return new ExplicitConstructorInvocationStmt(range(begin, tokenEnd()), typeArgs.list, isThis, expr, args);
+      default:
+        jj_la1[52] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
     }
+return new ExplicitConstructorInvocationStmt(range(begin, tokenEnd()),typeArgs.list, isThis, expr, args);
+  }
 
-    final public List<Statement> Statements() {
-        List<Statement> ret = null;
+  final public List<Statement> Statements() {List<Statement> ret = null;
         Statement stmt;
-        label_21:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case ABSTRACT:
-                case ASSERT:
-                case BOOLEAN:
-                case BREAK:
-                case BYTE:
-                case CHAR:
-                case CLASS:
-                case CONTINUE:
-                case DO:
-                case DOUBLE:
-                case FALSE:
-                case FINAL:
-                case FLOAT:
-                case FOR:
-                case IF:
-                case INT:
-                case INTERFACE:
-                case LONG:
-                case NATIVE:
-                case NEW:
-                case NULL:
-                case PRIVATE:
-                case PROTECTED:
-                case PUBLIC:
-                case RETURN:
-                case SHORT:
-                case STATIC:
-                case STRICTFP:
-                case SUPER:
-                case SWITCH:
-                case SYNCHRONIZED:
-                case THIS:
-                case THROW:
-                case TRANSIENT:
-                case TRUE:
-                case TRY:
-                case VOID:
-                case VOLATILE:
-                case WHILE:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case LBRACE:
-                case SEMICOLON:
-                case AT:
-                case INCR:
-                case DECR: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[53] = jj_gen;
-                    break label_21;
-            }
-            stmt = BlockStatement();
-            ret = add(ret, stmt);
-        }
-        return ret;
-    }
-
-    final public InitializerDeclaration InitializerDeclaration() {
-        BlockStmt block;
+    label_21:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ABSTRACT:
+      case ASSERT:
+      case BOOLEAN:
+      case BREAK:
+      case BYTE:
+      case CHAR:
+      case CLASS:
+      case CONTINUE:
+      case DO:
+      case DOUBLE:
+      case FALSE:
+      case FINAL:
+      case FLOAT:
+      case FOR:
+      case IF:
+      case INT:
+      case INTERFACE:
+      case LONG:
+      case NATIVE:
+      case NEW:
+      case NULL:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case RETURN:
+      case SHORT:
+      case STATIC:
+      case STRICTFP:
+      case SUPER:
+      case SWITCH:
+      case SYNCHRONIZED:
+      case THIS:
+      case THROW:
+      case TRANSIENT:
+      case TRUE:
+      case TRY:
+      case VOID:
+      case VOLATILE:
+      case WHILE:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LBRACE:
+      case SEMICOLON:
+      case AT:
+      case INCR:
+      case DECR:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[53] = jj_gen;
+        break label_21;
+      }
+      stmt = BlockStatement();
+ret = add(ret, stmt);
+    }
+return ret;
+  }
+
+  final public InitializerDeclaration InitializerDeclaration() {BlockStmt block;
         Position begin = INVALID;
         boolean isStatic = false;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case STATIC: {
-                jj_consume_token(STATIC);
-                isStatic = true;
-                begin = tokenBegin();
-                break;
-            }
-            default:
-                jj_la1[54] = jj_gen;
-                ;
-        }
-        block = Block();
-        begin = begin.orIfInvalid(block.getBegin());
-        return new InitializerDeclaration(range(begin, tokenEnd()), isStatic, block);
-    }
-
-    /*
-     * Type, name and expression syntax follows.
-     */
-    final public Type Type() {
-        Type ret;
-        if (jj_2_11(2)) {
-            ret = ReferenceType();
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case SHORT: {
-                    ret = PrimitiveType();
-                    break;
-                }
-                default:
-                    jj_la1[55] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        return ret;
-    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case STATIC:{
+      jj_consume_token(STATIC);
+isStatic = true; begin=tokenBegin();
+      break;
+      }
+    default:
+      jj_la1[54] = jj_gen;
+      ;
+    }
+    block = Block();
+begin = begin.orIfInvalid(block.getBegin());
+return new InitializerDeclaration(range(begin, tokenEnd()), isStatic, block);
+  }
 
-    final public ReferenceType ReferenceType() {
-        Type type;
+/*
+ * Type, name and expression syntax follows.
+ */
+  final public 
+Type Type() {Type ret;
+    if (jj_2_11(2)) {
+      ret = ReferenceType();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case SHORT:{
+        ret = PrimitiveType();
+        break;
+        }
+      default:
+        jj_la1[55] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+return ret;
+  }
+
+  final public ReferenceType ReferenceType() {Type type;
         ArrayBracketPair arrayBracketPair;
         List<ArrayBracketPair> arrayBracketPairs = null;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case SHORT: {
-                type = PrimitiveType();
-                label_22:
-                while (true) {
-                    arrayBracketPair = ArrayBracketPair();
-                    arrayBracketPairs = add(arrayBracketPairs, arrayBracketPair);
-                    if (jj_2_12(2)) {
-                        ;
-                    } else {
-                        break label_22;
-                    }
-                }
-                break;
-            }
-            case IDENTIFIER: {
-                type = ClassOrInterfaceType();
-                label_23:
-                while (true) {
-                    if (jj_2_13(2)) {
-                        ;
-                    } else {
-                        break label_23;
-                    }
-                    arrayBracketPair = ArrayBracketPair();
-                    arrayBracketPairs = add(arrayBracketPairs, arrayBracketPair);
-                }
-                break;
-            }
-            default:
-                jj_la1[56] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return (ReferenceType) wrapInArrayTypes(type, arrayBracketPairs);
-    }
-
-    final public ArrayBracketPair ArrayBracketPair() {
-        List<AnnotationExpr> annotations = null;
-        Position begin = INVALID;
-        annotations = Annotations();
-        jj_consume_token(LBRACKET);
-        begin = begin.orIfInvalid(tokenBegin());
-        jj_consume_token(RBRACKET);
-        return new ArrayBracketPair(range(begin, tokenEnd()), annotations);
-    }
-
-    final public IntersectionType IntersectionType() {
-        Position begin;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case SHORT:{
+      type = PrimitiveType();
+      label_22:
+      while (true) {
+        arrayBracketPair = ArrayBracketPair();
+arrayBracketPairs=add(arrayBracketPairs, arrayBracketPair);
+        if (jj_2_12(2)) {
+          ;
+        } else {
+          break label_22;
+        }
+      }
+      break;
+      }
+    case IDENTIFIER:{
+      type = ClassOrInterfaceType();
+      label_23:
+      while (true) {
+        if (jj_2_13(2)) {
+          ;
+        } else {
+          break label_23;
+        }
+        arrayBracketPair = ArrayBracketPair();
+arrayBracketPairs=add(arrayBracketPairs, arrayBracketPair);
+      }
+      break;
+      }
+    default:
+      jj_la1[56] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return (ReferenceType)wrapInArrayTypes(type, arrayBracketPairs);
+  }
+
+  final public ArrayBracketPair ArrayBracketPair() {List<AnnotationExpr> annotations = null;
+    Position begin = INVALID;
+    annotations = Annotations();
+    jj_consume_token(LBRACKET);
+begin = begin.orIfInvalid(tokenBegin());
+    jj_consume_token(RBRACKET);
+return new ArrayBracketPair(range(begin, tokenEnd()), annotations);
+  }
+
+  final public IntersectionType IntersectionType() {Position begin;
         ReferenceType elementType;
         List<ReferenceType> elements = null;
-        elementType = ReferenceType();
-        begin = elementType.getBegin();
-        elements = add(elements, elementType);
-        jj_consume_token(BIT_AND);
-        label_24:
-        while (true) {
-            elementType = ReferenceType();
-            elements = add(elements, elementType);
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case SHORT:
-                case IDENTIFIER: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[57] = jj_gen;
-                    break label_24;
-            }
-        }
-        return new IntersectionType(range(begin, tokenEnd()), elements);
-    }
-
-    final public ClassOrInterfaceType AnnotatedClassOrInterfaceType() {
-        List<AnnotationExpr> annotations;
+    elementType = ReferenceType();
+begin=elementType.getBegin(); elements = add(elements, elementType);
+    jj_consume_token(BIT_AND);
+    label_24:
+    while (true) {
+      elementType = ReferenceType();
+elements = add(elements, elementType);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case SHORT:
+      case IDENTIFIER:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[57] = jj_gen;
+        break label_24;
+      }
+    }
+return new IntersectionType(range(begin, tokenEnd()), elements);
+  }
+
+  final public ClassOrInterfaceType AnnotatedClassOrInterfaceType() {List<AnnotationExpr> annotations;
         ClassOrInterfaceType cit;
-        annotations = Annotations();
-        cit = ClassOrInterfaceType();
-        if (cit.getScope() != null) {
+    annotations = Annotations();
+    cit = ClassOrInterfaceType();
+if (cit.getScope()!=null) {
             cit.getScope().setAnnotations(annotations);
         } else {
             cit.setAnnotations(annotations);
         }
         return cit;
-    }
+  }
 
-    final public ClassOrInterfaceType ClassOrInterfaceType() {
-        ClassOrInterfaceType ret;
+  final public ClassOrInterfaceType ClassOrInterfaceType() {ClassOrInterfaceType ret;
         String name;
         RangedList<Type<?>> typeArgs = new RangedList<Type<?>>(null);
         Position begin;
         List<AnnotationExpr> annotations = null;
-        jj_consume_token(IDENTIFIER);
-        begin = tokenBegin();
-        name = token.image;
-        if (jj_2_14(2)) {
-            typeArgs = TypeArguments();
-        } else {
-            ;
-        }
-        ret = new ClassOrInterfaceType(range(begin, tokenEnd()), null, name, typeArgs.list);
-        label_25:
-        while (true) {
-            if (jj_2_15(2)) {
-                ;
-            } else {
-                break label_25;
-            }
-            jj_consume_token(DOT);
-            annotations = Annotations();
-            jj_consume_token(IDENTIFIER);
-            name = token.image;
-            if (jj_2_16(2)) {
-                typeArgs = TypeArguments();
-            } else {
-                ;
-            }
-            ret = new ClassOrInterfaceType(range(begin, tokenEnd()), ret, name, typeArgs.list);
+    jj_consume_token(IDENTIFIER);
+begin=tokenBegin();
+name = token.image;
+    if (jj_2_14(2)) {
+      typeArgs = TypeArguments();
+    } else {
+      ;
+    }
+ret = new ClassOrInterfaceType(range(begin, tokenEnd()),null, name, typeArgs.list);
+    label_25:
+    while (true) {
+      if (jj_2_15(2)) {
+        ;
+      } else {
+        break label_25;
+      }
+      jj_consume_token(DOT);
+      annotations = Annotations();
+      jj_consume_token(IDENTIFIER);
+name = token.image;
+      if (jj_2_16(2)) {
+        typeArgs = TypeArguments();
+      } else {
+        ;
+      }
+ret = new ClassOrInterfaceType(range(begin, tokenEnd()),ret, name, typeArgs.list);
             ret.setAnnotations(annotations);
             annotations = null;
-        }
-        return ret;
     }
+return ret;
+  }
 
-    final public RangedList<Type<?>> TypeArguments() {
-        RangedList<Type<?>> ret = new RangedList<Type<?>>(new LinkedList<Type<?>>());
+  final public RangedList<Type<?>> TypeArguments() {RangedList<Type<?>> ret = new RangedList<Type<?>>(new LinkedList<Type<?>>());
         Type type;
-        jj_consume_token(LT);
-        ret.beginAt(tokenBegin());
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case SHORT:
-            case IDENTIFIER:
-            case AT:
-            case HOOK: {
-                type = TypeArgument();
-                ret.add(type);
-                label_26:
-                while (true) {
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case COMMA: {
-                            ;
-                            break;
-                        }
-                        default:
-                            jj_la1[58] = jj_gen;
-                            break label_26;
-                    }
-                    jj_consume_token(COMMA);
-                    type = TypeArgument();
-                    ret.add(type);
-                }
-                break;
-            }
-            default:
-                jj_la1[59] = jj_gen;
-                ;
+    jj_consume_token(LT);
+ret.beginAt(tokenBegin());
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case SHORT:
+    case IDENTIFIER:
+    case AT:
+    case HOOK:{
+      type = TypeArgument();
+ret.add(type);
+      label_26:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case COMMA:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[58] = jj_gen;
+          break label_26;
         }
-        jj_consume_token(GT);
-        ret.endAt(tokenEnd());
-        return ret;
-    }
-
-    final public Type TypeArgument() {
-        Type ret;
+        jj_consume_token(COMMA);
+        type = TypeArgument();
+ret.add(type);
+      }
+      break;
+      }
+    default:
+      jj_la1[59] = jj_gen;
+      ;
+    }
+    jj_consume_token(GT);
+ret.endAt(tokenEnd());
+return ret;
+  }
+
+  final public Type TypeArgument() {Type ret;
         List<AnnotationExpr> annotations = null;
-        annotations = Annotations();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case SHORT:
-            case IDENTIFIER: {
-                ret = ReferenceType();
-                break;
-            }
-            case HOOK: {
-                ret = Wildcard();
-                break;
-            }
-            default:
-                jj_la1[60] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        ret.setAnnotations(annotations);
-        return ret;
-    }
-
-    final public WildcardType Wildcard() {
-        ReferenceType ext = null;
+    annotations = Annotations();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case SHORT:
+    case IDENTIFIER:{
+      ret = ReferenceType();
+      break;
+      }
+    case HOOK:{
+      ret = Wildcard();
+      break;
+      }
+    default:
+      jj_la1[60] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+ret.setAnnotations(annotations); return ret;
+  }
+
+  final public WildcardType Wildcard() {ReferenceType ext = null;
         ReferenceType sup = null;
         Position begin;
         List<AnnotationExpr> annotations = null;
-        jj_consume_token(HOOK);
-        begin = tokenBegin();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case EXTENDS:
-            case SUPER: {
-                switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                    case EXTENDS: {
-                        jj_consume_token(EXTENDS);
-                        annotations = Annotations();
-                        ext = ReferenceType();
-                        ext.setAnnotations(annotations);
-                        break;
-                    }
-                    case SUPER: {
-                        jj_consume_token(SUPER);
-                        annotations = Annotations();
-                        sup = ReferenceType();
-                        sup.setAnnotations(annotations);
-                        break;
-                    }
-                    default:
-                        jj_la1[61] = jj_gen;
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                }
-                break;
-            }
-            default:
-                jj_la1[62] = jj_gen;
-                ;
+    jj_consume_token(HOOK);
+begin=tokenBegin();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case EXTENDS:
+    case SUPER:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case EXTENDS:{
+        jj_consume_token(EXTENDS);
+        annotations = Annotations();
+        ext = ReferenceType();
+ext.setAnnotations(annotations);
+        break;
         }
-        return new WildcardType(range(begin, tokenEnd()), ext, sup);
-    }
+      case SUPER:{
+        jj_consume_token(SUPER);
+        annotations = Annotations();
+        sup = ReferenceType();
+sup.setAnnotations(annotations);
+        break;
+        }
+      default:
+        jj_la1[61] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      break;
+      }
+    default:
+      jj_la1[62] = jj_gen;
+      ;
+    }
+return new WildcardType(range(begin, tokenEnd()),ext, sup);
+  }
+
+  final public PrimitiveType PrimitiveType() {PrimitiveType ret;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case BOOLEAN:{
+      jj_consume_token(BOOLEAN);
+ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Boolean);
+      break;
+      }
+    case CHAR:{
+      jj_consume_token(CHAR);
+ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Char);
+      break;
+      }
+    case BYTE:{
+      jj_consume_token(BYTE);
+ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Byte);
+      break;
+      }
+    case SHORT:{
+      jj_consume_token(SHORT);
+ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Short);
+      break;
+      }
+    case INT:{
+      jj_consume_token(INT);
+ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Int);
+      break;
+      }
+    case LONG:{
+      jj_consume_token(LONG);
+ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Long);
+      break;
+      }
+    case FLOAT:{
+      jj_consume_token(FLOAT);
+ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Float);
+      break;
+      }
+    case DOUBLE:{
+      jj_consume_token(DOUBLE);
+ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Double);
+      break;
+      }
+    default:
+      jj_la1[63] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return ret;
+  }
+
+  final public Type ResultType() {Type ret;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case VOID:{
+      jj_consume_token(VOID);
+ret = new VoidType(tokenRange());
+      break;
+      }
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case SHORT:
+    case IDENTIFIER:{
+      ret = Type();
+      break;
+      }
+    default:
+      jj_la1[64] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return ret;
+  }
+
+  final public NameExpr Name() {NameExpr ret;
+    jj_consume_token(IDENTIFIER);
+ret = new NameExpr(tokenRange(), token.image);
+    label_27:
+    while (true) {
+      if (jj_2_17(2)) {
+        ;
+      } else {
+        break label_27;
+      }
+      jj_consume_token(DOT);
+      jj_consume_token(IDENTIFIER);
+ret = new QualifiedNameExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, token.image);
+    }
+return ret;
+  }
+
+  final public NameExpr SimpleName() {NameExpr ret;
+    jj_consume_token(IDENTIFIER);
+ret = new NameExpr(tokenRange(), token.image);
+return ret;
+  }
 
-    final public PrimitiveType PrimitiveType() {
-        PrimitiveType ret;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case BOOLEAN: {
-                jj_consume_token(BOOLEAN);
-                ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Boolean);
-                break;
-            }
-            case CHAR: {
-                jj_consume_token(CHAR);
-                ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Char);
-                break;
-            }
-            case BYTE: {
-                jj_consume_token(BYTE);
-                ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Byte);
-                break;
-            }
-            case SHORT: {
-                jj_consume_token(SHORT);
-                ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Short);
-                break;
-            }
-            case INT: {
-                jj_consume_token(INT);
-                ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Int);
-                break;
-            }
-            case LONG: {
-                jj_consume_token(LONG);
-                ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Long);
-                break;
-            }
-            case FLOAT: {
-                jj_consume_token(FLOAT);
-                ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Float);
-                break;
+/*
+ * Expression syntax follows.
+ */
+  final public 
+Expression Expression() {Expression ret;
+        AssignExpr.Operator op;
+        Expression value;
+        Statement lambdaBody = null;
+        RangedList<Type<?>> typeArgs = new RangedList<Type<?>>(null);
+    ret = ConditionalExpression();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ASSIGN:
+    case PLUSASSIGN:
+    case MINUSASSIGN:
+    case STARASSIGN:
+    case SLASHASSIGN:
+    case ANDASSIGN:
+    case ORASSIGN:
+    case XORASSIGN:
+    case REMASSIGN:
+    case LSHIFTASSIGN:
+    case RSIGNEDSHIFTASSIGN:
+    case RUNSIGNEDSHIFTASSIGN:
+    case ARROW:
+    case DOUBLECOLON:{
+      if (jj_2_18(2)) {
+        op = AssignmentOperator();
+        value = Expression();
+ret = new AssignExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, value, op);
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case ARROW:{
+          jj_consume_token(ARROW);
+          lambdaBody = LambdaBody();
+if (ret instanceof CastExpr)
+     {
+       ret = generateLambda(ret, lambdaBody);
+     }
+     else if (ret instanceof ConditionalExpr){
+         ConditionalExpr ce = (ConditionalExpr) ret;
+         if(ce.getElseExpr() != null){
+            ce.setElseExpr(generateLambda(ce.getElseExpr(), lambdaBody));
+         }
+     }
+     else
+     {
+       ret = generateLambda(ret, lambdaBody);
+     }
+          break;
+          }
+        case DOUBLECOLON:{
+          jj_consume_token(DOUBLECOLON);
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case LT:{
+            typeArgs = TypeArguments();
+            break;
             }
-            case DOUBLE: {
-                jj_consume_token(DOUBLE);
-                ret = new PrimitiveType(tokenRange(), PrimitiveType.Primitive.Double);
-                break;
+          default:
+            jj_la1[65] = jj_gen;
+            ;
+          }
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IDENTIFIER:{
+            jj_consume_token(IDENTIFIER);
+            break;
             }
-            default:
-                jj_la1[63] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return ret;
-    }
-
-    final public Type ResultType() {
-        Type ret;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case VOID: {
-                jj_consume_token(VOID);
-                ret = new VoidType(tokenRange());
-                break;
+          case NEW:{
+            jj_consume_token(NEW);
+            break;
             }
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case SHORT:
-            case IDENTIFIER: {
-                ret = Type();
-                break;
-            }
-            default:
-                jj_la1[64] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return ret;
-    }
-
-    final public NameExpr Name() {
-        NameExpr ret;
-        jj_consume_token(IDENTIFIER);
-        ret = new NameExpr(tokenRange(), token.image);
-        label_27:
-        while (true) {
-            if (jj_2_17(2)) {
-                ;
-            } else {
-                break label_27;
-            }
-            jj_consume_token(DOT);
-            jj_consume_token(IDENTIFIER);
-            ret = new QualifiedNameExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, token.image);
-        }
-        return ret;
-    }
-
-    final public NameExpr SimpleName() {
-        NameExpr ret;
-        jj_consume_token(IDENTIFIER);
-        ret = new NameExpr(tokenRange(), token.image);
-        return ret;
-    }
-
-    /*
-     * Expression syntax follows.
-     */
-    final public Expression Expression() {
-        Expression ret;
-        AssignExpr.Operator op;
-        Expression value;
-        Statement lambdaBody = null;
-        RangedList<Type<?>> typeArgs = new RangedList<Type<?>>(null);
-        ret = ConditionalExpression();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case ASSIGN:
-            case PLUSASSIGN:
-            case MINUSASSIGN:
-            case STARASSIGN:
-            case SLASHASSIGN:
-            case ANDASSIGN:
-            case ORASSIGN:
-            case XORASSIGN:
-            case REMASSIGN:
-            case LSHIFTASSIGN:
-            case RSIGNEDSHIFTASSIGN:
-            case RUNSIGNEDSHIFTASSIGN:
-            case ARROW:
-            case DOUBLECOLON: {
-                if (jj_2_18(2)) {
-                    op = AssignmentOperator();
-                    value = Expression();
-                    ret = new AssignExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, value, op);
-                } else {
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case ARROW: {
-                            jj_consume_token(ARROW);
-                            lambdaBody = LambdaBody();
-                            if (ret instanceof CastExpr) {
-                                ret = generateLambda(ret, lambdaBody);
-                            } else if (ret instanceof ConditionalExpr) {
-                                ConditionalExpr ce = (ConditionalExpr) ret;
-                                if (ce.getElseExpr() != null) {
-                                    ce.setElseExpr(generateLambda(ce.getElseExpr(), lambdaBody));
-                                }
-                            } else {
-                                ret = generateLambda(ret, lambdaBody);
-                            }
-                            break;
-                        }
-                        case DOUBLECOLON: {
-                            jj_consume_token(DOUBLECOLON);
-                            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                                case LT: {
-                                    typeArgs = TypeArguments();
-                                    break;
-                                }
-                                default:
-                                    jj_la1[65] = jj_gen;
-                                    ;
-                            }
-                            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                                case IDENTIFIER: {
-                                    jj_consume_token(IDENTIFIER);
-                                    break;
-                                }
-                                case NEW: {
-                                    jj_consume_token(NEW);
-                                    break;
-                                }
-                                default:
-                                    jj_la1[66] = jj_gen;
-                                    jj_consume_token(-1);
-                                    throw new ParseException();
-                            }
-                            ret = new MethodReferenceExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, typeArgs.list, token.image);
-                            break;
-                        }
-                        default:
-                            jj_la1[67] = jj_gen;
-                            jj_consume_token(-1);
-                            throw new ParseException();
-                    }
-                }
-                break;
-            }
-            default:
-                jj_la1[68] = jj_gen;
-                ;
-        }
-        return ret;
-    }
-
-    final public AssignExpr.Operator AssignmentOperator() {
-        AssignExpr.Operator ret;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case ASSIGN: {
-                jj_consume_token(ASSIGN);
-                ret = AssignExpr.Operator.assign;
-                break;
-            }
-            case STARASSIGN: {
-                jj_consume_token(STARASSIGN);
-                ret = AssignExpr.Operator.star;
-                break;
-            }
-            case SLASHASSIGN: {
-                jj_consume_token(SLASHASSIGN);
-                ret = AssignExpr.Operator.slash;
-                break;
-            }
-            case REMASSIGN: {
-                jj_consume_token(REMASSIGN);
-                ret = AssignExpr.Operator.rem;
-                break;
-            }
-            case PLUSASSIGN: {
-                jj_consume_token(PLUSASSIGN);
-                ret = AssignExpr.Operator.plus;
-                break;
-            }
-            case MINUSASSIGN: {
-                jj_consume_token(MINUSASSIGN);
-                ret = AssignExpr.Operator.minus;
-                break;
-            }
-            case LSHIFTASSIGN: {
-                jj_consume_token(LSHIFTASSIGN);
-                ret = AssignExpr.Operator.lShift;
-                break;
-            }
-            case RSIGNEDSHIFTASSIGN: {
-                jj_consume_token(RSIGNEDSHIFTASSIGN);
-                ret = AssignExpr.Operator.rSignedShift;
-                break;
-            }
-            case RUNSIGNEDSHIFTASSIGN: {
-                jj_consume_token(RUNSIGNEDSHIFTASSIGN);
-                ret = AssignExpr.Operator.rUnsignedShift;
-                break;
-            }
-            case ANDASSIGN: {
-                jj_consume_token(ANDASSIGN);
-                ret = AssignExpr.Operator.and;
-                break;
-            }
-            case XORASSIGN: {
-                jj_consume_token(XORASSIGN);
-                ret = AssignExpr.Operator.xor;
-                break;
-            }
-            case ORASSIGN: {
-                jj_consume_token(ORASSIGN);
-                ret = AssignExpr.Operator.or;
-                break;
-            }
-            default:
-                jj_la1[69] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return ret;
-    }
-
-    final public Expression ConditionalExpression() {
-        Expression ret;
+          default:
+            jj_la1[66] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
+ret = new MethodReferenceExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, typeArgs.list, token.image);
+          break;
+          }
+        default:
+          jj_la1[67] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+      break;
+      }
+    default:
+      jj_la1[68] = jj_gen;
+      ;
+    }
+return ret;
+  }
+
+  final public AssignExpr.Operator AssignmentOperator() {AssignExpr.Operator ret;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ASSIGN:{
+      jj_consume_token(ASSIGN);
+ret = AssignExpr.Operator.assign;
+      break;
+      }
+    case STARASSIGN:{
+      jj_consume_token(STARASSIGN);
+ret = AssignExpr.Operator.star;
+      break;
+      }
+    case SLASHASSIGN:{
+      jj_consume_token(SLASHASSIGN);
+ret = AssignExpr.Operator.slash;
+      break;
+      }
+    case REMASSIGN:{
+      jj_consume_token(REMASSIGN);
+ret = AssignExpr.Operator.rem;
+      break;
+      }
+    case PLUSASSIGN:{
+      jj_consume_token(PLUSASSIGN);
+ret = AssignExpr.Operator.plus;
+      break;
+      }
+    case MINUSASSIGN:{
+      jj_consume_token(MINUSASSIGN);
+ret = AssignExpr.Operator.minus;
+      break;
+      }
+    case LSHIFTASSIGN:{
+      jj_consume_token(LSHIFTASSIGN);
+ret = AssignExpr.Operator.lShift;
+      break;
+      }
+    case RSIGNEDSHIFTASSIGN:{
+      jj_consume_token(RSIGNEDSHIFTASSIGN);
+ret = AssignExpr.Operator.rSignedShift;
+      break;
+      }
+    case RUNSIGNEDSHIFTASSIGN:{
+      jj_consume_token(RUNSIGNEDSHIFTASSIGN);
+ret = AssignExpr.Operator.rUnsignedShift;
+      break;
+      }
+    case ANDASSIGN:{
+      jj_consume_token(ANDASSIGN);
+ret = AssignExpr.Operator.and;
+      break;
+      }
+    case XORASSIGN:{
+      jj_consume_token(XORASSIGN);
+ret = AssignExpr.Operator.xor;
+      break;
+      }
+    case ORASSIGN:{
+      jj_consume_token(ORASSIGN);
+ret = AssignExpr.Operator.or;
+      break;
+      }
+    default:
+      jj_la1[69] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return ret;
+  }
+
+  final public Expression ConditionalExpression() {Expression ret;
         Expression left;
         Expression right;
-        ret = ConditionalOrExpression();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case HOOK: {
-                jj_consume_token(HOOK);
-                left = Expression();
-                jj_consume_token(COLON);
-                right = ConditionalExpression();
-                ret = new ConditionalExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, left, right);
-                break;
-            }
-            default:
-                jj_la1[70] = jj_gen;
-                ;
-        }
-        return ret;
-    }
-
-    final public Expression ConditionalOrExpression() {
-        Expression ret;
+    ret = ConditionalOrExpression();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case HOOK:{
+      jj_consume_token(HOOK);
+      left = Expression();
+      jj_consume_token(COLON);
+      right = ConditionalExpression();
+ret = new ConditionalExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, left, right);
+      break;
+      }
+    default:
+      jj_la1[70] = jj_gen;
+      ;
+    }
+return ret;
+  }
+
+  final public Expression ConditionalOrExpression() {Expression ret;
         Expression right;
-        ret = ConditionalAndExpression();
-        label_28:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case SC_OR: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[71] = jj_gen;
-                    break label_28;
-            }
-            jj_consume_token(SC_OR);
-            right = ConditionalAndExpression();
-            ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, BinaryExpr.Operator.or);
-        }
-        return ret;
-    }
-
-    final public Expression ConditionalAndExpression() {
-        Expression ret;
+    ret = ConditionalAndExpression();
+    label_28:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case SC_OR:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[71] = jj_gen;
+        break label_28;
+      }
+      jj_consume_token(SC_OR);
+      right = ConditionalAndExpression();
+ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, BinaryExpr.Operator.or);
+    }
+return ret;
+  }
+
+  final public Expression ConditionalAndExpression() {Expression ret;
         Expression right;
-        ret = InclusiveOrExpression();
-        label_29:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case SC_AND: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[72] = jj_gen;
-                    break label_29;
-            }
-            jj_consume_token(SC_AND);
-            right = InclusiveOrExpression();
-            ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, BinaryExpr.Operator.and);
-        }
-        return ret;
-    }
-
-    final public Expression InclusiveOrExpression() {
-        Expression ret;
+    ret = InclusiveOrExpression();
+    label_29:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case SC_AND:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[72] = jj_gen;
+        break label_29;
+      }
+      jj_consume_token(SC_AND);
+      right = InclusiveOrExpression();
+ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, BinaryExpr.Operator.and);
+    }
+return ret;
+  }
+
+  final public Expression InclusiveOrExpression() {Expression ret;
         Expression right;
-        ret = ExclusiveOrExpression();
-        label_30:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case BIT_OR: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[73] = jj_gen;
-                    break label_30;
-            }
-            jj_consume_token(BIT_OR);
-            right = ExclusiveOrExpression();
-            ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, BinaryExpr.Operator.binOr);
-        }
-        return ret;
-    }
-
-    final public Expression ExclusiveOrExpression() {
-        Expression ret;
+    ret = ExclusiveOrExpression();
+    label_30:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case BIT_OR:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[73] = jj_gen;
+        break label_30;
+      }
+      jj_consume_token(BIT_OR);
+      right = ExclusiveOrExpression();
+ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, BinaryExpr.Operator.binOr);
+    }
+return ret;
+  }
+
+  final public Expression ExclusiveOrExpression() {Expression ret;
         Expression right;
-        ret = AndExpression();
-        label_31:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case XOR: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[74] = jj_gen;
-                    break label_31;
-            }
-            jj_consume_token(XOR);
-            right = AndExpression();
-            ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, BinaryExpr.Operator.xor);
-        }
-        return ret;
-    }
-
-    final public Expression AndExpression() {
-        Expression ret;
+    ret = AndExpression();
+    label_31:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case XOR:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[74] = jj_gen;
+        break label_31;
+      }
+      jj_consume_token(XOR);
+      right = AndExpression();
+ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, BinaryExpr.Operator.xor);
+    }
+return ret;
+  }
+
+  final public Expression AndExpression() {Expression ret;
         Expression right;
-        ret = EqualityExpression();
-        label_32:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case BIT_AND: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[75] = jj_gen;
-                    break label_32;
-            }
-            jj_consume_token(BIT_AND);
-            right = EqualityExpression();
-            ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, BinaryExpr.Operator.binAnd);
-        }
-        return ret;
-    }
-
-    final public Expression EqualityExpression() {
-        Expression ret;
+    ret = EqualityExpression();
+    label_32:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case BIT_AND:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[75] = jj_gen;
+        break label_32;
+      }
+      jj_consume_token(BIT_AND);
+      right = EqualityExpression();
+ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, BinaryExpr.Operator.binAnd);
+    }
+return ret;
+  }
+
+  final public Expression EqualityExpression() {Expression ret;
         Expression right;
         BinaryExpr.Operator op;
-        ret = InstanceOfExpression();
-        label_33:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case EQ:
-                case NE: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[76] = jj_gen;
-                    break label_33;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case EQ: {
-                    jj_consume_token(EQ);
-                    op = BinaryExpr.Operator.equals;
-                    break;
-                }
-                case NE: {
-                    jj_consume_token(NE);
-                    op = BinaryExpr.Operator.notEquals;
-                    break;
-                }
-                default:
-                    jj_la1[77] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-            right = InstanceOfExpression();
-            ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, op);
-        }
-        return ret;
-    }
-
-    final public Expression InstanceOfExpression() {
-        Expression ret;
+    ret = InstanceOfExpression();
+    label_33:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case EQ:
+      case NE:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[76] = jj_gen;
+        break label_33;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case EQ:{
+        jj_consume_token(EQ);
+op = BinaryExpr.Operator.equals;
+        break;
+        }
+      case NE:{
+        jj_consume_token(NE);
+op = BinaryExpr.Operator.notEquals;
+        break;
+        }
+      default:
+        jj_la1[77] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      right = InstanceOfExpression();
+ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, op);
+    }
+return ret;
+  }
+
+  final public Expression InstanceOfExpression() {Expression ret;
         Type type;
-        ret = RelationalExpression();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case INSTANCEOF: {
-                jj_consume_token(INSTANCEOF);
-                type = Type();
-                ret = new InstanceOfExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, type);
-                break;
-            }
-            default:
-                jj_la1[78] = jj_gen;
-                ;
-        }
-        return ret;
-    }
-
-    final public Expression RelationalExpression() {
-        Expression ret;
+    ret = RelationalExpression();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case INSTANCEOF:{
+      jj_consume_token(INSTANCEOF);
+      type = Type();
+ret = new InstanceOfExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, type);
+      break;
+      }
+    default:
+      jj_la1[78] = jj_gen;
+      ;
+    }
+return ret;
+  }
+
+  final public Expression RelationalExpression() {Expression ret;
         Expression right;
         BinaryExpr.Operator op;
-        ret = ShiftExpression();
-        label_34:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case LT:
-                case LE:
-                case GE:
-                case GT: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[79] = jj_gen;
-                    break label_34;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case LT: {
-                    jj_consume_token(LT);
-                    op = BinaryExpr.Operator.less;
-                    break;
-                }
-                case GT: {
-                    jj_consume_token(GT);
-                    op = BinaryExpr.Operator.greater;
-                    break;
-                }
-                case LE: {
-                    jj_consume_token(LE);
-                    op = BinaryExpr.Operator.lessEquals;
-                    break;
-                }
-                case GE: {
-                    jj_consume_token(GE);
-                    op = BinaryExpr.Operator.greaterEquals;
-                    break;
-                }
-                default:
-                    jj_la1[80] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-            right = ShiftExpression();
-            ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, op);
+    ret = ShiftExpression();
+    label_34:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LT:
+      case LE:
+      case GE:
+      case GT:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[79] = jj_gen;
+        break label_34;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LT:{
+        jj_consume_token(LT);
+op = BinaryExpr.Operator.less;
+        break;
         }
-        return ret;
-    }
-
-    final public Expression ShiftExpression() {
-        Expression ret;
+      case GT:{
+        jj_consume_token(GT);
+op = BinaryExpr.Operator.greater;
+        break;
+        }
+      case LE:{
+        jj_consume_token(LE);
+op = BinaryExpr.Operator.lessEquals;
+        break;
+        }
+      case GE:{
+        jj_consume_token(GE);
+op = BinaryExpr.Operator.greaterEquals;
+        break;
+        }
+      default:
+        jj_la1[80] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      right = ShiftExpression();
+ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, op);
+    }
+return ret;
+  }
+
+  final public Expression ShiftExpression() {Expression ret;
         Expression right;
         BinaryExpr.Operator op;
-        ret = AdditiveExpression();
-        label_35:
-        while (true) {
-            if (jj_2_19(1)) {
-                ;
-            } else {
-                break label_35;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case LSHIFT: {
-                    jj_consume_token(LSHIFT);
-                    op = BinaryExpr.Operator.lShift;
-                    break;
-                }
-                default:
-                    jj_la1[81] = jj_gen;
-                    if (jj_2_20(1)) {
-                        RSIGNEDSHIFT();
-                        op = BinaryExpr.Operator.rSignedShift;
-                    } else if (jj_2_21(1)) {
-                        RUNSIGNEDSHIFT();
-                        op = BinaryExpr.Operator.rUnsignedShift;
-                    } else {
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                    }
-            }
-            right = AdditiveExpression();
-            ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, op);
+    ret = AdditiveExpression();
+    label_35:
+    while (true) {
+      if (jj_2_19(1)) {
+        ;
+      } else {
+        break label_35;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LSHIFT:{
+        jj_consume_token(LSHIFT);
+op = BinaryExpr.Operator.lShift;
+        break;
+        }
+      default:
+        jj_la1[81] = jj_gen;
+        if (jj_2_20(1)) {
+          RSIGNEDSHIFT();
+op = BinaryExpr.Operator.rSignedShift;
+        } else if (jj_2_21(1)) {
+          RUNSIGNEDSHIFT();
+op = BinaryExpr.Operator.rUnsignedShift;
+        } else {
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-        return ret;
+      }
+      right = AdditiveExpression();
+ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, op);
     }
+return ret;
+  }
 
-    final public Expression AdditiveExpression() {
-        Expression ret;
+  final public Expression AdditiveExpression() {Expression ret;
         Expression right;
         BinaryExpr.Operator op;
-        ret = MultiplicativeExpression();
-        label_36:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case PLUS:
-                case MINUS: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[82] = jj_gen;
-                    break label_36;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case PLUS: {
-                    jj_consume_token(PLUS);
-                    op = BinaryExpr.Operator.plus;
-                    break;
-                }
-                case MINUS: {
-                    jj_consume_token(MINUS);
-                    op = BinaryExpr.Operator.minus;
-                    break;
-                }
-                default:
-                    jj_la1[83] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-            right = MultiplicativeExpression();
-            ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, op);
-        }
-        return ret;
-    }
-
-    final public Expression MultiplicativeExpression() {
-        Expression ret;
+    ret = MultiplicativeExpression();
+    label_36:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PLUS:
+      case MINUS:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[82] = jj_gen;
+        break label_36;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PLUS:{
+        jj_consume_token(PLUS);
+op = BinaryExpr.Operator.plus;
+        break;
+        }
+      case MINUS:{
+        jj_consume_token(MINUS);
+op = BinaryExpr.Operator.minus;
+        break;
+        }
+      default:
+        jj_la1[83] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      right = MultiplicativeExpression();
+ret = new BinaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, right, op);
+    }
+return ret;
+  }
+
+  final public Expression MultiplicativeExpression() {Expression ret;
         Expression right;
         BinaryExpr.Operator op;
-        ret = UnaryExpression();
-        label_37:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case STAR:
-                case SLASH:
-                case REM: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[84] = jj_gen;
-                    break label_37;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case STAR: {
-                    jj_consume_token(STAR);
-                    op = BinaryExpr.Operator.times;
-                    break;
-                }
-                case SLASH: {
-                    jj_consume_token(SLASH);
-                    op = BinaryExpr.Operator.divide;
-                    break;
-                }
-                case REM: {
-                    jj_consume_token(REM);
-                    op = BinaryExpr.Operator.remainder;
-                    break;
-                }
-                default:
-                    jj_la1[85] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-            right = UnaryExpression();
-            ret = new BinaryExpr(range(ret.getBegin(), tokenEnd()), ret, right, op);
-        }
-        return ret;
-    }
-
-    final public Expression UnaryExpression() {
-        Expression ret;
+    ret = UnaryExpression();
+    label_37:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case STAR:
+      case SLASH:
+      case REM:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[84] = jj_gen;
+        break label_37;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case STAR:{
+        jj_consume_token(STAR);
+op = BinaryExpr.Operator.times;
+        break;
+        }
+      case SLASH:{
+        jj_consume_token(SLASH);
+op = BinaryExpr.Operator.divide;
+        break;
+        }
+      case REM:{
+        jj_consume_token(REM);
+op = BinaryExpr.Operator.remainder;
+        break;
+        }
+      default:
+        jj_la1[85] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      right = UnaryExpression();
+ret = new BinaryExpr(range(ret.getBegin(), tokenEnd()), ret, right, op);
+    }
+return ret;
+  }
+
+  final public Expression UnaryExpression() {Expression ret;
         UnaryExpr.Operator op;
         Position begin = INVALID;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case INCR: {
-                ret = PreIncrementExpression();
-                break;
-            }
-            case DECR: {
-                ret = PreDecrementExpression();
-                break;
-            }
-            case PLUS:
-            case MINUS: {
-                switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                    case PLUS: {
-                        jj_consume_token(PLUS);
-                        op = UnaryExpr.Operator.positive;
-                        begin = tokenBegin();
-                        break;
-                    }
-                    case MINUS: {
-                        jj_consume_token(MINUS);
-                        op = UnaryExpr.Operator.negative;
-                        begin = tokenBegin();
-                        break;
-                    }
-                    default:
-                        jj_la1[86] = jj_gen;
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                }
-                ret = UnaryExpression();
-                if (op == UnaryExpr.Operator.negative) {
-                    if (ret instanceof IntegerLiteralExpr && ((IntegerLiteralExpr) ret).isMinValue()) {
-                        ret = new IntegerLiteralMinValueExpr(range(begin, tokenEnd()));
-                    } else if (ret instanceof LongLiteralExpr && ((LongLiteralExpr) ret).isMinValue()) {
-                        ret = new LongLiteralMinValueExpr(range(begin, tokenEnd()));
-                    } else {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case INCR:{
+      ret = PreIncrementExpression();
+      break;
+      }
+    case DECR:{
+      ret = PreDecrementExpression();
+      break;
+      }
+    case PLUS:
+    case MINUS:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PLUS:{
+        jj_consume_token(PLUS);
+op = UnaryExpr.Operator.positive; begin=tokenBegin();
+        break;
+        }
+      case MINUS:{
+        jj_consume_token(MINUS);
+op = UnaryExpr.Operator.negative; begin=tokenBegin();
+        break;
+        }
+      default:
+        jj_la1[86] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      ret = UnaryExpression();
+if(op == UnaryExpr.Operator.negative) {
+                        if (ret instanceof IntegerLiteralExpr && ((IntegerLiteralExpr)ret).isMinValue()) {
+                                ret = new IntegerLiteralMinValueExpr(range(begin, tokenEnd()));
+                        } else if (ret instanceof LongLiteralExpr && ((LongLiteralExpr)ret).isMinValue()) {
+                                ret = new LongLiteralMinValueExpr(range(begin, tokenEnd()));
+                        } else {
+                                ret = new UnaryExpr(range(begin, tokenEnd()), ret, op);
+                        }
+                 } else {
                         ret = new UnaryExpr(range(begin, tokenEnd()), ret, op);
-                    }
-                } else {
-                    ret = new UnaryExpr(range(begin, tokenEnd()), ret, op);
-                }
-                break;
-            }
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case BANG:
-            case TILDE: {
-                ret = UnaryExpressionNotPlusMinus();
-                break;
-            }
-            default:
-                jj_la1[87] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return ret;
-    }
-
-    final public Expression PreIncrementExpression() {
-        Expression ret;
+                 }
+      break;
+      }
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case BANG:
+    case TILDE:{
+      ret = UnaryExpressionNotPlusMinus();
+      break;
+      }
+    default:
+      jj_la1[87] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return ret;
+  }
+
+  final public Expression PreIncrementExpression() {Expression ret;
         Position begin = INVALID;
-        jj_consume_token(INCR);
-        begin = tokenBegin();
-        ret = UnaryExpression();
-        ret = new UnaryExpr(range(begin, tokenEnd()), ret, UnaryExpr.Operator.preIncrement);
-        return ret;
-    }
-
-    final public Expression PreDecrementExpression() {
-        Expression ret;
+    jj_consume_token(INCR);
+begin=tokenBegin();
+    ret = UnaryExpression();
+ret = new UnaryExpr(range(begin, tokenEnd()), ret, UnaryExpr.Operator.preIncrement);
+return ret;
+  }
+
+  final public Expression PreDecrementExpression() {Expression ret;
         Position begin;
-        jj_consume_token(DECR);
-        begin = tokenBegin();
-        ret = UnaryExpression();
-        ret = new UnaryExpr(range(begin, tokenEnd()), ret, UnaryExpr.Operator.preDecrement);
-        return ret;
-    }
-
-    final public Expression UnaryExpressionNotPlusMinus() {
-        Expression ret;
+    jj_consume_token(DECR);
+begin=tokenBegin();
+    ret = UnaryExpression();
+ret = new UnaryExpr(range(begin, tokenEnd()), ret, UnaryExpr.Operator.preDecrement);
+return ret;
+  }
+
+  final public Expression UnaryExpressionNotPlusMinus() {Expression ret;
         UnaryExpr.Operator op;
         Position begin = INVALID;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case BANG:
-            case TILDE: {
-                switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                    case TILDE: {
-                        jj_consume_token(TILDE);
-                        op = UnaryExpr.Operator.inverse;
-                        begin = tokenBegin();
-                        break;
-                    }
-                    case BANG: {
-                        jj_consume_token(BANG);
-                        op = UnaryExpr.Operator.not;
-                        begin = tokenBegin();
-                        break;
-                    }
-                    default:
-                        jj_la1[88] = jj_gen;
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                }
-                ret = UnaryExpression();
-                ret = new UnaryExpr(range(begin, tokenEnd()), ret, op);
-                break;
-            }
-            default:
-                jj_la1[89] = jj_gen;
-                if (jj_2_22(2147483647)) {
-                    ret = CastExpression();
-                } else {
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case BOOLEAN:
-                        case BYTE:
-                        case CHAR:
-                        case DOUBLE:
-                        case FALSE:
-                        case FLOAT:
-                        case INT:
-                        case LONG:
-                        case NEW:
-                        case NULL:
-                        case SHORT:
-                        case SUPER:
-                        case THIS:
-                        case TRUE:
-                        case VOID:
-                        case LONG_LITERAL:
-                        case INTEGER_LITERAL:
-                        case FLOATING_POINT_LITERAL:
-                        case CHARACTER_LITERAL:
-                        case STRING_LITERAL:
-                        case IDENTIFIER:
-                        case LPAREN: {
-                            ret = PostfixExpression();
-                            break;
-                        }
-                        default:
-                            jj_la1[90] = jj_gen;
-                            jj_consume_token(-1);
-                            throw new ParseException();
-                    }
-                }
-        }
-        return ret;
-    }
-
-    final public Expression PostfixExpression() {
-        Expression ret;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case BANG:
+    case TILDE:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case TILDE:{
+        jj_consume_token(TILDE);
+op = UnaryExpr.Operator.inverse; begin=tokenBegin();
+        break;
+        }
+      case BANG:{
+        jj_consume_token(BANG);
+op = UnaryExpr.Operator.not;     begin=tokenBegin();
+        break;
+        }
+      default:
+        jj_la1[88] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      ret = UnaryExpression();
+ret = new UnaryExpr(range(begin, tokenEnd()), ret, op);
+      break;
+      }
+    default:
+      jj_la1[89] = jj_gen;
+      if (jj_2_22(2147483647)) {
+        ret = CastExpression();
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case BOOLEAN:
+        case BYTE:
+        case CHAR:
+        case DOUBLE:
+        case FALSE:
+        case FLOAT:
+        case INT:
+        case LONG:
+        case NEW:
+        case NULL:
+        case SHORT:
+        case SUPER:
+        case THIS:
+        case TRUE:
+        case VOID:
+        case LONG_LITERAL:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case CHARACTER_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:{
+          ret = PostfixExpression();
+          break;
+          }
+        default:
+          jj_la1[90] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    }
+return ret;
+  }
+
+  final public Expression PostfixExpression() {Expression ret;
         UnaryExpr.Operator op;
-        ret = PrimaryExpression();
-        if (jj_2_23(2)) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case INCR: {
-                    jj_consume_token(INCR);
-                    op = UnaryExpr.Operator.posIncrement;
-                    break;
-                }
-                case DECR: {
-                    jj_consume_token(DECR);
-                    op = UnaryExpr.Operator.posDecrement;
-                    break;
-                }
-                default:
-                    jj_la1[91] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-            ret = new UnaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, op);
-        } else {
-            ;
+    ret = PrimaryExpression();
+    if (jj_2_23(2)) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case INCR:{
+        jj_consume_token(INCR);
+op = UnaryExpr.Operator.posIncrement;
+        break;
         }
-        return ret;
-    }
-
-    final public Expression CastExpression() {
-        Expression ret;
+      case DECR:{
+        jj_consume_token(DECR);
+op = UnaryExpr.Operator.posDecrement;
+        break;
+        }
+      default:
+        jj_la1[91] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+ret = new UnaryExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, op);
+    } else {
+      ;
+    }
+return ret;
+  }
+
+  final public Expression CastExpression() {Expression ret;
         ReferenceType referenceType;
         PrimitiveType primitiveType;
         Position begin = INVALID;
         List<AnnotationExpr> annotations = null;
         List<ReferenceType> typesOfMultiCast = null;
-        jj_consume_token(LPAREN);
-        begin = tokenBegin();
-        annotations = Annotations();
-        if (jj_2_24(2)) {
-            primitiveType = PrimitiveType();
-            jj_consume_token(RPAREN);
-            ret = UnaryExpression();
-            primitiveType.setAnnotations(annotations);
-            ret = new CastExpr(range(begin, tokenEnd()), primitiveType, ret);
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case SHORT:
-                case IDENTIFIER: {
-                    referenceType = ReferenceType();
-                    typesOfMultiCast = add(typesOfMultiCast, referenceType);
-                    referenceType.setAnnotations(annotations);
-                    label_38:
-                    while (true) {
-                        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                            case BIT_AND: {
-                                ;
-                                break;
-                            }
-                            default:
-                                jj_la1[92] = jj_gen;
-                                break label_38;
-                        }
-                        jj_consume_token(BIT_AND);
-                        referenceType = ReferenceType();
-                        typesOfMultiCast = add(typesOfMultiCast, referenceType);
-                    }
-                    jj_consume_token(RPAREN);
-                    ret = UnaryExpressionNotPlusMinus();
-                    if (typesOfMultiCast.size() > 1) {
-                        ret = new CastExpr(range(begin, tokenEnd()), new IntersectionType(range(begin, tokenEnd()), typesOfMultiCast), ret);
-                    }
-                    ret = new CastExpr(range(begin, tokenEnd()), referenceType, ret);
-                    break;
-                }
-                default:
-                    jj_la1[93] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        return ret;
-    }
-
-    final public Expression PrimaryExpression() {
-        Expression ret;
-        ret = PrimaryPrefix();
-        label_39:
-        while (true) {
-            if (jj_2_25(2)) {
-                ;
-            } else {
-                break label_39;
-            }
-            ret = PrimarySuffix(ret);
-        }
-        return ret;
-    }
-
-    final public Expression PrimaryExpressionWithoutSuperSuffix() {
-        Expression ret;
-        ret = PrimaryPrefix();
-        label_40:
+    jj_consume_token(LPAREN);
+begin=tokenBegin();
+    annotations = Annotations();
+    if (jj_2_24(2)) {
+      primitiveType = PrimitiveType();
+      jj_consume_token(RPAREN);
+      ret = UnaryExpression();
+primitiveType.setAnnotations(annotations); ret = new CastExpr(range(begin, tokenEnd()), primitiveType, ret);
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case SHORT:
+      case IDENTIFIER:{
+        referenceType = ReferenceType();
+typesOfMultiCast = add(typesOfMultiCast, referenceType); referenceType.setAnnotations(annotations);
+        label_38:
         while (true) {
-            if (jj_2_26(2147483647)) {
-                ;
-            } else {
-                break label_40;
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case BIT_AND:{
+            ;
+            break;
             }
-            ret = PrimarySuffixWithoutSuper(ret);
+          default:
+            jj_la1[92] = jj_gen;
+            break label_38;
+          }
+          jj_consume_token(BIT_AND);
+          referenceType = ReferenceType();
+typesOfMultiCast = add(typesOfMultiCast, referenceType);
         }
-        return ret;
-    }
-
-    final public Expression PrimaryPrefix() {
-        Expression ret = null;
+        jj_consume_token(RPAREN);
+        ret = UnaryExpressionNotPlusMinus();
+if (typesOfMultiCast.size() > 1) {
+                ret = new CastExpr(range(begin, tokenEnd()), new IntersectionType(range(begin, tokenEnd()), typesOfMultiCast), ret);
+            }
+            ret = new CastExpr(range(begin, tokenEnd()), referenceType, ret);
+        break;
+        }
+      default:
+        jj_la1[93] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+return ret;
+  }
+
+  final public Expression PrimaryExpression() {Expression ret;
+    ret = PrimaryPrefix();
+    label_39:
+    while (true) {
+      if (jj_2_25(2)) {
+        ;
+      } else {
+        break label_39;
+      }
+      ret = PrimarySuffix(ret);
+    }
+return ret;
+  }
+
+  final public Expression PrimaryExpressionWithoutSuperSuffix() {Expression ret;
+    ret = PrimaryPrefix();
+    label_40:
+    while (true) {
+      if (jj_2_26(2147483647)) {
+        ;
+      } else {
+        break label_40;
+      }
+      ret = PrimarySuffixWithoutSuper(ret);
+    }
+return ret;
+  }
+
+  final public Expression PrimaryPrefix() {Expression ret = null;
         NameExpr name;
         RangedList<Type<?>> typeArgs = new RangedList<Type<?>>(null);
         List<Expression> args = null;
@@ -2887,1613 +2792,1575 @@ final public Expression PrimaryPrefix() {
         Position begin;
         Parameter p = null;
         VariableDeclaratorId id = null;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case FALSE:
-            case NULL:
-            case TRUE:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL: {
-                ret = Literal();
-                break;
-            }
-            case THIS: {
-                jj_consume_token(THIS);
-                ret = new ThisExpr(tokenRange(), null);
-                break;
-            }
-            case SUPER: {
-                jj_consume_token(SUPER);
-                ret = new SuperExpr(tokenRange(), null);
-                switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                    case DOT: {
-                        jj_consume_token(DOT);
-                        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                            case LT: {
-                                typeArgs = TypeArguments();
-                                break;
-                            }
-                            default:
-                                jj_la1[94] = jj_gen;
-                                ;
-                        }
-                        name = SimpleName();
-                        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                            case LPAREN: {
-                                args = Arguments();
-                                hasArgs = true;
-                                break;
-                            }
-                            default:
-                                jj_la1[95] = jj_gen;
-                                ;
-                        }
-                        if (hasArgs) {
-                            MethodCallExpr m = new MethodCallExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, typeArgs.list, null, args);
-                            m.setNameExpr(name);
-                            ret = m;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case FALSE:
+    case NULL:
+    case TRUE:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:{
+      ret = Literal();
+      break;
+      }
+    case THIS:{
+      jj_consume_token(THIS);
+ret = new ThisExpr(tokenRange(), null);
+      break;
+      }
+    case SUPER:{
+      jj_consume_token(SUPER);
+ret = new SuperExpr(tokenRange(), null);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case DOT:{
+        jj_consume_token(DOT);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case LT:{
+          typeArgs = TypeArguments();
+          break;
+          }
+        default:
+          jj_la1[94] = jj_gen;
+          ;
+        }
+        name = SimpleName();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case LPAREN:{
+          args = Arguments();
+hasArgs=true;
+          break;
+          }
+        default:
+          jj_la1[95] = jj_gen;
+          ;
+        }
+if (hasArgs) {
+                                MethodCallExpr m = new MethodCallExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, typeArgs.list, null, args);
+                                m.setNameExpr(name);
+                                ret = m;
                         } else {
-                            FieldAccessExpr f = new FieldAccessExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, null, null);
-                            f.setFieldExpr(name);
-                            ret = f;
-                        }
-                        break;
-                    }
-                    case DOUBLECOLON: {
-                        jj_consume_token(DOUBLECOLON);
-                        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                            case LT: {
-                                typeArgs = TypeArguments();
-                                break;
-                            }
-                            default:
-                                jj_la1[96] = jj_gen;
-                                ;
-                        }
-                        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                            case IDENTIFIER: {
-                                jj_consume_token(IDENTIFIER);
-                                break;
-                            }
-                            case NEW: {
-                                jj_consume_token(NEW);
-                                break;
-                            }
-                            default:
-                                jj_la1[97] = jj_gen;
-                                jj_consume_token(-1);
-                                throw new ParseException();
+                                FieldAccessExpr f = new FieldAccessExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, null, null);
+                                f.setFieldExpr(name);
+                                ret = f;
                         }
-                        ret = new MethodReferenceExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, typeArgs.list, token.image);
-                        break;
-                    }
-                    default:
-                        jj_la1[98] = jj_gen;
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                }
-                break;
+        break;
+        }
+      case DOUBLECOLON:{
+        jj_consume_token(DOUBLECOLON);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case LT:{
+          typeArgs = TypeArguments();
+          break;
+          }
+        default:
+          jj_la1[96] = jj_gen;
+          ;
+        }
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IDENTIFIER:{
+          jj_consume_token(IDENTIFIER);
+          break;
+          }
+        case NEW:{
+          jj_consume_token(NEW);
+          break;
+          }
+        default:
+          jj_la1[97] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+ret = new MethodReferenceExpr(range(ret.getBegin(), pos(token.endLine, token.endColumn)), ret, typeArgs.list, token.image);
+        break;
+        }
+      default:
+        jj_la1[98] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      break;
+      }
+    case LPAREN:{
+      jj_consume_token(LPAREN);
+begin=tokenBegin();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ABSTRACT:
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FINAL:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NATIVE:
+      case NEW:
+      case NULL:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case SHORT:
+      case STATIC:
+      case STRICTFP:
+      case SUPER:
+      case SYNCHRONIZED:
+      case THIS:
+      case TRANSIENT:
+      case TRUE:
+      case VOID:
+      case VOLATILE:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case AT:
+      case BANG:
+      case TILDE:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:{
+        if (jj_2_27(2147483647)) {
+          p = FormalParameter();
+isLambda = true;
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case COMMA:{
+            params = FormalLambdaParameters();
+            break;
+            }
+          default:
+            jj_la1[99] = jj_gen;
+            ;
+          }
+        } else {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case BOOLEAN:
+          case BYTE:
+          case CHAR:
+          case DOUBLE:
+          case FALSE:
+          case FLOAT:
+          case INT:
+          case LONG:
+          case NEW:
+          case NULL:
+          case SHORT:
+          case SUPER:
+          case THIS:
+          case TRUE:
+          case VOID:
+          case LONG_LITERAL:
+          case INTEGER_LITERAL:
+          case FLOATING_POINT_LITERAL:
+          case CHARACTER_LITERAL:
+          case STRING_LITERAL:
+          case IDENTIFIER:
+          case LPAREN:
+          case BANG:
+          case TILDE:
+          case INCR:
+          case DECR:
+          case PLUS:
+          case MINUS:{
+            ret = Expression();
+            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+            case COMMA:{
+              params = InferredLambdaParameters();
+isLambda = true;
+              break;
+              }
+            default:
+              jj_la1[100] = jj_gen;
+              ;
             }
-            case LPAREN: {
-                jj_consume_token(LPAREN);
-                begin = tokenBegin();
-                switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                    case ABSTRACT:
-                    case BOOLEAN:
-                    case BYTE:
-                    case CHAR:
-                    case DOUBLE:
-                    case FALSE:
-                    case FINAL:
-                    case FLOAT:
-                    case INT:
-                    case LONG:
-                    case NATIVE:
-                    case NEW:
-                    case NULL:
-                    case PRIVATE:
-                    case PROTECTED:
-                    case PUBLIC:
-                    case SHORT:
-                    case STATIC:
-                    case STRICTFP:
-                    case SUPER:
-                    case SYNCHRONIZED:
-                    case THIS:
-                    case TRANSIENT:
-                    case TRUE:
-                    case VOID:
-                    case VOLATILE:
-                    case LONG_LITERAL:
-                    case INTEGER_LITERAL:
-                    case FLOATING_POINT_LITERAL:
-                    case CHARACTER_LITERAL:
-                    case STRING_LITERAL:
-                    case IDENTIFIER:
-                    case LPAREN:
-                    case AT:
-                    case BANG:
-                    case TILDE:
-                    case INCR:
-                    case DECR:
-                    case PLUS:
-                    case MINUS: {
-                        if (jj_2_27(2147483647)) {
-                            p = FormalParameter();
-                            isLambda = true;
-                            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                                case COMMA: {
-                                    params = FormalLambdaParameters();
-                                    break;
-                                }
-                                default:
-                                    jj_la1[99] = jj_gen;
-                                    ;
-                            }
-                        } else {
-                            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                                case BOOLEAN:
-                                case BYTE:
-                                case CHAR:
-                                case DOUBLE:
-                                case FALSE:
-                                case FLOAT:
-                                case INT:
-                                case LONG:
-                                case NEW:
-                                case NULL:
-                                case SHORT:
-                                case SUPER:
-                                case THIS:
-                                case TRUE:
-                                case VOID:
-                                case LONG_LITERAL:
-                                case INTEGER_LITERAL:
-                                case FLOATING_POINT_LITERAL:
-                                case CHARACTER_LITERAL:
-                                case STRING_LITERAL:
-                                case IDENTIFIER:
-                                case LPAREN:
-                                case BANG:
-                                case TILDE:
-                                case INCR:
-                                case DECR:
-                                case PLUS:
-                                case MINUS: {
-                                    ret = Expression();
-                                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                                        case COMMA: {
-                                            params = InferredLambdaParameters();
-                                            isLambda = true;
-                                            break;
+            break;
+            }
+          default:
+            jj_la1[101] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
+        }
+        break;
+        }
+      default:
+        jj_la1[102] = jj_gen;
+        ;
+      }
+      jj_consume_token(RPAREN);
+if(!isLambda) { ret = new EnclosedExpr(range(begin, tokenEnd()), ret);}
+                           else{
+                                  if(ret != null){
+                                          if(ret instanceof NameExpr)
+                                          {
+                                            id = new VariableDeclaratorId(range(ret.getBegin(), ret.getEnd()), ((NameExpr)ret).getName(), null);
+                                            p = new Parameter(range(ret.getBegin(), ret.getEnd()), EnumSet.noneOf(Modifier.class), null, new UnknownType(), null, false, id);
+                                          }
+
                                         }
-                                        default:
-                                            jj_la1[100] = jj_gen;
-                                            ;
-                                    }
-                                    break;
+                                        params = add(0, params, p);
+                                        // TODO p may be null here
+                                        ret = new LambdaExpr(range(p.getBegin(), tokenEnd()), params, null, true);
                                 }
-                                default:
-                                    jj_la1[101] = jj_gen;
-                                    jj_consume_token(-1);
-                                    throw new ParseException();
-                            }
-                        }
-                        break;
-                    }
-                    default:
-                        jj_la1[102] = jj_gen;
-                        ;
-                }
-                jj_consume_token(RPAREN);
-                if (!isLambda) {
-                    ret = new EnclosedExpr(range(begin, tokenEnd()), ret);
-                } else {
-                    if (ret != null) {
-                        if (ret instanceof NameExpr) {
-                            id = new VariableDeclaratorId(range(ret.getBegin(), ret.getEnd()), ((NameExpr) ret).getName(), null);
-                            p = new Parameter(range(ret.getBegin(), ret.getEnd()), EnumSet.noneOf(Modifier.class), null, new UnknownType(), null, false, id);
-                        }
-
-                    }
-                    params = add(0, params, p);
-                    // TODO p may be null here
-                    ret = new LambdaExpr(range(p.getBegin(), tokenEnd()), params, null, true);
-                }
-                break;
-            }
-            case NEW: {
-                ret = AllocationExpression(null);
-                break;
+      break;
+      }
+    case NEW:{
+      ret = AllocationExpression(null);
+      break;
+      }
+    default:
+      jj_la1[106] = jj_gen;
+      if (jj_2_28(2147483647)) {
+        type = ResultType();
+        jj_consume_token(DOT);
+        jj_consume_token(CLASS);
+ret = new ClassExpr(range(type.getBegin(), tokenEnd()), type);
+      } else if (jj_2_29(2147483647)) {
+        type = ResultType();
+        jj_consume_token(DOUBLECOLON);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case LT:{
+          typeArgs = TypeArguments();
+          break;
+          }
+        default:
+          jj_la1[103] = jj_gen;
+          ;
+        }
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IDENTIFIER:{
+          jj_consume_token(IDENTIFIER);
+          break;
+          }
+        case NEW:{
+          jj_consume_token(NEW);
+          break;
+          }
+        default:
+          jj_la1[104] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+ret = new TypeExpr(type.getRange(), type);
+                  ret = new MethodReferenceExpr(ret.getRange(), ret, typeArgs.list, token.image);
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IDENTIFIER:{
+          name = SimpleName();
+begin=tokenBegin();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case LPAREN:{
+            args = Arguments();
+hasArgs=true;
+            break;
             }
-            default:
-                jj_la1[106] = jj_gen;
-                if (jj_2_28(2147483647)) {
-                    type = ResultType();
-                    jj_consume_token(DOT);
-                    jj_consume_token(CLASS);
-                    ret = new ClassExpr(range(type.getBegin(), tokenEnd()), type);
-                } else if (jj_2_29(2147483647)) {
-                    type = ResultType();
-                    jj_consume_token(DOUBLECOLON);
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case LT: {
-                            typeArgs = TypeArguments();
-                            break;
-                        }
-                        default:
-                            jj_la1[103] = jj_gen;
-                            ;
-                    }
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case IDENTIFIER: {
-                            jj_consume_token(IDENTIFIER);
-                            break;
-                        }
-                        case NEW: {
-                            jj_consume_token(NEW);
-                            break;
-                        }
-                        default:
-                            jj_la1[104] = jj_gen;
-                            jj_consume_token(-1);
-                            throw new ParseException();
-                    }
-                    ret = new TypeExpr(type.getRange(), type);
-                    ret = new MethodReferenceExpr(ret.getRange(), ret, typeArgs.list, token.image);
-                } else {
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case IDENTIFIER: {
-                            name = SimpleName();
-                            begin = tokenBegin();
-                            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                                case LPAREN: {
-                                    args = Arguments();
-                                    hasArgs = true;
-                                    break;
-                                }
-                                default:
-                                    jj_la1[105] = jj_gen;
-                                    ;
-                            }
-                            if (hasArgs) {
+          default:
+            jj_la1[105] = jj_gen;
+            ;
+          }
+if (hasArgs) {
                                 MethodCallExpr m = new MethodCallExpr(range(begin, tokenEnd()), null, null, null, args);
                                 m.setNameExpr(name);
                                 ret = m;
-                            } else {
+                        } else {
                                 ret = name;
-                            }
-                            break;
                         }
-                        default:
-                            jj_la1[107] = jj_gen;
-                            jj_consume_token(-1);
-                            throw new ParseException();
-                    }
-                }
-        }
-        return ret;
-    }
-
-    final public Expression PrimarySuffix(Expression scope) {
-        Expression ret;
-        if (jj_2_30(2)) {
-            ret = PrimarySuffixWithoutSuper(scope);
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case DOT: {
-                    jj_consume_token(DOT);
-                    jj_consume_token(SUPER);
-                    ret = new SuperExpr(range(scope.getBegin(), tokenEnd()), scope);
-                    break;
-                }
-                default:
-                    jj_la1[108] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        return ret;
-    }
-
-    final public Expression PrimarySuffixWithoutSuper(Expression scope) {
-        Expression ret;
+          break;
+          }
+        default:
+          jj_la1[107] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    }
+return ret;
+  }
+
+  final public Expression PrimarySuffix(Expression scope) {Expression ret;
+    if (jj_2_30(2)) {
+      ret = PrimarySuffixWithoutSuper(scope);
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case DOT:{
+        jj_consume_token(DOT);
+        jj_consume_token(SUPER);
+ret = new SuperExpr(range(scope.getBegin(), tokenEnd()), scope);
+        break;
+        }
+      default:
+        jj_la1[108] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+return ret;
+  }
+
+  final public Expression PrimarySuffixWithoutSuper(Expression scope) {Expression ret;
         RangedList<Type<?>> typeArgs = new RangedList<Type<?>>(null);
         List<Expression> args = null;
         boolean hasArgs = false;
         NameExpr name;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case DOT: {
-                jj_consume_token(DOT);
-                switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                    case THIS: {
-                        jj_consume_token(THIS);
-                        ret = new ThisExpr(range(scope.getBegin(), tokenEnd()), scope);
-                        break;
-                    }
-                    case NEW: {
-                        ret = AllocationExpression(scope);
-                        break;
-                    }
-                    default:
-                        jj_la1[111] = jj_gen;
-                        if (jj_2_31(2147483647)) {
-                            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                                case LT: {
-                                    typeArgs = TypeArguments();
-                                    break;
-                                }
-                                default:
-                                    jj_la1[109] = jj_gen;
-                                    ;
-                            }
-                            name = SimpleName();
-                            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                                case LPAREN: {
-                                    args = Arguments();
-                                    hasArgs = true;
-                                    break;
-                                }
-                                default:
-                                    jj_la1[110] = jj_gen;
-                                    ;
-                            }
-                            if (hasArgs) {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case DOT:{
+      jj_consume_token(DOT);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case THIS:{
+        jj_consume_token(THIS);
+ret = new ThisExpr(range(scope.getBegin(), tokenEnd()), scope);
+        break;
+        }
+      case NEW:{
+        ret = AllocationExpression(scope);
+        break;
+        }
+      default:
+        jj_la1[111] = jj_gen;
+        if (jj_2_31(2147483647)) {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case LT:{
+            typeArgs = TypeArguments();
+            break;
+            }
+          default:
+            jj_la1[109] = jj_gen;
+            ;
+          }
+          name = SimpleName();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case LPAREN:{
+            args = Arguments();
+hasArgs=true;
+            break;
+            }
+          default:
+            jj_la1[110] = jj_gen;
+            ;
+          }
+if (hasArgs) {
                                 MethodCallExpr m = new MethodCallExpr(range(scope.getBegin(), tokenEnd()), scope, typeArgs.list, null, args);
                                 m.setNameExpr(name);
                                 ret = m;
-                            } else {
-                                FieldAccessExpr f = new FieldAccessExpr(range(scope.getBegin(), tokenEnd()), scope, typeArgs.list, null);
+                        } else {
+                                FieldAccessExpr f =  new FieldAccessExpr(range(scope.getBegin(), tokenEnd()), scope, typeArgs.list, null);
                                 f.setFieldExpr(name);
                                 ret = f;
-                            }
-                        } else {
-                            jj_consume_token(-1);
-                            throw new ParseException();
                         }
-                }
-                break;
-            }
-            case LBRACKET: {
-                jj_consume_token(LBRACKET);
-                ret = Expression();
-                jj_consume_token(RBRACKET);
-                ret = new ArrayAccessExpr(range(scope.getBegin(), tokenEnd()), scope, ret);
-                break;
-            }
-            default:
-                jj_la1[112] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return ret;
-    }
-
-    final public Expression Literal() {
-        Expression ret;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case INTEGER_LITERAL: {
-                jj_consume_token(INTEGER_LITERAL);
-                ret = new IntegerLiteralExpr(tokenRange(), token.image);
-                break;
-            }
-            case LONG_LITERAL: {
-                jj_consume_token(LONG_LITERAL);
-                ret = new LongLiteralExpr(tokenRange(), token.image);
-                break;
-            }
-            case FLOATING_POINT_LITERAL: {
-                jj_consume_token(FLOATING_POINT_LITERAL);
-                ret = new DoubleLiteralExpr(tokenRange(), token.image);
-                break;
-            }
-            case CHARACTER_LITERAL: {
-                jj_consume_token(CHARACTER_LITERAL);
-                ret = new CharLiteralExpr(tokenRange(), token.image.substring(1, token.image.length() - 1));
-                break;
-            }
-            case STRING_LITERAL: {
-                jj_consume_token(STRING_LITERAL);
-                ret = new StringLiteralExpr(tokenRange(), token.image.substring(1, token.image.length() - 1));
-                break;
-            }
-            case FALSE:
-            case TRUE: {
-                ret = BooleanLiteral();
-                break;
-            }
-            case NULL: {
-                ret = NullLiteral();
-                break;
-            }
-            default:
-                jj_la1[113] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return ret;
-    }
-
-    final public Expression BooleanLiteral() {
-        Expression ret;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case TRUE: {
-                jj_consume_token(TRUE);
-                ret = new BooleanLiteralExpr(tokenRange(), true);
-                break;
-            }
-            case FALSE: {
-                jj_consume_token(FALSE);
-                ret = new BooleanLiteralExpr(tokenRange(), false);
-                break;
-            }
-            default:
-                jj_la1[114] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return ret;
-    }
-
-    final public Expression NullLiteral() {
-        jj_consume_token(NULL);
-        return new NullLiteralExpr(tokenRange());
-    }
-
-    final public List<Expression> Arguments() {
-        List<Expression> ret = null;
-        jj_consume_token(LPAREN);
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS: {
-                ret = ArgumentList();
-                break;
-            }
-            default:
-                jj_la1[115] = jj_gen;
-                ;
-        }
-        jj_consume_token(RPAREN);
-        return ret;
-    }
-
-    final public List<Expression> ArgumentList() {
-        List<Expression> ret = new LinkedList<Expression>();
+        } else {
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+      break;
+      }
+    case LBRACKET:{
+      jj_consume_token(LBRACKET);
+      ret = Expression();
+      jj_consume_token(RBRACKET);
+ret = new ArrayAccessExpr(range(scope.getBegin(), tokenEnd()), scope, ret);
+      break;
+      }
+    default:
+      jj_la1[112] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return ret;
+  }
+
+  final public Expression Literal() {Expression ret;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case INTEGER_LITERAL:{
+      jj_consume_token(INTEGER_LITERAL);
+ret = new IntegerLiteralExpr(tokenRange(), token.image);
+      break;
+      }
+    case LONG_LITERAL:{
+      jj_consume_token(LONG_LITERAL);
+ret = new LongLiteralExpr(tokenRange(), token.image);
+      break;
+      }
+    case FLOATING_POINT_LITERAL:{
+      jj_consume_token(FLOATING_POINT_LITERAL);
+ret = new DoubleLiteralExpr(tokenRange(), token.image);
+      break;
+      }
+    case CHARACTER_LITERAL:{
+      jj_consume_token(CHARACTER_LITERAL);
+ret = new CharLiteralExpr(tokenRange(), token.image.substring(1, token.image.length()-1));
+      break;
+      }
+    case STRING_LITERAL:{
+      jj_consume_token(STRING_LITERAL);
+ret = new StringLiteralExpr(tokenRange(), token.image.substring(1, token.image.length()-1));
+      break;
+      }
+    case FALSE:
+    case TRUE:{
+      ret = BooleanLiteral();
+      break;
+      }
+    case NULL:{
+      ret = NullLiteral();
+      break;
+      }
+    default:
+      jj_la1[113] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return ret;
+  }
+
+  final public Expression BooleanLiteral() {Expression ret;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case TRUE:{
+      jj_consume_token(TRUE);
+ret = new BooleanLiteralExpr(tokenRange(), true);
+      break;
+      }
+    case FALSE:{
+      jj_consume_token(FALSE);
+ret = new BooleanLiteralExpr(tokenRange(), false);
+      break;
+      }
+    default:
+      jj_la1[114] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return ret;
+  }
+
+  final public Expression NullLiteral() {
+    jj_consume_token(NULL);
+return new NullLiteralExpr(tokenRange());
+  }
+
+  final public List<Expression> Arguments() {List<Expression> ret = null;
+    jj_consume_token(LPAREN);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:{
+      ret = ArgumentList();
+      break;
+      }
+    default:
+      jj_la1[115] = jj_gen;
+      ;
+    }
+    jj_consume_token(RPAREN);
+return ret;
+  }
+
+  final public List<Expression> ArgumentList() {List<Expression> ret = new LinkedList<Expression>();
         Expression expr;
-        expr = Expression();
-        ret.add(expr);
-        label_41:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case COMMA: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[116] = jj_gen;
-                    break label_41;
-            }
-            jj_consume_token(COMMA);
-            expr = Expression();
-            ret.add(expr);
-        }
-        return ret;
-    }
-
-    final public Expression AllocationExpression(Expression scope) {
-        Expression ret;
+    expr = Expression();
+ret.add(expr);
+    label_41:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[116] = jj_gen;
+        break label_41;
+      }
+      jj_consume_token(COMMA);
+      expr = Expression();
+ret.add(expr);
+    }
+return ret;
+  }
+
+  final public Expression AllocationExpression(Expression scope) {Expression ret;
         Type type;
         RangedList<Type<?>> typeArgs = new RangedList<Type<?>>(null);
         List<BodyDeclaration<?>> anonymousBody = null;
         List<Expression> args;
         Position begin;
         List<AnnotationExpr> annotations = null;
-        jj_consume_token(NEW);
-        if (scope == null) {
-            begin = tokenBegin();
-        } else {
-            begin = scope.getBegin();
-        }
+    jj_consume_token(NEW);
+if(scope==null) {begin=tokenBegin();} else {begin=scope.getBegin();}
+    annotations = Annotations();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case SHORT:{
+      type = PrimitiveType();
+type.setAnnotations(annotations);
+      ret = ArrayCreation(begin, type);
+      break;
+      }
+    case IDENTIFIER:
+    case AT:
+    case LT:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LT:{
+        typeArgs = TypeArguments();
         annotations = Annotations();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case SHORT: {
-                type = PrimitiveType();
-                type.setAnnotations(annotations);
-                ret = ArrayCreation(begin, type);
-                break;
-            }
-            case IDENTIFIER:
-            case AT:
-            case LT: {
-                switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                    case LT: {
-                        typeArgs = TypeArguments();
-                        annotations = Annotations();
-                        break;
-                    }
-                    default:
-                        jj_la1[117] = jj_gen;
-                        ;
-                }
-                type = AnnotatedClassOrInterfaceType();
-                switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                    case LBRACKET:
-                    case AT: {
-                        ret = ArrayCreation(begin, type);
-                        break;
-                    }
-                    case LPAREN: {
-                        args = Arguments();
-                        if (jj_2_32(2)) {
-                            anonymousBody = ClassOrInterfaceBody(false);
-                        } else {
-                            ;
-                        }
-                        ret = new ObjectCreationExpr(range(begin, tokenEnd()), scope, (ClassOrInterfaceType) type, typeArgs.list, args, anonymousBody);
-                        break;
-                    }
-                    default:
-                        jj_la1[118] = jj_gen;
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                }
-                break;
-            }
-            default:
-                jj_la1[119] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return ret;
-    }
+        break;
+        }
+      default:
+        jj_la1[117] = jj_gen;
+        ;
+      }
+      type = AnnotatedClassOrInterfaceType();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LBRACKET:
+      case AT:{
+        ret = ArrayCreation(begin, type);
+        break;
+        }
+      case LPAREN:{
+        args = Arguments();
+        if (jj_2_32(2)) {
+          anonymousBody = ClassOrInterfaceBody(false);
+        } else {
+          ;
+        }
+ret = new ObjectCreationExpr(range(begin, tokenEnd()), scope, (ClassOrInterfaceType) type, typeArgs.list, args, anonymousBody);
+        break;
+        }
+      default:
+        jj_la1[118] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      break;
+      }
+    default:
+      jj_la1[119] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return ret;
+  }
 
-    /*
-     * The third LOOKAHEAD specification below is to parse to PrimarySuffix
-     * if there is an expression between the "[...]".
-     */
-    final public ArrayCreationExpr ArrayCreation(Position begin, Type type) {
-        Expression expr = null;
+/*
+ * The third LOOKAHEAD specification below is to parse to PrimarySuffix
+ * if there is an expression between the "[...]".
+ */
+  final public ArrayCreationExpr ArrayCreation(Position begin, Type type) {Expression expr = null;
         ArrayInitializerExpr arrayInitializerExpr = null;
         List<Expression> inits = null;
         List<List<AnnotationExpr>> accum = null;
         List<AnnotationExpr> annotations = null;
-        label_42:
-        while (true) {
-            annotations = Annotations();
-            jj_consume_token(LBRACKET);
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FALSE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case NEW:
-                case NULL:
-                case SHORT:
-                case SUPER:
-                case THIS:
-                case TRUE:
-                case VOID:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case BANG:
-                case TILDE:
-                case INCR:
-                case DECR:
-                case PLUS:
-                case MINUS: {
-                    expr = Expression();
-                    break;
-                }
-                default:
-                    jj_la1[120] = jj_gen;
-                    ;
-            }
-            accum = add(accum, annotations);
-            inits = add(inits, expr);
-            annotations = null;
-            expr = null;
-            jj_consume_token(RBRACKET);
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case LBRACKET:
-                case AT: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[121] = jj_gen;
-                    break label_42;
-            }
-        }
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case LBRACE: {
-                arrayInitializerExpr = ArrayInitializer();
-                break;
-            }
-            default:
-                jj_la1[122] = jj_gen;
-                ;
-        }
-        return juggleArrayCreation(range(begin, tokenEnd()), type, inits, accum, arrayInitializerExpr);
-    }
-
-    /*
-     * Statement syntax follows.
-     */
-    final public Statement Statement() {
-        Statement ret;
-        if (jj_2_33(2)) {
-            ret = LabeledStatement();
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case ASSERT: {
-                    ret = AssertStatement();
-                    break;
-                }
-                case LBRACE: {
-                    ret = Block();
-                    break;
-                }
-                case SEMICOLON: {
-                    ret = EmptyStatement();
-                    break;
-                }
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FALSE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case NEW:
-                case NULL:
-                case SHORT:
-                case SUPER:
-                case THIS:
-                case TRUE:
-                case VOID:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case INCR:
-                case DECR: {
-                    ret = StatementExpression();
-                    break;
-                }
-                case SWITCH: {
-                    ret = SwitchStatement();
-                    break;
-                }
-                case IF: {
-                    ret = IfStatement();
-                    break;
-                }
-                case WHILE: {
-                    ret = WhileStatement();
-                    break;
-                }
-                case DO: {
-                    ret = DoStatement();
-                    break;
-                }
-                case FOR: {
-                    ret = ForStatement();
-                    break;
-                }
-                case BREAK: {
-                    ret = BreakStatement();
-                    break;
-                }
-                case CONTINUE: {
-                    ret = ContinueStatement();
-                    break;
-                }
-                case RETURN: {
-                    ret = ReturnStatement();
-                    break;
-                }
-                case THROW: {
-                    ret = ThrowStatement();
-                    break;
-                }
-                case SYNCHRONIZED: {
-                    ret = SynchronizedStatement();
-                    break;
-                }
-                case TRY: {
-                    ret = TryStatement();
-                    break;
-                }
-                default:
-                    jj_la1[123] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        return ret;
-    }
+    label_42:
+    while (true) {
+      annotations = Annotations();
+      jj_consume_token(LBRACKET);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NEW:
+      case NULL:
+      case SHORT:
+      case SUPER:
+      case THIS:
+      case TRUE:
+      case VOID:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case BANG:
+      case TILDE:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:{
+        expr = Expression();
+        break;
+        }
+      default:
+        jj_la1[120] = jj_gen;
+        ;
+      }
+accum = add(accum, annotations); inits = add(inits, expr); annotations=null; expr=null;
+      jj_consume_token(RBRACKET);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LBRACKET:
+      case AT:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[121] = jj_gen;
+        break label_42;
+      }
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LBRACE:{
+      arrayInitializerExpr = ArrayInitializer();
+      break;
+      }
+    default:
+      jj_la1[122] = jj_gen;
+      ;
+    }
+return juggleArrayCreation(range(begin, tokenEnd()), type, inits, accum, arrayInitializerExpr);
+  }
 
-    final public AssertStmt AssertStatement() {
-        Expression check;
+/*
+ * Statement syntax follows.
+ */
+  final public 
+Statement Statement() {Statement ret;
+    if (jj_2_33(2)) {
+      ret = LabeledStatement();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ASSERT:{
+        ret = AssertStatement();
+        break;
+        }
+      case LBRACE:{
+        ret = Block();
+        break;
+        }
+      case SEMICOLON:{
+        ret = EmptyStatement();
+        break;
+        }
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NEW:
+      case NULL:
+      case SHORT:
+      case SUPER:
+      case THIS:
+      case TRUE:
+      case VOID:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case INCR:
+      case DECR:{
+        ret = StatementExpression();
+        break;
+        }
+      case SWITCH:{
+        ret = SwitchStatement();
+        break;
+        }
+      case IF:{
+        ret = IfStatement();
+        break;
+        }
+      case WHILE:{
+        ret = WhileStatement();
+        break;
+        }
+      case DO:{
+        ret = DoStatement();
+        break;
+        }
+      case FOR:{
+        ret = ForStatement();
+        break;
+        }
+      case BREAK:{
+        ret = BreakStatement();
+        break;
+        }
+      case CONTINUE:{
+        ret = ContinueStatement();
+        break;
+        }
+      case RETURN:{
+        ret = ReturnStatement();
+        break;
+        }
+      case THROW:{
+        ret = ThrowStatement();
+        break;
+        }
+      case SYNCHRONIZED:{
+        ret = SynchronizedStatement();
+        break;
+        }
+      case TRY:{
+        ret = TryStatement();
+        break;
+        }
+      default:
+        jj_la1[123] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+return ret;
+  }
+
+  final public AssertStmt AssertStatement() {Expression check;
         Expression msg = null;
         Position begin;
-        jj_consume_token(ASSERT);
-        begin = tokenBegin();
-        check = Expression();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case COLON: {
-                jj_consume_token(COLON);
-                msg = Expression();
-                break;
-            }
-            default:
-                jj_la1[124] = jj_gen;
-                ;
-        }
-        jj_consume_token(SEMICOLON);
-        return new AssertStmt(range(begin, tokenEnd()), check, msg);
-    }
-
-    final public LabeledStmt LabeledStatement() {
-        String label;
+    jj_consume_token(ASSERT);
+begin=tokenBegin();
+    check = Expression();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case COLON:{
+      jj_consume_token(COLON);
+      msg = Expression();
+      break;
+      }
+    default:
+      jj_la1[124] = jj_gen;
+      ;
+    }
+    jj_consume_token(SEMICOLON);
+return new AssertStmt(range(begin, tokenEnd()),check, msg);
+  }
+
+  final public LabeledStmt LabeledStatement() {String label;
         Statement stmt;
         Position begin;
-        jj_consume_token(IDENTIFIER);
-        begin = tokenBegin();
-        label = token.image;
-        jj_consume_token(COLON);
-        stmt = Statement();
-        return new LabeledStmt(range(begin, tokenEnd()), label, stmt);
-    }
-
-    final public BlockStmt Block() {
-        List<Statement> stmts;
+    jj_consume_token(IDENTIFIER);
+begin=tokenBegin();
+label = token.image;
+    jj_consume_token(COLON);
+    stmt = Statement();
+return new LabeledStmt(range(begin, tokenEnd()),label, stmt);
+  }
+
+  final public BlockStmt Block() {List<Statement> stmts;
         Position begin;
-        jj_consume_token(LBRACE);
-        begin = tokenBegin();
-        stmts = Statements();
-        jj_consume_token(RBRACE);
-        return new BlockStmt(range(begin, tokenEnd()), stmts);
-    }
+    jj_consume_token(LBRACE);
+begin=tokenBegin();
+    stmts = Statements();
+    jj_consume_token(RBRACE);
+return new BlockStmt(range(begin, tokenEnd()), stmts);
+  }
 
-    /*
-     * Classes inside block stametents can only be abstract or final. The semantic must check it.
-     */
-    final public Statement BlockStatement() {
-        Statement ret;
+/*
+ * Classes inside block stametents can only be abstract or final. The semantic must check it.
+ */
+  final public Statement BlockStatement() {Statement ret;
         Expression expr;
         ClassOrInterfaceDeclaration typeDecl;
         ModifierHolder modifier;
-        if (jj_2_34(2147483647)) {
-
-            modifier = Modifiers();
-            typeDecl = ClassOrInterfaceDeclaration(modifier);
-            ret = new TypeDeclarationStmt(range(typeDecl.getBegin().line, typeDecl.getBegin().column, token.endLine, token.endColumn), typeDecl);
-        } else if (jj_2_35(2147483647)) {
-            expr = VariableDeclarationExpression();
-            jj_consume_token(SEMICOLON);
-            ret = new ExpressionStmt(range(expr.getBegin().line, expr.getBegin().column, token.endLine, token.endColumn), expr);
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case ASSERT:
-                case BOOLEAN:
-                case BREAK:
-                case BYTE:
-                case CHAR:
-                case CONTINUE:
-                case DO:
-                case DOUBLE:
-                case FALSE:
-                case FLOAT:
-                case FOR:
-                case IF:
-                case INT:
-                case LONG:
-                case NEW:
-                case NULL:
-                case RETURN:
-                case SHORT:
-                case SUPER:
-                case SWITCH:
-                case SYNCHRONIZED:
-                case THIS:
-                case THROW:
-                case TRUE:
-                case TRY:
-                case VOID:
-                case WHILE:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case LBRACE:
-                case SEMICOLON:
-                case INCR:
-                case DECR: {
-                    ret = Statement();
-                    break;
-                }
-                default:
-                    jj_la1[125] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        return ret;
-    }
-
-    final public VariableDeclarationExpr VariableDeclarationExpression() {
-        ModifierHolder modifier;
+    if (jj_2_34(2147483647)) {
+
+      modifier = Modifiers();
+      typeDecl = ClassOrInterfaceDeclaration(modifier);
+ret = new TypeDeclarationStmt(range(typeDecl.getBegin().line, typeDecl.getBegin().column, token.endLine, token.endColumn), typeDecl);
+    } else if (jj_2_35(2147483647)) {
+      expr = VariableDeclarationExpression();
+      jj_consume_token(SEMICOLON);
+ret = new ExpressionStmt(range(expr.getBegin().line, expr.getBegin().column, token.endLine, token.endColumn), expr);
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ASSERT:
+      case BOOLEAN:
+      case BREAK:
+      case BYTE:
+      case CHAR:
+      case CONTINUE:
+      case DO:
+      case DOUBLE:
+      case FALSE:
+      case FLOAT:
+      case FOR:
+      case IF:
+      case INT:
+      case LONG:
+      case NEW:
+      case NULL:
+      case RETURN:
+      case SHORT:
+      case SUPER:
+      case SWITCH:
+      case SYNCHRONIZED:
+      case THIS:
+      case THROW:
+      case TRUE:
+      case TRY:
+      case VOID:
+      case WHILE:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LBRACE:
+      case SEMICOLON:
+      case INCR:
+      case DECR:{
+        ret = Statement();
+        break;
+        }
+      default:
+        jj_la1[125] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+return ret;
+  }
+
+  final public VariableDeclarationExpr VariableDeclarationExpression() {ModifierHolder modifier;
         Type type;
         List<VariableDeclarator> variables = new LinkedList<VariableDeclarator>();
         VariableDeclarator var;
-        modifier = Modifiers();
-        type = Type();
-        var = VariableDeclarator();
-        variables.add(var);
-        label_43:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case COMMA: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[126] = jj_gen;
-                    break label_43;
-            }
-            jj_consume_token(COMMA);
-            var = VariableDeclarator();
-            variables.add(var);
-        }
-        Position begin = modifier.begin.orIfInvalid(type.getBegin());
+    modifier = Modifiers();
+    type = Type();
+    var = VariableDeclarator();
+variables.add(var);
+    label_43:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[126] = jj_gen;
+        break label_43;
+      }
+      jj_consume_token(COMMA);
+      var = VariableDeclarator();
+variables.add(var);
+    }
+Position begin=modifier.begin.orIfInvalid(type.getBegin());
         Pair<Type, List<ArrayBracketPair>> typeListPair = unwrapArrayTypes(type);
         return new VariableDeclarationExpr(range(begin, tokenEnd()), modifier.modifiers, modifier.annotations, typeListPair.a, variables, typeListPair.b);
-    }
-
-    final public EmptyStmt EmptyStatement() {
-        jj_consume_token(SEMICOLON);
-        return new EmptyStmt(tokenRange());
-    }
-
-    final public Statement LambdaBody() {
-        Expression expr;
-        Statement n = null;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS: {
-                expr = Expression();
-                n = new ExpressionStmt(range(expr.getBegin(), tokenEnd()), expr);
-                break;
-            }
-            case LBRACE: {
-                n = Block();
-                break;
-            }
-            default:
-                jj_la1[127] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return n;
-    }
-
-    final public ExpressionStmt StatementExpression() {
-        Expression expr;
+  }
+
+  final public EmptyStmt EmptyStatement() {
+    jj_consume_token(SEMICOLON);
+return new EmptyStmt(tokenRange());
+  }
+
+  final public Statement LambdaBody() {Expression expr;
+  Statement n = null;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:{
+      expr = Expression();
+n = new ExpressionStmt(range(expr.getBegin(), tokenEnd()), expr);
+      break;
+      }
+    case LBRACE:{
+      n = Block();
+      break;
+      }
+    default:
+      jj_la1[127] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return n;
+  }
+
+  final public ExpressionStmt StatementExpression() {Expression expr;
         AssignExpr.Operator op;
         Expression value;
         RangedList<Type<?>> typeArgs = new RangedList<Type<?>>(null);
         Statement lambdaBody;
-        if (jj_2_36(2)) {
-            expr = PreIncrementExpression();
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case DECR: {
-                    expr = PreDecrementExpression();
-                    break;
-                }
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FALSE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case NEW:
-                case NULL:
-                case SHORT:
-                case SUPER:
-                case THIS:
-                case TRUE:
-                case VOID:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN: {
-                    expr = PrimaryExpression();
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case ASSIGN:
-                        case INCR:
-                        case DECR:
-                        case PLUSASSIGN:
-                        case MINUSASSIGN:
-                        case STARASSIGN:
-                        case SLASHASSIGN:
-                        case ANDASSIGN:
-                        case ORASSIGN:
-                        case XORASSIGN:
-                        case REMASSIGN:
-                        case LSHIFTASSIGN:
-                        case RSIGNEDSHIFTASSIGN:
-                        case RUNSIGNEDSHIFTASSIGN:
-                        case ARROW:
-                        case DOUBLECOLON: {
-                            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                                case INCR: {
-                                    jj_consume_token(INCR);
-                                    expr = new UnaryExpr(range(expr.getBegin(), tokenEnd()), expr, UnaryExpr.Operator.posIncrement);
-                                    break;
-                                }
-                                case DECR: {
-                                    jj_consume_token(DECR);
-                                    expr = new UnaryExpr(range(expr.getBegin(), tokenEnd()), expr, UnaryExpr.Operator.posDecrement);
-                                    break;
-                                }
-                                case ASSIGN:
-                                case PLUSASSIGN:
-                                case MINUSASSIGN:
-                                case STARASSIGN:
-                                case SLASHASSIGN:
-                                case ANDASSIGN:
-                                case ORASSIGN:
-                                case XORASSIGN:
-                                case REMASSIGN:
-                                case LSHIFTASSIGN:
-                                case RSIGNEDSHIFTASSIGN:
-                                case RUNSIGNEDSHIFTASSIGN: {
-                                    op = AssignmentOperator();
-                                    value = Expression();
-                                    expr = new AssignExpr(range(expr.getBegin(), tokenEnd()), expr, value, op);
-                                    break;
-                                }
-                                case DOUBLECOLON: {
-                                    jj_consume_token(DOUBLECOLON);
-                                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                                        case LT: {
-                                            typeArgs = TypeArguments();
-                                            break;
-                                        }
-                                        default:
-                                            jj_la1[128] = jj_gen;
-                                            ;
-                                    }
-                                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                                        case IDENTIFIER: {
-                                            jj_consume_token(IDENTIFIER);
-                                            break;
-                                        }
-                                        case NEW: {
-                                            jj_consume_token(NEW);
-                                            break;
-                                        }
-                                        default:
-                                            jj_la1[129] = jj_gen;
-                                            jj_consume_token(-1);
-                                            throw new ParseException();
-                                    }
-                                    expr = new MethodReferenceExpr(range(expr.getBegin(), tokenEnd()), expr, typeArgs.list, token.image);
-                                    break;
-                                }
-                                case ARROW: {
-                                    jj_consume_token(ARROW);
-                                    lambdaBody = LambdaBody();
-                                    expr = generateLambda(expr, lambdaBody);
-                                    break;
-                                }
-                                default:
-                                    jj_la1[130] = jj_gen;
-                                    jj_consume_token(-1);
-                                    throw new ParseException();
-                            }
-                            break;
-                        }
-                        default:
-                            jj_la1[131] = jj_gen;
-                            ;
-                    }
-                    break;
-                }
-                default:
-                    jj_la1[132] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
+    if (jj_2_36(2)) {
+      expr = PreIncrementExpression();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case DECR:{
+        expr = PreDecrementExpression();
+        break;
+        }
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NEW:
+      case NULL:
+      case SHORT:
+      case SUPER:
+      case THIS:
+      case TRUE:
+      case VOID:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:{
+        expr = PrimaryExpression();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case ASSIGN:
+        case INCR:
+        case DECR:
+        case PLUSASSIGN:
+        case MINUSASSIGN:
+        case STARASSIGN:
+        case SLASHASSIGN:
+        case ANDASSIGN:
+        case ORASSIGN:
+        case XORASSIGN:
+        case REMASSIGN:
+        case LSHIFTASSIGN:
+        case RSIGNEDSHIFTASSIGN:
+        case RUNSIGNEDSHIFTASSIGN:
+        case ARROW:
+        case DOUBLECOLON:{
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case INCR:{
+            jj_consume_token(INCR);
+expr = new UnaryExpr(range(expr.getBegin(), tokenEnd()), expr, UnaryExpr.Operator.posIncrement);
+            break;
+            }
+          case DECR:{
+            jj_consume_token(DECR);
+expr = new UnaryExpr(range(expr.getBegin(), tokenEnd()), expr, UnaryExpr.Operator.posDecrement);
+            break;
+            }
+          case ASSIGN:
+          case PLUSASSIGN:
+          case MINUSASSIGN:
+          case STARASSIGN:
+          case SLASHASSIGN:
+          case ANDASSIGN:
+          case ORASSIGN:
+          case XORASSIGN:
+          case REMASSIGN:
+          case LSHIFTASSIGN:
+          case RSIGNEDSHIFTASSIGN:
+          case RUNSIGNEDSHIFTASSIGN:{
+            op = AssignmentOperator();
+            value = Expression();
+expr = new AssignExpr(range(expr.getBegin(), tokenEnd()), expr, value, op);
+            break;
+            }
+          case DOUBLECOLON:{
+            jj_consume_token(DOUBLECOLON);
+            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+            case LT:{
+              typeArgs = TypeArguments();
+              break;
+              }
+            default:
+              jj_la1[128] = jj_gen;
+              ;
+            }
+            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+            case IDENTIFIER:{
+              jj_consume_token(IDENTIFIER);
+              break;
+              }
+            case NEW:{
+              jj_consume_token(NEW);
+              break;
+              }
+            default:
+              jj_la1[129] = jj_gen;
+              jj_consume_token(-1);
+              throw new ParseException();
             }
-        }
-        jj_consume_token(SEMICOLON);
-        return new ExpressionStmt(range(expr.getBegin(), tokenEnd()), expr);
-    }
-
-    final public SwitchStmt SwitchStatement() {
-        Expression selector;
+expr = new MethodReferenceExpr(range(expr.getBegin(), tokenEnd()), expr, typeArgs.list, token.image);
+            break;
+            }
+          case ARROW:{
+            jj_consume_token(ARROW);
+            lambdaBody = LambdaBody();
+expr = generateLambda(expr, lambdaBody);
+            break;
+            }
+          default:
+            jj_la1[130] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
+          break;
+          }
+        default:
+          jj_la1[131] = jj_gen;
+          ;
+        }
+        break;
+        }
+      default:
+        jj_la1[132] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    jj_consume_token(SEMICOLON);
+return new ExpressionStmt(range(expr.getBegin(), tokenEnd()), expr);
+  }
+
+  final public SwitchStmt SwitchStatement() {Expression selector;
         SwitchEntryStmt entry;
         List<SwitchEntryStmt> entries = null;
         Position begin;
-        jj_consume_token(SWITCH);
-        begin = tokenBegin();
-        jj_consume_token(LPAREN);
-        selector = Expression();
-        jj_consume_token(RPAREN);
-        jj_consume_token(LBRACE);
-        label_44:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case CASE:
-                case _DEFAULT: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[133] = jj_gen;
-                    break label_44;
-            }
-            entry = SwitchEntry();
-            entries = add(entries, entry);
-        }
-        jj_consume_token(RBRACE);
-        return new SwitchStmt(range(begin, tokenEnd()), selector, entries);
-    }
-
-    final public SwitchEntryStmt SwitchEntry() {
-        Expression label = null;
+    jj_consume_token(SWITCH);
+begin=tokenBegin();
+    jj_consume_token(LPAREN);
+    selector = Expression();
+    jj_consume_token(RPAREN);
+    jj_consume_token(LBRACE);
+    label_44:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case CASE:
+      case _DEFAULT:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[133] = jj_gen;
+        break label_44;
+      }
+      entry = SwitchEntry();
+entries = add(entries, entry);
+    }
+    jj_consume_token(RBRACE);
+return new SwitchStmt(range(begin, tokenEnd()), selector, entries);
+  }
+
+  final public SwitchEntryStmt SwitchEntry() {Expression label = null;
         List<Statement> stmts;
         Position begin;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case CASE: {
-                jj_consume_token(CASE);
-                begin = tokenBegin();
-                label = Expression();
-                break;
-            }
-            case _DEFAULT: {
-                jj_consume_token(_DEFAULT);
-                begin = tokenBegin();
-                break;
-            }
-            default:
-                jj_la1[134] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        jj_consume_token(COLON);
-        stmts = Statements();
-        return new SwitchEntryStmt(range(begin, tokenEnd()), label, stmts);
-    }
-
-    final public IfStmt IfStatement() {
-        Expression condition;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case CASE:{
+      jj_consume_token(CASE);
+begin=tokenBegin();
+      label = Expression();
+      break;
+      }
+    case _DEFAULT:{
+      jj_consume_token(_DEFAULT);
+begin=tokenBegin();
+      break;
+      }
+    default:
+      jj_la1[134] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    jj_consume_token(COLON);
+    stmts = Statements();
+return new SwitchEntryStmt(range(begin, tokenEnd()),label, stmts);
+  }
+
+  final public IfStmt IfStatement() {Expression condition;
         Statement thenStmt;
         Statement elseStmt = null;
         Position begin;
-        Comment thenCmmt = null;
-        Comment elseCmmt = null;
-        jj_consume_token(IF);
-        begin = tokenBegin();
-        jj_consume_token(LPAREN);
-        condition = Expression();
-        jj_consume_token(RPAREN);
-
-        thenStmt = Statement();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case ELSE: {
-                jj_consume_token(ELSE);
-
-                elseStmt = Statement();
-                break;
-            }
-            default:
-                jj_la1[135] = jj_gen;
-                ;
-        }
-        IfStmt tmp = new IfStmt(range(begin, tokenEnd()), condition, thenStmt, elseStmt);
-
-        // TODO comment is always null
-        thenStmt.setComment(thenCmmt);
-        if (elseStmt != null)
-            // TODO comment is always null
-            elseStmt.setComment(elseCmmt);
-        return tmp;
-    }
-
-    final public WhileStmt WhileStatement() {
-        Expression condition;
+    Comment thenCmmt = null;
+    Comment elseCmmt = null;
+    jj_consume_token(IF);
+begin=tokenBegin();
+    jj_consume_token(LPAREN);
+    condition = Expression();
+    jj_consume_token(RPAREN);
+
+    thenStmt = Statement();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ELSE:{
+      jj_consume_token(ELSE);
+
+      elseStmt = Statement();
+      break;
+      }
+    default:
+      jj_la1[135] = jj_gen;
+      ;
+    }
+IfStmt tmp = new IfStmt(range(begin, tokenEnd()),condition, thenStmt, elseStmt);
+
+      // TODO comment is always null
+      thenStmt.setComment(thenCmmt);
+      if (elseStmt != null)
+          // TODO comment is always null
+          elseStmt.setComment(elseCmmt);
+      return tmp;
+  }
+
+  final public WhileStmt WhileStatement() {Expression condition;
         Statement body;
         Position begin;
-        jj_consume_token(WHILE);
-        begin = tokenBegin();
-        jj_consume_token(LPAREN);
-        condition = Expression();
-        jj_consume_token(RPAREN);
-        body = Statement();
-        return new WhileStmt(range(begin, tokenEnd()), condition, body);
-    }
-
-    final public DoStmt DoStatement() {
-        Expression condition;
+    jj_consume_token(WHILE);
+begin=tokenBegin();
+    jj_consume_token(LPAREN);
+    condition = Expression();
+    jj_consume_token(RPAREN);
+    body = Statement();
+return new WhileStmt(range(begin, tokenEnd()),condition, body);
+  }
+
+  final public DoStmt DoStatement() {Expression condition;
         Statement body;
         Position begin;
-        jj_consume_token(DO);
-        begin = tokenBegin();
-        body = Statement();
-        jj_consume_token(WHILE);
-        jj_consume_token(LPAREN);
-        condition = Expression();
-        jj_consume_token(RPAREN);
-        jj_consume_token(SEMICOLON);
-        return new DoStmt(range(begin, tokenEnd()), body, condition);
-    }
-
-    final public Statement ForStatement() {
-        VariableDeclarationExpr varExpr = null;
+    jj_consume_token(DO);
+begin=tokenBegin();
+    body = Statement();
+    jj_consume_token(WHILE);
+    jj_consume_token(LPAREN);
+    condition = Expression();
+    jj_consume_token(RPAREN);
+    jj_consume_token(SEMICOLON);
+return new DoStmt(range(begin, tokenEnd()),body, condition);
+  }
+
+  final public Statement ForStatement() {VariableDeclarationExpr varExpr = null;
         Expression expr = null;
         List<Expression> init = null;
         List<Expression> update = null;
         Statement body;
         Position begin;
-        jj_consume_token(FOR);
-        begin = tokenBegin();
-        jj_consume_token(LPAREN);
-        if (jj_2_37(2147483647)) {
-            varExpr = VariableDeclarationExpression();
-            jj_consume_token(COLON);
-            expr = Expression();
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case ABSTRACT:
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FALSE:
-                case FINAL:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case NATIVE:
-                case NEW:
-                case NULL:
-                case PRIVATE:
-                case PROTECTED:
-                case PUBLIC:
-                case SHORT:
-                case STATIC:
-                case STRICTFP:
-                case SUPER:
-                case SYNCHRONIZED:
-                case THIS:
-                case TRANSIENT:
-                case TRUE:
-                case VOID:
-                case VOLATILE:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case SEMICOLON:
-                case AT:
-                case BANG:
-                case TILDE:
-                case INCR:
-                case DECR:
-                case PLUS:
-                case MINUS: {
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case ABSTRACT:
-                        case BOOLEAN:
-                        case BYTE:
-                        case CHAR:
-                        case DOUBLE:
-                        case FALSE:
-                        case FINAL:
-                        case FLOAT:
-                        case INT:
-                        case LONG:
-                        case NATIVE:
-                        case NEW:
-                        case NULL:
-                        case PRIVATE:
-                        case PROTECTED:
-                        case PUBLIC:
-                        case SHORT:
-                        case STATIC:
-                        case STRICTFP:
-                        case SUPER:
-                        case SYNCHRONIZED:
-                        case THIS:
-                        case TRANSIENT:
-                        case TRUE:
-                        case VOID:
-                        case VOLATILE:
-                        case LONG_LITERAL:
-                        case INTEGER_LITERAL:
-                        case FLOATING_POINT_LITERAL:
-                        case CHARACTER_LITERAL:
-                        case STRING_LITERAL:
-                        case IDENTIFIER:
-                        case LPAREN:
-                        case AT:
-                        case BANG:
-                        case TILDE:
-                        case INCR:
-                        case DECR:
-                        case PLUS:
-                        case MINUS: {
-                            init = ForInit();
-                            break;
-                        }
-                        default:
-                            jj_la1[136] = jj_gen;
-                            ;
-                    }
-                    jj_consume_token(SEMICOLON);
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case BOOLEAN:
-                        case BYTE:
-                        case CHAR:
-                        case DOUBLE:
-                        case FALSE:
-                        case FLOAT:
-                        case INT:
-                        case LONG:
-                        case NEW:
-                        case NULL:
-                        case SHORT:
-                        case SUPER:
-                        case THIS:
-                        case TRUE:
-                        case VOID:
-                        case LONG_LITERAL:
-                        case INTEGER_LITERAL:
-                        case FLOATING_POINT_LITERAL:
-                        case CHARACTER_LITERAL:
-                        case STRING_LITERAL:
-                        case IDENTIFIER:
-                        case LPAREN:
-                        case BANG:
-                        case TILDE:
-                        case INCR:
-                        case DECR:
-                        case PLUS:
-                        case MINUS: {
-                            expr = Expression();
-                            break;
-                        }
-                        default:
-                            jj_la1[137] = jj_gen;
-                            ;
-                    }
-                    jj_consume_token(SEMICOLON);
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case BOOLEAN:
-                        case BYTE:
-                        case CHAR:
-                        case DOUBLE:
-                        case FALSE:
-                        case FLOAT:
-                        case INT:
-                        case LONG:
-                        case NEW:
-                        case NULL:
-                        case SHORT:
-                        case SUPER:
-                        case THIS:
-                        case TRUE:
-                        case VOID:
-                        case LONG_LITERAL:
-                        case INTEGER_LITERAL:
-                        case FLOATING_POINT_LITERAL:
-                        case CHARACTER_LITERAL:
-                        case STRING_LITERAL:
-                        case IDENTIFIER:
-                        case LPAREN:
-                        case BANG:
-                        case TILDE:
-                        case INCR:
-                        case DECR:
-                        case PLUS:
-                        case MINUS: {
-                            update = ForUpdate();
-                            break;
-                        }
-                        default:
-                            jj_la1[138] = jj_gen;
-                            ;
-                    }
-                    break;
-                }
-                default:
-                    jj_la1[139] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
+    jj_consume_token(FOR);
+begin=tokenBegin();
+    jj_consume_token(LPAREN);
+    if (jj_2_37(2147483647)) {
+      varExpr = VariableDeclarationExpression();
+      jj_consume_token(COLON);
+      expr = Expression();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ABSTRACT:
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FINAL:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NATIVE:
+      case NEW:
+      case NULL:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case SHORT:
+      case STATIC:
+      case STRICTFP:
+      case SUPER:
+      case SYNCHRONIZED:
+      case THIS:
+      case TRANSIENT:
+      case TRUE:
+      case VOID:
+      case VOLATILE:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case SEMICOLON:
+      case AT:
+      case BANG:
+      case TILDE:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:{
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case ABSTRACT:
+        case BOOLEAN:
+        case BYTE:
+        case CHAR:
+        case DOUBLE:
+        case FALSE:
+        case FINAL:
+        case FLOAT:
+        case INT:
+        case LONG:
+        case NATIVE:
+        case NEW:
+        case NULL:
+        case PRIVATE:
+        case PROTECTED:
+        case PUBLIC:
+        case SHORT:
+        case STATIC:
+        case STRICTFP:
+        case SUPER:
+        case SYNCHRONIZED:
+        case THIS:
+        case TRANSIENT:
+        case TRUE:
+        case VOID:
+        case VOLATILE:
+        case LONG_LITERAL:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case CHARACTER_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+        case AT:
+        case BANG:
+        case TILDE:
+        case INCR:
+        case DECR:
+        case PLUS:
+        case MINUS:{
+          init = ForInit();
+          break;
+          }
+        default:
+          jj_la1[136] = jj_gen;
+          ;
         }
-        jj_consume_token(RPAREN);
-        body = Statement();
-        if (varExpr != null) {
-            return new ForeachStmt(range(begin, tokenEnd()), varExpr, expr, body);
+        jj_consume_token(SEMICOLON);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case BOOLEAN:
+        case BYTE:
+        case CHAR:
+        case DOUBLE:
+        case FALSE:
+        case FLOAT:
+        case INT:
+        case LONG:
+        case NEW:
+        case NULL:
+        case SHORT:
+        case SUPER:
+        case THIS:
+        case TRUE:
+        case VOID:
+        case LONG_LITERAL:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case CHARACTER_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+        case BANG:
+        case TILDE:
+        case INCR:
+        case DECR:
+        case PLUS:
+        case MINUS:{
+          expr = Expression();
+          break;
+          }
+        default:
+          jj_la1[137] = jj_gen;
+          ;
         }
-        return new ForStmt(range(begin, tokenEnd()), init, expr, update, body);
-    }
-
-    final public List<Expression> ForInit() {
-        List<Expression> ret;
+        jj_consume_token(SEMICOLON);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case BOOLEAN:
+        case BYTE:
+        case CHAR:
+        case DOUBLE:
+        case FALSE:
+        case FLOAT:
+        case INT:
+        case LONG:
+        case NEW:
+        case NULL:
+        case SHORT:
+        case SUPER:
+        case THIS:
+        case TRUE:
+        case VOID:
+        case LONG_LITERAL:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case CHARACTER_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+        case BANG:
+        case TILDE:
+        case INCR:
+        case DECR:
+        case PLUS:
+        case MINUS:{
+          update = ForUpdate();
+          break;
+          }
+        default:
+          jj_la1[138] = jj_gen;
+          ;
+        }
+        break;
+        }
+      default:
+        jj_la1[139] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    jj_consume_token(RPAREN);
+    body = Statement();
+if (varExpr != null) {
+                return new ForeachStmt(range(begin, tokenEnd()),varExpr, expr, body);
+        }
+        return new ForStmt(range(begin, tokenEnd()),init, expr, update, body);
+  }
+
+  final public List<Expression> ForInit() {List<Expression> ret;
         Expression expr;
-        if (jj_2_38(2147483647)) {
-            expr = VariableDeclarationExpression();
-            ret = new LinkedList<Expression>();
-            ret.add(expr);
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FALSE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case NEW:
-                case NULL:
-                case SHORT:
-                case SUPER:
-                case THIS:
-                case TRUE:
-                case VOID:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case BANG:
-                case TILDE:
-                case INCR:
-                case DECR:
-                case PLUS:
-                case MINUS: {
-                    ret = ExpressionList();
-                    break;
-                }
-                default:
-                    jj_la1[140] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
+    if (jj_2_38(2147483647)) {
+      expr = VariableDeclarationExpression();
+ret = new LinkedList<Expression>(); ret.add(expr);
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NEW:
+      case NULL:
+      case SHORT:
+      case SUPER:
+      case THIS:
+      case TRUE:
+      case VOID:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case BANG:
+      case TILDE:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:{
+        ret = ExpressionList();
+        break;
         }
-        return ret;
+      default:
+        jj_la1[140] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
     }
+return ret;
+  }
 
-    final public List<Expression> ExpressionList() {
-        List<Expression> ret = new LinkedList<Expression>();
+  final public List<Expression> ExpressionList() {List<Expression> ret = new LinkedList<Expression>();
         Expression expr;
-        expr = Expression();
-        ret.add(expr);
-        label_45:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case COMMA: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[141] = jj_gen;
-                    break label_45;
-            }
-            jj_consume_token(COMMA);
-            expr = Expression();
-            ret.add(expr);
-        }
-        return ret;
-    }
-
-    final public List<Expression> ForUpdate() {
-        List<Expression> ret;
-        ret = ExpressionList();
-        return ret;
-    }
-
-    final public BreakStmt BreakStatement() {
-        String id = null;
+    expr = Expression();
+ret.add(expr);
+    label_45:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[141] = jj_gen;
+        break label_45;
+      }
+      jj_consume_token(COMMA);
+      expr = Expression();
+ret.add(expr);
+    }
+return ret;
+  }
+
+  final public List<Expression> ForUpdate() {List<Expression> ret;
+    ret = ExpressionList();
+return ret;
+  }
+
+  final public BreakStmt BreakStatement() {String id = null;
         Position begin;
-        jj_consume_token(BREAK);
-        begin = tokenBegin();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case IDENTIFIER: {
-                jj_consume_token(IDENTIFIER);
-                id = token.image;
-                break;
-            }
-            default:
-                jj_la1[142] = jj_gen;
-                ;
-        }
-        jj_consume_token(SEMICOLON);
-        return new BreakStmt(range(begin, tokenEnd()), id);
-    }
-
-    final public ContinueStmt ContinueStatement() {
-        String id = null;
+    jj_consume_token(BREAK);
+begin=tokenBegin();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IDENTIFIER:{
+      jj_consume_token(IDENTIFIER);
+id = token.image;
+      break;
+      }
+    default:
+      jj_la1[142] = jj_gen;
+      ;
+    }
+    jj_consume_token(SEMICOLON);
+return new BreakStmt(range(begin, tokenEnd()),id);
+  }
+
+  final public ContinueStmt ContinueStatement() {String id = null;
         Position begin;
-        jj_consume_token(CONTINUE);
-        begin = tokenBegin();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case IDENTIFIER: {
-                jj_consume_token(IDENTIFIER);
-                id = token.image;
-                break;
-            }
-            default:
-                jj_la1[143] = jj_gen;
-                ;
-        }
-        jj_consume_token(SEMICOLON);
-        return new ContinueStmt(range(begin, tokenEnd()), id);
-    }
-
-    final public ReturnStmt ReturnStatement() {
-        Expression expr = null;
+    jj_consume_token(CONTINUE);
+begin=tokenBegin();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IDENTIFIER:{
+      jj_consume_token(IDENTIFIER);
+id = token.image;
+      break;
+      }
+    default:
+      jj_la1[143] = jj_gen;
+      ;
+    }
+    jj_consume_token(SEMICOLON);
+return new ContinueStmt(range(begin, tokenEnd()),id);
+  }
+
+  final public ReturnStmt ReturnStatement() {Expression expr = null;
         Position begin;
-        jj_consume_token(RETURN);
-        begin = tokenBegin();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS: {
-                expr = Expression();
-                break;
-            }
-            default:
-                jj_la1[144] = jj_gen;
-                ;
-        }
-        jj_consume_token(SEMICOLON);
-        return new ReturnStmt(range(begin, tokenEnd()), expr);
-    }
-
-    final public ThrowStmt ThrowStatement() {
-        Expression expr;
+    jj_consume_token(RETURN);
+begin=tokenBegin();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:{
+      expr = Expression();
+      break;
+      }
+    default:
+      jj_la1[144] = jj_gen;
+      ;
+    }
+    jj_consume_token(SEMICOLON);
+return new ReturnStmt(range(begin, tokenEnd()),expr);
+  }
+
+  final public ThrowStmt ThrowStatement() {Expression expr;
         Position begin;
-        jj_consume_token(THROW);
-        begin = tokenBegin();
-        expr = Expression();
-        jj_consume_token(SEMICOLON);
-        return new ThrowStmt(range(begin, tokenEnd()), expr);
-    }
-
-    final public SynchronizedStmt SynchronizedStatement() {
-        Expression expr;
+    jj_consume_token(THROW);
+begin=tokenBegin();
+    expr = Expression();
+    jj_consume_token(SEMICOLON);
+return new ThrowStmt(range(begin, tokenEnd()),expr);
+  }
+
+  final public SynchronizedStmt SynchronizedStatement() {Expression expr;
         BlockStmt block;
         Position begin;
-        jj_consume_token(SYNCHRONIZED);
-        begin = tokenBegin();
-        jj_consume_token(LPAREN);
-        expr = Expression();
-        jj_consume_token(RPAREN);
-        block = Block();
-        return new SynchronizedStmt(range(begin, tokenEnd()), expr, block);
-    }
-
-    final public TryStmt TryStatement() {
-        List<VariableDeclarationExpr> resources = null;
+    jj_consume_token(SYNCHRONIZED);
+begin=tokenBegin();
+    jj_consume_token(LPAREN);
+    expr = Expression();
+    jj_consume_token(RPAREN);
+    block = Block();
+return new SynchronizedStmt(range(begin, tokenEnd()),expr, block);
+  }
+
+  final public TryStmt TryStatement() {List<VariableDeclarationExpr> resources = null;
         BlockStmt tryBlock;
         BlockStmt finallyBlock = null;
         List<CatchClause> catchs = null;
@@ -4505,5001 +4372,4947 @@ final public TryStmt TryStatement() {
         Position begin;
         Position catchBegin;
         Type type;
-        jj_consume_token(TRY);
-        begin = tokenBegin();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case LPAREN: {
-                resources = ResourceSpecification();
-                break;
-            }
-            default:
-                jj_la1[145] = jj_gen;
-                ;
-        }
-        tryBlock = Block();
-        label_46:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case CATCH: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[146] = jj_gen;
-                    break label_46;
-            }
-            jj_consume_token(CATCH);
-            catchBegin = tokenBegin();
-            jj_consume_token(LPAREN);
-            exceptModifier = Modifiers();
-            exceptionType = ReferenceType();
-            exceptionTypes.add(exceptionType);
-            label_47:
-            while (true) {
-                switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                    case BIT_OR: {
-                        ;
-                        break;
-                    }
-                    default:
-                        jj_la1[147] = jj_gen;
-                        break label_47;
-                }
-                jj_consume_token(BIT_OR);
-                exceptionType = ReferenceTypeWithAnnotations();
-                exceptionTypes.add(exceptionType);
-            }
-            exceptId = VariableDeclaratorId();
-            jj_consume_token(RPAREN);
-            catchBlock = Block();
-            if (exceptionTypes.size() > 1) {
-                type = new UnionType(exceptionTypes);
-            } else {
-                type = (Type) exceptionTypes.get(0);
-            }
-            catchs = add(catchs, new CatchClause(range(catchBegin, tokenEnd()), exceptModifier.modifiers, exceptModifier.annotations, type, exceptId, catchBlock));
-            exceptionTypes = new LinkedList<ReferenceType>();
-        }
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case FINALLY: {
-                jj_consume_token(FINALLY);
-                finallyBlock = Block();
-                break;
-            }
-            default:
-                jj_la1[148] = jj_gen;
-                ;
-        }
-        if (finallyBlock == null && catchs == null && resources == null) {
-            addProblem("Try has no finally, no catch, and no resources");
-        }
-        return new TryStmt(range(begin, tokenEnd()), resources, tryBlock, catchs, finallyBlock);
-    }
-
-    final public List<VariableDeclarationExpr> ResourceSpecification() {
-        List<VariableDeclarationExpr> variables;
-        jj_consume_token(LPAREN);
-        variables = Resources();
-        if (jj_2_39(2)) {
-            jj_consume_token(SEMICOLON);
-        } else {
-            ;
-        }
-        jj_consume_token(RPAREN);
-        return variables;
-    }
-
-    final public List<VariableDeclarationExpr> Resources() {
-        List<VariableDeclarationExpr> variables = new LinkedList<VariableDeclarationExpr>();
+    jj_consume_token(TRY);
+begin=tokenBegin();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LPAREN:{
+      resources = ResourceSpecification();
+      break;
+      }
+    default:
+      jj_la1[145] = jj_gen;
+      ;
+    }
+    tryBlock = Block();
+    label_46:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case CATCH:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[146] = jj_gen;
+        break label_46;
+      }
+      jj_consume_token(CATCH);
+catchBegin=tokenBegin();
+      jj_consume_token(LPAREN);
+      exceptModifier = Modifiers();
+      exceptionType = ReferenceType();
+exceptionTypes.add(exceptionType);
+      label_47:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case BIT_OR:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[147] = jj_gen;
+          break label_47;
+        }
+        jj_consume_token(BIT_OR);
+        exceptionType = ReferenceTypeWithAnnotations();
+exceptionTypes.add(exceptionType);
+      }
+      exceptId = VariableDeclaratorId();
+      jj_consume_token(RPAREN);
+      catchBlock = Block();
+if (exceptionTypes.size() > 1) {
+                                type = new UnionType(exceptionTypes);
+                           } else {
+                                type = (Type)exceptionTypes.get(0);
+                           }
+                           catchs = add(catchs, new CatchClause(range(catchBegin, tokenEnd()), exceptModifier.modifiers, exceptModifier.annotations, type, exceptId, catchBlock));
+                           exceptionTypes = new LinkedList<ReferenceType>();
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case FINALLY:{
+      jj_consume_token(FINALLY);
+      finallyBlock = Block();
+      break;
+      }
+    default:
+      jj_la1[148] = jj_gen;
+      ;
+    }
+if (finallyBlock==null && catchs==null && resources==null) {
+      addProblem("Try has no finally, no catch, and no resources");
+    }
+    return new TryStmt(range(begin, tokenEnd()), resources, tryBlock, catchs, finallyBlock);
+  }
+
+  final public List<VariableDeclarationExpr> ResourceSpecification() {List<VariableDeclarationExpr> variables;
+    jj_consume_token(LPAREN);
+    variables = Resources();
+    if (jj_2_39(2)) {
+      jj_consume_token(SEMICOLON);
+    } else {
+      ;
+    }
+    jj_consume_token(RPAREN);
+return variables;
+  }
+
+  final public List<VariableDeclarationExpr> Resources() {List<VariableDeclarationExpr> variables = new LinkedList<VariableDeclarationExpr>();
         VariableDeclarationExpr var;
-        /*this is a bit more lenient than we need to be, eg allowing access modifiers like private*/
-        var = VariableDeclarationExpression();
-        variables.add(var);
-        label_48:
-        while (true) {
-            if (jj_2_40(2)) {
-                ;
-            } else {
-                break label_48;
-            }
-            jj_consume_token(SEMICOLON);
-            var = VariableDeclarationExpression();
-            variables.add(var);
-        }
-        return variables;
-    }
-
-    /* We use productions to match >>>, >> and > so that we can keep the
-     * type declaration syntax with generics clean
-     */
-    final public void RUNSIGNEDSHIFT() {
-        if (getToken(1).kind == GT &&
-                ((GTToken) getToken(1)).realKind == RUNSIGNEDSHIFT) {
-
-        } else {
-            jj_consume_token(-1);
-            throw new ParseException();
-        }
-        jj_consume_token(GT);
-        jj_consume_token(GT);
-        jj_consume_token(GT);
-    }
-
-    final public void RSIGNEDSHIFT() {
-        if (getToken(1).kind == GT &&
-                ((GTToken) getToken(1)).realKind == RSIGNEDSHIFT) {
-
-        } else {
-            jj_consume_token(-1);
-            throw new ParseException();
-        }
-        jj_consume_token(GT);
-        jj_consume_token(GT);
-    }
-
-    /* Annotation syntax follows. */
-    final public List<AnnotationExpr> Annotations() {
-        List<AnnotationExpr> annotations = null;
+    /*this is a bit more lenient than we need to be, eg allowing access modifiers like private*/
+      var = VariableDeclarationExpression();
+variables.add(var);
+    label_48:
+    while (true) {
+      if (jj_2_40(2)) {
+        ;
+      } else {
+        break label_48;
+      }
+      jj_consume_token(SEMICOLON);
+      var = VariableDeclarationExpression();
+variables.add(var);
+    }
+return variables;
+  }
+
+/* We use productions to match >>>, >> and > so that we can keep the
+ * type declaration syntax with generics clean
+ */
+  final public 
+void RUNSIGNEDSHIFT() {
+    if (getToken(1).kind == GT &&
+                    ((GTToken)getToken(1)).realKind == RUNSIGNEDSHIFT) {
+
+    } else {
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    jj_consume_token(GT);
+    jj_consume_token(GT);
+    jj_consume_token(GT);
+  }
+
+  final public void RSIGNEDSHIFT() {
+    if (getToken(1).kind == GT &&
+                    ((GTToken)getToken(1)).realKind == RSIGNEDSHIFT) {
+
+    } else {
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    jj_consume_token(GT);
+    jj_consume_token(GT);
+  }
+
+/* Annotation syntax follows. */
+  final public 
+List<AnnotationExpr> Annotations() {List<AnnotationExpr> annotations = null;
         AnnotationExpr annotation;
-        label_49:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case AT: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[149] = jj_gen;
-                    break label_49;
-            }
-            annotation = Annotation();
-            annotations = add(annotations, annotation);
-        }
-        return annotations;
-    }
-
-    final public AnnotationExpr Annotation() {
-        AnnotationExpr ret;
-        if (jj_2_41(2147483647)) {
-            ret = NormalAnnotation();
-        } else if (jj_2_42(2147483647)) {
-            ret = SingleMemberAnnotation();
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case AT: {
-                    ret = MarkerAnnotation();
-                    break;
-                }
-                default:
-                    jj_la1[150] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        return ret;
-    }
-
-    final public NormalAnnotationExpr NormalAnnotation() {
-        NameExpr name;
+    label_49:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case AT:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[149] = jj_gen;
+        break label_49;
+      }
+      annotation = Annotation();
+annotations = add(annotations, annotation);
+    }
+return annotations;
+  }
+
+  final public AnnotationExpr Annotation() {AnnotationExpr ret;
+    if (jj_2_41(2147483647)) {
+      ret = NormalAnnotation();
+    } else if (jj_2_42(2147483647)) {
+      ret = SingleMemberAnnotation();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case AT:{
+        ret = MarkerAnnotation();
+        break;
+        }
+      default:
+        jj_la1[150] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+return ret;
+  }
+
+  final public NormalAnnotationExpr NormalAnnotation() {NameExpr name;
         List<MemberValuePair> pairs = null;
         Position begin;
-        jj_consume_token(AT);
-        begin = tokenBegin();
-        name = Name();
-        jj_consume_token(LPAREN);
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case IDENTIFIER: {
-                pairs = MemberValuePairs();
-                break;
-            }
-            default:
-                jj_la1[151] = jj_gen;
-                ;
-        }
-        jj_consume_token(RPAREN);
-        return new NormalAnnotationExpr(range(begin, tokenEnd()), name, pairs);
-    }
-
-    final public MarkerAnnotationExpr MarkerAnnotation() {
-        NameExpr name;
+    jj_consume_token(AT);
+begin=tokenBegin();
+    name = Name();
+    jj_consume_token(LPAREN);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IDENTIFIER:{
+      pairs = MemberValuePairs();
+      break;
+      }
+    default:
+      jj_la1[151] = jj_gen;
+      ;
+    }
+    jj_consume_token(RPAREN);
+return new NormalAnnotationExpr(range(begin, tokenEnd()),name, pairs);
+  }
+
+  final public MarkerAnnotationExpr MarkerAnnotation() {NameExpr name;
         Position begin;
-        jj_consume_token(AT);
-        begin = tokenBegin();
-        name = Name();
-        return new MarkerAnnotationExpr(range(begin, tokenEnd()), name);
-    }
+    jj_consume_token(AT);
+begin=tokenBegin();
+    name = Name();
+return new MarkerAnnotationExpr(range(begin, tokenEnd()),name);
+  }
 
-    final public SingleMemberAnnotationExpr SingleMemberAnnotation() {
-        NameExpr name;
+  final public SingleMemberAnnotationExpr SingleMemberAnnotation() {NameExpr name;
         Expression memberVal;
         Position begin;
-        jj_consume_token(AT);
-        begin = tokenBegin();
-        name = Name();
-        jj_consume_token(LPAREN);
-        memberVal = MemberValue();
-        jj_consume_token(RPAREN);
-        return new SingleMemberAnnotationExpr(range(begin, tokenEnd()), name, memberVal);
-    }
-
-    final public List<MemberValuePair> MemberValuePairs() {
-        List<MemberValuePair> ret = new LinkedList<MemberValuePair>();
+    jj_consume_token(AT);
+begin=tokenBegin();
+    name = Name();
+    jj_consume_token(LPAREN);
+    memberVal = MemberValue();
+    jj_consume_token(RPAREN);
+return new SingleMemberAnnotationExpr(range(begin, tokenEnd()),name, memberVal);
+  }
+
+  final public List<MemberValuePair> MemberValuePairs() {List<MemberValuePair> ret = new LinkedList<MemberValuePair>();
         MemberValuePair pair;
-        pair = MemberValuePair();
-        ret.add(pair);
-        label_50:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case COMMA: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[152] = jj_gen;
-                    break label_50;
-            }
-            jj_consume_token(COMMA);
-            pair = MemberValuePair();
-            ret.add(pair);
-        }
-        return ret;
-    }
-
-    final public MemberValuePair MemberValuePair() {
-        String name;
+    pair = MemberValuePair();
+ret.add(pair);
+    label_50:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[152] = jj_gen;
+        break label_50;
+      }
+      jj_consume_token(COMMA);
+      pair = MemberValuePair();
+ret.add(pair);
+    }
+return ret;
+  }
+
+  final public MemberValuePair MemberValuePair() {String name;
         Expression value;
         Position begin;
-        jj_consume_token(IDENTIFIER);
-        name = token.image;
-        begin = tokenBegin();
-        jj_consume_token(ASSIGN);
-        value = MemberValue();
-        return new MemberValuePair(range(begin, tokenEnd()), name, value);
-    }
-
-    final public Expression MemberValue() {
-        Expression ret;
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case AT: {
-                ret = Annotation();
-                break;
-            }
-            case LBRACE: {
-                ret = MemberValueArrayInitializer();
-                break;
-            }
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS: {
-                ret = ConditionalExpression();
-                break;
-            }
-            default:
-                jj_la1[153] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return ret;
-    }
-
-    final public Expression MemberValueArrayInitializer() {
-        List<Expression> ret = new LinkedList<Expression>();
+    jj_consume_token(IDENTIFIER);
+name = token.image; begin=tokenBegin();
+    jj_consume_token(ASSIGN);
+    value = MemberValue();
+return new MemberValuePair(range(begin, tokenEnd()),name, value);
+  }
+
+  final public Expression MemberValue() {Expression ret;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case AT:{
+      ret = Annotation();
+      break;
+      }
+    case LBRACE:{
+      ret = MemberValueArrayInitializer();
+      break;
+      }
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:{
+      ret = ConditionalExpression();
+      break;
+      }
+    default:
+      jj_la1[153] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return ret;
+  }
+
+  final public Expression MemberValueArrayInitializer() {List<Expression> ret = new LinkedList<Expression>();
         Expression member;
         Position begin;
-        jj_consume_token(LBRACE);
-        begin = tokenBegin();
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case LBRACE:
-            case AT:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS: {
-                member = MemberValue();
-                ret.add(member);
-                label_51:
-                while (true) {
-                    if (jj_2_43(2)) {
-                        ;
-                    } else {
-                        break label_51;
-                    }
-                    jj_consume_token(COMMA);
-                    member = MemberValue();
-                    ret.add(member);
-                }
-                break;
-            }
-            default:
-                jj_la1[154] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case COMMA: {
-                jj_consume_token(COMMA);
-                break;
-            }
-            default:
-                jj_la1[155] = jj_gen;
-                ;
+    jj_consume_token(LBRACE);
+begin=tokenBegin();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case AT:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:{
+      member = MemberValue();
+ret.add(member);
+      label_51:
+      while (true) {
+        if (jj_2_43(2)) {
+          ;
+        } else {
+          break label_51;
         }
-        jj_consume_token(RBRACE);
-        return new ArrayInitializerExpr(range(begin, tokenEnd()), ret);
-    }
-
-    /* Annotation Types. */
-    final public AnnotationDeclaration AnnotationTypeDeclaration(ModifierHolder modifier) {
-        NameExpr name;
+        jj_consume_token(COMMA);
+        member = MemberValue();
+ret.add(member);
+      }
+      break;
+      }
+    default:
+      jj_la1[154] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case COMMA:{
+      jj_consume_token(COMMA);
+      break;
+      }
+    default:
+      jj_la1[155] = jj_gen;
+      ;
+    }
+    jj_consume_token(RBRACE);
+return new ArrayInitializerExpr(range(begin, tokenEnd()),ret);
+  }
+
+/* Annotation Types. */
+  final public 
+AnnotationDeclaration AnnotationTypeDeclaration(ModifierHolder modifier) {NameExpr name;
         List<BodyDeclaration<?>> members;
         Position begin = modifier.begin;
-        jj_consume_token(AT);
-        begin = begin.orIfInvalid(tokenBegin());
-        jj_consume_token(INTERFACE);
-        name = Name();
-        members = AnnotationTypeBody();
-        AnnotationDeclaration tmp = new AnnotationDeclaration(range(begin, tokenEnd()), modifier.modifiers, modifier.annotations, null, members);
-        tmp.setNameExpr(name);
-        return tmp;
-    }
-
-    final public List<BodyDeclaration<?>> AnnotationTypeBody() {
-        List<BodyDeclaration<?>> ret = null;
+    jj_consume_token(AT);
+begin=begin.orIfInvalid(tokenBegin());
+    jj_consume_token(INTERFACE);
+    name = Name();
+    members = AnnotationTypeBody();
+AnnotationDeclaration tmp = new AnnotationDeclaration(range(begin, tokenEnd()), modifier.modifiers, modifier.annotations, null, members);
+      tmp.setNameExpr(name);
+      return tmp;
+  }
+
+  final public List<BodyDeclaration<?>> AnnotationTypeBody() {List<BodyDeclaration<?>> ret = null;
         BodyDeclaration member;
-        jj_consume_token(LBRACE);
-        label_52:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                case ABSTRACT:
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case CLASS:
-                case DOUBLE:
-                case ENUM:
-                case FINAL:
-                case FLOAT:
-                case INT:
-                case INTERFACE:
-                case LONG:
-                case NATIVE:
-                case PRIVATE:
-                case PROTECTED:
-                case PUBLIC:
-                case SHORT:
-                case STATIC:
-                case STRICTFP:
-                case SYNCHRONIZED:
-                case TRANSIENT:
-                case VOLATILE:
-                case IDENTIFIER:
-                case SEMICOLON:
-                case AT: {
-                    ;
-                    break;
-                }
-                default:
-                    jj_la1[156] = jj_gen;
-                    break label_52;
-            }
-            member = AnnotationBodyDeclaration();
-            ret = add(ret, member);
-        }
-        jj_consume_token(RBRACE);
-        return ret;
-    }
-
-    final public BodyDeclaration<?> AnnotationBodyDeclaration() {
-        ModifierHolder modifier;
-        BodyDeclaration ret;
-
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case SEMICOLON: {
-                jj_consume_token(SEMICOLON);
-                ret = new EmptyTypeDeclaration(tokenRange());
-                break;
-            }
-            case ABSTRACT:
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case CLASS:
-            case DOUBLE:
-            case ENUM:
-            case FINAL:
-            case FLOAT:
-            case INT:
-            case INTERFACE:
-            case LONG:
-            case NATIVE:
-            case PRIVATE:
-            case PROTECTED:
-            case PUBLIC:
-            case SHORT:
-            case STATIC:
-            case STRICTFP:
-            case SYNCHRONIZED:
-            case TRANSIENT:
-            case VOLATILE:
-            case IDENTIFIER:
-            case AT: {
-                modifier = Modifiers();
-                if (jj_2_44(2147483647)) {
-                    ret = AnnotationTypeMemberDeclaration(modifier);
-                } else {
-                    switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-                        case CLASS:
-                        case INTERFACE: {
-                            ret = ClassOrInterfaceDeclaration(modifier);
-                            break;
-                        }
-                        case ENUM: {
-                            ret = EnumDeclaration(modifier);
-                            break;
-                        }
-                        case AT: {
-                            ret = AnnotationTypeDeclaration(modifier);
-                            break;
-                        }
-                        case BOOLEAN:
-                        case BYTE:
-                        case CHAR:
-                        case DOUBLE:
-                        case FLOAT:
-                        case INT:
-                        case LONG:
-                        case SHORT:
-                        case IDENTIFIER: {
-                            ret = FieldDeclaration(modifier);
-                            break;
-                        }
-                        default:
-                            jj_la1[157] = jj_gen;
-                            jj_consume_token(-1);
-                            throw new ParseException();
-                    }
-                }
-                break;
-            }
-            default:
-                jj_la1[158] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        return ret;
-    }
-
-    final public AnnotationMemberDeclaration AnnotationTypeMemberDeclaration(ModifierHolder modifier) {
-        Type type;
+    jj_consume_token(LBRACE);
+    label_52:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ABSTRACT:
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case CLASS:
+      case DOUBLE:
+      case ENUM:
+      case FINAL:
+      case FLOAT:
+      case INT:
+      case INTERFACE:
+      case LONG:
+      case NATIVE:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case SHORT:
+      case STATIC:
+      case STRICTFP:
+      case SYNCHRONIZED:
+      case TRANSIENT:
+      case VOLATILE:
+      case IDENTIFIER:
+      case SEMICOLON:
+      case AT:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[156] = jj_gen;
+        break label_52;
+      }
+      member = AnnotationBodyDeclaration();
+ret = add(ret, member);
+    }
+    jj_consume_token(RBRACE);
+return ret;
+  }
+
+  final public BodyDeclaration<?> AnnotationBodyDeclaration() {ModifierHolder modifier;
+   BodyDeclaration ret;
+
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case SEMICOLON:{
+      jj_consume_token(SEMICOLON);
+ret = new EmptyTypeDeclaration(tokenRange());
+      break;
+      }
+    case ABSTRACT:
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case CLASS:
+    case DOUBLE:
+    case ENUM:
+    case FINAL:
+    case FLOAT:
+    case INT:
+    case INTERFACE:
+    case LONG:
+    case NATIVE:
+    case PRIVATE:
+    case PROTECTED:
+    case PUBLIC:
+    case SHORT:
+    case STATIC:
+    case STRICTFP:
+    case SYNCHRONIZED:
+    case TRANSIENT:
+    case VOLATILE:
+    case IDENTIFIER:
+    case AT:{
+      modifier = Modifiers();
+      if (jj_2_44(2147483647)) {
+        ret = AnnotationTypeMemberDeclaration(modifier);
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case CLASS:
+        case INTERFACE:{
+          ret = ClassOrInterfaceDeclaration(modifier);
+          break;
+          }
+        case ENUM:{
+          ret = EnumDeclaration(modifier);
+          break;
+          }
+        case AT:{
+          ret = AnnotationTypeDeclaration(modifier);
+          break;
+          }
+        case BOOLEAN:
+        case BYTE:
+        case CHAR:
+        case DOUBLE:
+        case FLOAT:
+        case INT:
+        case LONG:
+        case SHORT:
+        case IDENTIFIER:{
+          ret = FieldDeclaration(modifier);
+          break;
+          }
+        default:
+          jj_la1[157] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+      break;
+      }
+    default:
+      jj_la1[158] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+return ret;
+  }
+
+  final public AnnotationMemberDeclaration AnnotationTypeMemberDeclaration(ModifierHolder modifier) {Type type;
         String name;
         Expression defaultVal = null;
-        type = Type();
-        jj_consume_token(IDENTIFIER);
-        name = token.image;
-        jj_consume_token(LPAREN);
-        jj_consume_token(RPAREN);
-        switch ((jj_ntk == -1) ? jj_ntk_f() : jj_ntk) {
-            case _DEFAULT: {
-                defaultVal = DefaultValue();
-                break;
-            }
-            default:
-                jj_la1[159] = jj_gen;
-                ;
-        }
-        jj_consume_token(SEMICOLON);
-        Position begin = modifier.begin.orIfInvalid(tokenBegin());
-        return new AnnotationMemberDeclaration(range(begin, tokenEnd()), modifier.modifiers, modifier.annotations, type, name, defaultVal);
-    }
-
-    final public Expression DefaultValue() {
-        Expression ret;
-        jj_consume_token(_DEFAULT);
-        ret = MemberValue();
-        return ret;
-    }
-
-    private boolean jj_2_1(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_1();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(0, xla);
-        }
-    }
-
-    private boolean jj_2_2(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_2();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(1, xla);
-        }
-    }
-
-    private boolean jj_2_3(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_3();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(2, xla);
-        }
-    }
-
-    private boolean jj_2_4(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_4();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(3, xla);
-        }
-    }
-
-    private boolean jj_2_5(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_5();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(4, xla);
-        }
-    }
-
-    private boolean jj_2_6(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_6();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(5, xla);
-        }
-    }
-
-    private boolean jj_2_7(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_7();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(6, xla);
-        }
-    }
-
-    private boolean jj_2_8(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_8();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(7, xla);
-        }
-    }
-
-    private boolean jj_2_9(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_9();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(8, xla);
-        }
-    }
-
-    private boolean jj_2_10(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_10();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(9, xla);
-        }
-    }
-
-    private boolean jj_2_11(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_11();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(10, xla);
-        }
-    }
-
-    private boolean jj_2_12(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_12();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(11, xla);
-        }
-    }
-
-    private boolean jj_2_13(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_13();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(12, xla);
-        }
-    }
-
-    private boolean jj_2_14(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_14();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(13, xla);
-        }
-    }
-
-    private boolean jj_2_15(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_15();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(14, xla);
-        }
-    }
-
-    private boolean jj_2_16(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_16();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(15, xla);
-        }
-    }
-
-    private boolean jj_2_17(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_17();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(16, xla);
-        }
-    }
-
-    private boolean jj_2_18(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_18();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(17, xla);
-        }
-    }
-
-    private boolean jj_2_19(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_19();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(18, xla);
-        }
-    }
-
-    private boolean jj_2_20(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_20();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(19, xla);
-        }
-    }
-
-    private boolean jj_2_21(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_21();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(20, xla);
-        }
-    }
-
-    private boolean jj_2_22(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_22();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(21, xla);
-        }
-    }
-
-    private boolean jj_2_23(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_23();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(22, xla);
-        }
-    }
-
-    private boolean jj_2_24(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_24();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(23, xla);
-        }
-    }
-
-    private boolean jj_2_25(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_25();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(24, xla);
-        }
-    }
-
-    private boolean jj_2_26(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_26();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(25, xla);
-        }
-    }
-
-    private boolean jj_2_27(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_27();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(26, xla);
-        }
-    }
-
-    private boolean jj_2_28(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_28();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(27, xla);
-        }
-    }
-
-    private boolean jj_2_29(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_29();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(28, xla);
-        }
-    }
-
-    private boolean jj_2_30(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_30();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(29, xla);
-        }
-    }
-
-    private boolean jj_2_31(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_31();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(30, xla);
-        }
-    }
-
-    private boolean jj_2_32(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_32();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(31, xla);
-        }
-    }
-
-    private boolean jj_2_33(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_33();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(32, xla);
-        }
-    }
-
-    private boolean jj_2_34(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_34();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(33, xla);
-        }
-    }
-
-    private boolean jj_2_35(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_35();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(34, xla);
-        }
-    }
-
-    private boolean jj_2_36(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_36();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(35, xla);
-        }
-    }
-
-    private boolean jj_2_37(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_37();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(36, xla);
-        }
-    }
-
-    private boolean jj_2_38(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_38();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(37, xla);
-        }
-    }
-
-    private boolean jj_2_39(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_39();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(38, xla);
-        }
-    }
-
-    private boolean jj_2_40(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_40();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(39, xla);
-        }
-    }
-
-    private boolean jj_2_41(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_41();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(40, xla);
-        }
-    }
-
-    private boolean jj_2_42(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_42();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(41, xla);
-        }
-    }
-
-    private boolean jj_2_43(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_43();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(42, xla);
-        }
-    }
-
-    private boolean jj_2_44(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_44();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(43, xla);
-        }
-    }
-
-    private boolean jj_3_38() {
-        if (jj_3R_95()) return true;
-        if (jj_3R_68()) return true;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_341() {
-        if (jj_3R_345()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_373()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_385() {
-        if (jj_scan_token(ELSE)) return true;
-        if (jj_3R_277()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_377() {
-        if (jj_3R_93()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_427() {
-        if (jj_3R_80()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_429()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_159() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_78()) return true;
-        if (jj_3R_158()) return true;
-        return false;
-    }
-
-    private boolean jj_3_21() {
-        if (jj_3R_83()) return true;
-        return false;
-    }
-
-    private boolean jj_3_20() {
-        if (jj_3R_82()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_426() {
-        if (jj_3R_427()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_81() {
-        if (jj_scan_token(LSHIFT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_402() {
-        if (jj_3R_80()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_103() {
-        if (jj_scan_token(LT)) return true;
-        if (jj_3R_78()) return true;
-        if (jj_3R_158()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_159()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(GT)) return true;
-        return false;
-    }
-
-    private boolean jj_3_19() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_81()) {
-            jj_scanpos = xsp;
-            if (jj_3_20()) {
-                jj_scanpos = xsp;
-                if (jj_3_21()) return true;
-            }
-        }
-        if (jj_3R_341()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_425() {
-        if (jj_3R_96()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_342() {
-        if (jj_scan_token(INSTANCEOF)) return true;
-        if (jj_3R_68()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_339() {
-        if (jj_3R_341()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_19()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_419() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_425()) {
-            jj_scanpos = xsp;
-            if (jj_3R_426()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_364() {
-        if (jj_scan_token(GE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_363() {
-        if (jj_scan_token(LE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_362() {
-        if (jj_scan_token(GT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_361() {
-        if (jj_scan_token(LT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_376() {
-        if (jj_3R_163()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_346() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_361()) {
-            jj_scanpos = xsp;
-            if (jj_3R_362()) {
-                jj_scanpos = xsp;
-                if (jj_3R_363()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_364()) return true;
-                }
-            }
-        }
-        if (jj_3R_339()) return true;
-        return false;
-    }
-
-    private boolean jj_3_37() {
-        if (jj_3R_96()) return true;
-        if (jj_scan_token(COLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_102() {
-        if (jj_3R_101()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_367() {
-        if (jj_3R_183()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_66() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_102()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(IDENTIFIER)) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_376()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_377()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_401() {
-        if (jj_3R_419()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_387() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_401()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_402()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_403()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_337() {
-        if (jj_3R_339()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_346()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_386() {
-        if (jj_3R_96()) return true;
-        if (jj_scan_token(COLON)) return true;
-        if (jj_3R_80()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_352() {
-        if (jj_scan_token(SEMICOLON)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_367()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_338() {
-        if (jj_scan_token(BIT_AND)) return true;
-        if (jj_3R_314()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_325() {
-        if (jj_scan_token(FOR)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_386()) {
-            jj_scanpos = xsp;
-            if (jj_3R_387()) return true;
-        }
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_277()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_332() {
-        if (jj_3R_337()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_342()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_351() {
-        if (jj_3R_66()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_3()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_344() {
-        if (jj_scan_token(NE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_343() {
-        if (jj_scan_token(EQ)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_340() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_343()) {
-            jj_scanpos = xsp;
-            if (jj_3R_344()) return true;
-        }
-        if (jj_3R_332()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_333() {
-        if (jj_scan_token(XOR)) return true;
-        if (jj_3R_285()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_324() {
-        if (jj_scan_token(DO)) return true;
-        if (jj_3R_277()) return true;
-        if (jj_scan_token(WHILE)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_80()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_350() {
-        if (jj_3R_366()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_315() {
-        if (jj_scan_token(BIT_OR)) return true;
-        if (jj_3R_265()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_314() {
-        if (jj_3R_332()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_340()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_271() {
-        if (jj_scan_token(ENUM)) return true;
-        if (jj_3R_98()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_350()) jj_scanpos = xsp;
-        if (jj_scan_token(LBRACE)) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_351()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(113)) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_352()) jj_scanpos = xsp;
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_323() {
-        if (jj_scan_token(WHILE)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_80()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_277()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_286() {
-        if (jj_scan_token(SC_AND)) return true;
-        if (jj_3R_237()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_285() {
-        if (jj_3R_314()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_338()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_267() {
-        if (jj_scan_token(SC_OR)) return true;
-        if (jj_3R_207()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_375() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_251()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_366() {
-        if (jj_scan_token(IMPLEMENTS)) return true;
-        if (jj_3R_251()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_375()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_265() {
-        if (jj_3R_285()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_333()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_322() {
-        if (jj_scan_token(IF)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_80()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_277()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_385()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_237() {
-        if (jj_3R_265()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_315()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_374() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_251()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_365() {
-        if (jj_scan_token(EXTENDS)) return true;
-        if (jj_3R_251()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_374()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_207() {
-        if (jj_3R_237()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_286()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_418() {
-        if (jj_scan_token(_DEFAULT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_417() {
-        if (jj_scan_token(CASE)) return true;
-        if (jj_3R_80()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_289() {
-        if (jj_scan_token(INTERFACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_349() {
-        if (jj_3R_366()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_176() {
-        if (jj_3R_207()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_267()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_348() {
-        if (jj_3R_365()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_400() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_417()) {
-            jj_scanpos = xsp;
-            if (jj_3R_418()) return true;
-        }
-        if (jj_scan_token(COLON)) return true;
-        if (jj_3R_160()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_347() {
-        if (jj_3R_103()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_270() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(45)) {
-            jj_scanpos = xsp;
-            if (jj_3R_289()) return true;
-        }
-        if (jj_3R_98()) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_347()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_348()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_349()) jj_scanpos = xsp;
-        if (jj_3R_93()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_150() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_149()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_241() {
-        if (jj_scan_token(HOOK)) return true;
-        if (jj_3R_80()) return true;
-        if (jj_scan_token(COLON)) return true;
-        if (jj_3R_129()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_384() {
-        if (jj_3R_400()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_129() {
-        if (jj_3R_176()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_241()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_321() {
-        if (jj_scan_token(SWITCH)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_80()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_scan_token(LBRACE)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_384()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_128() {
-        if (jj_scan_token(ORASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_424() {
-        if (jj_3R_77()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_127() {
-        if (jj_scan_token(XORASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_126() {
-        if (jj_scan_token(ANDASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_125() {
-        if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_124() {
-        if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_123() {
-        if (jj_scan_token(LSHIFTASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_416() {
-        if (jj_scan_token(ARROW)) return true;
-        if (jj_3R_268()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_122() {
-        if (jj_scan_token(MINUSASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_121() {
-        if (jj_scan_token(PLUSASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_415() {
-        if (jj_scan_token(DOUBLECOLON)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_424()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(103)) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(68)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_120() {
-        if (jj_scan_token(REMASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_414() {
-        if (jj_3R_79()) return true;
-        if (jj_3R_80()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_119() {
-        if (jj_scan_token(SLASHASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_118() {
-        if (jj_scan_token(STARASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_413() {
-        if (jj_scan_token(DECR)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_117() {
-        if (jj_scan_token(ASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_412() {
-        if (jj_scan_token(INCR)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_399() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_412()) {
-            jj_scanpos = xsp;
-            if (jj_3R_413()) {
-                jj_scanpos = xsp;
-                if (jj_3R_414()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_415()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_416()) return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_79() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_117()) {
-            jj_scanpos = xsp;
-            if (jj_3R_118()) {
-                jj_scanpos = xsp;
-                if (jj_3R_119()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_120()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_121()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_122()) {
-                                jj_scanpos = xsp;
-                                if (jj_3R_123()) {
-                                    jj_scanpos = xsp;
-                                    if (jj_3R_124()) {
-                                        jj_scanpos = xsp;
-                                        if (jj_3R_125()) {
-                                            jj_scanpos = xsp;
-                                            if (jj_3R_126()) {
-                                                jj_scanpos = xsp;
-                                                if (jj_3R_127()) {
-                                                    jj_scanpos = xsp;
-                                                    if (jj_3R_128()) return true;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_336() {
-        if (jj_3R_266()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_399()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_335() {
-        if (jj_3R_216()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_269() {
-        if (jj_3R_77()) return true;
-        return false;
-    }
-
-    private boolean jj_3_36() {
-        if (jj_3R_97()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_243() {
-        if (jj_scan_token(DOUBLECOLON)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_269()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(103)) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(68)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_320() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_36()) {
-            jj_scanpos = xsp;
-            if (jj_3R_335()) {
-                jj_scanpos = xsp;
-                if (jj_3R_336()) return true;
-            }
-        }
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_65() {
-        if (jj_3R_101()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_64() {
-        if (jj_scan_token(STRICTFP)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_63() {
-        if (jj_scan_token(VOLATILE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_62() {
-        if (jj_scan_token(TRANSIENT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_61() {
-        if (jj_scan_token(NATIVE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_60() {
-        if (jj_scan_token(SYNCHRONIZED)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_288() {
-        if (jj_3R_106()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_59() {
-        if (jj_scan_token(ABSTRACT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_58() {
-        if (jj_scan_token(FINAL)) return true;
-        return false;
-    }
-
-    private boolean jj_3_18() {
-        if (jj_3R_79()) return true;
-        if (jj_3R_80()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_242() {
-        if (jj_scan_token(ARROW)) return true;
-        if (jj_3R_268()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_57() {
-        if (jj_scan_token(PRIVATE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_56() {
-        if (jj_scan_token(PROTECTED)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_213() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_18()) {
-            jj_scanpos = xsp;
-            if (jj_3R_242()) {
-                jj_scanpos = xsp;
-                if (jj_3R_243()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_287() {
-        if (jj_3R_80()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_55() {
-        if (jj_scan_token(STATIC)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_54() {
-        if (jj_scan_token(PUBLIC)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_80() {
-        if (jj_3R_129()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_213()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3_2() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_54()) {
-            jj_scanpos = xsp;
-            if (jj_3R_55()) {
-                jj_scanpos = xsp;
-                if (jj_3R_56()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_57()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_58()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_59()) {
-                                jj_scanpos = xsp;
-                                if (jj_3R_60()) {
-                                    jj_scanpos = xsp;
-                                    if (jj_3R_61()) {
-                                        jj_scanpos = xsp;
-                                        if (jj_3R_62()) {
-                                            jj_scanpos = xsp;
-                                            if (jj_3R_63()) {
-                                                jj_scanpos = xsp;
-                                                if (jj_3R_64()) {
-                                                    jj_scanpos = xsp;
-                                                    if (jj_3R_65()) return true;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_268() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_287()) {
-            jj_scanpos = xsp;
-            if (jj_3R_288()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_95() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_2()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_319() {
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3_35() {
-        if (jj_3R_96()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_96() {
-        if (jj_3R_95()) return true;
-        if (jj_3R_68()) return true;
-        if (jj_3R_149()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_150()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_202() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        return false;
-    }
-
-    private boolean jj_3_34() {
-        if (jj_3R_95()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(45)) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(65)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_255() {
-        if (jj_3R_277()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_383() {
-        if (jj_scan_token(COLON)) return true;
-        if (jj_3R_80()) return true;
-        return false;
-    }
-
-    private boolean jj_3_17() {
-        if (jj_scan_token(DOT)) return true;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_254() {
-        if (jj_3R_96()) return true;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_98() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_17()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_53() {
-        if (jj_3R_78()) return true;
-        if (jj_scan_token(PACKAGE)) return true;
-        if (jj_3R_98()) return true;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_253() {
-        if (jj_3R_95()) return true;
-        if (jj_3R_270()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_147() {
-        if (jj_3R_68()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_146() {
-        if (jj_scan_token(VOID)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_220() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_253()) {
-            jj_scanpos = xsp;
-            if (jj_3R_254()) {
-                jj_scanpos = xsp;
-                if (jj_3R_255()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3_1() {
-        if (jj_3R_53()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_91() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_146()) {
-            jj_scanpos = xsp;
-            if (jj_3R_147()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_140() {
-        if (jj_scan_token(DOUBLE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_106() {
-        if (jj_scan_token(LBRACE)) return true;
-        if (jj_3R_160()) return true;
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_139() {
-        if (jj_scan_token(FLOAT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_138() {
-        if (jj_scan_token(LONG)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_137() {
-        if (jj_scan_token(INT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_136() {
-        if (jj_scan_token(SHORT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_135() {
-        if (jj_scan_token(BYTE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_94() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        if (jj_scan_token(COLON)) return true;
-        if (jj_3R_277()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_134() {
-        if (jj_scan_token(CHAR)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_133() {
-        if (jj_scan_token(BOOLEAN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_313() {
-        if (jj_scan_token(SUPER)) return true;
-        if (jj_3R_78()) return true;
-        if (jj_3R_75()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_87() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_133()) {
-            jj_scanpos = xsp;
-            if (jj_3R_134()) {
-                jj_scanpos = xsp;
-                if (jj_3R_135()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_136()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_137()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_138()) {
-                                jj_scanpos = xsp;
-                                if (jj_3R_139()) {
-                                    jj_scanpos = xsp;
-                                    if (jj_3R_140()) return true;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_204() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_175()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_312() {
-        if (jj_scan_token(EXTENDS)) return true;
-        if (jj_3R_78()) return true;
-        if (jj_3R_75()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_284() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_312()) {
-            jj_scanpos = xsp;
-            if (jj_3R_313()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_318() {
-        if (jj_scan_token(ASSERT)) return true;
-        if (jj_3R_80()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_383()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_308() {
-        if (jj_3R_331()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_307() {
-        if (jj_3R_330()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_306() {
-        if (jj_3R_329()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_305() {
-        if (jj_3R_328()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_304() {
-        if (jj_3R_327()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_303() {
-        if (jj_3R_326()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_236() {
-        if (jj_scan_token(HOOK)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_284()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_302() {
-        if (jj_3R_325()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_301() {
-        if (jj_3R_324()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_300() {
-        if (jj_3R_323()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_299() {
-        if (jj_3R_322()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_298() {
-        if (jj_3R_321()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_297() {
-        if (jj_3R_320()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_206() {
-        if (jj_3R_236()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_296() {
-        if (jj_3R_319()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_205() {
-        if (jj_3R_75()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_295() {
-        if (jj_3R_106()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_294() {
-        if (jj_3R_318()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_175() {
-        if (jj_3R_78()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_205()) {
-            jj_scanpos = xsp;
-            if (jj_3R_206()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3_33() {
-        if (jj_3R_94()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_115() {
-        if (jj_3R_175()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_204()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_277() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_33()) {
-            jj_scanpos = xsp;
-            if (jj_3R_294()) {
-                jj_scanpos = xsp;
-                if (jj_3R_295()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_296()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_297()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_298()) {
-                                jj_scanpos = xsp;
-                                if (jj_3R_299()) {
-                                    jj_scanpos = xsp;
-                                    if (jj_3R_300()) {
-                                        jj_scanpos = xsp;
-                                        if (jj_3R_301()) {
-                                            jj_scanpos = xsp;
-                                            if (jj_3R_302()) {
-                                                jj_scanpos = xsp;
-                                                if (jj_3R_303()) {
-                                                    jj_scanpos = xsp;
-                                                    if (jj_3R_304()) {
-                                                        jj_scanpos = xsp;
-                                                        if (jj_3R_305()) {
-                                                            jj_scanpos = xsp;
-                                                            if (jj_3R_306()) {
-                                                                jj_scanpos = xsp;
-                                                                if (jj_3R_307()) {
-                                                                    jj_scanpos = xsp;
-                                                                    if (jj_3R_308()) return true;
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_77() {
-        if (jj_scan_token(LT)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_115()) jj_scanpos = xsp;
-        if (jj_scan_token(GT)) return true;
-        return false;
-    }
-
-    private boolean jj_3_16() {
-        if (jj_3R_77()) return true;
-        return false;
-    }
-
-    private boolean jj_3_32() {
-        if (jj_3R_93()) return true;
-        return false;
-    }
-
-    private boolean jj_3_15() {
-        if (jj_scan_token(DOT)) return true;
-        if (jj_3R_78()) return true;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_16()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_311() {
-        if (jj_3R_80()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_283() {
-        if (jj_3R_161()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_282() {
-        if (jj_3R_78()) return true;
-        if (jj_scan_token(LBRACKET)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_311()) jj_scanpos = xsp;
-        if (jj_scan_token(RBRACKET)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_261() {
-        Token xsp;
-        if (jj_3R_282()) return true;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_282()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        xsp = jj_scanpos;
-        if (jj_3R_283()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3_14() {
-        if (jj_3R_77()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_174() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_14()) jj_scanpos = xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_15()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_256() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_80()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_264() {
-        if (jj_3R_163()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_32()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_263() {
-        if (jj_3R_261()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_262() {
-        if (jj_3R_77()) return true;
-        if (jj_3R_78()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_235() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_262()) jj_scanpos = xsp;
-        if (jj_3R_251()) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_263()) {
-            jj_scanpos = xsp;
-            if (jj_3R_264()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_234() {
-        if (jj_3R_87()) return true;
-        if (jj_3R_261()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_251() {
-        if (jj_3R_78()) return true;
-        if (jj_3R_174()) return true;
-        return false;
-    }
-
-    private boolean jj_3_13() {
-        if (jj_3R_76()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_428() {
-        if (jj_3R_430()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_200() {
-        if (jj_scan_token(NEW)) return true;
-        if (jj_3R_78()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_234()) {
-            jj_scanpos = xsp;
-            if (jj_3R_235()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3_12() {
-        if (jj_3R_76()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_355() {
-        if (jj_scan_token(THROWS)) return true;
-        if (jj_3R_370()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_371()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_76() {
-        if (jj_3R_78()) return true;
-        if (jj_scan_token(LBRACKET)) return true;
-        if (jj_scan_token(RBRACKET)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_221() {
-        if (jj_3R_80()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_256()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_195() {
-        if (jj_3R_221()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_114() {
-        if (jj_3R_174()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_13()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_163() {
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_195()) jj_scanpos = xsp;
-        if (jj_scan_token(RPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_113() {
-        if (jj_3R_87()) return true;
-        Token xsp;
-        if (jj_3_12()) return true;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_12()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_75() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_113()) {
-            jj_scanpos = xsp;
-            if (jj_3R_114()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_258() {
-        if (jj_scan_token(NULL)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_279() {
-        if (jj_scan_token(FALSE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_278() {
-        if (jj_scan_token(TRUE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_104() {
-        if (jj_3R_87()) return true;
-        return false;
-    }
-
-    private boolean jj_3_11() {
-        if (jj_3R_75()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_68() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_11()) {
-            jj_scanpos = xsp;
-            if (jj_3R_104()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_257() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_278()) {
-            jj_scanpos = xsp;
-            if (jj_3R_279()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_430() {
-        if (jj_scan_token(_DEFAULT)) return true;
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_228() {
-        if (jj_3R_258()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_227() {
-        if (jj_3R_257()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_226() {
-        if (jj_scan_token(STRING_LITERAL)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_105() {
-        if (jj_scan_token(STATIC)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_225() {
-        if (jj_scan_token(CHARACTER_LITERAL)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_423() {
-        if (jj_3R_68()) return true;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_428()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_70() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_105()) jj_scanpos = xsp;
-        if (jj_3R_106()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_224() {
-        if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_194() {
-        if (jj_3R_220()) return true;
-        return false;
-    }
-
-    private boolean jj_3_44() {
-        if (jj_3R_68()) return true;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_411() {
-        if (jj_3R_274()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_160() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_194()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_410() {
-        if (jj_3R_272()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_223() {
-        if (jj_scan_token(LONG_LITERAL)) return true;
-        return false;
-    }
-
-    private boolean jj_3_9() {
-        if (jj_3R_73()) return true;
-        if (jj_scan_token(DOT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_409() {
-        if (jj_3R_271()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_408() {
-        if (jj_3R_270()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_222() {
-        if (jj_scan_token(INTEGER_LITERAL)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_407() {
-        if (jj_3R_423()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_74() {
-        if (jj_3R_77()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_165() {
-        if (jj_3R_77()) return true;
-        return false;
-    }
-
-    private boolean jj_3_10() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_74()) jj_scanpos = xsp;
-        if (jj_scan_token(THIS)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_164() {
-        if (jj_3R_73()) return true;
-        if (jj_scan_token(DOT)) return true;
-        return false;
-    }
-
-    private boolean jj_3_43() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_92() {
-        if (jj_3R_77()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_196() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_222()) {
-            jj_scanpos = xsp;
-            if (jj_3R_223()) {
-                jj_scanpos = xsp;
-                if (jj_3R_224()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_225()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_226()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_227()) {
-                                jj_scanpos = xsp;
-                                if (jj_3R_228()) return true;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_394() {
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_110() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_164()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_165()) jj_scanpos = xsp;
-        if (jj_scan_token(SUPER)) return true;
-        if (jj_3R_163()) return true;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_143() {
-        if (jj_scan_token(LBRACKET)) return true;
-        if (jj_3R_80()) return true;
-        if (jj_scan_token(RBRACKET)) return true;
-        return false;
-    }
-
-    private boolean jj_3_31() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_92()) jj_scanpos = xsp;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_395() {
-        if (jj_3R_95()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_407()) {
-            jj_scanpos = xsp;
-            if (jj_3R_408()) {
-                jj_scanpos = xsp;
-                if (jj_3R_409()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_410()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_411()) return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_162() {
-        if (jj_3R_77()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_109() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_162()) jj_scanpos = xsp;
-        if (jj_scan_token(THIS)) return true;
-        if (jj_3R_163()) return true;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_212() {
-        if (jj_3R_163()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_378() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_394()) {
-            jj_scanpos = xsp;
-            if (jj_3R_395()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_211() {
-        if (jj_3R_77()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_181() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_211()) jj_scanpos = xsp;
-        if (jj_3R_202()) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_212()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_368() {
-        if (jj_3R_378()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_180() {
-        if (jj_3R_200()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_72() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_109()) {
-            jj_scanpos = xsp;
-            if (jj_3R_110()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_179() {
-        if (jj_scan_token(THIS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_353() {
-        if (jj_scan_token(LBRACE)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_368()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_259() {
-        if (jj_3R_280()) return true;
-        return false;
-    }
-
-    private boolean jj_3_8() {
-        if (jj_3R_72()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_144() {
-        if (jj_scan_token(ELLIPSIS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_142() {
-        if (jj_scan_token(DOT)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_179()) {
-            jj_scanpos = xsp;
-            if (jj_3R_180()) {
-                jj_scanpos = xsp;
-                if (jj_3R_181()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_309() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_90()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_89() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_142()) {
-            jj_scanpos = xsp;
-            if (jj_3R_143()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_356() {
-        if (jj_3R_72()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_272() {
-        if (jj_scan_token(AT)) return true;
-        if (jj_scan_token(INTERFACE)) return true;
-        if (jj_3R_98()) return true;
-        if (jj_3R_353()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_371() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_370()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_317() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_316()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_290() {
-        if (jj_3R_103()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_141() {
-        if (jj_scan_token(DOT)) return true;
-        if (jj_scan_token(SUPER)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_273() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_290()) jj_scanpos = xsp;
-        if (jj_3R_202()) return true;
-        if (jj_3R_354()) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_355()) jj_scanpos = xsp;
-        if (jj_scan_token(LBRACE)) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_356()) jj_scanpos = xsp;
-        if (jj_3R_160()) return true;
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_334() {
-        if (jj_3R_100()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_43()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3_30() {
-        if (jj_3R_89()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_201() {
-        if (jj_3R_77()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_379() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_90()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_88() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_30()) {
-            jj_scanpos = xsp;
-            if (jj_3R_141()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_189() {
-        if (jj_scan_token(LBRACE)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_334()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(113)) jj_scanpos = xsp;
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_203() {
-        if (jj_3R_163()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_154() {
-        if (jj_3R_129()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_153() {
-        if (jj_3R_189()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_173() {
-        if (jj_3R_202()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_203()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_152() {
-        if (jj_3R_101()) return true;
-        return false;
-    }
-
-    private boolean jj_3_29() {
-        if (jj_3R_91()) return true;
-        if (jj_scan_token(DOUBLECOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3_28() {
-        if (jj_3R_91()) return true;
-        if (jj_scan_token(DOT)) return true;
-        if (jj_scan_token(CLASS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_90() {
-        if (jj_3R_95()) return true;
-        if (jj_3R_68()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_144()) jj_scanpos = xsp;
-        if (jj_3R_145()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_100() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_152()) {
-            jj_scanpos = xsp;
-            if (jj_3R_153()) {
-                jj_scanpos = xsp;
-                if (jj_3R_154()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3_7() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_71()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_260() {
-        if (jj_3R_281()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_172() {
-        if (jj_3R_91()) return true;
-        if (jj_scan_token(DOUBLECOLON)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_201()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(103)) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(68)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_276() {
-        if (jj_3R_293()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_171() {
-        if (jj_3R_91()) return true;
-        if (jj_scan_token(DOT)) return true;
-        if (jj_scan_token(CLASS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_316() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        if (jj_scan_token(ASSIGN)) return true;
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_310() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_145()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_170() {
-        if (jj_3R_200()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_281() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_145()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_310()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3_27() {
-        if (jj_3R_90()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_293() {
-        if (jj_3R_316()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_317()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_358() {
-        if (jj_3R_76()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_233() {
-        if (jj_3R_80()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_260()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_280() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_90()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_309()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_232() {
-        if (jj_3R_90()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_259()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_199() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_232()) {
-            jj_scanpos = xsp;
-            if (jj_3R_233()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_231() {
-        if (jj_3R_77()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_369() {
-        if (jj_3R_90()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_379()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_191() {
-        if (jj_scan_token(AT)) return true;
-        if (jj_3R_98()) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_100()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_99() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        if (jj_scan_token(ASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_169() {
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_199()) jj_scanpos = xsp;
-        if (jj_scan_token(RPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_198() {
-        if (jj_scan_token(DOUBLECOLON)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_231()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(103)) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(68)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_354() {
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_369()) jj_scanpos = xsp;
-        if (jj_scan_token(RPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_192() {
-        if (jj_scan_token(AT)) return true;
-        if (jj_3R_98()) return true;
-        return false;
-    }
-
-    private boolean jj_3_42() {
-        if (jj_scan_token(AT)) return true;
-        if (jj_3R_98()) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3_41() {
-        if (jj_scan_token(AT)) return true;
-        if (jj_3R_98()) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_99()) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(107)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_230() {
-        if (jj_3R_163()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_190() {
-        if (jj_scan_token(AT)) return true;
-        if (jj_3R_98()) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_276()) jj_scanpos = xsp;
-        if (jj_scan_token(RPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_370() {
-        if (jj_3R_78()) return true;
-        if (jj_3R_75()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_197() {
-        if (jj_scan_token(DOT)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_229()) jj_scanpos = xsp;
-        if (jj_3R_202()) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_230()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_229() {
-        if (jj_3R_77()) return true;
-        return false;
-    }
-
-    private boolean jj_3_40() {
-        if (jj_scan_token(SEMICOLON)) return true;
-        if (jj_3R_96()) return true;
-        return false;
-    }
-
-    private boolean jj_3_26() {
-        if (jj_3R_89()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_157() {
-        if (jj_3R_192()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_182() {
-        if (jj_3R_76()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_168() {
-        if (jj_scan_token(SUPER)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_197()) {
-            jj_scanpos = xsp;
-            if (jj_3R_198()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_156() {
-        if (jj_3R_191()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_167() {
-        if (jj_scan_token(THIS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_155() {
-        if (jj_3R_190()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_166() {
-        if (jj_3R_196()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_292() {
-        if (jj_3R_71()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_7()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_372() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_370()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_360() {
-        if (jj_3R_106()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_112() {
-        if (jj_3R_89()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_359() {
-        if (jj_scan_token(THROWS)) return true;
-        if (jj_3R_370()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_372()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_291() {
-        if (jj_3R_103()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_111() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_166()) {
-            jj_scanpos = xsp;
-            if (jj_3R_167()) {
-                jj_scanpos = xsp;
-                if (jj_3R_168()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_169()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_170()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_171()) {
-                                jj_scanpos = xsp;
-                                if (jj_3R_172()) {
-                                    jj_scanpos = xsp;
-                                    if (jj_3R_173()) return true;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_101() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_155()) {
-            jj_scanpos = xsp;
-            if (jj_3R_156()) {
-                jj_scanpos = xsp;
-                if (jj_3R_157()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_275() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_291()) jj_scanpos = xsp;
-        if (jj_3R_91()) return true;
-        if (jj_3R_98()) return true;
-        if (jj_3R_354()) return true;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_358()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        xsp = jj_scanpos;
-        if (jj_3R_359()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_360()) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(112)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3_25() {
-        if (jj_3R_88()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_116() {
-        if (jj_3R_101()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_78() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_116()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_130() {
-        return false;
-    }
-
-    private boolean jj_3R_73() {
-        if (jj_3R_111()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_112()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_131() {
-        return false;
-    }
-
-    private boolean jj_3R_161() {
-        if (jj_scan_token(LBRACE)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_292()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(113)) jj_scanpos = xsp;
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_82() {
-        jj_lookingAhead = true;
-        jj_semLA = getToken(1).kind == GT &&
-                ((GTToken) getToken(1)).realKind == RSIGNEDSHIFT;
-        jj_lookingAhead = false;
-        if (!jj_semLA || jj_3R_130()) return true;
-        if (jj_scan_token(GT)) return true;
-        if (jj_scan_token(GT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_108() {
-        if (jj_3R_80()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_107() {
-        if (jj_3R_161()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_184() {
-        if (jj_scan_token(ASSIGN)) return true;
-        if (jj_3R_71()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_266() {
-        if (jj_3R_111()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_25()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_83() {
-        jj_lookingAhead = true;
-        jj_semLA = getToken(1).kind == GT &&
-                ((GTToken) getToken(1)).realKind == RUNSIGNEDSHIFT;
-        jj_lookingAhead = false;
-        if (!jj_semLA || jj_3R_131()) return true;
-        if (jj_scan_token(GT)) return true;
-        if (jj_scan_token(GT)) return true;
-        if (jj_scan_token(GT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_71() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_107()) {
-            jj_scanpos = xsp;
-            if (jj_3R_108()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_177() {
-        if (jj_scan_token(BIT_AND)) return true;
-        if (jj_3R_75()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_132() {
-        if (jj_3R_75()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_177()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_178()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_421() {
-        if (jj_3R_96()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_40()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_145() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_182()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3_24() {
-        if (jj_3R_87()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_151()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_84() {
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_78()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_24()) {
-            jj_scanpos = xsp;
-            if (jj_3R_132()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3_39() {
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_149() {
-        if (jj_3R_145()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_184()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_404() {
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_421()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_39()) jj_scanpos = xsp;
-        if (jj_scan_token(RPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_406() {
-        if (jj_scan_token(FINALLY)) return true;
-        if (jj_3R_106()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_393() {
-        if (jj_scan_token(FINALLY)) return true;
-        if (jj_3R_106()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_422() {
-        if (jj_scan_token(BIT_OR)) return true;
-        if (jj_3R_370()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_69() {
-        if (jj_3R_76()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_86() {
-        if (jj_scan_token(DECR)) return true;
-        return false;
-    }
-
-    private boolean jj_3_23() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_85()) {
-            jj_scanpos = xsp;
-            if (jj_3R_86()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_85() {
-        if (jj_scan_token(INCR)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_357() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_149()) return true;
-        return false;
-    }
-
-    private boolean jj_3_22() {
-        if (jj_3R_84()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_405() {
-        if (jj_scan_token(CATCH)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_95()) return true;
-        if (jj_3R_75()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_422()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_3R_145()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_106()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_274() {
-        if (jj_3R_68()) return true;
-        if (jj_3R_149()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_357()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_240() {
-        if (jj_3R_266()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_23()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_215() {
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_209() {
-        if (jj_3R_84()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_210() {
-        if (jj_3R_240()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_239() {
-        if (jj_scan_token(BANG)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_238() {
-        if (jj_scan_token(TILDE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_208() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_238()) {
-            jj_scanpos = xsp;
-            if (jj_3R_239()) return true;
-        }
-        if (jj_3R_151()) return true;
-        return false;
-    }
-
-    private boolean jj_3_5() {
-        if (jj_3R_68()) return true;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_69()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        xsp = jj_scanpos;
-        if (jj_scan_token(113)) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(116)) {
-                jj_scanpos = xsp;
-                if (jj_scan_token(112)) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_392() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_405()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        xsp = jj_scanpos;
-        if (jj_3R_406()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_67() {
-        if (jj_3R_103()) return true;
-        return false;
-    }
-
-    private boolean jj_3_4() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_67()) jj_scanpos = xsp;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_178() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_208()) {
-            jj_scanpos = xsp;
-            if (jj_3R_209()) {
-                jj_scanpos = xsp;
-                if (jj_3R_210()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_250() {
-        if (jj_3R_275()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_391() {
-        if (jj_3R_404()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_331() {
-        if (jj_scan_token(TRY)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_391()) jj_scanpos = xsp;
-        if (jj_3R_106()) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_392()) {
-            jj_scanpos = xsp;
-            if (jj_3R_393()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_244() {
-        if (jj_scan_token(_DEFAULT)) return true;
-        if (jj_3R_95()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_249() {
-        if (jj_3R_274()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_248() {
-        if (jj_3R_273()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_247() {
-        if (jj_3R_272()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_216() {
-        if (jj_scan_token(DECR)) return true;
-        if (jj_3R_151()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_246() {
-        if (jj_3R_271()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_245() {
-        if (jj_3R_270()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_390() {
-        if (jj_3R_80()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_193() {
-        if (jj_3R_219()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_97() {
-        if (jj_scan_token(INCR)) return true;
-        if (jj_3R_151()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_188() {
-        if (jj_3R_178()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_389() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_330() {
-        if (jj_scan_token(SYNCHRONIZED)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_80()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_106()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_214() {
-        if (jj_3R_95()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_244()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_245()) {
-            jj_scanpos = xsp;
-            if (jj_3R_246()) {
-                jj_scanpos = xsp;
-                if (jj_3R_247()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_248()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_249()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_250()) return true;
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3_6() {
-        if (jj_3R_70()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_388() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_218() {
-        if (jj_scan_token(MINUS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_217() {
-        if (jj_scan_token(PLUS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_329() {
-        if (jj_scan_token(THROW)) return true;
-        if (jj_3R_80()) return true;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_187() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_217()) {
-            jj_scanpos = xsp;
-            if (jj_3R_218()) return true;
-        }
-        if (jj_3R_151()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_186() {
-        if (jj_3R_216()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_185() {
-        if (jj_3R_97()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_183() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_6()) {
-            jj_scanpos = xsp;
-            if (jj_3R_214()) {
-                jj_scanpos = xsp;
-                if (jj_3R_215()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_429() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_80()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_328() {
-        if (jj_scan_token(RETURN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_390()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_148() {
-        if (jj_3R_183()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_151() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_185()) {
-            jj_scanpos = xsp;
-            if (jj_3R_186()) {
-                jj_scanpos = xsp;
-                if (jj_3R_187()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_188()) return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_398() {
-        if (jj_scan_token(REM)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_397() {
-        if (jj_scan_token(SLASH)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_327() {
-        if (jj_scan_token(CONTINUE)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_389()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_93() {
-        if (jj_scan_token(LBRACE)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_148()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_396() {
-        if (jj_scan_token(STAR)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_380() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_396()) {
-            jj_scanpos = xsp;
-            if (jj_3R_397()) {
-                jj_scanpos = xsp;
-                if (jj_3R_398()) return true;
-            }
-        }
-        if (jj_3R_151()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_403() {
-        if (jj_3R_420()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_252() {
-        if (jj_scan_token(BIT_AND)) return true;
-        if (jj_3R_251()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_326() {
-        if (jj_scan_token(BREAK)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_388()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_219() {
-        if (jj_scan_token(EXTENDS)) return true;
-        if (jj_3R_251()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_252()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_345() {
-        if (jj_3R_151()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_380()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_382() {
-        if (jj_scan_token(MINUS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_381() {
-        if (jj_scan_token(PLUS)) return true;
-        return false;
-    }
-
-    private boolean jj_3_3() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_66()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_373() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_381()) {
-            jj_scanpos = xsp;
-            if (jj_3R_382()) return true;
-        }
-        if (jj_3R_345()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_158() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_193()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_420() {
-        if (jj_3R_427()) return true;
-        return false;
-    }
-
-    /**
-     * Generated Token Manager.
-     */
-    public ASTParserTokenManager token_source;
-    JavaCharStream jj_input_stream;
-    /**
-     * Current token.
-     */
-    public Token token;
-    /**
-     * Next token.
-     */
-    public Token jj_nt;
-    private int jj_ntk;
-    private Token jj_scanpos, jj_lastpos;
-    private int jj_la;
-    /**
-     * Whether we are looking ahead.
-     */
-    private boolean jj_lookingAhead = false;
-    private boolean jj_semLA;
-    private int jj_gen;
-    final private int[] jj_la1 = new int[160];
-    static private int[] jj_la1_0;
-    static private int[] jj_la1_1;
-    static private int[] jj_la1_2;
-    static private int[] jj_la1_3;
-    static private int[] jj_la1_4;
-
-    static {
-        jj_la1_init_0();
-        jj_la1_init_1();
-        jj_la1_init_2();
-        jj_la1_init_3();
-        jj_la1_init_4();
-    }
-
-    private static void jj_la1_init_0() {
-        jj_la1_0 = new int[]{0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,};
-    }
-
-    private static void jj_la1_init_1() {
-        jj_la1_1 = new int[]{0x40000000, 0x40000000, 0x902020, 0x0, 0x0, 0x0, 0x800020, 0x102000, 0x902020, 0x2000, 0x0, 0x200000, 0x20000000, 0x0, 0x0, 0x20000000, 0x0, 0x0, 0x29532a0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x200000, 0x0, 0x29532a0, 0x10000, 0x102000, 0x2041280, 0x29532a0, 0x0, 0x0, 0x0, 0x2441280, 0x2441280, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x28412a0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2441280, 0x16c6b3e0, 0x0, 0x2041280, 0x2041280, 0x2041280, 0x0, 0x2041280, 0x2041280, 0x200000, 0x200000, 0x2041280, 0x2041280, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x80000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2441280, 0x0, 0x0, 0x2441280, 0x0, 0x0, 0x2041280, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2441280, 0x2c412a0, 0x0, 0x0, 0x0, 0x400000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x400000, 0x2441280, 0x0, 0x0, 0x0, 0x2041280, 0x2441280, 0x0, 0x0, 0x164693c0, 0x0, 0x164693c0, 0x0, 0x2441280, 0x0, 0x0, 0x0, 0x0, 0x2441280, 0x10400, 0x10400, 0x80000, 0x2c412a0, 0x2441280, 0x2441280, 0x2c412a0, 0x2441280, 0x0, 0x0, 0x0, 0x2441280, 0x0, 0x800, 0x0, 0x1000000, 0x0, 0x0, 0x0, 0x0, 0x2441280, 0x2441280, 0x0, 0x29432a0, 0x2143280, 0x29432a0, 0x10000,};
-    }
-
-    private static void jj_la1_init_2() {
-        jj_la1_2 = new int[]{0x0, 0x0, 0x111338a, 0x0, 0x1000, 0x0, 0x1113388, 0x2, 0x111338a, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1913b8f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1913b8f, 0x0, 0x2, 0x800805, 0x1913b8f, 0x0, 0x0, 0x0, 0xca24835, 0xca24835, 0x0, 0x0, 0x0, 0x0, 0x80000, 0x0, 0x0, 0x1113b8d, 0x0, 0x0, 0x0, 0x0, 0x0, 0x80000, 0x0, 0x0, 0xca24835, 0xff7ffbf, 0x1000, 0x805, 0x805, 0x805, 0x0, 0x805, 0x805, 0x4000, 0x4000, 0x805, 0x800805, 0x0, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xca24835, 0x0, 0x0, 0xca24835, 0x0, 0x0, 0x805, 0x0, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0xca24835, 0xdb37bbd, 0x0, 0x10, 0x0, 0xc224030, 0x0, 0x0, 0x0, 0x0, 0x20010, 0x0, 0xc200020, 0x200000, 0xca24835, 0x0, 0x0, 0x0, 0x805, 0xca24835, 0x0, 0x0, 0xee7cc35, 0x0, 0xee7cc35, 0x0, 0xca24835, 0x0, 0x10, 0x0, 0x0, 0xca24835, 0x0, 0x0, 0x0, 0xdb37bbd, 0xca24835, 0xca24835, 0xdb37bbd, 0xca24835, 0x0, 0x0, 0x0, 0xca24835, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xca24835, 0xca24835, 0x0, 0x1113b8f, 0x807, 0x1113b8f, 0x0,};
-    }
-
-    private static void jj_la1_init_3() {
-        jj_la1_3 = new int[]{0x10000, 0x10000, 0x90000, 0x0, 0x0, 0x40000, 0x80000, 0x80000, 0x90000, 0x0, 0x200000, 0x0, 0x0, 0x20000, 0x20000, 0x0, 0x80080, 0x20000, 0x291080, 0x10000, 0x80000, 0x400, 0x1000, 0x20000, 0x0, 0x0, 0x291080, 0x0, 0x80000, 0x200080, 0x290080, 0x20000, 0x100000, 0x84000, 0xc014e1, 0xc014e1, 0x20000, 0x200000, 0x84000, 0x20000, 0x0, 0x11000, 0x20000, 0x80080, 0x20000, 0x20000, 0x0, 0x200000, 0x20000, 0x0, 0x200000, 0x200000, 0x2004e1, 0x914e1, 0x0, 0x0, 0x80, 0x80, 0x20000, 0x1080080, 0x1000080, 0x0, 0x0, 0x0, 0x80, 0x200000, 0x80, 0x0, 0x100000, 0x100000, 0x1000000, 0x40000000, 0x80000000, 0x0, 0x0, 0x0, 0x24000000, 0x24000000, 0x0, 0x18200000, 0x18200000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc004e1, 0xc00000, 0xc00000, 0x4e1, 0x0, 0x0, 0x80, 0x200000, 0x400, 0x200000, 0x80, 0x40000, 0x20000, 0x20000, 0xc004e1, 0xc804e1, 0x200000, 0x80, 0x400, 0x461, 0x80, 0x40000, 0x200000, 0x400, 0x0, 0x44000, 0x61, 0x0, 0xc004e1, 0x20000, 0x200000, 0x84400, 0x280080, 0xc004e1, 0x84000, 0x1000, 0x114e1, 0x2000000, 0x114e1, 0x20000, 0xc014e1, 0x200000, 0x80, 0x100000, 0x100000, 0x4e1, 0x0, 0x0, 0x0, 0xc804e1, 0xc004e1, 0xc004e1, 0xc904e1, 0xc004e1, 0x20000, 0x80, 0x80, 0xc004e1, 0x400, 0x0, 0x0, 0x0, 0x80000, 0x80000, 0x80, 0x20000, 0xc814e1, 0xc814e1, 0x20000, 0x90080, 0x80080, 0x90080, 0x0,};
-    }
-
-    private static void jj_la1_init_4() {
-        jj_la1_4 = new int[]{0x0, 0x0, 0x0, 0x10000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x400000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1800000, 0x1bff800, 0x3ff800, 0x0, 0x0, 0x0, 0x80, 0x100, 0x40, 0x0, 0x0, 0x0, 0x8000000, 0x8000000, 0x400, 0xc, 0xc, 0x230, 0x230, 0xc, 0xf, 0x0, 0x0, 0x0, 0x3, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000000, 0x0, 0x0, 0xf, 0xf, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0x0, 0x0, 0x0, 0x0, 0xf, 0x0, 0x0, 0x3, 0x0, 0x3, 0x0, 0xf, 0x0, 0x0, 0x1bff803, 0x1bff803, 0x2, 0x0, 0x0, 0x0, 0xf, 0xf, 0xf, 0xf, 0xf, 0x0, 0x0, 0x0, 0xf, 0x0, 0x0, 0x80, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf, 0xf, 0x0, 0x0, 0x0, 0x0, 0x0,};
-    }
-
-    final private JJCalls[] jj_2_rtns = new JJCalls[44];
-    private boolean jj_rescan = false;
-    private int jj_gc = 0;
-
-    /**
-     * Constructor.
-     */
-    public ASTParser(Provider stream) {
-        jj_input_stream = new JavaCharStream(stream, 1, 1);
-        token_source = new ASTParserTokenManager(jj_input_stream);
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 160; i++) jj_la1[i] = -1;
-        for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
-    }
-
-    /**
-     * Constructor.
-     */
-    public ASTParser(String dsl) throws ParseException, TokenMgrException {
-        this(new StringProvider(dsl));
-    }
-
-    public void ReInit(String s) {
-        ReInit(new StringProvider(s));
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(Provider stream) {
-        if (jj_input_stream == null) {
-            jj_input_stream = new JavaCharStream(stream, 1, 1);
-        } else {
-            jj_input_stream.ReInit(stream, 1, 1);
-        }
-        if (token_source == null) {
-            token_source = new ASTParserTokenManager(jj_input_stream);
-        }
-
-        token_source.ReInit(jj_input_stream);
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 160; i++) jj_la1[i] = -1;
-        for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
-    }
-
-    /**
-     * Constructor with generated Token Manager.
-     */
-    public ASTParser(ASTParserTokenManager tm) {
-        token_source = tm;
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 160; i++) jj_la1[i] = -1;
-        for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(ASTParserTokenManager tm) {
-        token_source = tm;
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 160; i++) jj_la1[i] = -1;
-        for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
-    }
-
-    private Token jj_consume_token(int kind) {
-        Token oldToken;
-        if ((oldToken = token).next != null) token = token.next;
-        else token = token.next = token_source.getNextToken();
-        jj_ntk = -1;
-        if (token.kind == kind) {
-            jj_gen++;
-            if (++jj_gc > 100) {
-                jj_gc = 0;
-                for (int i = 0; i < jj_2_rtns.length; i++) {
-                    JJCalls c = jj_2_rtns[i];
-                    while (c != null) {
-                        if (c.gen < jj_gen) c.first = null;
-                        c = c.next;
-                    }
-                }
-            }
-            return token;
-        }
-        token = oldToken;
-        jj_kind = kind;
-        throw generateParseException();
-    }
-
-    @SuppressWarnings("serial")
-    static private final class LookaheadSuccess extends java.lang.RuntimeException {
-    }
-
-    final private LookaheadSuccess jj_ls = new LookaheadSuccess();
-
-    private boolean jj_scan_token(int kind) {
-        if (jj_scanpos == jj_lastpos) {
-            jj_la--;
-            if (jj_scanpos.next == null) {
-                jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
-            } else {
-                jj_lastpos = jj_scanpos = jj_scanpos.next;
-            }
-        } else {
-            jj_scanpos = jj_scanpos.next;
-        }
-        if (jj_rescan) {
-            int i = 0;
-            Token tok = token;
-            while (tok != null && tok != jj_scanpos) {
-                i++;
-                tok = tok.next;
-            }
-            if (tok != null) jj_add_error_token(kind, i);
-        }
-        if (jj_scanpos.kind != kind) return true;
-        if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
-        return false;
-    }
-
-
-    /**
-     * Get the next Token.
-     */
-    final public Token getNextToken() {
-        if (token.next != null) token = token.next;
-        else token = token.next = token_source.getNextToken();
-        jj_ntk = -1;
-        jj_gen++;
-        return token;
-    }
-
-    /**
-     * Get the specific Token.
-     */
-    final public Token getToken(int index) {
-        Token t = jj_lookingAhead ? jj_scanpos : token;
-        for (int i = 0; i < index; i++) {
-            if (t.next != null) t = t.next;
-            else t = t.next = token_source.getNextToken();
-        }
-        return t;
-    }
-
-    private int jj_ntk_f() {
-        if ((jj_nt = token.next) == null)
-            return (jj_ntk = (token.next = token_source.getNextToken()).kind);
-        else
-            return (jj_ntk = jj_nt.kind);
-    }
-
-    private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
-    private int[] jj_expentry;
-    private int jj_kind = -1;
-    private int[] jj_lasttokens = new int[100];
-    private int jj_endpos;
-
-    private void jj_add_error_token(int kind, int pos) {
-        if (pos >= 100) {
-            return;
-        }
-
-        if (pos == jj_endpos + 1) {
-            jj_lasttokens[jj_endpos++] = kind;
-        } else if (jj_endpos != 0) {
-            jj_expentry = new int[jj_endpos];
-
-            for (int i = 0; i < jj_endpos; i++) {
-                jj_expentry[i] = jj_lasttokens[i];
-            }
-
-            for (int[] oldentry : jj_expentries) {
-                if (oldentry.length == jj_expentry.length) {
-                    boolean isMatched = true;
-
-                    for (int i = 0; i < jj_expentry.length; i++) {
-                        if (oldentry[i] != jj_expentry[i]) {
-                            isMatched = false;
-                            break;
-                        }
-
-                    }
-                    if (isMatched) {
-                        jj_expentries.add(jj_expentry);
-                        break;
-                    }
-                }
-            }
-
-            if (pos != 0) {
-                jj_lasttokens[(jj_endpos = pos) - 1] = kind;
-            }
-        }
-    }
-
-    /**
-     * Generate ParseException.
-     */
-    public ParseException generateParseException() {
-        jj_expentries.clear();
-        boolean[] la1tokens = new boolean[157];
-        if (jj_kind >= 0) {
-            la1tokens[jj_kind] = true;
-            jj_kind = -1;
-        }
-        for (int i = 0; i < 160; i++) {
-            if (jj_la1[i] == jj_gen) {
-                for (int j = 0; j < 32; j++) {
-                    if ((jj_la1_0[i] & (1 << j)) != 0) {
-                        la1tokens[j] = true;
-                    }
-                    if ((jj_la1_1[i] & (1 << j)) != 0) {
-                        la1tokens[32 + j] = true;
-                    }
-                    if ((jj_la1_2[i] & (1 << j)) != 0) {
-                        la1tokens[64 + j] = true;
-                    }
-                    if ((jj_la1_3[i] & (1 << j)) != 0) {
-                        la1tokens[96 + j] = true;
-                    }
-                    if ((jj_la1_4[i] & (1 << j)) != 0) {
-                        la1tokens[128 + j] = true;
-                    }
-                }
-            }
-        }
-        for (int i = 0; i < 157; i++) {
-            if (la1tokens[i]) {
-                jj_expentry = new int[1];
-                jj_expentry[0] = i;
-                jj_expentries.add(jj_expentry);
-            }
-        }
-        jj_endpos = 0;
-        jj_rescan_token();
-        jj_add_error_token(0, 0);
-        int[][] exptokseq = new int[jj_expentries.size()][];
-        for (int i = 0; i < jj_expentries.size(); i++) {
-            exptokseq[i] = jj_expentries.get(i);
-        }
-        return new ParseException(token, exptokseq, tokenImage, token_source == null ? null : ASTParserTokenManager.lexStateNames[token_source.curLexState]);
-    }
-
-    /**
-     * Enable tracing.
-     */
-    final public void enable_tracing() {
-    }
-
-    /**
-     * Disable tracing.
-     */
-    final public void disable_tracing() {
-    }
-
-    private void jj_rescan_token() {
-        jj_rescan = true;
-        for (int i = 0; i < 44; i++) {
-            try {
-                JJCalls p = jj_2_rtns[i];
-
-                do {
-                    if (p.gen > jj_gen) {
-                        jj_la = p.arg;
-                        jj_lastpos = jj_scanpos = p.first;
-                        switch (i) {
-                            case 0:
-                                jj_3_1();
-                                break;
-                            case 1:
-                                jj_3_2();
-                                break;
-                            case 2:
-                                jj_3_3();
-                                break;
-                            case 3:
-                                jj_3_4();
-                                break;
-                            case 4:
-                                jj_3_5();
-                                break;
-                            case 5:
-                                jj_3_6();
-                                break;
-                            case 6:
-                                jj_3_7();
-                                break;
-                            case 7:
-                                jj_3_8();
-                                break;
-                            case 8:
-                                jj_3_9();
-                                break;
-                            case 9:
-                                jj_3_10();
-                                break;
-                            case 10:
-                                jj_3_11();
-                                break;
-                            case 11:
-                                jj_3_12();
-                                break;
-                            case 12:
-                                jj_3_13();
-                                break;
-                            case 13:
-                                jj_3_14();
-                                break;
-                            case 14:
-                                jj_3_15();
-                                break;
-                            case 15:
-                                jj_3_16();
-                                break;
-                            case 16:
-                                jj_3_17();
-                                break;
-                            case 17:
-                                jj_3_18();
-                                break;
-                            case 18:
-                                jj_3_19();
-                                break;
-                            case 19:
-                                jj_3_20();
-                                break;
-                            case 20:
-                                jj_3_21();
-                                break;
-                            case 21:
-                                jj_3_22();
-                                break;
-                            case 22:
-                                jj_3_23();
-                                break;
-                            case 23:
-                                jj_3_24();
-                                break;
-                            case 24:
-                                jj_3_25();
-                                break;
-                            case 25:
-                                jj_3_26();
-                                break;
-                            case 26:
-                                jj_3_27();
-                                break;
-                            case 27:
-                                jj_3_28();
-                                break;
-                            case 28:
-                                jj_3_29();
-                                break;
-                            case 29:
-                                jj_3_30();
-                                break;
-                            case 30:
-                                jj_3_31();
-                                break;
-                            case 31:
-                                jj_3_32();
-                                break;
-                            case 32:
-                                jj_3_33();
-                                break;
-                            case 33:
-                                jj_3_34();
-                                break;
-                            case 34:
-                                jj_3_35();
-                                break;
-                            case 35:
-                                jj_3_36();
-                                break;
-                            case 36:
-                                jj_3_37();
-                                break;
-                            case 37:
-                                jj_3_38();
-                                break;
-                            case 38:
-                                jj_3_39();
-                                break;
-                            case 39:
-                                jj_3_40();
-                                break;
-                            case 40:
-                                jj_3_41();
-                                break;
-                            case 41:
-                                jj_3_42();
-                                break;
-                            case 42:
-                                jj_3_43();
-                                break;
-                            case 43:
-                                jj_3_44();
-                                break;
-                        }
-                    }
-                    p = p.next;
-                } while (p != null);
-
-            } catch (LookaheadSuccess ls) {
-            }
-        }
-        jj_rescan = false;
-    }
-
-    private void jj_save(int index, int xla) {
-        JJCalls p = jj_2_rtns[index];
-        while (p.gen > jj_gen) {
-            if (p.next == null) {
-                p = p.next = new JJCalls();
-                break;
-            }
-            p = p.next;
-        }
-
-        p.gen = jj_gen + xla - jj_la;
-        p.first = token;
-        p.arg = xla;
-    }
-
-    static final class JJCalls {
-        int gen;
-        Token first;
-        int arg;
-        JJCalls next;
-    }
+    type = Type();
+    jj_consume_token(IDENTIFIER);
+name = token.image;
+    jj_consume_token(LPAREN);
+    jj_consume_token(RPAREN);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case _DEFAULT:{
+      defaultVal = DefaultValue();
+      break;
+      }
+    default:
+      jj_la1[159] = jj_gen;
+      ;
+    }
+    jj_consume_token(SEMICOLON);
+Position begin = modifier.begin.orIfInvalid(tokenBegin());
+    return new AnnotationMemberDeclaration(range(begin, tokenEnd()), modifier.modifiers, modifier.annotations, type, name, defaultVal);
+  }
+
+  final public Expression DefaultValue() {Expression ret;
+    jj_consume_token(_DEFAULT);
+    ret = MemberValue();
+return ret;
+  }
+
+  private boolean jj_2_1(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_1(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(0, xla); }
+  }
+
+  private boolean jj_2_2(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_2(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(1, xla); }
+  }
+
+  private boolean jj_2_3(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_3(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(2, xla); }
+  }
+
+  private boolean jj_2_4(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_4(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(3, xla); }
+  }
+
+  private boolean jj_2_5(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_5(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(4, xla); }
+  }
+
+  private boolean jj_2_6(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_6(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(5, xla); }
+  }
+
+  private boolean jj_2_7(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_7(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(6, xla); }
+  }
+
+  private boolean jj_2_8(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_8(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(7, xla); }
+  }
+
+  private boolean jj_2_9(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_9(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(8, xla); }
+  }
+
+  private boolean jj_2_10(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_10(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(9, xla); }
+  }
+
+  private boolean jj_2_11(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_11(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(10, xla); }
+  }
+
+  private boolean jj_2_12(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_12(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(11, xla); }
+  }
+
+  private boolean jj_2_13(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_13(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(12, xla); }
+  }
+
+  private boolean jj_2_14(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_14(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(13, xla); }
+  }
+
+  private boolean jj_2_15(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_15(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(14, xla); }
+  }
+
+  private boolean jj_2_16(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_16(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(15, xla); }
+  }
+
+  private boolean jj_2_17(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_17(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(16, xla); }
+  }
+
+  private boolean jj_2_18(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_18(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(17, xla); }
+  }
+
+  private boolean jj_2_19(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_19(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(18, xla); }
+  }
+
+  private boolean jj_2_20(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_20(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(19, xla); }
+  }
+
+  private boolean jj_2_21(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_21(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(20, xla); }
+  }
+
+  private boolean jj_2_22(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_22(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(21, xla); }
+  }
+
+  private boolean jj_2_23(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_23(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(22, xla); }
+  }
+
+  private boolean jj_2_24(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_24(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(23, xla); }
+  }
+
+  private boolean jj_2_25(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_25(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(24, xla); }
+  }
+
+  private boolean jj_2_26(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_26(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(25, xla); }
+  }
+
+  private boolean jj_2_27(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_27(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(26, xla); }
+  }
+
+  private boolean jj_2_28(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_28(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(27, xla); }
+  }
+
+  private boolean jj_2_29(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_29(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(28, xla); }
+  }
+
+  private boolean jj_2_30(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_30(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(29, xla); }
+  }
+
+  private boolean jj_2_31(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_31(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(30, xla); }
+  }
+
+  private boolean jj_2_32(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_32(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(31, xla); }
+  }
+
+  private boolean jj_2_33(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_33(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(32, xla); }
+  }
+
+  private boolean jj_2_34(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_34(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(33, xla); }
+  }
+
+  private boolean jj_2_35(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_35(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(34, xla); }
+  }
+
+  private boolean jj_2_36(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_36(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(35, xla); }
+  }
+
+  private boolean jj_2_37(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_37(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(36, xla); }
+  }
+
+  private boolean jj_2_38(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_38(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(37, xla); }
+  }
+
+  private boolean jj_2_39(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_39(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(38, xla); }
+  }
+
+  private boolean jj_2_40(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_40(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(39, xla); }
+  }
+
+  private boolean jj_2_41(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_41(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(40, xla); }
+  }
+
+  private boolean jj_2_42(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_42(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(41, xla); }
+  }
+
+  private boolean jj_2_43(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_43(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(42, xla); }
+  }
+
+  private boolean jj_2_44(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_44(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(43, xla); }
+  }
+
+  private boolean jj_3_38()
+ {
+    if (jj_3R_95()) return true;
+    if (jj_3R_68()) return true;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_341()
+ {
+    if (jj_3R_345()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_373()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_385()
+ {
+    if (jj_scan_token(ELSE)) return true;
+    if (jj_3R_277()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_377()
+ {
+    if (jj_3R_93()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_427()
+ {
+    if (jj_3R_80()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_429()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_159()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_78()) return true;
+    if (jj_3R_158()) return true;
+    return false;
+  }
+
+  private boolean jj_3_21()
+ {
+    if (jj_3R_83()) return true;
+    return false;
+  }
+
+  private boolean jj_3_20()
+ {
+    if (jj_3R_82()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_426()
+ {
+    if (jj_3R_427()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_81()
+ {
+    if (jj_scan_token(LSHIFT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_402()
+ {
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_103()
+ {
+    if (jj_scan_token(LT)) return true;
+    if (jj_3R_78()) return true;
+    if (jj_3R_158()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_159()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(GT)) return true;
+    return false;
+  }
+
+  private boolean jj_3_19()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_81()) {
+    jj_scanpos = xsp;
+    if (jj_3_20()) {
+    jj_scanpos = xsp;
+    if (jj_3_21()) return true;
+    }
+    }
+    if (jj_3R_341()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_425()
+ {
+    if (jj_3R_96()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_342()
+ {
+    if (jj_scan_token(INSTANCEOF)) return true;
+    if (jj_3R_68()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_339()
+ {
+    if (jj_3R_341()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_19()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_419()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_425()) {
+    jj_scanpos = xsp;
+    if (jj_3R_426()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_364()
+ {
+    if (jj_scan_token(GE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_363()
+ {
+    if (jj_scan_token(LE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_362()
+ {
+    if (jj_scan_token(GT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_361()
+ {
+    if (jj_scan_token(LT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_376()
+ {
+    if (jj_3R_163()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_346()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_361()) {
+    jj_scanpos = xsp;
+    if (jj_3R_362()) {
+    jj_scanpos = xsp;
+    if (jj_3R_363()) {
+    jj_scanpos = xsp;
+    if (jj_3R_364()) return true;
+    }
+    }
+    }
+    if (jj_3R_339()) return true;
+    return false;
+  }
+
+  private boolean jj_3_37()
+ {
+    if (jj_3R_96()) return true;
+    if (jj_scan_token(COLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_102()
+ {
+    if (jj_3R_101()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_367()
+ {
+    if (jj_3R_183()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_66()
+ {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_102()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(IDENTIFIER)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_376()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_377()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_401()
+ {
+    if (jj_3R_419()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_387()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_401()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_402()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_403()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_337()
+ {
+    if (jj_3R_339()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_346()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_386()
+ {
+    if (jj_3R_96()) return true;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_352()
+ {
+    if (jj_scan_token(SEMICOLON)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_367()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_338()
+ {
+    if (jj_scan_token(BIT_AND)) return true;
+    if (jj_3R_314()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_325()
+ {
+    if (jj_scan_token(FOR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_386()) {
+    jj_scanpos = xsp;
+    if (jj_3R_387()) return true;
+    }
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_277()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_332()
+ {
+    if (jj_3R_337()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_342()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_351()
+ {
+    if (jj_3R_66()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_3()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_344()
+ {
+    if (jj_scan_token(NE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_343()
+ {
+    if (jj_scan_token(EQ)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_340()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_343()) {
+    jj_scanpos = xsp;
+    if (jj_3R_344()) return true;
+    }
+    if (jj_3R_332()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_333()
+ {
+    if (jj_scan_token(XOR)) return true;
+    if (jj_3R_285()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_324()
+ {
+    if (jj_scan_token(DO)) return true;
+    if (jj_3R_277()) return true;
+    if (jj_scan_token(WHILE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_80()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_350()
+ {
+    if (jj_3R_366()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_315()
+ {
+    if (jj_scan_token(BIT_OR)) return true;
+    if (jj_3R_265()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_314()
+ {
+    if (jj_3R_332()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_340()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_271()
+ {
+    if (jj_scan_token(ENUM)) return true;
+    if (jj_3R_98()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_350()) jj_scanpos = xsp;
+    if (jj_scan_token(LBRACE)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_351()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(113)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_352()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_323()
+ {
+    if (jj_scan_token(WHILE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_80()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_277()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_286()
+ {
+    if (jj_scan_token(SC_AND)) return true;
+    if (jj_3R_237()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_285()
+ {
+    if (jj_3R_314()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_338()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_267()
+ {
+    if (jj_scan_token(SC_OR)) return true;
+    if (jj_3R_207()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_375()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_251()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_366()
+ {
+    if (jj_scan_token(IMPLEMENTS)) return true;
+    if (jj_3R_251()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_375()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_265()
+ {
+    if (jj_3R_285()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_333()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_322()
+ {
+    if (jj_scan_token(IF)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_80()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_277()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_385()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_237()
+ {
+    if (jj_3R_265()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_315()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_374()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_251()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_365()
+ {
+    if (jj_scan_token(EXTENDS)) return true;
+    if (jj_3R_251()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_374()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_207()
+ {
+    if (jj_3R_237()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_286()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_418()
+ {
+    if (jj_scan_token(_DEFAULT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_417()
+ {
+    if (jj_scan_token(CASE)) return true;
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_289()
+ {
+    if (jj_scan_token(INTERFACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_349()
+ {
+    if (jj_3R_366()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_176()
+ {
+    if (jj_3R_207()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_267()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_348()
+ {
+    if (jj_3R_365()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_400()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_417()) {
+    jj_scanpos = xsp;
+    if (jj_3R_418()) return true;
+    }
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_160()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_347()
+ {
+    if (jj_3R_103()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_270()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(45)) {
+    jj_scanpos = xsp;
+    if (jj_3R_289()) return true;
+    }
+    if (jj_3R_98()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_347()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_348()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_349()) jj_scanpos = xsp;
+    if (jj_3R_93()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_150()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_149()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_241()
+ {
+    if (jj_scan_token(HOOK)) return true;
+    if (jj_3R_80()) return true;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_129()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_384()
+ {
+    if (jj_3R_400()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_129()
+ {
+    if (jj_3R_176()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_241()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_321()
+ {
+    if (jj_scan_token(SWITCH)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_80()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_scan_token(LBRACE)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_384()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_128()
+ {
+    if (jj_scan_token(ORASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_424()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_127()
+ {
+    if (jj_scan_token(XORASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_126()
+ {
+    if (jj_scan_token(ANDASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_125()
+ {
+    if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_124()
+ {
+    if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_123()
+ {
+    if (jj_scan_token(LSHIFTASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_416()
+ {
+    if (jj_scan_token(ARROW)) return true;
+    if (jj_3R_268()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_122()
+ {
+    if (jj_scan_token(MINUSASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_121()
+ {
+    if (jj_scan_token(PLUSASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_415()
+ {
+    if (jj_scan_token(DOUBLECOLON)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_424()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(103)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_120()
+ {
+    if (jj_scan_token(REMASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_414()
+ {
+    if (jj_3R_79()) return true;
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_119()
+ {
+    if (jj_scan_token(SLASHASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_118()
+ {
+    if (jj_scan_token(STARASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_413()
+ {
+    if (jj_scan_token(DECR)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_117()
+ {
+    if (jj_scan_token(ASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_412()
+ {
+    if (jj_scan_token(INCR)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_399()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_412()) {
+    jj_scanpos = xsp;
+    if (jj_3R_413()) {
+    jj_scanpos = xsp;
+    if (jj_3R_414()) {
+    jj_scanpos = xsp;
+    if (jj_3R_415()) {
+    jj_scanpos = xsp;
+    if (jj_3R_416()) return true;
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_79()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_117()) {
+    jj_scanpos = xsp;
+    if (jj_3R_118()) {
+    jj_scanpos = xsp;
+    if (jj_3R_119()) {
+    jj_scanpos = xsp;
+    if (jj_3R_120()) {
+    jj_scanpos = xsp;
+    if (jj_3R_121()) {
+    jj_scanpos = xsp;
+    if (jj_3R_122()) {
+    jj_scanpos = xsp;
+    if (jj_3R_123()) {
+    jj_scanpos = xsp;
+    if (jj_3R_124()) {
+    jj_scanpos = xsp;
+    if (jj_3R_125()) {
+    jj_scanpos = xsp;
+    if (jj_3R_126()) {
+    jj_scanpos = xsp;
+    if (jj_3R_127()) {
+    jj_scanpos = xsp;
+    if (jj_3R_128()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_336()
+ {
+    if (jj_3R_266()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_399()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_335()
+ {
+    if (jj_3R_216()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_269()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3_36()
+ {
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_243()
+ {
+    if (jj_scan_token(DOUBLECOLON)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_269()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(103)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_320()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_36()) {
+    jj_scanpos = xsp;
+    if (jj_3R_335()) {
+    jj_scanpos = xsp;
+    if (jj_3R_336()) return true;
+    }
+    }
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_65()
+ {
+    if (jj_3R_101()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_64()
+ {
+    if (jj_scan_token(STRICTFP)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_63()
+ {
+    if (jj_scan_token(VOLATILE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_62()
+ {
+    if (jj_scan_token(TRANSIENT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_61()
+ {
+    if (jj_scan_token(NATIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_60()
+ {
+    if (jj_scan_token(SYNCHRONIZED)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_288()
+ {
+    if (jj_3R_106()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_59()
+ {
+    if (jj_scan_token(ABSTRACT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_58()
+ {
+    if (jj_scan_token(FINAL)) return true;
+    return false;
+  }
+
+  private boolean jj_3_18()
+ {
+    if (jj_3R_79()) return true;
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_242()
+ {
+    if (jj_scan_token(ARROW)) return true;
+    if (jj_3R_268()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_57()
+ {
+    if (jj_scan_token(PRIVATE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_56()
+ {
+    if (jj_scan_token(PROTECTED)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_213()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_18()) {
+    jj_scanpos = xsp;
+    if (jj_3R_242()) {
+    jj_scanpos = xsp;
+    if (jj_3R_243()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_287()
+ {
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_55()
+ {
+    if (jj_scan_token(STATIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_54()
+ {
+    if (jj_scan_token(PUBLIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_80()
+ {
+    if (jj_3R_129()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_213()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3_2()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_54()) {
+    jj_scanpos = xsp;
+    if (jj_3R_55()) {
+    jj_scanpos = xsp;
+    if (jj_3R_56()) {
+    jj_scanpos = xsp;
+    if (jj_3R_57()) {
+    jj_scanpos = xsp;
+    if (jj_3R_58()) {
+    jj_scanpos = xsp;
+    if (jj_3R_59()) {
+    jj_scanpos = xsp;
+    if (jj_3R_60()) {
+    jj_scanpos = xsp;
+    if (jj_3R_61()) {
+    jj_scanpos = xsp;
+    if (jj_3R_62()) {
+    jj_scanpos = xsp;
+    if (jj_3R_63()) {
+    jj_scanpos = xsp;
+    if (jj_3R_64()) {
+    jj_scanpos = xsp;
+    if (jj_3R_65()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_268()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_287()) {
+    jj_scanpos = xsp;
+    if (jj_3R_288()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_95()
+ {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_2()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_319()
+ {
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3_35()
+ {
+    if (jj_3R_96()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_96()
+ {
+    if (jj_3R_95()) return true;
+    if (jj_3R_68()) return true;
+    if (jj_3R_149()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_150()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_202()
+ {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    return false;
+  }
+
+  private boolean jj_3_34()
+ {
+    if (jj_3R_95()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(45)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(65)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_255()
+ {
+    if (jj_3R_277()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_383()
+ {
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+  private boolean jj_3_17()
+ {
+    if (jj_scan_token(DOT)) return true;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_254()
+ {
+    if (jj_3R_96()) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_98()
+ {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_17()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_53()
+ {
+    if (jj_3R_78()) return true;
+    if (jj_scan_token(PACKAGE)) return true;
+    if (jj_3R_98()) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_253()
+ {
+    if (jj_3R_95()) return true;
+    if (jj_3R_270()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_147()
+ {
+    if (jj_3R_68()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_146()
+ {
+    if (jj_scan_token(VOID)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_220()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_253()) {
+    jj_scanpos = xsp;
+    if (jj_3R_254()) {
+    jj_scanpos = xsp;
+    if (jj_3R_255()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3_1()
+ {
+    if (jj_3R_53()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_91()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_146()) {
+    jj_scanpos = xsp;
+    if (jj_3R_147()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_140()
+ {
+    if (jj_scan_token(DOUBLE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_106()
+ {
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_160()) return true;
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_139()
+ {
+    if (jj_scan_token(FLOAT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_138()
+ {
+    if (jj_scan_token(LONG)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_137()
+ {
+    if (jj_scan_token(INT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_136()
+ {
+    if (jj_scan_token(SHORT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_135()
+ {
+    if (jj_scan_token(BYTE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_94()
+ {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_277()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_134()
+ {
+    if (jj_scan_token(CHAR)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_133()
+ {
+    if (jj_scan_token(BOOLEAN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_313()
+ {
+    if (jj_scan_token(SUPER)) return true;
+    if (jj_3R_78()) return true;
+    if (jj_3R_75()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_87()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_133()) {
+    jj_scanpos = xsp;
+    if (jj_3R_134()) {
+    jj_scanpos = xsp;
+    if (jj_3R_135()) {
+    jj_scanpos = xsp;
+    if (jj_3R_136()) {
+    jj_scanpos = xsp;
+    if (jj_3R_137()) {
+    jj_scanpos = xsp;
+    if (jj_3R_138()) {
+    jj_scanpos = xsp;
+    if (jj_3R_139()) {
+    jj_scanpos = xsp;
+    if (jj_3R_140()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_204()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_175()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_312()
+ {
+    if (jj_scan_token(EXTENDS)) return true;
+    if (jj_3R_78()) return true;
+    if (jj_3R_75()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_284()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_312()) {
+    jj_scanpos = xsp;
+    if (jj_3R_313()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_318()
+ {
+    if (jj_scan_token(ASSERT)) return true;
+    if (jj_3R_80()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_383()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_308()
+ {
+    if (jj_3R_331()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_307()
+ {
+    if (jj_3R_330()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_306()
+ {
+    if (jj_3R_329()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_305()
+ {
+    if (jj_3R_328()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_304()
+ {
+    if (jj_3R_327()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_303()
+ {
+    if (jj_3R_326()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_236()
+ {
+    if (jj_scan_token(HOOK)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_284()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_302()
+ {
+    if (jj_3R_325()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_301()
+ {
+    if (jj_3R_324()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_300()
+ {
+    if (jj_3R_323()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_299()
+ {
+    if (jj_3R_322()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_298()
+ {
+    if (jj_3R_321()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_297()
+ {
+    if (jj_3R_320()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_206()
+ {
+    if (jj_3R_236()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_296()
+ {
+    if (jj_3R_319()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_205()
+ {
+    if (jj_3R_75()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_295()
+ {
+    if (jj_3R_106()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_294()
+ {
+    if (jj_3R_318()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_175()
+ {
+    if (jj_3R_78()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_205()) {
+    jj_scanpos = xsp;
+    if (jj_3R_206()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3_33()
+ {
+    if (jj_3R_94()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_115()
+ {
+    if (jj_3R_175()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_204()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_277()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_33()) {
+    jj_scanpos = xsp;
+    if (jj_3R_294()) {
+    jj_scanpos = xsp;
+    if (jj_3R_295()) {
+    jj_scanpos = xsp;
+    if (jj_3R_296()) {
+    jj_scanpos = xsp;
+    if (jj_3R_297()) {
+    jj_scanpos = xsp;
+    if (jj_3R_298()) {
+    jj_scanpos = xsp;
+    if (jj_3R_299()) {
+    jj_scanpos = xsp;
+    if (jj_3R_300()) {
+    jj_scanpos = xsp;
+    if (jj_3R_301()) {
+    jj_scanpos = xsp;
+    if (jj_3R_302()) {
+    jj_scanpos = xsp;
+    if (jj_3R_303()) {
+    jj_scanpos = xsp;
+    if (jj_3R_304()) {
+    jj_scanpos = xsp;
+    if (jj_3R_305()) {
+    jj_scanpos = xsp;
+    if (jj_3R_306()) {
+    jj_scanpos = xsp;
+    if (jj_3R_307()) {
+    jj_scanpos = xsp;
+    if (jj_3R_308()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_77()
+ {
+    if (jj_scan_token(LT)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_115()) jj_scanpos = xsp;
+    if (jj_scan_token(GT)) return true;
+    return false;
+  }
+
+  private boolean jj_3_16()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3_32()
+ {
+    if (jj_3R_93()) return true;
+    return false;
+  }
+
+  private boolean jj_3_15()
+ {
+    if (jj_scan_token(DOT)) return true;
+    if (jj_3R_78()) return true;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_16()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_311()
+ {
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_283()
+ {
+    if (jj_3R_161()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_282()
+ {
+    if (jj_3R_78()) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_311()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_261()
+ {
+    Token xsp;
+    if (jj_3R_282()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_282()) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_283()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3_14()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_174()
+ {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_14()) jj_scanpos = xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_15()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_256()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_264()
+ {
+    if (jj_3R_163()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_32()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_263()
+ {
+    if (jj_3R_261()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_262()
+ {
+    if (jj_3R_77()) return true;
+    if (jj_3R_78()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_235()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_262()) jj_scanpos = xsp;
+    if (jj_3R_251()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_263()) {
+    jj_scanpos = xsp;
+    if (jj_3R_264()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_234()
+ {
+    if (jj_3R_87()) return true;
+    if (jj_3R_261()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_251()
+ {
+    if (jj_3R_78()) return true;
+    if (jj_3R_174()) return true;
+    return false;
+  }
+
+  private boolean jj_3_13()
+ {
+    if (jj_3R_76()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_428()
+ {
+    if (jj_3R_430()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_200()
+ {
+    if (jj_scan_token(NEW)) return true;
+    if (jj_3R_78()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_234()) {
+    jj_scanpos = xsp;
+    if (jj_3R_235()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3_12()
+ {
+    if (jj_3R_76()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_355()
+ {
+    if (jj_scan_token(THROWS)) return true;
+    if (jj_3R_370()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_371()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_76()
+ {
+    if (jj_3R_78()) return true;
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_221()
+ {
+    if (jj_3R_80()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_256()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_195()
+ {
+    if (jj_3R_221()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_114()
+ {
+    if (jj_3R_174()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_13()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_163()
+ {
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_195()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_113()
+ {
+    if (jj_3R_87()) return true;
+    Token xsp;
+    if (jj_3_12()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_12()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_75()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_113()) {
+    jj_scanpos = xsp;
+    if (jj_3R_114()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_258()
+ {
+    if (jj_scan_token(NULL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_279()
+ {
+    if (jj_scan_token(FALSE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_278()
+ {
+    if (jj_scan_token(TRUE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_104()
+ {
+    if (jj_3R_87()) return true;
+    return false;
+  }
+
+  private boolean jj_3_11()
+ {
+    if (jj_3R_75()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_68()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_11()) {
+    jj_scanpos = xsp;
+    if (jj_3R_104()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_257()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_278()) {
+    jj_scanpos = xsp;
+    if (jj_3R_279()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_430()
+ {
+    if (jj_scan_token(_DEFAULT)) return true;
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_228()
+ {
+    if (jj_3R_258()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_227()
+ {
+    if (jj_3R_257()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_226()
+ {
+    if (jj_scan_token(STRING_LITERAL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_105()
+ {
+    if (jj_scan_token(STATIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_225()
+ {
+    if (jj_scan_token(CHARACTER_LITERAL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_423()
+ {
+    if (jj_3R_68()) return true;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_428()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_70()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_105()) jj_scanpos = xsp;
+    if (jj_3R_106()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_224()
+ {
+    if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_194()
+ {
+    if (jj_3R_220()) return true;
+    return false;
+  }
+
+  private boolean jj_3_44()
+ {
+    if (jj_3R_68()) return true;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_411()
+ {
+    if (jj_3R_274()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_160()
+ {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_194()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_410()
+ {
+    if (jj_3R_272()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_223()
+ {
+    if (jj_scan_token(LONG_LITERAL)) return true;
+    return false;
+  }
+
+  private boolean jj_3_9()
+ {
+    if (jj_3R_73()) return true;
+    if (jj_scan_token(DOT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_409()
+ {
+    if (jj_3R_271()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_408()
+ {
+    if (jj_3R_270()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_222()
+ {
+    if (jj_scan_token(INTEGER_LITERAL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_407()
+ {
+    if (jj_3R_423()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_74()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_165()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3_10()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_74()) jj_scanpos = xsp;
+    if (jj_scan_token(THIS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_164()
+ {
+    if (jj_3R_73()) return true;
+    if (jj_scan_token(DOT)) return true;
+    return false;
+  }
+
+  private boolean jj_3_43()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_92()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_196()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_222()) {
+    jj_scanpos = xsp;
+    if (jj_3R_223()) {
+    jj_scanpos = xsp;
+    if (jj_3R_224()) {
+    jj_scanpos = xsp;
+    if (jj_3R_225()) {
+    jj_scanpos = xsp;
+    if (jj_3R_226()) {
+    jj_scanpos = xsp;
+    if (jj_3R_227()) {
+    jj_scanpos = xsp;
+    if (jj_3R_228()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_394()
+ {
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_110()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_164()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_165()) jj_scanpos = xsp;
+    if (jj_scan_token(SUPER)) return true;
+    if (jj_3R_163()) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_143()
+ {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_80()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3_31()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_92()) jj_scanpos = xsp;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_395()
+ {
+    if (jj_3R_95()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_407()) {
+    jj_scanpos = xsp;
+    if (jj_3R_408()) {
+    jj_scanpos = xsp;
+    if (jj_3R_409()) {
+    jj_scanpos = xsp;
+    if (jj_3R_410()) {
+    jj_scanpos = xsp;
+    if (jj_3R_411()) return true;
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_162()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_109()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_162()) jj_scanpos = xsp;
+    if (jj_scan_token(THIS)) return true;
+    if (jj_3R_163()) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_212()
+ {
+    if (jj_3R_163()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_378()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_394()) {
+    jj_scanpos = xsp;
+    if (jj_3R_395()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_211()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_181()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_211()) jj_scanpos = xsp;
+    if (jj_3R_202()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_212()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_368()
+ {
+    if (jj_3R_378()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_180()
+ {
+    if (jj_3R_200()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_72()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_109()) {
+    jj_scanpos = xsp;
+    if (jj_3R_110()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_179()
+ {
+    if (jj_scan_token(THIS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_353()
+ {
+    if (jj_scan_token(LBRACE)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_368()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_259()
+ {
+    if (jj_3R_280()) return true;
+    return false;
+  }
+
+  private boolean jj_3_8()
+ {
+    if (jj_3R_72()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_144()
+ {
+    if (jj_scan_token(ELLIPSIS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_142()
+ {
+    if (jj_scan_token(DOT)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_179()) {
+    jj_scanpos = xsp;
+    if (jj_3R_180()) {
+    jj_scanpos = xsp;
+    if (jj_3R_181()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_309()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_90()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_89()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_142()) {
+    jj_scanpos = xsp;
+    if (jj_3R_143()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_356()
+ {
+    if (jj_3R_72()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_272()
+ {
+    if (jj_scan_token(AT)) return true;
+    if (jj_scan_token(INTERFACE)) return true;
+    if (jj_3R_98()) return true;
+    if (jj_3R_353()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_371()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_370()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_317()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_316()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_290()
+ {
+    if (jj_3R_103()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_141()
+ {
+    if (jj_scan_token(DOT)) return true;
+    if (jj_scan_token(SUPER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_273()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_290()) jj_scanpos = xsp;
+    if (jj_3R_202()) return true;
+    if (jj_3R_354()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_355()) jj_scanpos = xsp;
+    if (jj_scan_token(LBRACE)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_356()) jj_scanpos = xsp;
+    if (jj_3R_160()) return true;
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_334()
+ {
+    if (jj_3R_100()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_43()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3_30()
+ {
+    if (jj_3R_89()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_201()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_379()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_90()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_88()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_30()) {
+    jj_scanpos = xsp;
+    if (jj_3R_141()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_189()
+ {
+    if (jj_scan_token(LBRACE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_334()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(113)) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_203()
+ {
+    if (jj_3R_163()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_154()
+ {
+    if (jj_3R_129()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_153()
+ {
+    if (jj_3R_189()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_173()
+ {
+    if (jj_3R_202()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_203()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_152()
+ {
+    if (jj_3R_101()) return true;
+    return false;
+  }
+
+  private boolean jj_3_29()
+ {
+    if (jj_3R_91()) return true;
+    if (jj_scan_token(DOUBLECOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3_28()
+ {
+    if (jj_3R_91()) return true;
+    if (jj_scan_token(DOT)) return true;
+    if (jj_scan_token(CLASS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_90()
+ {
+    if (jj_3R_95()) return true;
+    if (jj_3R_68()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_144()) jj_scanpos = xsp;
+    if (jj_3R_145()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_100()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_152()) {
+    jj_scanpos = xsp;
+    if (jj_3R_153()) {
+    jj_scanpos = xsp;
+    if (jj_3R_154()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3_7()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_71()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_260()
+ {
+    if (jj_3R_281()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_172()
+ {
+    if (jj_3R_91()) return true;
+    if (jj_scan_token(DOUBLECOLON)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_201()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(103)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_276()
+ {
+    if (jj_3R_293()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_171()
+ {
+    if (jj_3R_91()) return true;
+    if (jj_scan_token(DOT)) return true;
+    if (jj_scan_token(CLASS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_316()
+ {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_scan_token(ASSIGN)) return true;
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_310()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_145()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_170()
+ {
+    if (jj_3R_200()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_281()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_145()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_310()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3_27()
+ {
+    if (jj_3R_90()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_293()
+ {
+    if (jj_3R_316()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_317()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_358()
+ {
+    if (jj_3R_76()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_233()
+ {
+    if (jj_3R_80()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_260()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_280()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_90()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_309()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_232()
+ {
+    if (jj_3R_90()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_259()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_199()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_232()) {
+    jj_scanpos = xsp;
+    if (jj_3R_233()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_231()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_369()
+ {
+    if (jj_3R_90()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_379()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_191()
+ {
+    if (jj_scan_token(AT)) return true;
+    if (jj_3R_98()) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_100()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_99()
+ {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_scan_token(ASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_169()
+ {
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_199()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_198()
+ {
+    if (jj_scan_token(DOUBLECOLON)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_231()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(103)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_354()
+ {
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_369()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_192()
+ {
+    if (jj_scan_token(AT)) return true;
+    if (jj_3R_98()) return true;
+    return false;
+  }
+
+  private boolean jj_3_42()
+ {
+    if (jj_scan_token(AT)) return true;
+    if (jj_3R_98()) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3_41()
+ {
+    if (jj_scan_token(AT)) return true;
+    if (jj_3R_98()) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_99()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(107)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_230()
+ {
+    if (jj_3R_163()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_190()
+ {
+    if (jj_scan_token(AT)) return true;
+    if (jj_3R_98()) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_276()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_370()
+ {
+    if (jj_3R_78()) return true;
+    if (jj_3R_75()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_197()
+ {
+    if (jj_scan_token(DOT)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_229()) jj_scanpos = xsp;
+    if (jj_3R_202()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_230()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_229()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3_40()
+ {
+    if (jj_scan_token(SEMICOLON)) return true;
+    if (jj_3R_96()) return true;
+    return false;
+  }
+
+  private boolean jj_3_26()
+ {
+    if (jj_3R_89()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_157()
+ {
+    if (jj_3R_192()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_182()
+ {
+    if (jj_3R_76()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_168()
+ {
+    if (jj_scan_token(SUPER)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_197()) {
+    jj_scanpos = xsp;
+    if (jj_3R_198()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_156()
+ {
+    if (jj_3R_191()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_167()
+ {
+    if (jj_scan_token(THIS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_155()
+ {
+    if (jj_3R_190()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_166()
+ {
+    if (jj_3R_196()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_292()
+ {
+    if (jj_3R_71()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_7()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_372()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_370()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_360()
+ {
+    if (jj_3R_106()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_112()
+ {
+    if (jj_3R_89()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_359()
+ {
+    if (jj_scan_token(THROWS)) return true;
+    if (jj_3R_370()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_372()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_291()
+ {
+    if (jj_3R_103()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_111()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_166()) {
+    jj_scanpos = xsp;
+    if (jj_3R_167()) {
+    jj_scanpos = xsp;
+    if (jj_3R_168()) {
+    jj_scanpos = xsp;
+    if (jj_3R_169()) {
+    jj_scanpos = xsp;
+    if (jj_3R_170()) {
+    jj_scanpos = xsp;
+    if (jj_3R_171()) {
+    jj_scanpos = xsp;
+    if (jj_3R_172()) {
+    jj_scanpos = xsp;
+    if (jj_3R_173()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_101()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_155()) {
+    jj_scanpos = xsp;
+    if (jj_3R_156()) {
+    jj_scanpos = xsp;
+    if (jj_3R_157()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_275()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_291()) jj_scanpos = xsp;
+    if (jj_3R_91()) return true;
+    if (jj_3R_98()) return true;
+    if (jj_3R_354()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_358()) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_359()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_360()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(112)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3_25()
+ {
+    if (jj_3R_88()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_116()
+ {
+    if (jj_3R_101()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_78()
+ {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_116()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_130()
+ {
+    return false;
+  }
+
+  private boolean jj_3R_73()
+ {
+    if (jj_3R_111()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_112()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_131()
+ {
+    return false;
+  }
+
+  private boolean jj_3R_161()
+ {
+    if (jj_scan_token(LBRACE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_292()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(113)) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_82()
+ {
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind == GT &&
+                ((GTToken)getToken(1)).realKind == RSIGNEDSHIFT;
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_130()) return true;
+    if (jj_scan_token(GT)) return true;
+    if (jj_scan_token(GT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_108()
+ {
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_107()
+ {
+    if (jj_3R_161()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_184()
+ {
+    if (jj_scan_token(ASSIGN)) return true;
+    if (jj_3R_71()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_266()
+ {
+    if (jj_3R_111()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_25()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_83()
+ {
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind == GT &&
+                ((GTToken)getToken(1)).realKind == RUNSIGNEDSHIFT;
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_131()) return true;
+    if (jj_scan_token(GT)) return true;
+    if (jj_scan_token(GT)) return true;
+    if (jj_scan_token(GT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_71()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_107()) {
+    jj_scanpos = xsp;
+    if (jj_3R_108()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_177()
+ {
+    if (jj_scan_token(BIT_AND)) return true;
+    if (jj_3R_75()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_132()
+ {
+    if (jj_3R_75()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_177()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_178()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_421()
+ {
+    if (jj_3R_96()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_40()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_145()
+ {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_182()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3_24()
+ {
+    if (jj_3R_87()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_151()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_84()
+ {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_78()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_24()) {
+    jj_scanpos = xsp;
+    if (jj_3R_132()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3_39()
+ {
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_149()
+ {
+    if (jj_3R_145()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_184()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_404()
+ {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_421()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_39()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_406()
+ {
+    if (jj_scan_token(FINALLY)) return true;
+    if (jj_3R_106()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_393()
+ {
+    if (jj_scan_token(FINALLY)) return true;
+    if (jj_3R_106()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_422()
+ {
+    if (jj_scan_token(BIT_OR)) return true;
+    if (jj_3R_370()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_69()
+ {
+    if (jj_3R_76()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_86()
+ {
+    if (jj_scan_token(DECR)) return true;
+    return false;
+  }
+
+  private boolean jj_3_23()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_85()) {
+    jj_scanpos = xsp;
+    if (jj_3R_86()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_85()
+ {
+    if (jj_scan_token(INCR)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_357()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_149()) return true;
+    return false;
+  }
+
+  private boolean jj_3_22()
+ {
+    if (jj_3R_84()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_405()
+ {
+    if (jj_scan_token(CATCH)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_95()) return true;
+    if (jj_3R_75()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_422()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_145()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_106()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_274()
+ {
+    if (jj_3R_68()) return true;
+    if (jj_3R_149()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_357()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_240()
+ {
+    if (jj_3R_266()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_23()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_215()
+ {
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_209()
+ {
+    if (jj_3R_84()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_210()
+ {
+    if (jj_3R_240()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_239()
+ {
+    if (jj_scan_token(BANG)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_238()
+ {
+    if (jj_scan_token(TILDE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_208()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_238()) {
+    jj_scanpos = xsp;
+    if (jj_3R_239()) return true;
+    }
+    if (jj_3R_151()) return true;
+    return false;
+  }
+
+  private boolean jj_3_5()
+ {
+    if (jj_3R_68()) return true;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_69()) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_scan_token(113)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(116)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(112)) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_392()
+ {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_405()) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_406()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_67()
+ {
+    if (jj_3R_103()) return true;
+    return false;
+  }
+
+  private boolean jj_3_4()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_67()) jj_scanpos = xsp;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_178()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_208()) {
+    jj_scanpos = xsp;
+    if (jj_3R_209()) {
+    jj_scanpos = xsp;
+    if (jj_3R_210()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_250()
+ {
+    if (jj_3R_275()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_391()
+ {
+    if (jj_3R_404()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_331()
+ {
+    if (jj_scan_token(TRY)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_391()) jj_scanpos = xsp;
+    if (jj_3R_106()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_392()) {
+    jj_scanpos = xsp;
+    if (jj_3R_393()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_244()
+ {
+    if (jj_scan_token(_DEFAULT)) return true;
+    if (jj_3R_95()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_249()
+ {
+    if (jj_3R_274()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_248()
+ {
+    if (jj_3R_273()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_247()
+ {
+    if (jj_3R_272()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_216()
+ {
+    if (jj_scan_token(DECR)) return true;
+    if (jj_3R_151()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_246()
+ {
+    if (jj_3R_271()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_245()
+ {
+    if (jj_3R_270()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_390()
+ {
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_193()
+ {
+    if (jj_3R_219()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_97()
+ {
+    if (jj_scan_token(INCR)) return true;
+    if (jj_3R_151()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_188()
+ {
+    if (jj_3R_178()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_389()
+ {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_330()
+ {
+    if (jj_scan_token(SYNCHRONIZED)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_80()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_106()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_214()
+ {
+    if (jj_3R_95()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_244()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_245()) {
+    jj_scanpos = xsp;
+    if (jj_3R_246()) {
+    jj_scanpos = xsp;
+    if (jj_3R_247()) {
+    jj_scanpos = xsp;
+    if (jj_3R_248()) {
+    jj_scanpos = xsp;
+    if (jj_3R_249()) {
+    jj_scanpos = xsp;
+    if (jj_3R_250()) return true;
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3_6()
+ {
+    if (jj_3R_70()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_388()
+ {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_218()
+ {
+    if (jj_scan_token(MINUS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_217()
+ {
+    if (jj_scan_token(PLUS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_329()
+ {
+    if (jj_scan_token(THROW)) return true;
+    if (jj_3R_80()) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_187()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_217()) {
+    jj_scanpos = xsp;
+    if (jj_3R_218()) return true;
+    }
+    if (jj_3R_151()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_186()
+ {
+    if (jj_3R_216()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_185()
+ {
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_183()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_6()) {
+    jj_scanpos = xsp;
+    if (jj_3R_214()) {
+    jj_scanpos = xsp;
+    if (jj_3R_215()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_429()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_80()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_328()
+ {
+    if (jj_scan_token(RETURN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_390()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_148()
+ {
+    if (jj_3R_183()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_151()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_185()) {
+    jj_scanpos = xsp;
+    if (jj_3R_186()) {
+    jj_scanpos = xsp;
+    if (jj_3R_187()) {
+    jj_scanpos = xsp;
+    if (jj_3R_188()) return true;
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_398()
+ {
+    if (jj_scan_token(REM)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_397()
+ {
+    if (jj_scan_token(SLASH)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_327()
+ {
+    if (jj_scan_token(CONTINUE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_389()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_93()
+ {
+    if (jj_scan_token(LBRACE)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_148()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_396()
+ {
+    if (jj_scan_token(STAR)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_380()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_396()) {
+    jj_scanpos = xsp;
+    if (jj_3R_397()) {
+    jj_scanpos = xsp;
+    if (jj_3R_398()) return true;
+    }
+    }
+    if (jj_3R_151()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_403()
+ {
+    if (jj_3R_420()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_252()
+ {
+    if (jj_scan_token(BIT_AND)) return true;
+    if (jj_3R_251()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_326()
+ {
+    if (jj_scan_token(BREAK)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_388()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_219()
+ {
+    if (jj_scan_token(EXTENDS)) return true;
+    if (jj_3R_251()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_252()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_345()
+ {
+    if (jj_3R_151()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_380()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_382()
+ {
+    if (jj_scan_token(MINUS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_381()
+ {
+    if (jj_scan_token(PLUS)) return true;
+    return false;
+  }
+
+  private boolean jj_3_3()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_66()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_373()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_381()) {
+    jj_scanpos = xsp;
+    if (jj_3R_382()) return true;
+    }
+    if (jj_3R_345()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_158()
+ {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_193()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_420()
+ {
+    if (jj_3R_427()) return true;
+    return false;
+  }
+
+  /** Generated Token Manager. */
+  public ASTParserTokenManager token_source;
+  JavaCharStream jj_input_stream;
+  /** Current token. */
+  public Token token;
+  /** Next token. */
+  public Token jj_nt;
+  private int jj_ntk;
+  private Token jj_scanpos, jj_lastpos;
+  private int jj_la;
+  /** Whether we are looking ahead. */
+  private boolean jj_lookingAhead = false;
+  private boolean jj_semLA;
+  private int jj_gen;
+  final private int[] jj_la1 = new int[160];
+  static private int[] jj_la1_0;
+  static private int[] jj_la1_1;
+  static private int[] jj_la1_2;
+  static private int[] jj_la1_3;
+  static private int[] jj_la1_4;
+  static {
+      jj_la1_init_0();
+      jj_la1_init_1();
+      jj_la1_init_2();
+      jj_la1_init_3();
+      jj_la1_init_4();
+   }
+   private static void jj_la1_init_0() {
+      jj_la1_0 = new int[] {0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+   }
+   private static void jj_la1_init_1() {
+      jj_la1_1 = new int[] {0x40000000,0x40000000,0x902020,0x0,0x0,0x0,0x800020,0x102000,0x902020,0x2000,0x0,0x200000,0x20000000,0x0,0x0,0x20000000,0x0,0x0,0x29532a0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x29532a0,0x10000,0x102000,0x2041280,0x29532a0,0x0,0x0,0x0,0x2441280,0x2441280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x28412a0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2441280,0x16c6b3e0,0x0,0x2041280,0x2041280,0x2041280,0x0,0x2041280,0x2041280,0x200000,0x200000,0x2041280,0x2041280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2441280,0x0,0x0,0x2441280,0x0,0x0,0x2041280,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2441280,0x2c412a0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x400000,0x2441280,0x0,0x0,0x0,0x2041280,0x2441280,0x0,0x0,0x164693c0,0x0,0x164693c0,0x0,0x2441280,0x0,0x0,0x0,0x0,0x2441280,0x10400,0x10400,0x80000,0x2c412a0,0x2441280,0x2441280,0x2c412a0,0x2441280,0x0,0x0,0x0,0x2441280,0x0,0x800,0x0,0x1000000,0x0,0x0,0x0,0x0,0x2441280,0x2441280,0x0,0x29432a0,0x2143280,0x29432a0,0x10000,};
+   }
+   private static void jj_la1_init_2() {
+      jj_la1_2 = new int[] {0x0,0x0,0x111338a,0x0,0x1000,0x0,0x1113388,0x2,0x111338a,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1913b8f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1913b8f,0x0,0x2,0x800805,0x1913b8f,0x0,0x0,0x0,0xca24835,0xca24835,0x0,0x0,0x0,0x0,0x80000,0x0,0x0,0x1113b8d,0x0,0x0,0x0,0x0,0x0,0x80000,0x0,0x0,0xca24835,0xff7ffbf,0x1000,0x805,0x805,0x805,0x0,0x805,0x805,0x4000,0x4000,0x805,0x800805,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xca24835,0x0,0x0,0xca24835,0x0,0x0,0x805,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0xca24835,0xdb37bbd,0x0,0x10,0x0,0xc224030,0x0,0x0,0x0,0x0,0x20010,0x0,0xc200020,0x200000,0xca24835,0x0,0x0,0x0,0x805,0xca24835,0x0,0x0,0xee7cc35,0x0,0xee7cc35,0x0,0xca24835,0x0,0x10,0x0,0x0,0xca24835,0x0,0x0,0x0,0xdb37bbd,0xca24835,0xca24835,0xdb37bbd,0xca24835,0x0,0x0,0x0,0xca24835,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xca24835,0xca24835,0x0,0x1113b8f,0x807,0x1113b8f,0x0,};
+   }
+   private static void jj_la1_init_3() {
+      jj_la1_3 = new int[] {0x10000,0x10000,0x90000,0x0,0x0,0x40000,0x80000,0x80000,0x90000,0x0,0x200000,0x0,0x0,0x20000,0x20000,0x0,0x80080,0x20000,0x291080,0x10000,0x80000,0x400,0x1000,0x20000,0x0,0x0,0x291080,0x0,0x80000,0x200080,0x290080,0x20000,0x100000,0x84000,0xc014e1,0xc014e1,0x20000,0x200000,0x84000,0x20000,0x0,0x11000,0x20000,0x80080,0x20000,0x20000,0x0,0x200000,0x20000,0x0,0x200000,0x200000,0x2004e1,0x914e1,0x0,0x0,0x80,0x80,0x20000,0x1080080,0x1000080,0x0,0x0,0x0,0x80,0x200000,0x80,0x0,0x100000,0x100000,0x1000000,0x40000000,0x80000000,0x0,0x0,0x0,0x24000000,0x24000000,0x0,0x18200000,0x18200000,0x0,0x0,0x0,0x0,0x0,0x0,0xc004e1,0xc00000,0xc00000,0x4e1,0x0,0x0,0x80,0x200000,0x400,0x200000,0x80,0x40000,0x20000,0x20000,0xc004e1,0xc804e1,0x200000,0x80,0x400,0x461,0x80,0x40000,0x200000,0x400,0x0,0x44000,0x61,0x0,0xc004e1,0x20000,0x200000,0x84400,0x280080,0xc004e1,0x84000,0x1000,0x114e1,0x2000000,0x114e1,0x20000,0xc014e1,0x200000,0x80,0x100000,0x100000,0x4e1,0x0,0x0,0x0,0xc804e1,0xc004e1,0xc004e1,0xc904e1,0xc004e1,0x20000,0x80,0x80,0xc004e1,0x400,0x0,0x0,0x0,0x80000,0x80000,0x80,0x20000,0xc814e1,0xc814e1,0x20000,0x90080,0x80080,0x90080,0x0,};
+   }
+   private static void jj_la1_init_4() {
+      jj_la1_4 = new int[] {0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400000,0x0,0x0,0x0,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1800000,0x1bff800,0x3ff800,0x0,0x0,0x0,0x80,0x100,0x40,0x0,0x0,0x0,0x8000000,0x8000000,0x400,0xc,0xc,0x230,0x230,0xc,0xf,0x0,0x0,0x0,0x3,0x40,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0xf,0xf,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf,0x0,0x0,0x0,0x0,0xf,0x0,0x0,0x3,0x0,0x3,0x0,0xf,0x0,0x0,0x1bff803,0x1bff803,0x2,0x0,0x0,0x0,0xf,0xf,0xf,0xf,0xf,0x0,0x0,0x0,0xf,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0xf,0xf,0x0,0x0,0x0,0x0,0x0,};
+   }
+  final private JJCalls[] jj_2_rtns = new JJCalls[44];
+  private boolean jj_rescan = false;
+  private int jj_gc = 0;
+
+  /** Constructor. */
+  public ASTParser(Provider stream) {
+    jj_input_stream = new JavaCharStream(stream, 1, 1);
+    token_source = new ASTParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 160; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  /** Constructor. */
+  public ASTParser(String dsl) throws ParseException, TokenMgrException {
+      this(new StringProvider(dsl));
+  }
+
+  public void ReInit(String s) {
+     ReInit(new StringProvider(s));
+  }
+  /** Reinitialise. */
+  public void ReInit(Provider stream) {
+	if (jj_input_stream == null) {
+      jj_input_stream = new JavaCharStream(stream, 1, 1);
+   } else {
+      jj_input_stream.ReInit(stream, 1, 1);
+   }
+   if (token_source == null) {
+      token_source = new ASTParserTokenManager(jj_input_stream);
+   }
+
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 160; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  /** Constructor with generated Token Manager. */
+  public ASTParser(ASTParserTokenManager tm) {
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 160; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  /** Reinitialise. */
+  public void ReInit(ASTParserTokenManager tm) {
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 160; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  private Token jj_consume_token(int kind) {
+    Token oldToken;
+    if ((oldToken = token).next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    if (token.kind == kind) {
+      jj_gen++;
+      if (++jj_gc > 100) {
+        jj_gc = 0;
+        for (int i = 0; i < jj_2_rtns.length; i++) {
+          JJCalls c = jj_2_rtns[i];
+          while (c != null) {
+            if (c.gen < jj_gen) c.first = null;
+            c = c.next;
+          }
+        }
+      }
+      return token;
+    }
+    token = oldToken;
+    jj_kind = kind;
+    throw generateParseException();
+  }
+
+  @SuppressWarnings("serial")
+  static private final class LookaheadSuccess extends java.lang.RuntimeException { }
+  final private LookaheadSuccess jj_ls = new LookaheadSuccess();
+  private boolean jj_scan_token(int kind) {
+    if (jj_scanpos == jj_lastpos) {
+      jj_la--;
+      if (jj_scanpos.next == null) {
+        jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
+      } else {
+        jj_lastpos = jj_scanpos = jj_scanpos.next;
+      }
+    } else {
+      jj_scanpos = jj_scanpos.next;
+    }
+    if (jj_rescan) {
+      int i = 0; Token tok = token;
+      while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
+      if (tok != null) jj_add_error_token(kind, i);
+    }
+    if (jj_scanpos.kind != kind) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
+    return false;
+  }
+
+
+/** Get the next Token. */
+  final public Token getNextToken() {
+    if (token.next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    jj_gen++;
+    return token;
+  }
+
+/** Get the specific Token. */
+  final public Token getToken(int index) {
+    Token t = jj_lookingAhead ? jj_scanpos : token;
+    for (int i = 0; i < index; i++) {
+      if (t.next != null) t = t.next;
+      else t = t.next = token_source.getNextToken();
+    }
+    return t;
+  }
+
+  private int jj_ntk_f() {
+    if ((jj_nt=token.next) == null)
+      return (jj_ntk = (token.next=token_source.getNextToken()).kind);
+    else
+      return (jj_ntk = jj_nt.kind);
+  }
+
+  private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
+  private int[] jj_expentry;
+  private int jj_kind = -1;
+  private int[] jj_lasttokens = new int[100];
+  private int jj_endpos;
+
+  private void jj_add_error_token(int kind, int pos) {
+    if (pos >= 100) {
+       return;
+    }
+
+    if (pos == jj_endpos + 1) {
+      jj_lasttokens[jj_endpos++] = kind;
+    } else if (jj_endpos != 0) {
+      jj_expentry = new int[jj_endpos];
+
+      for (int i = 0; i < jj_endpos; i++) {
+        jj_expentry[i] = jj_lasttokens[i];
+      }
+
+      for (int[] oldentry : jj_expentries) {
+        if (oldentry.length == jj_expentry.length) {
+          boolean isMatched = true;
+
+          for (int i = 0; i < jj_expentry.length; i++) {
+            if (oldentry[i] != jj_expentry[i]) {
+              isMatched = false;
+              break;
+            }
+
+          }
+          if (isMatched) {
+            jj_expentries.add(jj_expentry);
+            break;
+          }
+        }
+      }
+
+      if (pos != 0) {
+        jj_lasttokens[(jj_endpos = pos) - 1] = kind;
+      }
+    }
+  }
+
+  /** Generate ParseException. */
+  public ParseException generateParseException() {
+    jj_expentries.clear();
+    boolean[] la1tokens = new boolean[157];
+    if (jj_kind >= 0) {
+      la1tokens[jj_kind] = true;
+      jj_kind = -1;
+    }
+    for (int i = 0; i < 160; i++) {
+      if (jj_la1[i] == jj_gen) {
+        for (int j = 0; j < 32; j++) {
+          if ((jj_la1_0[i] & (1<<j)) != 0) {
+            la1tokens[j] = true;
+          }
+          if ((jj_la1_1[i] & (1<<j)) != 0) {
+            la1tokens[32+j] = true;
+          }
+          if ((jj_la1_2[i] & (1<<j)) != 0) {
+            la1tokens[64+j] = true;
+          }
+          if ((jj_la1_3[i] & (1<<j)) != 0) {
+            la1tokens[96+j] = true;
+          }
+          if ((jj_la1_4[i] & (1<<j)) != 0) {
+            la1tokens[128+j] = true;
+          }
+        }
+      }
+    }
+    for (int i = 0; i < 157; i++) {
+      if (la1tokens[i]) {
+        jj_expentry = new int[1];
+        jj_expentry[0] = i;
+        jj_expentries.add(jj_expentry);
+      }
+    }
+    jj_endpos = 0;
+    jj_rescan_token();
+    jj_add_error_token(0, 0);
+    int[][] exptokseq = new int[jj_expentries.size()][];
+    for (int i = 0; i < jj_expentries.size(); i++) {
+      exptokseq[i] = jj_expentries.get(i);
+    }
+    return new ParseException(token, exptokseq, tokenImage, token_source == null ? null : ASTParserTokenManager.lexStateNames[token_source.curLexState]);
+  }
+
+  /** Enable tracing. */
+  final public void enable_tracing() {
+  }
+
+  /** Disable tracing. */
+  final public void disable_tracing() {
+  }
+
+  private void jj_rescan_token() {
+    jj_rescan = true;
+    for (int i = 0; i < 44; i++) {
+      try {
+        JJCalls p = jj_2_rtns[i];
+
+        do {
+          if (p.gen > jj_gen) {
+            jj_la = p.arg; jj_lastpos = jj_scanpos = p.first;
+            switch (i) {
+              case 0: jj_3_1(); break;
+              case 1: jj_3_2(); break;
+              case 2: jj_3_3(); break;
+              case 3: jj_3_4(); break;
+              case 4: jj_3_5(); break;
+              case 5: jj_3_6(); break;
+              case 6: jj_3_7(); break;
+              case 7: jj_3_8(); break;
+              case 8: jj_3_9(); break;
+              case 9: jj_3_10(); break;
+              case 10: jj_3_11(); break;
+              case 11: jj_3_12(); break;
+              case 12: jj_3_13(); break;
+              case 13: jj_3_14(); break;
+              case 14: jj_3_15(); break;
+              case 15: jj_3_16(); break;
+              case 16: jj_3_17(); break;
+              case 17: jj_3_18(); break;
+              case 18: jj_3_19(); break;
+              case 19: jj_3_20(); break;
+              case 20: jj_3_21(); break;
+              case 21: jj_3_22(); break;
+              case 22: jj_3_23(); break;
+              case 23: jj_3_24(); break;
+              case 24: jj_3_25(); break;
+              case 25: jj_3_26(); break;
+              case 26: jj_3_27(); break;
+              case 27: jj_3_28(); break;
+              case 28: jj_3_29(); break;
+              case 29: jj_3_30(); break;
+              case 30: jj_3_31(); break;
+              case 31: jj_3_32(); break;
+              case 32: jj_3_33(); break;
+              case 33: jj_3_34(); break;
+              case 34: jj_3_35(); break;
+              case 35: jj_3_36(); break;
+              case 36: jj_3_37(); break;
+              case 37: jj_3_38(); break;
+              case 38: jj_3_39(); break;
+              case 39: jj_3_40(); break;
+              case 40: jj_3_41(); break;
+              case 41: jj_3_42(); break;
+              case 42: jj_3_43(); break;
+              case 43: jj_3_44(); break;
+            }
+          }
+          p = p.next;
+        } while (p != null);
+
+        } catch(LookaheadSuccess ls) { }
+    }
+    jj_rescan = false;
+  }
+
+  private void jj_save(int index, int xla) {
+    JJCalls p = jj_2_rtns[index];
+    while (p.gen > jj_gen) {
+      if (p.next == null) { p = p.next = new JJCalls(); break; }
+      p = p.next;
+    }
+
+    p.gen = jj_gen + xla - jj_la; 
+    p.first = token;
+    p.arg = xla;
+  }
+
+  static final class JJCalls {
+    int gen;
+    Token first;
+    int arg;
+    JJCalls next;
+  }
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserConstants.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserConstants.java
index eab016e814..b256848a99 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserConstants.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserConstants.java
@@ -20,673 +20,419 @@
  */
 public interface ASTParserConstants {
 
-    /**
-     * End of File.
-     */
-    int EOF = 0;
-    /**
-     * RegularExpression Id.
-     */
-    int SINGLE_LINE_COMMENT = 31;
-    /**
-     * RegularExpression Id.
-     */
-    int JAVA_DOC_COMMENT = 34;
-    /**
-     * RegularExpression Id.
-     */
-    int MULTI_LINE_COMMENT = 35;
-    /**
-     * RegularExpression Id.
-     */
-    int ABSTRACT = 37;
-    /**
-     * RegularExpression Id.
-     */
-    int ASSERT = 38;
-    /**
-     * RegularExpression Id.
-     */
-    int BOOLEAN = 39;
-    /**
-     * RegularExpression Id.
-     */
-    int BREAK = 40;
-    /**
-     * RegularExpression Id.
-     */
-    int BYTE = 41;
-    /**
-     * RegularExpression Id.
-     */
-    int CASE = 42;
-    /**
-     * RegularExpression Id.
-     */
-    int CATCH = 43;
-    /**
-     * RegularExpression Id.
-     */
-    int CHAR = 44;
-    /**
-     * RegularExpression Id.
-     */
-    int CLASS = 45;
-    /**
-     * RegularExpression Id.
-     */
-    int CONST = 46;
-    /**
-     * RegularExpression Id.
-     */
-    int CONTINUE = 47;
-    /**
-     * RegularExpression Id.
-     */
-    int _DEFAULT = 48;
-    /**
-     * RegularExpression Id.
-     */
-    int DO = 49;
-    /**
-     * RegularExpression Id.
-     */
-    int DOUBLE = 50;
-    /**
-     * RegularExpression Id.
-     */
-    int ELSE = 51;
-    /**
-     * RegularExpression Id.
-     */
-    int ENUM = 52;
-    /**
-     * RegularExpression Id.
-     */
-    int EXTENDS = 53;
-    /**
-     * RegularExpression Id.
-     */
-    int FALSE = 54;
-    /**
-     * RegularExpression Id.
-     */
-    int FINAL = 55;
-    /**
-     * RegularExpression Id.
-     */
-    int FINALLY = 56;
-    /**
-     * RegularExpression Id.
-     */
-    int FLOAT = 57;
-    /**
-     * RegularExpression Id.
-     */
-    int FOR = 58;
-    /**
-     * RegularExpression Id.
-     */
-    int GOTO = 59;
-    /**
-     * RegularExpression Id.
-     */
-    int IF = 60;
-    /**
-     * RegularExpression Id.
-     */
-    int IMPLEMENTS = 61;
-    /**
-     * RegularExpression Id.
-     */
-    int IMPORT = 62;
-    /**
-     * RegularExpression Id.
-     */
-    int INSTANCEOF = 63;
-    /**
-     * RegularExpression Id.
-     */
-    int INT = 64;
-    /**
-     * RegularExpression Id.
-     */
-    int INTERFACE = 65;
-    /**
-     * RegularExpression Id.
-     */
-    int LONG = 66;
-    /**
-     * RegularExpression Id.
-     */
-    int NATIVE = 67;
-    /**
-     * RegularExpression Id.
-     */
-    int NEW = 68;
-    /**
-     * RegularExpression Id.
-     */
-    int NULL = 69;
-    /**
-     * RegularExpression Id.
-     */
-    int PACKAGE = 70;
-    /**
-     * RegularExpression Id.
-     */
-    int PRIVATE = 71;
-    /**
-     * RegularExpression Id.
-     */
-    int PROTECTED = 72;
-    /**
-     * RegularExpression Id.
-     */
-    int PUBLIC = 73;
-    /**
-     * RegularExpression Id.
-     */
-    int RETURN = 74;
-    /**
-     * RegularExpression Id.
-     */
-    int SHORT = 75;
-    /**
-     * RegularExpression Id.
-     */
-    int STATIC = 76;
-    /**
-     * RegularExpression Id.
-     */
-    int STRICTFP = 77;
-    /**
-     * RegularExpression Id.
-     */
-    int SUPER = 78;
-    /**
-     * RegularExpression Id.
-     */
-    int SWITCH = 79;
-    /**
-     * RegularExpression Id.
-     */
-    int SYNCHRONIZED = 80;
-    /**
-     * RegularExpression Id.
-     */
-    int THIS = 81;
-    /**
-     * RegularExpression Id.
-     */
-    int THROW = 82;
-    /**
-     * RegularExpression Id.
-     */
-    int THROWS = 83;
-    /**
-     * RegularExpression Id.
-     */
-    int TRANSIENT = 84;
-    /**
-     * RegularExpression Id.
-     */
-    int TRUE = 85;
-    /**
-     * RegularExpression Id.
-     */
-    int TRY = 86;
-    /**
-     * RegularExpression Id.
-     */
-    int VOID = 87;
-    /**
-     * RegularExpression Id.
-     */
-    int VOLATILE = 88;
-    /**
-     * RegularExpression Id.
-     */
-    int WHILE = 89;
-    /**
-     * RegularExpression Id.
-     */
-    int LONG_LITERAL = 90;
-    /**
-     * RegularExpression Id.
-     */
-    int INTEGER_LITERAL = 91;
-    /**
-     * RegularExpression Id.
-     */
-    int DECIMAL_LITERAL = 92;
-    /**
-     * RegularExpression Id.
-     */
-    int HEX_LITERAL = 93;
-    /**
-     * RegularExpression Id.
-     */
-    int OCTAL_LITERAL = 94;
-    /**
-     * RegularExpression Id.
-     */
-    int BINARY_LITERAL = 95;
-    /**
-     * RegularExpression Id.
-     */
-    int FLOATING_POINT_LITERAL = 96;
-    /**
-     * RegularExpression Id.
-     */
-    int DECIMAL_FLOATING_POINT_LITERAL = 97;
-    /**
-     * RegularExpression Id.
-     */
-    int DECIMAL_EXPONENT = 98;
-    /**
-     * RegularExpression Id.
-     */
-    int HEXADECIMAL_FLOATING_POINT_LITERAL = 99;
-    /**
-     * RegularExpression Id.
-     */
-    int HEXADECIMAL_EXPONENT = 100;
-    /**
-     * RegularExpression Id.
-     */
-    int CHARACTER_LITERAL = 101;
-    /**
-     * RegularExpression Id.
-     */
-    int STRING_LITERAL = 102;
-    /**
-     * RegularExpression Id.
-     */
-    int IDENTIFIER = 103;
-    /**
-     * RegularExpression Id.
-     */
-    int LETTER = 104;
-    /**
-     * RegularExpression Id.
-     */
-    int PART_LETTER = 105;
-    /**
-     * RegularExpression Id.
-     */
-    int LPAREN = 106;
-    /**
-     * RegularExpression Id.
-     */
-    int RPAREN = 107;
-    /**
-     * RegularExpression Id.
-     */
-    int LBRACE = 108;
-    /**
-     * RegularExpression Id.
-     */
-    int RBRACE = 109;
-    /**
-     * RegularExpression Id.
-     */
-    int LBRACKET = 110;
-    /**
-     * RegularExpression Id.
-     */
-    int RBRACKET = 111;
-    /**
-     * RegularExpression Id.
-     */
-    int SEMICOLON = 112;
-    /**
-     * RegularExpression Id.
-     */
-    int COMMA = 113;
-    /**
-     * RegularExpression Id.
-     */
-    int DOT = 114;
-    /**
-     * RegularExpression Id.
-     */
-    int AT = 115;
-    /**
-     * RegularExpression Id.
-     */
-    int ASSIGN = 116;
-    /**
-     * RegularExpression Id.
-     */
-    int LT = 117;
-    /**
-     * RegularExpression Id.
-     */
-    int BANG = 118;
-    /**
-     * RegularExpression Id.
-     */
-    int TILDE = 119;
-    /**
-     * RegularExpression Id.
-     */
-    int HOOK = 120;
-    /**
-     * RegularExpression Id.
-     */
-    int COLON = 121;
-    /**
-     * RegularExpression Id.
-     */
-    int EQ = 122;
-    /**
-     * RegularExpression Id.
-     */
-    int LE = 123;
-    /**
-     * RegularExpression Id.
-     */
-    int GE = 124;
-    /**
-     * RegularExpression Id.
-     */
-    int NE = 125;
-    /**
-     * RegularExpression Id.
-     */
-    int SC_OR = 126;
-    /**
-     * RegularExpression Id.
-     */
-    int SC_AND = 127;
-    /**
-     * RegularExpression Id.
-     */
-    int INCR = 128;
-    /**
-     * RegularExpression Id.
-     */
-    int DECR = 129;
-    /**
-     * RegularExpression Id.
-     */
-    int PLUS = 130;
-    /**
-     * RegularExpression Id.
-     */
-    int MINUS = 131;
-    /**
-     * RegularExpression Id.
-     */
-    int STAR = 132;
-    /**
-     * RegularExpression Id.
-     */
-    int SLASH = 133;
-    /**
-     * RegularExpression Id.
-     */
-    int BIT_AND = 134;
-    /**
-     * RegularExpression Id.
-     */
-    int BIT_OR = 135;
-    /**
-     * RegularExpression Id.
-     */
-    int XOR = 136;
-    /**
-     * RegularExpression Id.
-     */
-    int REM = 137;
-    /**
-     * RegularExpression Id.
-     */
-    int LSHIFT = 138;
-    /**
-     * RegularExpression Id.
-     */
-    int PLUSASSIGN = 139;
-    /**
-     * RegularExpression Id.
-     */
-    int MINUSASSIGN = 140;
-    /**
-     * RegularExpression Id.
-     */
-    int STARASSIGN = 141;
-    /**
-     * RegularExpression Id.
-     */
-    int SLASHASSIGN = 142;
-    /**
-     * RegularExpression Id.
-     */
-    int ANDASSIGN = 143;
-    /**
-     * RegularExpression Id.
-     */
-    int ORASSIGN = 144;
-    /**
-     * RegularExpression Id.
-     */
-    int XORASSIGN = 145;
-    /**
-     * RegularExpression Id.
-     */
-    int REMASSIGN = 146;
-    /**
-     * RegularExpression Id.
-     */
-    int LSHIFTASSIGN = 147;
-    /**
-     * RegularExpression Id.
-     */
-    int RSIGNEDSHIFTASSIGN = 148;
-    /**
-     * RegularExpression Id.
-     */
-    int RUNSIGNEDSHIFTASSIGN = 149;
-    /**
-     * RegularExpression Id.
-     */
-    int ELLIPSIS = 150;
-    /**
-     * RegularExpression Id.
-     */
-    int ARROW = 151;
-    /**
-     * RegularExpression Id.
-     */
-    int DOUBLECOLON = 152;
-    /**
-     * RegularExpression Id.
-     */
-    int RUNSIGNEDSHIFT = 153;
-    /**
-     * RegularExpression Id.
-     */
-    int RSIGNEDSHIFT = 154;
-    /**
-     * RegularExpression Id.
-     */
-    int GT = 155;
+  /** End of File. */
+  int EOF = 0;
+  /** RegularExpression Id. */
+  int SINGLE_LINE_COMMENT = 31;
+  /** RegularExpression Id. */
+  int JAVA_DOC_COMMENT = 34;
+  /** RegularExpression Id. */
+  int MULTI_LINE_COMMENT = 35;
+  /** RegularExpression Id. */
+  int ABSTRACT = 37;
+  /** RegularExpression Id. */
+  int ASSERT = 38;
+  /** RegularExpression Id. */
+  int BOOLEAN = 39;
+  /** RegularExpression Id. */
+  int BREAK = 40;
+  /** RegularExpression Id. */
+  int BYTE = 41;
+  /** RegularExpression Id. */
+  int CASE = 42;
+  /** RegularExpression Id. */
+  int CATCH = 43;
+  /** RegularExpression Id. */
+  int CHAR = 44;
+  /** RegularExpression Id. */
+  int CLASS = 45;
+  /** RegularExpression Id. */
+  int CONST = 46;
+  /** RegularExpression Id. */
+  int CONTINUE = 47;
+  /** RegularExpression Id. */
+  int _DEFAULT = 48;
+  /** RegularExpression Id. */
+  int DO = 49;
+  /** RegularExpression Id. */
+  int DOUBLE = 50;
+  /** RegularExpression Id. */
+  int ELSE = 51;
+  /** RegularExpression Id. */
+  int ENUM = 52;
+  /** RegularExpression Id. */
+  int EXTENDS = 53;
+  /** RegularExpression Id. */
+  int FALSE = 54;
+  /** RegularExpression Id. */
+  int FINAL = 55;
+  /** RegularExpression Id. */
+  int FINALLY = 56;
+  /** RegularExpression Id. */
+  int FLOAT = 57;
+  /** RegularExpression Id. */
+  int FOR = 58;
+  /** RegularExpression Id. */
+  int GOTO = 59;
+  /** RegularExpression Id. */
+  int IF = 60;
+  /** RegularExpression Id. */
+  int IMPLEMENTS = 61;
+  /** RegularExpression Id. */
+  int IMPORT = 62;
+  /** RegularExpression Id. */
+  int INSTANCEOF = 63;
+  /** RegularExpression Id. */
+  int INT = 64;
+  /** RegularExpression Id. */
+  int INTERFACE = 65;
+  /** RegularExpression Id. */
+  int LONG = 66;
+  /** RegularExpression Id. */
+  int NATIVE = 67;
+  /** RegularExpression Id. */
+  int NEW = 68;
+  /** RegularExpression Id. */
+  int NULL = 69;
+  /** RegularExpression Id. */
+  int PACKAGE = 70;
+  /** RegularExpression Id. */
+  int PRIVATE = 71;
+  /** RegularExpression Id. */
+  int PROTECTED = 72;
+  /** RegularExpression Id. */
+  int PUBLIC = 73;
+  /** RegularExpression Id. */
+  int RETURN = 74;
+  /** RegularExpression Id. */
+  int SHORT = 75;
+  /** RegularExpression Id. */
+  int STATIC = 76;
+  /** RegularExpression Id. */
+  int STRICTFP = 77;
+  /** RegularExpression Id. */
+  int SUPER = 78;
+  /** RegularExpression Id. */
+  int SWITCH = 79;
+  /** RegularExpression Id. */
+  int SYNCHRONIZED = 80;
+  /** RegularExpression Id. */
+  int THIS = 81;
+  /** RegularExpression Id. */
+  int THROW = 82;
+  /** RegularExpression Id. */
+  int THROWS = 83;
+  /** RegularExpression Id. */
+  int TRANSIENT = 84;
+  /** RegularExpression Id. */
+  int TRUE = 85;
+  /** RegularExpression Id. */
+  int TRY = 86;
+  /** RegularExpression Id. */
+  int VOID = 87;
+  /** RegularExpression Id. */
+  int VOLATILE = 88;
+  /** RegularExpression Id. */
+  int WHILE = 89;
+  /** RegularExpression Id. */
+  int LONG_LITERAL = 90;
+  /** RegularExpression Id. */
+  int INTEGER_LITERAL = 91;
+  /** RegularExpression Id. */
+  int DECIMAL_LITERAL = 92;
+  /** RegularExpression Id. */
+  int HEX_LITERAL = 93;
+  /** RegularExpression Id. */
+  int OCTAL_LITERAL = 94;
+  /** RegularExpression Id. */
+  int BINARY_LITERAL = 95;
+  /** RegularExpression Id. */
+  int FLOATING_POINT_LITERAL = 96;
+  /** RegularExpression Id. */
+  int DECIMAL_FLOATING_POINT_LITERAL = 97;
+  /** RegularExpression Id. */
+  int DECIMAL_EXPONENT = 98;
+  /** RegularExpression Id. */
+  int HEXADECIMAL_FLOATING_POINT_LITERAL = 99;
+  /** RegularExpression Id. */
+  int HEXADECIMAL_EXPONENT = 100;
+  /** RegularExpression Id. */
+  int CHARACTER_LITERAL = 101;
+  /** RegularExpression Id. */
+  int STRING_LITERAL = 102;
+  /** RegularExpression Id. */
+  int IDENTIFIER = 103;
+  /** RegularExpression Id. */
+  int LETTER = 104;
+  /** RegularExpression Id. */
+  int PART_LETTER = 105;
+  /** RegularExpression Id. */
+  int LPAREN = 106;
+  /** RegularExpression Id. */
+  int RPAREN = 107;
+  /** RegularExpression Id. */
+  int LBRACE = 108;
+  /** RegularExpression Id. */
+  int RBRACE = 109;
+  /** RegularExpression Id. */
+  int LBRACKET = 110;
+  /** RegularExpression Id. */
+  int RBRACKET = 111;
+  /** RegularExpression Id. */
+  int SEMICOLON = 112;
+  /** RegularExpression Id. */
+  int COMMA = 113;
+  /** RegularExpression Id. */
+  int DOT = 114;
+  /** RegularExpression Id. */
+  int AT = 115;
+  /** RegularExpression Id. */
+  int ASSIGN = 116;
+  /** RegularExpression Id. */
+  int LT = 117;
+  /** RegularExpression Id. */
+  int BANG = 118;
+  /** RegularExpression Id. */
+  int TILDE = 119;
+  /** RegularExpression Id. */
+  int HOOK = 120;
+  /** RegularExpression Id. */
+  int COLON = 121;
+  /** RegularExpression Id. */
+  int EQ = 122;
+  /** RegularExpression Id. */
+  int LE = 123;
+  /** RegularExpression Id. */
+  int GE = 124;
+  /** RegularExpression Id. */
+  int NE = 125;
+  /** RegularExpression Id. */
+  int SC_OR = 126;
+  /** RegularExpression Id. */
+  int SC_AND = 127;
+  /** RegularExpression Id. */
+  int INCR = 128;
+  /** RegularExpression Id. */
+  int DECR = 129;
+  /** RegularExpression Id. */
+  int PLUS = 130;
+  /** RegularExpression Id. */
+  int MINUS = 131;
+  /** RegularExpression Id. */
+  int STAR = 132;
+  /** RegularExpression Id. */
+  int SLASH = 133;
+  /** RegularExpression Id. */
+  int BIT_AND = 134;
+  /** RegularExpression Id. */
+  int BIT_OR = 135;
+  /** RegularExpression Id. */
+  int XOR = 136;
+  /** RegularExpression Id. */
+  int REM = 137;
+  /** RegularExpression Id. */
+  int LSHIFT = 138;
+  /** RegularExpression Id. */
+  int PLUSASSIGN = 139;
+  /** RegularExpression Id. */
+  int MINUSASSIGN = 140;
+  /** RegularExpression Id. */
+  int STARASSIGN = 141;
+  /** RegularExpression Id. */
+  int SLASHASSIGN = 142;
+  /** RegularExpression Id. */
+  int ANDASSIGN = 143;
+  /** RegularExpression Id. */
+  int ORASSIGN = 144;
+  /** RegularExpression Id. */
+  int XORASSIGN = 145;
+  /** RegularExpression Id. */
+  int REMASSIGN = 146;
+  /** RegularExpression Id. */
+  int LSHIFTASSIGN = 147;
+  /** RegularExpression Id. */
+  int RSIGNEDSHIFTASSIGN = 148;
+  /** RegularExpression Id. */
+  int RUNSIGNEDSHIFTASSIGN = 149;
+  /** RegularExpression Id. */
+  int ELLIPSIS = 150;
+  /** RegularExpression Id. */
+  int ARROW = 151;
+  /** RegularExpression Id. */
+  int DOUBLECOLON = 152;
+  /** RegularExpression Id. */
+  int RUNSIGNEDSHIFT = 153;
+  /** RegularExpression Id. */
+  int RSIGNEDSHIFT = 154;
+  /** RegularExpression Id. */
+  int GT = 155;
 
-    /**
-     * Lexical state.
-     */
-    int DEFAULT = 0;
-    /**
-     * Lexical state.
-     */
-    int IN_JAVA_DOC_COMMENT = 1;
-    /**
-     * Lexical state.
-     */
-    int IN_MULTI_LINE_COMMENT = 2;
+  /** Lexical state. */
+  int DEFAULT = 0;
+  /** Lexical state. */
+  int IN_JAVA_DOC_COMMENT = 1;
+  /** Lexical state. */
+  int IN_MULTI_LINE_COMMENT = 2;
 
-    /**
-     * Literal token values.
-     */
-    String[] tokenImage = {
-            "<EOF>",
-            "\" \"",
-            "\"\\t\"",
-            "\"\\n\"",
-            "\"\\r\"",
-            "\"\\f\"",
-            "\"\\u0085\"",
-            "\"\\u00a0\"",
-            "\"\\u1680\"",
-            "\"\\u180e\"",
-            "\"\\u2000\"",
-            "\"\\u2001\"",
-            "\"\\u2002\"",
-            "\"\\u2003\"",
-            "\"\\u2004\"",
-            "\"\\u2005\"",
-            "\"\\u2006\"",
-            "\"\\u2007\"",
-            "\"\\u2008\"",
-            "\"\\u2009\"",
-            "\"\\u200a\"",
-            "\"\\u200b\"",
-            "\"\\u200c\"",
-            "\"\\u200d\"",
-            "\"\\u2028\"",
-            "\"\\u2029\"",
-            "\"\\u202f\"",
-            "\"\\u205f\"",
-            "\"\\u2060\"",
-            "\"\\u3000\"",
-            "\"\\ufeff\"",
-            "<SINGLE_LINE_COMMENT>",
-            "<token of kind 32>",
-            "\"/*\"",
-            "\"*/\"",
-            "\"*/\"",
-            "<token of kind 36>",
-            "\"abstract\"",
-            "\"assert\"",
-            "\"boolean\"",
-            "\"break\"",
-            "\"byte\"",
-            "\"case\"",
-            "\"catch\"",
-            "\"char\"",
-            "\"class\"",
-            "\"const\"",
-            "\"continue\"",
-            "\"default\"",
-            "\"do\"",
-            "\"double\"",
-            "\"else\"",
-            "\"enum\"",
-            "\"extends\"",
-            "\"false\"",
-            "\"final\"",
-            "\"finally\"",
-            "\"float\"",
-            "\"for\"",
-            "\"goto\"",
-            "\"if\"",
-            "\"implements\"",
-            "\"import\"",
-            "\"instanceof\"",
-            "\"int\"",
-            "\"interface\"",
-            "\"long\"",
-            "\"native\"",
-            "\"new\"",
-            "\"null\"",
-            "\"package\"",
-            "\"private\"",
-            "\"protected\"",
-            "\"public\"",
-            "\"return\"",
-            "\"short\"",
-            "\"static\"",
-            "\"strictfp\"",
-            "\"super\"",
-            "\"switch\"",
-            "\"synchronized\"",
-            "\"this\"",
-            "\"throw\"",
-            "\"throws\"",
-            "\"transient\"",
-            "\"true\"",
-            "\"try\"",
-            "\"void\"",
-            "\"volatile\"",
-            "\"while\"",
-            "<LONG_LITERAL>",
-            "<INTEGER_LITERAL>",
-            "<DECIMAL_LITERAL>",
-            "<HEX_LITERAL>",
-            "<OCTAL_LITERAL>",
-            "<BINARY_LITERAL>",
-            "<FLOATING_POINT_LITERAL>",
-            "<DECIMAL_FLOATING_POINT_LITERAL>",
-            "<DECIMAL_EXPONENT>",
-            "<HEXADECIMAL_FLOATING_POINT_LITERAL>",
-            "<HEXADECIMAL_EXPONENT>",
-            "<CHARACTER_LITERAL>",
-            "<STRING_LITERAL>",
-            "<IDENTIFIER>",
-            "<LETTER>",
-            "<PART_LETTER>",
-            "\"(\"",
-            "\")\"",
-            "\"{\"",
-            "\"}\"",
-            "\"[\"",
-            "\"]\"",
-            "\";\"",
-            "\",\"",
-            "\".\"",
-            "\"@\"",
-            "\"=\"",
-            "\"<\"",
-            "\"!\"",
-            "\"~\"",
-            "\"?\"",
-            "\":\"",
-            "\"==\"",
-            "\"<=\"",
-            "\">=\"",
-            "\"!=\"",
-            "\"||\"",
-            "\"&&\"",
-            "\"++\"",
-            "\"--\"",
-            "\"+\"",
-            "\"-\"",
-            "\"*\"",
-            "\"/\"",
-            "\"&\"",
-            "\"|\"",
-            "\"^\"",
-            "\"%\"",
-            "\"<<\"",
-            "\"+=\"",
-            "\"-=\"",
-            "\"*=\"",
-            "\"/=\"",
-            "\"&=\"",
-            "\"|=\"",
-            "\"^=\"",
-            "\"%=\"",
-            "\"<<=\"",
-            "\">>=\"",
-            "\">>>=\"",
-            "\"...\"",
-            "\"->\"",
-            "\"::\"",
-            "\">>>\"",
-            "\">>\"",
-            "\">\"",
-            "\"\\u001a\"",
-    };
+  /** Literal token values. */
+  String[] tokenImage = {
+    "<EOF>",
+    "\" \"",
+    "\"\\t\"",
+    "\"\\n\"",
+    "\"\\r\"",
+    "\"\\f\"",
+    "\"\\u0085\"",
+    "\"\\u00a0\"",
+    "\"\\u1680\"",
+    "\"\\u180e\"",
+    "\"\\u2000\"",
+    "\"\\u2001\"",
+    "\"\\u2002\"",
+    "\"\\u2003\"",
+    "\"\\u2004\"",
+    "\"\\u2005\"",
+    "\"\\u2006\"",
+    "\"\\u2007\"",
+    "\"\\u2008\"",
+    "\"\\u2009\"",
+    "\"\\u200a\"",
+    "\"\\u200b\"",
+    "\"\\u200c\"",
+    "\"\\u200d\"",
+    "\"\\u2028\"",
+    "\"\\u2029\"",
+    "\"\\u202f\"",
+    "\"\\u205f\"",
+    "\"\\u2060\"",
+    "\"\\u3000\"",
+    "\"\\ufeff\"",
+    "<SINGLE_LINE_COMMENT>",
+    "<token of kind 32>",
+    "\"/*\"",
+    "\"*/\"",
+    "\"*/\"",
+    "<token of kind 36>",
+    "\"abstract\"",
+    "\"assert\"",
+    "\"boolean\"",
+    "\"break\"",
+    "\"byte\"",
+    "\"case\"",
+    "\"catch\"",
+    "\"char\"",
+    "\"class\"",
+    "\"const\"",
+    "\"continue\"",
+    "\"default\"",
+    "\"do\"",
+    "\"double\"",
+    "\"else\"",
+    "\"enum\"",
+    "\"extends\"",
+    "\"false\"",
+    "\"final\"",
+    "\"finally\"",
+    "\"float\"",
+    "\"for\"",
+    "\"goto\"",
+    "\"if\"",
+    "\"implements\"",
+    "\"import\"",
+    "\"instanceof\"",
+    "\"int\"",
+    "\"interface\"",
+    "\"long\"",
+    "\"native\"",
+    "\"new\"",
+    "\"null\"",
+    "\"package\"",
+    "\"private\"",
+    "\"protected\"",
+    "\"public\"",
+    "\"return\"",
+    "\"short\"",
+    "\"static\"",
+    "\"strictfp\"",
+    "\"super\"",
+    "\"switch\"",
+    "\"synchronized\"",
+    "\"this\"",
+    "\"throw\"",
+    "\"throws\"",
+    "\"transient\"",
+    "\"true\"",
+    "\"try\"",
+    "\"void\"",
+    "\"volatile\"",
+    "\"while\"",
+    "<LONG_LITERAL>",
+    "<INTEGER_LITERAL>",
+    "<DECIMAL_LITERAL>",
+    "<HEX_LITERAL>",
+    "<OCTAL_LITERAL>",
+    "<BINARY_LITERAL>",
+    "<FLOATING_POINT_LITERAL>",
+    "<DECIMAL_FLOATING_POINT_LITERAL>",
+    "<DECIMAL_EXPONENT>",
+    "<HEXADECIMAL_FLOATING_POINT_LITERAL>",
+    "<HEXADECIMAL_EXPONENT>",
+    "<CHARACTER_LITERAL>",
+    "<STRING_LITERAL>",
+    "<IDENTIFIER>",
+    "<LETTER>",
+    "<PART_LETTER>",
+    "\"(\"",
+    "\")\"",
+    "\"{\"",
+    "\"}\"",
+    "\"[\"",
+    "\"]\"",
+    "\";\"",
+    "\",\"",
+    "\".\"",
+    "\"@\"",
+    "\"=\"",
+    "\"<\"",
+    "\"!\"",
+    "\"~\"",
+    "\"?\"",
+    "\":\"",
+    "\"==\"",
+    "\"<=\"",
+    "\">=\"",
+    "\"!=\"",
+    "\"||\"",
+    "\"&&\"",
+    "\"++\"",
+    "\"--\"",
+    "\"+\"",
+    "\"-\"",
+    "\"*\"",
+    "\"/\"",
+    "\"&\"",
+    "\"|\"",
+    "\"^\"",
+    "\"%\"",
+    "\"<<\"",
+    "\"+=\"",
+    "\"-=\"",
+    "\"*=\"",
+    "\"/=\"",
+    "\"&=\"",
+    "\"|=\"",
+    "\"^=\"",
+    "\"%=\"",
+    "\"<<=\"",
+    "\">>=\"",
+    "\">>>=\"",
+    "\"...\"",
+    "\"->\"",
+    "\"::\"",
+    "\">>>\"",
+    "\">>\"",
+    "\">\"",
+    "\"\\u001a\"",
+  };
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserTokenManager.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserTokenManager.java
index 8ff4d69ed0..fe6c0c668a 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserTokenManager.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ASTParserTokenManager.java
@@ -13,10 +13,8 @@
  * along with Java 1.8 parser and Abstract Syntax Tree.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.github.javaparser;
-
 import java.io.*;
 import java.util.*;
-
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.comments.*;
@@ -24,17 +22,13 @@
 import com.github.javaparser.ast.stmt.*;
 import com.github.javaparser.ast.type.*;
 import com.github.javaparser.utils.*;
-
 import static com.github.javaparser.ASTParser.*;
 import static com.github.javaparser.Range.*;
 import static com.github.javaparser.Position.*;
 import static com.github.javaparser.ast.type.ArrayType.*;
 
-/**
- * Token Manager.
- */
-@SuppressWarnings("unused")
-public class ASTParserTokenManager implements ASTParserConstants {
+/** Token Manager. */
+@SuppressWarnings("unused")public class ASTParserTokenManager implements ASTParserConstants {
     private List<Token> tokens = new ArrayList<Token>();
     private CommentsCollection commentsCollection = new CommentsCollection();
 
@@ -73,2728 +67,2569 @@ private void CommonTokenAction(Token token) {
         }
     }
 
-    /**
-     * Debug output.
-     */
-    public java.io.PrintStream debugStream = System.out;
-
-    /**
-     * Set debug output.
-     */
-    public void setDebugStream(java.io.PrintStream ds) {
-        debugStream = ds;
-    }
-
-    private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1, long active2) {
-        switch (pos) {
-            case 0:
-                if ((active0 & 0xffffffe000000000L) != 0L || (active1 & 0x3ffffffL) != 0L) {
-                    jjmatchedKind = 103;
-                    return 43;
-                }
-                if ((active0 & 0x200000000L) != 0L || (active2 & 0x4020L) != 0L)
-                    return 45;
-                if ((active1 & 0x4000000000000L) != 0L || (active2 & 0x400000L) != 0L)
-                    return 1;
-                return -1;
-            case 1:
-                if ((active0 & 0xeff9ffe000000000L) != 0L || (active1 & 0x3ffffffL) != 0L) {
-                    if (jjmatchedPos != 1) {
-                        jjmatchedKind = 103;
-                        jjmatchedPos = 1;
-                    }
-                    return 43;
-                }
-                if ((active0 & 0x1006000000000000L) != 0L)
-                    return 43;
-                if ((active0 & 0x200000000L) != 0L)
-                    return 50;
-                return -1;
-            case 2:
-                if ((active0 & 0x400000000000000L) != 0L || (active1 & 0x400013L) != 0L)
-                    return 43;
-                if ((active0 & 0xebfdffe000000000L) != 0L || (active1 & 0x3bfffecL) != 0L) {
-                    if (jjmatchedPos != 2) {
-                        jjmatchedKind = 103;
-                        jjmatchedPos = 2;
-                    }
-                    return 43;
-                }
-                return -1;
-            case 3:
-                if ((active0 & 0xe3e5e9e000000000L) != 0L || (active1 & 0x31dffcaL) != 0L) {
-                    jjmatchedKind = 103;
-                    jjmatchedPos = 3;
-                    return 43;
-                }
-                if ((active0 & 0x818160000000000L) != 0L || (active1 & 0xa20024L) != 0L)
-                    return 43;
-                return -1;
-            case 4:
-                if ((active0 & 0xe02580e000000000L) != 0L || (active1 & 0x111b7caL) != 0L) {
-                    if (jjmatchedPos != 4) {
-                        jjmatchedKind = 103;
-                        jjmatchedPos = 4;
-                    }
-                    return 43;
-                }
-                if ((active0 & 0x3c0690000000000L) != 0L || (active1 & 0x20c4800L) != 0L)
-                    return 43;
-                return -1;
-            case 5:
-                if ((active0 & 0x4004004000000000L) != 0L || (active1 & 0x89608L) != 0L)
-                    return 43;
-                if ((active0 & 0xa12180a000000000L) != 0L || (active1 & 0x11121c2L) != 0L) {
-                    jjmatchedKind = 103;
-                    jjmatchedPos = 5;
-                    return 43;
-                }
-                return -1;
-            case 6:
-                if ((active0 & 0x121008000000000L) != 0L || (active1 & 0xc0L) != 0L)
-                    return 43;
-                if ((active0 & 0xa000802000000000L) != 0L || (active1 & 0x1112102L) != 0L) {
-                    jjmatchedKind = 103;
-                    jjmatchedPos = 6;
-                    return 43;
-                }
-                return -1;
-            case 7:
-                if ((active0 & 0xa000000000000000L) != 0L || (active1 & 0x110102L) != 0L) {
-                    jjmatchedKind = 103;
-                    jjmatchedPos = 7;
-                    return 43;
-                }
-                if ((active0 & 0x802000000000L) != 0L || (active1 & 0x1002000L) != 0L)
-                    return 43;
-                return -1;
-            case 8:
-                if ((active1 & 0x100102L) != 0L)
-                    return 43;
-                if ((active0 & 0xa000000000000000L) != 0L || (active1 & 0x10000L) != 0L) {
-                    jjmatchedKind = 103;
-                    jjmatchedPos = 8;
-                    return 43;
-                }
-                return -1;
-            case 9:
-                if ((active0 & 0xa000000000000000L) != 0L)
-                    return 43;
-                if ((active1 & 0x10000L) != 0L) {
-                    jjmatchedKind = 103;
-                    jjmatchedPos = 9;
-                    return 43;
-                }
-                return -1;
-            case 10:
-                if ((active1 & 0x10000L) != 0L) {
-                    jjmatchedKind = 103;
-                    jjmatchedPos = 10;
-                    return 43;
-                }
-                return -1;
-            default:
-                return -1;
-        }
-    }
-
-    private final int jjStartNfa_0(int pos, long active0, long active1, long active2) {
-        return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1, active2), pos + 1);
-    }
-
-    private int jjStopAtPos(int pos, int kind) {
-        jjmatchedKind = kind;
-        jjmatchedPos = pos;
-        return pos + 1;
-    }
-
-    private int jjMoveStringLiteralDfa0_0() {
-        switch (curChar) {
-            case 26:
-                return jjStopAtPos(0, 156);
-            case 33:
-                jjmatchedKind = 118;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000000000000L, 0x0L);
-            case 37:
-                jjmatchedKind = 137;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x40000L);
-            case 38:
-                jjmatchedKind = 134;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x8000000000000000L, 0x8000L);
-            case 40:
-                return jjStopAtPos(0, 106);
-            case 41:
-                return jjStopAtPos(0, 107);
-            case 42:
-                jjmatchedKind = 132;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000L);
-            case 43:
-                jjmatchedKind = 130;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x801L);
-            case 44:
-                return jjStopAtPos(0, 113);
-            case 45:
-                jjmatchedKind = 131;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x801002L);
-            case 46:
-                jjmatchedKind = 114;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x400000L);
-            case 47:
-                jjmatchedKind = 133;
-                return jjMoveStringLiteralDfa1_0(0x200000000L, 0x0L, 0x4000L);
-            case 58:
-                jjmatchedKind = 121;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1000000L);
-            case 59:
-                return jjStopAtPos(0, 112);
-            case 60:
-                jjmatchedKind = 117;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x800000000000000L, 0x80400L);
-            case 61:
-                jjmatchedKind = 116;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x400000000000000L, 0x0L);
-            case 62:
-                jjmatchedKind = 155;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x1000000000000000L, 0x6300000L);
-            case 63:
-                return jjStopAtPos(0, 120);
-            case 64:
-                return jjStopAtPos(0, 115);
-            case 91:
-                return jjStopAtPos(0, 110);
-            case 93:
-                return jjStopAtPos(0, 111);
-            case 94:
-                jjmatchedKind = 136;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x20000L);
-            case 97:
-                return jjMoveStringLiteralDfa1_0(0x6000000000L, 0x0L, 0x0L);
-            case 98:
-                return jjMoveStringLiteralDfa1_0(0x38000000000L, 0x0L, 0x0L);
-            case 99:
-                return jjMoveStringLiteralDfa1_0(0xfc0000000000L, 0x0L, 0x0L);
-            case 100:
-                return jjMoveStringLiteralDfa1_0(0x7000000000000L, 0x0L, 0x0L);
-            case 101:
-                return jjMoveStringLiteralDfa1_0(0x38000000000000L, 0x0L, 0x0L);
-            case 102:
-                return jjMoveStringLiteralDfa1_0(0x7c0000000000000L, 0x0L, 0x0L);
-            case 103:
-                return jjMoveStringLiteralDfa1_0(0x800000000000000L, 0x0L, 0x0L);
-            case 105:
-                return jjMoveStringLiteralDfa1_0(0xf000000000000000L, 0x3L, 0x0L);
-            case 108:
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x4L, 0x0L);
-            case 110:
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x38L, 0x0L);
-            case 112:
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x3c0L, 0x0L);
-            case 114:
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x400L, 0x0L);
-            case 115:
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x1f800L, 0x0L);
-            case 116:
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x7e0000L, 0x0L);
-            case 118:
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x1800000L, 0x0L);
-            case 119:
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000L, 0x0L);
-            case 123:
-                return jjStopAtPos(0, 108);
-            case 124:
-                jjmatchedKind = 135;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x4000000000000000L, 0x10000L);
-            case 125:
-                return jjStopAtPos(0, 109);
-            case 126:
-                return jjStopAtPos(0, 119);
-            case 133:
-                return jjStopAtPos(0, 6);
-            case 160:
-                return jjStopAtPos(0, 7);
-            case 5760:
-                return jjStopAtPos(0, 8);
-            case 6158:
-                return jjStopAtPos(0, 9);
-            case 8192:
-                return jjStopAtPos(0, 10);
-            case 8193:
-                return jjStopAtPos(0, 11);
-            case 8194:
-                return jjStopAtPos(0, 12);
-            case 8195:
-                return jjStopAtPos(0, 13);
-            case 8196:
-                return jjStopAtPos(0, 14);
-            case 8197:
-                return jjStopAtPos(0, 15);
-            case 8198:
-                return jjStopAtPos(0, 16);
-            case 8199:
-                return jjStopAtPos(0, 17);
-            case 8200:
-                return jjStopAtPos(0, 18);
-            case 8201:
-                return jjStopAtPos(0, 19);
-            case 8202:
-                return jjStopAtPos(0, 20);
-            case 8203:
-                return jjStopAtPos(0, 21);
-            case 8204:
-                return jjStopAtPos(0, 22);
-            case 8205:
-                return jjStopAtPos(0, 23);
-            case 8232:
-                return jjStopAtPos(0, 24);
-            case 8233:
-                return jjStopAtPos(0, 25);
-            case 8239:
-                return jjStopAtPos(0, 26);
-            case 8287:
-                return jjStopAtPos(0, 27);
-            case 8288:
-                return jjStopAtPos(0, 28);
-            case 12288:
-                return jjStopAtPos(0, 29);
-            case 65279:
-                return jjStopAtPos(0, 30);
-            default:
-                return jjMoveNfa_0(0, 0);
-        }
-    }
-
-    private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2) {
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(0, active0, active1, active2);
+  /** Debug output. */
+  public  java.io.PrintStream debugStream = System.out;
+  /** Set debug output. */
+  public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
+private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1, long active2){
+   switch (pos)
+   {
+      case 0:
+         if ((active0 & 0xffffffe000000000L) != 0L || (active1 & 0x3ffffffL) != 0L)
+         {
+            jjmatchedKind = 103;
+            return 43;
+         }
+         if ((active0 & 0x200000000L) != 0L || (active2 & 0x4020L) != 0L)
+            return 45;
+         if ((active1 & 0x4000000000000L) != 0L || (active2 & 0x400000L) != 0L)
             return 1;
-        }
-        switch (curChar) {
-            case 38:
-                if ((active1 & 0x8000000000000000L) != 0L)
-                    return jjStopAtPos(1, 127);
-                break;
-            case 42:
-                if ((active0 & 0x200000000L) != 0L)
-                    return jjStartNfaWithStates_0(1, 33, 50);
-                break;
-            case 43:
-                if ((active2 & 0x1L) != 0L)
-                    return jjStopAtPos(1, 128);
-                break;
-            case 45:
-                if ((active2 & 0x2L) != 0L)
-                    return jjStopAtPos(1, 129);
-                break;
-            case 46:
-                return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x400000L);
-            case 58:
-                if ((active2 & 0x1000000L) != 0L)
-                    return jjStopAtPos(1, 152);
-                break;
-            case 60:
-                if ((active2 & 0x400L) != 0L) {
-                    jjmatchedKind = 138;
-                    jjmatchedPos = 1;
-                }
-                return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x80000L);
-            case 61:
-                if ((active1 & 0x400000000000000L) != 0L)
-                    return jjStopAtPos(1, 122);
-                else if ((active1 & 0x800000000000000L) != 0L)
-                    return jjStopAtPos(1, 123);
-                else if ((active1 & 0x1000000000000000L) != 0L)
-                    return jjStopAtPos(1, 124);
-                else if ((active1 & 0x2000000000000000L) != 0L)
-                    return jjStopAtPos(1, 125);
-                else if ((active2 & 0x800L) != 0L)
-                    return jjStopAtPos(1, 139);
-                else if ((active2 & 0x1000L) != 0L)
-                    return jjStopAtPos(1, 140);
-                else if ((active2 & 0x2000L) != 0L)
-                    return jjStopAtPos(1, 141);
-                else if ((active2 & 0x4000L) != 0L)
-                    return jjStopAtPos(1, 142);
-                else if ((active2 & 0x8000L) != 0L)
-                    return jjStopAtPos(1, 143);
-                else if ((active2 & 0x10000L) != 0L)
-                    return jjStopAtPos(1, 144);
-                else if ((active2 & 0x20000L) != 0L)
-                    return jjStopAtPos(1, 145);
-                else if ((active2 & 0x40000L) != 0L)
-                    return jjStopAtPos(1, 146);
-                break;
-            case 62:
-                if ((active2 & 0x800000L) != 0L)
-                    return jjStopAtPos(1, 151);
-                else if ((active2 & 0x4000000L) != 0L) {
-                    jjmatchedKind = 154;
-                    jjmatchedPos = 1;
-                }
-                return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x2300000L);
-            case 97:
-                return jjMoveStringLiteralDfa2_0(active0, 0x400c0000000000L, active1, 0x48L, active2, 0L);
-            case 98:
-                return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L, active1, 0L, active2, 0L);
-            case 101:
-                return jjMoveStringLiteralDfa2_0(active0, 0x1000000000000L, active1, 0x410L, active2, 0L);
-            case 102:
-                if ((active0 & 0x1000000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(1, 60, 43);
-                break;
-            case 104:
-                return jjMoveStringLiteralDfa2_0(active0, 0x100000000000L, active1, 0x20e0800L, active2, 0L);
-            case 105:
-                return jjMoveStringLiteralDfa2_0(active0, 0x180000000000000L, active1, 0L, active2, 0L);
-            case 108:
-                return jjMoveStringLiteralDfa2_0(active0, 0x208200000000000L, active1, 0L, active2, 0L);
-            case 109:
-                return jjMoveStringLiteralDfa2_0(active0, 0x6000000000000000L, active1, 0L, active2, 0L);
-            case 110:
-                return jjMoveStringLiteralDfa2_0(active0, 0x8010000000000000L, active1, 0x3L, active2, 0L);
-            case 111:
-                if ((active0 & 0x2000000000000L) != 0L) {
-                    jjmatchedKind = 49;
-                    jjmatchedPos = 1;
-                }
-                return jjMoveStringLiteralDfa2_0(active0, 0xc04c08000000000L, active1, 0x1800004L, active2, 0L);
-            case 114:
-                return jjMoveStringLiteralDfa2_0(active0, 0x10000000000L, active1, 0x700180L, active2, 0L);
-            case 115:
-                return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0L, active2, 0L);
-            case 116:
-                return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x3000L, active2, 0L);
-            case 117:
-                return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4220L, active2, 0L);
-            case 119:
-                return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000L, active2, 0L);
-            case 120:
-                return jjMoveStringLiteralDfa2_0(active0, 0x20000000000000L, active1, 0L, active2, 0L);
-            case 121:
-                return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 0x10000L, active2, 0L);
-            case 124:
-                if ((active1 & 0x4000000000000000L) != 0L)
-                    return jjStopAtPos(1, 126);
-                break;
-            default:
-                break;
-        }
-        return jjStartNfa_0(0, active0, active1, active2);
-    }
-
-    private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1, long old2, long active2) {
-        if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
-            return jjStartNfa_0(0, old0, old1, old2);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(1, active0, active1, active2);
-            return 2;
-        }
-        switch (curChar) {
-            case 46:
-                if ((active2 & 0x400000L) != 0L)
-                    return jjStopAtPos(2, 150);
-                break;
-            case 61:
-                if ((active2 & 0x80000L) != 0L)
-                    return jjStopAtPos(2, 147);
-                else if ((active2 & 0x100000L) != 0L)
-                    return jjStopAtPos(2, 148);
-                break;
-            case 62:
-                if ((active2 & 0x2000000L) != 0L) {
-                    jjmatchedKind = 153;
-                    jjmatchedPos = 2;
-                }
-                return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0L, active2, 0x200000L);
-            case 97:
-                return jjMoveStringLiteralDfa3_0(active0, 0x300000000000L, active1, 0x101000L, active2, 0L);
-            case 98:
-                return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200L, active2, 0L);
-            case 99:
-                return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40L, active2, 0L);
-            case 101:
-                return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
-            case 102:
-                return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L, active1, 0L, active2, 0L);
-            case 105:
-                return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2828080L, active2, 0L);
-            case 108:
-                return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0x1000020L, active2, 0L);
-            case 110:
-                return jjMoveStringLiteralDfa3_0(active0, 0x180c00000000000L, active1, 0x10004L, active2, 0L);
-            case 111:
-                return jjMoveStringLiteralDfa3_0(active0, 0x200008000000000L, active1, 0x900L, active2, 0L);
-            case 112:
-                return jjMoveStringLiteralDfa3_0(active0, 0x6000000000000000L, active1, 0x4000L, active2, 0L);
-            case 114:
-                if ((active0 & 0x400000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(2, 58, 43);
-                return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0xc2000L, active2, 0L);
-            case 115:
-                return jjMoveStringLiteralDfa3_0(active0, 0x8008046000000000L, active1, 0L, active2, 0L);
-            case 116:
-                if ((active1 & 0x1L) != 0L) {
-                    jjmatchedKind = 64;
-                    jjmatchedPos = 2;
-                }
-                return jjMoveStringLiteralDfa3_0(active0, 0x8200a0000000000L, active1, 0x40aL, active2, 0L);
-            case 117:
-                return jjMoveStringLiteralDfa3_0(active0, 0x14000000000000L, active1, 0x200000L, active2, 0L);
-            case 119:
-                if ((active1 & 0x10L) != 0L)
-                    return jjStartNfaWithStates_0(2, 68, 43);
-                break;
-            case 121:
-                if ((active1 & 0x400000L) != 0L)
-                    return jjStartNfaWithStates_0(2, 86, 43);
-                break;
-            default:
-                break;
-        }
-        return jjStartNfa_0(1, active0, active1, active2);
-    }
-
-    private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1, long old2, long active2) {
-        if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
-            return jjStartNfa_0(1, old0, old1, old2);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(2, active0, active1, active2);
-            return 3;
-        }
-        switch (curChar) {
-            case 61:
-                if ((active2 & 0x200000L) != 0L)
-                    return jjStopAtPos(3, 149);
-                break;
-            case 97:
-                return jjMoveStringLiteralDfa4_0(active0, 0x381010000000000L, active1, 0x1000000L, active2, 0L);
-            case 98:
-                return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0L, active2, 0L);
-            case 99:
-                return jjMoveStringLiteralDfa4_0(active0, 0x80000000000L, active1, 0x10000L, active2, 0L);
-            case 100:
-                if ((active1 & 0x800000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 87, 43);
-                break;
-            case 101:
-                if ((active0 & 0x20000000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 41, 43);
-                else if ((active0 & 0x40000000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 42, 43);
-                else if ((active0 & 0x8000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 51, 43);
-                else if ((active1 & 0x200000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 85, 43);
-                return jjMoveStringLiteralDfa4_0(active0, 0x20004000000000L, active1, 0x4002L, active2, 0L);
-            case 103:
-                if ((active1 & 0x4L) != 0L)
-                    return jjStartNfaWithStates_0(3, 66, 43);
-                break;
-            case 105:
-                return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x2008L, active2, 0L);
-            case 107:
-                return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40L, active2, 0L);
-            case 108:
-                if ((active1 & 0x20L) != 0L)
-                    return jjStartNfaWithStates_0(3, 69, 43);
-                return jjMoveStringLiteralDfa4_0(active0, 0x2000008000000000L, active1, 0x2000200L, active2, 0L);
-            case 109:
-                if ((active0 & 0x10000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 52, 43);
-                break;
-            case 110:
-                return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000L, active2, 0L);
-            case 111:
-                if ((active0 & 0x800000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 59, 43);
-                return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0xc0000L, active2, 0L);
-            case 114:
-                if ((active0 & 0x100000000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 44, 43);
-                return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x800L, active2, 0L);
-            case 115:
-                if ((active1 & 0x20000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 81, 43);
-                return jjMoveStringLiteralDfa4_0(active0, 0x40600000000000L, active1, 0L, active2, 0L);
-            case 116:
-                return jjMoveStringLiteralDfa4_0(active0, 0x8000802000000000L, active1, 0x9100L, active2, 0L);
-            case 117:
-                return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400L, active2, 0L);
-            case 118:
-                return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80L, active2, 0L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(2, active0, active1, active2);
-    }
-
-    private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1, long old2, long active2) {
-        if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
-            return jjStartNfa_0(2, old0, old1, old2);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(3, active0, active1, 0L);
-            return 4;
-        }
-        switch (curChar) {
-            case 97:
-                return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0xc0L);
-            case 99:
-                return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0xa000L);
-            case 101:
-                if ((active0 & 0x40000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 54, 43);
-                else if ((active1 & 0x2000000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 89, 43);
-                return jjMoveStringLiteralDfa5_0(active0, 0x2000008000000000L, active1, 0x100L);
-            case 104:
-                if ((active0 & 0x80000000000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 43, 43);
-                return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10000L);
-            case 105:
-                return jjMoveStringLiteralDfa5_0(active0, 0x800000000000L, active1, 0x1200L);
-            case 107:
-                if ((active0 & 0x10000000000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 40, 43);
-                break;
-            case 108:
-                if ((active0 & 0x80000000000000L) != 0L) {
-                    jjmatchedKind = 55;
-                    jjmatchedPos = 4;
-                }
-                return jjMoveStringLiteralDfa5_0(active0, 0x104000000000000L, active1, 0L);
-            case 110:
-                return jjMoveStringLiteralDfa5_0(active0, 0x20000000000000L, active1, 0L);
-            case 114:
-                if ((active1 & 0x4000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 78, 43);
-                return jjMoveStringLiteralDfa5_0(active0, 0x4000006000000000L, active1, 0x402L);
-            case 115:
-                if ((active0 & 0x200000000000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 45, 43);
-                return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000L);
-            case 116:
-                if ((active0 & 0x400000000000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 46, 43);
-                else if ((active0 & 0x200000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 57, 43);
-                else if ((active1 & 0x800L) != 0L)
-                    return jjStartNfaWithStates_0(4, 75, 43);
-                return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1000000L);
-            case 117:
-                return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000L, active1, 0L);
-            case 118:
-                return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8L);
-            case 119:
-                if ((active1 & 0x40000L) != 0L) {
-                    jjmatchedKind = 82;
-                    jjmatchedPos = 4;
-                }
-                return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(3, active0, active1, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long active1) {
-        if (((active0 &= old0) | (active1 &= old1)) == 0L)
-            return jjStartNfa_0(3, old0, old1, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(4, active0, active1, 0L);
-            return 5;
-        }
-        switch (curChar) {
-            case 97:
-                return jjMoveStringLiteralDfa6_0(active0, 0xa000000000L, active1, 0L);
-            case 99:
-                if ((active1 & 0x200L) != 0L)
-                    return jjStartNfaWithStates_0(5, 73, 43);
-                else if ((active1 & 0x1000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 76, 43);
-                return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100L);
-            case 100:
-                return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L, active1, 0L);
-            case 101:
-                if ((active0 & 0x4000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 50, 43);
-                else if ((active1 & 0x8L) != 0L)
-                    return jjStartNfaWithStates_0(5, 67, 43);
-                break;
-            case 102:
-                return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2L);
-            case 103:
-                return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40L);
-            case 104:
-                if ((active1 & 0x8000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 79, 43);
-                break;
-            case 105:
-                return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1100000L);
-            case 108:
-                return jjMoveStringLiteralDfa6_0(active0, 0x101000000000000L, active1, 0L);
-            case 109:
-                return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000000L, active1, 0L);
-            case 110:
-                if ((active1 & 0x400L) != 0L)
-                    return jjStartNfaWithStates_0(5, 74, 43);
-                return jjMoveStringLiteralDfa6_0(active0, 0x8000800000000000L, active1, 0L);
-            case 114:
-                return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10000L);
-            case 115:
-                if ((active1 & 0x80000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 83, 43);
-                break;
-            case 116:
-                if ((active0 & 0x4000000000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 38, 43);
-                else if ((active0 & 0x4000000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 62, 43);
-                return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2080L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(4, active0, active1, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long active1) {
-        if (((active0 &= old0) | (active1 &= old1)) == 0L)
-            return jjStartNfa_0(4, old0, old1, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(5, active0, active1, 0L);
-            return 6;
-        }
-        switch (curChar) {
-            case 97:
-                return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2L);
-            case 99:
-                return jjMoveStringLiteralDfa7_0(active0, 0x8000002000000000L, active1, 0L);
-            case 101:
-                if ((active1 & 0x40L) != 0L)
-                    return jjStartNfaWithStates_0(6, 70, 43);
-                else if ((active1 & 0x80L) != 0L)
-                    return jjStartNfaWithStates_0(6, 71, 43);
-                return jjMoveStringLiteralDfa7_0(active0, 0x2000000000000000L, active1, 0x100000L);
-            case 102:
-                return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2000L);
-            case 108:
-                return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x1000000L);
-            case 110:
-                if ((active0 & 0x8000000000L) != 0L)
-                    return jjStartNfaWithStates_0(6, 39, 43);
-                break;
-            case 111:
-                return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x10000L);
-            case 115:
-                if ((active0 & 0x20000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(6, 53, 43);
-                break;
-            case 116:
-                if ((active0 & 0x1000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(6, 48, 43);
-                return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100L);
-            case 117:
-                return jjMoveStringLiteralDfa7_0(active0, 0x800000000000L, active1, 0L);
-            case 121:
-                if ((active0 & 0x100000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(6, 56, 43);
-                break;
-            default:
-                break;
-        }
-        return jjStartNfa_0(5, active0, active1, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long active1) {
-        if (((active0 &= old0) | (active1 &= old1)) == 0L)
-            return jjStartNfa_0(5, old0, old1, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(6, active0, active1, 0L);
-            return 7;
-        }
-        switch (curChar) {
-            case 99:
-                return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x2L);
-            case 101:
-                if ((active0 & 0x800000000000L) != 0L)
-                    return jjStartNfaWithStates_0(7, 47, 43);
-                else if ((active1 & 0x1000000L) != 0L)
-                    return jjStartNfaWithStates_0(7, 88, 43);
-                return jjMoveStringLiteralDfa8_0(active0, 0x8000000000000000L, active1, 0x100L);
-            case 110:
-                return jjMoveStringLiteralDfa8_0(active0, 0x2000000000000000L, active1, 0x110000L);
-            case 112:
-                if ((active1 & 0x2000L) != 0L)
-                    return jjStartNfaWithStates_0(7, 77, 43);
-                break;
-            case 116:
-                if ((active0 & 0x2000000000L) != 0L)
-                    return jjStartNfaWithStates_0(7, 37, 43);
-                break;
-            default:
-                break;
-        }
-        return jjStartNfa_0(6, active0, active1, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long active1) {
-        if (((active0 &= old0) | (active1 &= old1)) == 0L)
-            return jjStartNfa_0(6, old0, old1, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(7, active0, active1, 0L);
-            return 8;
-        }
-        switch (curChar) {
-            case 100:
-                if ((active1 & 0x100L) != 0L)
-                    return jjStartNfaWithStates_0(8, 72, 43);
-                break;
-            case 101:
-                if ((active1 & 0x2L) != 0L)
-                    return jjStartNfaWithStates_0(8, 65, 43);
-                break;
-            case 105:
-                return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x10000L);
-            case 111:
-                return jjMoveStringLiteralDfa9_0(active0, 0x8000000000000000L, active1, 0L);
-            case 116:
-                if ((active1 & 0x100000L) != 0L)
-                    return jjStartNfaWithStates_0(8, 84, 43);
-                return jjMoveStringLiteralDfa9_0(active0, 0x2000000000000000L, active1, 0L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(7, active0, active1, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long active1) {
-        if (((active0 &= old0) | (active1 &= old1)) == 0L)
-            return jjStartNfa_0(7, old0, old1, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(8, active0, active1, 0L);
-            return 9;
-        }
-        switch (curChar) {
-            case 102:
-                if ((active0 & 0x8000000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(9, 63, 43);
-                break;
-            case 115:
-                if ((active0 & 0x2000000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(9, 61, 43);
-                break;
-            case 122:
-                return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x10000L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(8, active0, active1, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa10_0(long old0, long active0, long old1, long active1) {
-        if (((active0 &= old0) | (active1 &= old1)) == 0L)
-            return jjStartNfa_0(8, old0, old1, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(9, 0L, active1, 0L);
-            return 10;
-        }
-        switch (curChar) {
-            case 101:
-                return jjMoveStringLiteralDfa11_0(active1, 0x10000L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(9, 0L, active1, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa11_0(long old1, long active1) {
-        if (((active1 &= old1)) == 0L)
-            return jjStartNfa_0(9, 0L, old1, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(10, 0L, active1, 0L);
-            return 11;
-        }
-        switch (curChar) {
-            case 100:
-                if ((active1 & 0x10000L) != 0L)
-                    return jjStartNfaWithStates_0(11, 80, 43);
-                break;
-            default:
-                break;
-        }
-        return jjStartNfa_0(10, 0L, active1, 0L);
-    }
-
-    private int jjStartNfaWithStates_0(int pos, int kind, int state) {
-        jjmatchedKind = kind;
-        jjmatchedPos = pos;
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            return pos + 1;
-        }
-        return jjMoveNfa_0(state, pos + 1);
-    }
-
-    static final long[] jjbitVec0 = {
-            0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
-    };
-    static final long[] jjbitVec2 = {
-            0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
-    };
-    static final long[] jjbitVec3 = {
-            0xfff0000000200002L, 0xffffffffffffdfffL, 0xfffff00f7fffffffL, 0x12000000007fffffL
-    };
-    static final long[] jjbitVec4 = {
-            0x0L, 0x0L, 0x420043c00000000L, 0xff7fffffff7fffffL
-    };
-    static final long[] jjbitVec5 = {
-            0x7fffffffffffffL, 0xffffffffffff0000L, 0xffffffffffffffffL, 0x401f0003ffc3L
-    };
-    static final long[] jjbitVec6 = {
-            0x0L, 0x400000000000000L, 0xfffffffbffffd740L, 0xfbfffffffff7fffL
-    };
-    static final long[] jjbitVec7 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffffffc03L, 0x33fffffffff7fffL
-    };
-    static final long[] jjbitVec8 = {
-            0xfffe00000000ffffL, 0xfffffffe027fffffL, 0xffL, 0x707ffffff0000L
-    };
-    static final long[] jjbitVec9 = {
-            0x7fffffe00000000L, 0xfffec000000007ffL, 0xffffffffffffffffL, 0x9c00c060002fffffL
-    };
-    static final long[] jjbitVec10 = {
-            0xfffffffd0000L, 0xe000L, 0x2003fffffffffL, 0x0L
-    };
-    static final long[] jjbitVec11 = {
-            0x23fffffffffffff0L, 0x3ff010000L, 0x23c5fdfffff99fe0L, 0xf0003b0000000L
-    };
-    static final long[] jjbitVec12 = {
-            0x36dfdfffff987e0L, 0x1c00005e000000L, 0x23edfdfffffbbfe0L, 0x2000300010000L
-    };
-    static final long[] jjbitVec13 = {
-            0x23edfdfffff99fe0L, 0x20003b0000000L, 0x3bfc718d63dc7e8L, 0x200000000000000L
-    };
-    static final long[] jjbitVec14 = {
-            0x3effdfffffddfe0L, 0x300000000L, 0x23effdfffffddfe0L, 0x340000000L
-    };
-    static final long[] jjbitVec15 = {
-            0x3fffdfffffddfe0L, 0x300000000L, 0x2ffbfffffc7fffe0L, 0x7fL
-    };
-    static final long[] jjbitVec16 = {
-            0x800dfffffffffffeL, 0x7fL, 0x200decaefef02596L, 0x3000005fL
-    };
-    static final long[] jjbitVec17 = {
-            0x1L, 0x7fffffffeffL, 0xf00L, 0x0L
-    };
-    static final long[] jjbitVec18 = {
-            0x6fbffffffffL, 0x3f0000L, 0xffffffff00000000L, 0x1ffffffffff003fL
-    };
-    static final long[] jjbitVec19 = {
-            0xffffffffffffffffL, 0xffffffff83ffffffL, 0xffffff07ffffffffL, 0x3ffffffffffffffL
-    };
-    static final long[] jjbitVec20 = {
-            0xffffffffffffff7fL, 0xffffffff3d7f3d7fL, 0x7f3d7fffffff3d7fL, 0xffff7fffff7f7f3dL
-    };
-    static final long[] jjbitVec21 = {
-            0xffffffff7f3d7fffL, 0x7ffff7fL, 0xffffffff00000000L, 0x1fffffffffffffL
-    };
-    static final long[] jjbitVec22 = {
-            0xffffffffffffffffL, 0x7f9fffffffffffL, 0xffffffff07fffffeL, 0x1c7ffffffffffL
-    };
-    static final long[] jjbitVec23 = {
-            0x3ffff0003dfffL, 0x1dfff0003ffffL, 0xfffffffffffffL, 0x18800000L
-    };
-    static final long[] jjbitVec24 = {
-            0xffffffff00000000L, 0xffffffffffffffL, 0x1ffffffffffL, 0x0L
-    };
-    static final long[] jjbitVec25 = {
-            0x1fffffffL, 0x1f3fffffff0000L, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec26 = {
-            0xffffffffffffffffL, 0xfffffffffffL, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec27 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffff0fffffffL, 0x3ffffffffffffffL
-    };
-    static final long[] jjbitVec28 = {
-            0xffffffff3f3fffffL, 0x3fffffffaaff3f3fL, 0x5fdfffffffffffffL, 0x1fdc1fff0fcf1fdcL
-    };
-    static final long[] jjbitVec29 = {
-            0x8000000000000000L, 0x8002000000100001L, 0x3ffff00000000L, 0x0L
-    };
-    static final long[] jjbitVec30 = {
-            0xe3fbbd503e2ffc84L, 0xffffffff000003e0L, 0xfL, 0x0L
-    };
-    static final long[] jjbitVec31 = {
-            0x1f3e03fe000000e0L, 0xfffffffffffffffeL, 0xfffffffee07fffffL, 0xffffffffffffffffL
-    };
-    static final long[] jjbitVec32 = {
-            0xfffe1fffffffffe0L, 0xffffffffffffffffL, 0xffffff00007fffL, 0xffff000000000000L
-    };
-    static final long[] jjbitVec33 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0x3fffffffffffffL, 0x0L
-    };
-    static final long[] jjbitVec34 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0x3fffffffffL, 0x0L
-    };
-    static final long[] jjbitVec35 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0x1fffL, 0x0L
-    };
-    static final long[] jjbitVec36 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffL, 0x0L
-    };
-    static final long[] jjbitVec37 = {
-            0x6L, 0x0L, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec38 = {
-            0xffff3fffffffffffL, 0x7ffffffffffL, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec39 = {
-            0x5f7ffdffa0f8007fL, 0xffffffffffffffdbL, 0x3ffffffffffffL, 0xfffffffffff80000L
-    };
-    static final long[] jjbitVec40 = {
-            0x3fffffffffffffffL, 0xffffffffffff0000L, 0xfffffffffffcffffL, 0x1fff0000000000ffL
-    };
-    static final long[] jjbitVec41 = {
-            0x18000000000000L, 0xffdf02000000e000L, 0xffffffffffffffffL, 0x1fffffffffffffffL
-    };
-    static final long[] jjbitVec42 = {
-            0x87fffffe00000010L, 0xffffffe007fffffeL, 0x7fffffffffffffffL, 0x631cfcfcfcL
-    };
-    static final long[] jjbitVec43 = {
-            0x0L, 0x0L, 0x420243cffffffffL, 0xff7fffffff7fffffL
-    };
-    static final long[] jjbitVec44 = {
-            0xffffffffffffffffL, 0x400ffffe0ffffffL, 0xfffffffbffffd740L, 0xfbfffffffff7fffL
-    };
-    static final long[] jjbitVec45 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffffffc7bL, 0x33fffffffff7fffL
-    };
-    static final long[] jjbitVec46 = {
-            0xfffe00000000ffffL, 0xfffffffe027fffffL, 0xbbfffffbfffe00ffL, 0x707ffffff0016L
-    };
-    static final long[] jjbitVec47 = {
-            0x7fffffe003f000fL, 0xffffc3ff01ffffffL, 0xffffffffffffffffL, 0x9ffffdffbfefffffL
-    };
-    static final long[] jjbitVec48 = {
-            0xffffffffffff8000L, 0xe7ffL, 0x3ffffffffffffL, 0x0L
-    };
-    static final long[] jjbitVec49 = {
-            0xf3fffffffffffffeL, 0xffcfff1f3fffL, 0xf3c5fdfffff99feeL, 0xfffcfb080399fL
-    };
-    static final long[] jjbitVec50 = {
-            0xd36dfdfffff987eeL, 0x1fffc05e003987L, 0xf3edfdfffffbbfeeL, 0x2ffcf00013bbfL
-    };
-    static final long[] jjbitVec51 = {
-            0xf3edfdfffff99feeL, 0x2ffc3b0c0398fL, 0xc3bfc718d63dc7ecL, 0x200ff8000803dc7L
-    };
-    static final long[] jjbitVec52 = {
-            0xc3effdfffffddfeeL, 0xffc300603ddfL, 0xf3effdfffffddfecL, 0xffc340603ddfL
-    };
-    static final long[] jjbitVec53 = {
-            0xc3fffdfffffddfecL, 0xffc300803dcfL, 0x2ffbfffffc7fffecL, 0xc0000ff5f847fL
-    };
-    static final long[] jjbitVec54 = {
-            0x87fffffffffffffeL, 0x3ff7fffL, 0x3bffecaefef02596L, 0x33ff3f5fL
-    };
-    static final long[] jjbitVec55 = {
-            0xc2a003ff03000001L, 0xfffe07fffffffeffL, 0x1ffffffffeff0fdfL, 0x40L
-    };
-    static final long[] jjbitVec56 = {
-            0x3c7f6fbffffffffL, 0x3ff03ffL, 0xffffffff00000000L, 0x1ffffffffff003fL
-    };
-    static final long[] jjbitVec57 = {
-            0xffffffff7f3d7fffL, 0x3fe0007ffff7fL, 0xffffffff00000000L, 0x1fffffffffffffL
-    };
-    static final long[] jjbitVec58 = {
-            0x1fffff001fdfffL, 0xddfff000fffffL, 0xffffffffffffffffL, 0x3ff388fffffL
-    };
-    static final long[] jjbitVec59 = {
-            0xffffffff03ff3800L, 0xffffffffffffffL, 0x3ffffffffffL, 0x0L
-    };
-    static final long[] jjbitVec60 = {
-            0xfff0fff1fffffffL, 0x1f3fffffffffc0L, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec61 = {
-            0x80007c000000f000L, 0x8002fc0f00100001L, 0x3ffff00000000L, 0x7e21fff0000L
-    };
-    static final long[] jjbitVec62 = {
-            0x1f3efffe000000e0L, 0xfffffffffffffffeL, 0xfffffffee67fffffL, 0xffffffffffffffffL
-    };
-    static final long[] jjbitVec63 = {
-            0x10000000000006L, 0x0L, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec64 = {
-            0x3L, 0x0L, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec65 = {
-            0x0L, 0x800000000000000L, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec66 = {
-            0x5f7ffdffe0f8007fL, 0xffffffffffffffdbL, 0x3ffffffffffffL, 0xfffffffffff80000L
-    };
-    static final long[] jjbitVec67 = {
-            0x18000f0000ffffL, 0xffdf02000000e000L, 0xffffffffffffffffL, 0x9fffffffffffffffL
-    };
-    static final long[] jjbitVec68 = {
-            0x87fffffe03ff0010L, 0xffffffe007fffffeL, 0x7fffffffffffffffL, 0xe0000631cfcfcfcL
-    };
-
-    private int jjMoveNfa_0(int startState, int curPos) {
-        int startsAt = 0;
-        jjnewStateCnt = 130;
-        int i = 1;
-        jjstateSet[0] = startState;
-        int kind = 0x7fffffff;
-        for (; ; ) {
-            if (++jjround == 0x7fffffff)
-                ReInitRounds();
-            if (curChar < 64) {
-                long l = 1L << curChar;
-                do {
-                    switch (jjstateSet[--i]) {
-                        case 45:
-                            if (curChar == 42)
-                                jjstateSet[jjnewStateCnt++] = 50;
-                            else if (curChar == 47) {
-                                if (kind > 31)
-                                    kind = 31;
-                                {
-                                    jjCheckNAddStates(0, 2);
-                                }
-                            }
-                            break;
-                        case 0:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                if (kind > 91)
-                                    kind = 91;
-                                {
-                                    jjCheckNAddStates(3, 17);
-                                }
-                            } else if (curChar == 47) {
-                                jjAddStates(18, 19);
-                            } else if (curChar == 36) {
-                                if (kind > 103)
-                                    kind = 103;
-                                {
-                                    jjCheckNAdd(43);
-                                }
-                            } else if (curChar == 34) {
-                                jjCheckNAddStates(20, 23);
-                            } else if (curChar == 39) {
-                                jjAddStates(24, 26);
-                            } else if (curChar == 46) {
-                                jjCheckNAdd(1);
-                            }
-                            if (curChar == 48) {
-                                jjAddStates(27, 34);
-                            }
-                            break;
-                        case 1:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(35, 38);
-                        }
-                        break;
-                        case 2:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(2, 3);
-                            }
-                            break;
-                        case 3:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(39, 41);
-                        }
-                        break;
-                        case 5:
-                            if ((0x280000000000L & l) != 0L) {
-                                jjCheckNAdd(6);
-                            }
-                            break;
-                        case 6:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(42, 44);
-                        }
-                        break;
-                        case 7:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(7, 8);
-                            }
-                            break;
-                        case 8:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddTwoStates(6, 9);
-                        }
-                        break;
-                        case 10:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(45, 48);
-                        }
-                        break;
-                        case 11:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(49, 53);
-                        }
-                        break;
-                        case 12:
-                            if (curChar == 39) {
-                                jjAddStates(24, 26);
-                            }
-                            break;
-                        case 13:
-                            if ((0xffffff7fffffdbffL & l) != 0L) {
-                                jjCheckNAdd(14);
-                            }
-                            break;
-                        case 14:
-                            if (curChar == 39 && kind > 101)
-                                kind = 101;
-                            break;
-                        case 16:
-                            if ((0x8400000000L & l) != 0L) {
-                                jjCheckNAdd(14);
-                            }
-                            break;
-                        case 17:
-                            if ((0xff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(18, 14);
-                            }
-                            break;
-                        case 18:
-                            if ((0xff000000000000L & l) != 0L) {
-                                jjCheckNAdd(14);
-                            }
-                            break;
-                        case 19:
-                            if ((0xf000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 20;
-                            break;
-                        case 20:
-                            if ((0xff000000000000L & l) != 0L) {
-                                jjCheckNAdd(18);
-                            }
-                            break;
-                        case 22:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 23;
-                            break;
-                        case 23:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 24;
-                            break;
-                        case 24:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 25;
-                            break;
-                        case 25:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAdd(14);
-                            }
-                            break;
-                        case 27:
-                            if (curChar == 34) {
-                                jjCheckNAddStates(20, 23);
-                            }
-                            break;
-                        case 28:
-                            if ((0xfffffffbffffdbffL & l) != 0L) {
-                                jjCheckNAddStates(20, 23);
-                            }
-                            break;
-                        case 30:
-                            if ((0x8400000000L & l) != 0L) {
-                                jjCheckNAddStates(20, 23);
-                            }
-                            break;
-                        case 32:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 33;
-                            break;
-                        case 33:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 34;
-                            break;
-                        case 34:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 35;
-                            break;
-                        case 35:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(20, 23);
-                            }
-                            break;
-                        case 37:
-                            if (curChar == 34 && kind > 102)
-                                kind = 102;
-                            break;
-                        case 38:
-                            if ((0xff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(54, 58);
-                            }
-                            break;
-                        case 39:
-                            if ((0xff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(20, 23);
-                            }
-                            break;
-                        case 40:
-                            if ((0xf000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 41;
-                            break;
-                        case 41:
-                            if ((0xff000000000000L & l) != 0L) {
-                                jjCheckNAdd(39);
-                            }
-                            break;
-                        case 42:
-                            if (curChar != 36)
-                                break;
-                            if (kind > 103)
-                                kind = 103;
-                        {
-                            jjCheckNAdd(43);
-                        }
-                        break;
-                        case 43:
-                            if ((0x3ff00100fffc1ffL & l) == 0L)
-                                break;
-                            if (kind > 103)
-                                kind = 103;
-                        {
-                            jjCheckNAdd(43);
-                        }
-                        break;
-                        case 44:
-                            if (curChar == 47) {
-                                jjAddStates(18, 19);
-                            }
-                            break;
-                        case 46:
-                            if ((0xffffffffffffdbffL & l) == 0L)
-                                break;
-                            if (kind > 31)
-                                kind = 31;
-                        {
-                            jjCheckNAddStates(0, 2);
-                        }
-                        break;
-                        case 47:
-                            if ((0x2400L & l) != 0L && kind > 31)
-                                kind = 31;
-                            break;
-                        case 48:
-                            if (curChar == 10 && kind > 31)
-                                kind = 31;
-                            break;
-                        case 49:
-                            if (curChar == 13)
-                                jjstateSet[jjnewStateCnt++] = 48;
-                            break;
-                        case 50:
-                            if (curChar == 42)
-                                jjstateSet[jjnewStateCnt++] = 51;
-                            break;
-                        case 51:
-                            if ((0xffff7fffffffffffL & l) != 0L && kind > 32)
-                                kind = 32;
-                            break;
-                        case 52:
-                            if (curChar == 42)
-                                jjstateSet[jjnewStateCnt++] = 50;
-                            break;
-                        case 53:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 91)
-                                kind = 91;
-                        {
-                            jjCheckNAddStates(3, 17);
-                        }
-                        break;
-                        case 54:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(54, 55);
-                            }
-                            break;
-                        case 55:
-                        case 98:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAdd(56);
-                            }
-                            break;
-                        case 57:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(57, 58);
-                            }
-                            break;
-                        case 58:
-                        case 109:
-                            if ((0x3ff000000000000L & l) != 0L && kind > 91)
-                                kind = 91;
-                            break;
-                        case 59:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(59, 60);
-                            }
-                            break;
-                        case 60:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(59, 61);
-                            }
-                            break;
-                        case 61:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(62, 65);
-                            }
-                            break;
-                        case 63:
-                            if ((0x280000000000L & l) != 0L) {
-                                jjCheckNAdd(64);
-                            }
-                            break;
-                        case 64:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(66, 68);
-                            }
-                            break;
-                        case 65:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(65, 66);
-                            }
-                            break;
-                        case 66:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(64, 9);
-                            }
-                            break;
-                        case 67:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(69, 72);
-                            }
-                            break;
-                        case 68:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(73, 77);
-                            }
-                            break;
-                        case 69:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(69, 70);
-                            }
-                            break;
-                        case 70:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(71, 72);
-                            }
-                            break;
-                        case 71:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(78, 80);
-                            }
-                            break;
-                        case 73:
-                            if ((0x280000000000L & l) != 0L) {
-                                jjCheckNAdd(74);
-                            }
-                            break;
-                        case 74:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(81, 83);
-                        }
-                        break;
-                        case 75:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(75, 76);
-                            }
-                            break;
-                        case 76:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddTwoStates(74, 9);
-                        }
-                        break;
-                        case 77:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(84, 87);
-                        }
-                        break;
-                        case 78:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(88, 91);
-                            }
-                            break;
-                        case 79:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(79, 80);
-                            }
-                            break;
-                        case 80:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(81, 82);
-                            }
-                            break;
-                        case 81:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(92, 94);
-                            }
-                            break;
-                        case 82:
-                            if (curChar != 46)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(95, 97);
-                        }
-                        break;
-                        case 83:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(98, 101);
-                        }
-                        break;
-                        case 84:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(84, 85);
-                            }
-                            break;
-                        case 85:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(95, 97);
-                        }
-                        break;
-                        case 87:
-                            if ((0x280000000000L & l) != 0L) {
-                                jjCheckNAdd(88);
-                            }
-                            break;
-                        case 88:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(102, 104);
-                        }
-                        break;
-                        case 89:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(89, 90);
-                            }
-                            break;
-                        case 90:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddTwoStates(88, 9);
-                        }
-                        break;
-                        case 91:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(105, 108);
-                        }
-                        break;
-                        case 92:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddStates(109, 113);
-                        }
-                        break;
-                        case 93:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(114, 117);
-                            }
-                            break;
-                        case 94:
-                            if (curChar == 48) {
-                                jjAddStates(27, 34);
-                            }
-                            break;
-                        case 96:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(118, 120);
-                            }
-                            break;
-                        case 97:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(97, 98);
-                            }
-                            break;
-                        case 99:
-                            if ((0xff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(121, 123);
-                            }
-                            break;
-                        case 100:
-                            if ((0xff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(100, 101);
-                            }
-                            break;
-                        case 101:
-                            if ((0xff000000000000L & l) != 0L) {
-                                jjCheckNAdd(56);
-                            }
-                            break;
-                        case 103:
-                            if ((0x3000000000000L & l) != 0L) {
-                                jjCheckNAddStates(124, 126);
-                            }
-                            break;
-                        case 104:
-                            if ((0x3000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(104, 105);
-                            }
-                            break;
-                        case 105:
-                            if ((0x3000000000000L & l) != 0L) {
-                                jjCheckNAdd(56);
-                            }
-                            break;
-                        case 107:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 91)
-                                kind = 91;
-                        {
-                            jjCheckNAddTwoStates(108, 109);
-                        }
-                        break;
-                        case 108:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(108, 109);
-                            }
-                            break;
-                        case 110:
-                            if ((0xff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 91)
-                                kind = 91;
-                        {
-                            jjCheckNAddTwoStates(111, 112);
-                        }
-                        break;
-                        case 111:
-                            if ((0xff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(111, 112);
-                            }
-                            break;
-                        case 112:
-                            if ((0xff000000000000L & l) != 0L && kind > 91)
-                                kind = 91;
-                            break;
-                        case 114:
-                            if ((0x3000000000000L & l) == 0L)
-                                break;
-                            if (kind > 91)
-                                kind = 91;
-                        {
-                            jjCheckNAddTwoStates(115, 116);
-                        }
-                        break;
-                        case 115:
-                            if ((0x3000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(115, 116);
-                            }
-                            break;
-                        case 116:
-                            if ((0x3000000000000L & l) != 0L && kind > 91)
-                                kind = 91;
-                            break;
-                        case 118:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjAddStates(127, 128);
-                            }
-                            break;
-                        case 119:
-                            if (curChar == 46) {
-                                jjCheckNAdd(120);
-                            }
-                            break;
-                        case 120:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(120, 121);
-                            }
-                            break;
-                        case 122:
-                            if ((0x280000000000L & l) != 0L) {
-                                jjCheckNAdd(123);
-                            }
-                            break;
-                        case 123:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddTwoStates(123, 9);
-                        }
-                        break;
-                        case 125:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                jjCheckNAddStates(129, 131);
-                            }
-                            break;
-                        case 126:
-                            if (curChar == 46) {
-                                jjCheckNAdd(127);
-                            }
-                            break;
-                        case 128:
-                            if ((0x280000000000L & l) != 0L) {
-                                jjCheckNAdd(129);
-                            }
-                            break;
-                        case 129:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 96)
-                                kind = 96;
-                        {
-                            jjCheckNAddTwoStates(129, 9);
-                        }
-                        break;
-                        default:
-                            break;
-                    }
-                } while (i != startsAt);
-            } else if (curChar < 128) {
-                long l = 1L << (curChar & 077);
-                do {
-                    switch (jjstateSet[--i]) {
-                        case 0:
-                            if ((0x7fffffe87fffffeL & l) == 0L)
-                                break;
-                            if (kind > 103)
-                                kind = 103;
-                        {
-                            jjCheckNAdd(43);
-                        }
-                        break;
-                        case 2:
-                            if (curChar == 95) {
-                                jjAddStates(132, 133);
-                            }
-                            break;
-                        case 4:
-                            if ((0x2000000020L & l) != 0L) {
-                                jjAddStates(134, 135);
-                            }
-                            break;
-                        case 7:
-                            if (curChar == 95) {
-                                jjAddStates(136, 137);
-                            }
-                            break;
-                        case 9:
-                            if ((0x5000000050L & l) != 0L && kind > 96)
-                                kind = 96;
-                            break;
-                        case 13:
-                            if ((0xffffffffefffffffL & l) != 0L) {
-                                jjCheckNAdd(14);
-                            }
-                            break;
-                        case 15:
-                            if (curChar == 92) {
-                                jjAddStates(138, 140);
-                            }
-                            break;
-                        case 16:
-                            if ((0x14404410000000L & l) != 0L) {
-                                jjCheckNAdd(14);
-                            }
-                            break;
-                        case 21:
-                            if (curChar == 117)
-                                jjstateSet[jjnewStateCnt++] = 22;
-                            break;
-                        case 22:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 23;
-                            break;
-                        case 23:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 24;
-                            break;
-                        case 24:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 25;
-                            break;
-                        case 25:
-                            if ((0x7e0000007eL & l) != 0L) {
-                                jjCheckNAdd(14);
-                            }
-                            break;
-                        case 26:
-                            if (curChar == 92)
-                                jjstateSet[jjnewStateCnt++] = 21;
-                            break;
-                        case 28:
-                            if ((0xffffffffefffffffL & l) != 0L) {
-                                jjCheckNAddStates(20, 23);
-                            }
-                            break;
-                        case 29:
-                            if (curChar == 92) {
-                                jjAddStates(141, 143);
-                            }
-                            break;
-                        case 30:
-                            if ((0x14404410000000L & l) != 0L) {
-                                jjCheckNAddStates(20, 23);
-                            }
-                            break;
-                        case 31:
-                            if (curChar == 117)
-                                jjstateSet[jjnewStateCnt++] = 32;
-                            break;
-                        case 32:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 33;
-                            break;
-                        case 33:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 34;
-                            break;
-                        case 34:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 35;
-                            break;
-                        case 35:
-                            if ((0x7e0000007eL & l) != 0L) {
-                                jjCheckNAddStates(20, 23);
-                            }
-                            break;
-                        case 36:
-                            if (curChar == 92)
-                                jjstateSet[jjnewStateCnt++] = 31;
-                            break;
-                        case 43:
-                            if ((0x87fffffe87fffffeL & l) == 0L)
-                                break;
-                            if (kind > 103)
-                                kind = 103;
-                        {
-                            jjCheckNAdd(43);
-                        }
-                        break;
-                        case 46:
-                            if (kind > 31)
-                                kind = 31;
-                        {
-                            jjAddStates(0, 2);
-                        }
-                        break;
-                        case 51:
-                            if (kind > 32)
-                                kind = 32;
-                            break;
-                        case 54:
-                            if (curChar == 95) {
-                                jjAddStates(144, 145);
-                            }
-                            break;
-                        case 56:
-                            if ((0x100000001000L & l) != 0L && kind > 90)
-                                kind = 90;
-                            break;
-                        case 57:
-                            if (curChar == 95) {
-                                jjAddStates(146, 147);
-                            }
-                            break;
-                        case 59:
-                            if (curChar == 95) {
-                                jjAddStates(148, 149);
-                            }
-                            break;
-                        case 62:
-                            if ((0x2000000020L & l) != 0L) {
-                                jjAddStates(150, 151);
-                            }
-                            break;
-                        case 65:
-                            if (curChar == 95) {
-                                jjAddStates(152, 153);
-                            }
-                            break;
-                        case 69:
-                            if (curChar == 95) {
-                                jjAddStates(154, 155);
-                            }
-                            break;
-                        case 72:
-                            if ((0x2000000020L & l) != 0L) {
-                                jjAddStates(156, 157);
-                            }
-                            break;
-                        case 75:
-                            if (curChar == 95) {
-                                jjAddStates(158, 159);
-                            }
-                            break;
-                        case 79:
-                            if (curChar == 95) {
-                                jjAddStates(160, 161);
-                            }
-                            break;
-                        case 84:
-                            if (curChar == 95) {
-                                jjAddStates(162, 163);
-                            }
-                            break;
-                        case 86:
-                            if ((0x2000000020L & l) != 0L) {
-                                jjAddStates(164, 165);
-                            }
-                            break;
-                        case 89:
-                            if (curChar == 95) {
-                                jjAddStates(166, 167);
-                            }
-                            break;
-                        case 95:
-                            if ((0x100000001000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 96;
-                            break;
-                        case 96:
-                            if ((0x7e0000007eL & l) != 0L) {
-                                jjCheckNAddStates(118, 120);
-                            }
-                            break;
-                        case 97:
-                            if ((0x7e8000007eL & l) != 0L) {
-                                jjCheckNAddTwoStates(97, 98);
-                            }
-                            break;
-                        case 98:
-                            if ((0x7e0000007eL & l) != 0L) {
-                                jjCheckNAdd(56);
-                            }
-                            break;
-                        case 100:
-                            if (curChar == 95) {
-                                jjAddStates(168, 169);
-                            }
-                            break;
-                        case 102:
-                            if ((0x400000004L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 103;
-                            break;
-                        case 104:
-                            if (curChar == 95) {
-                                jjAddStates(170, 171);
-                            }
-                            break;
-                        case 106:
-                            if ((0x100000001000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 107;
-                            break;
-                        case 107:
-                            if ((0x7e0000007eL & l) == 0L)
-                                break;
-                            if (kind > 91)
-                                kind = 91;
-                        {
-                            jjCheckNAddTwoStates(108, 109);
-                        }
-                        break;
-                        case 108:
-                            if ((0x7e8000007eL & l) != 0L) {
-                                jjCheckNAddTwoStates(108, 109);
-                            }
-                            break;
-                        case 109:
-                            if ((0x7e0000007eL & l) != 0L && kind > 91)
-                                kind = 91;
-                            break;
-                        case 111:
-                            if (curChar == 95) {
-                                jjAddStates(172, 173);
-                            }
-                            break;
-                        case 113:
-                            if ((0x400000004L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 114;
-                            break;
-                        case 115:
-                            if (curChar == 95) {
-                                jjAddStates(174, 175);
-                            }
-                            break;
-                        case 117:
-                            if ((0x100000001000000L & l) != 0L) {
-                                jjCheckNAddTwoStates(118, 119);
-                            }
-                            break;
-                        case 118:
-                            if ((0x7e0000007eL & l) != 0L) {
-                                jjCheckNAddTwoStates(118, 119);
-                            }
-                            break;
-                        case 120:
-                            if ((0x7e0000007eL & l) != 0L) {
-                                jjAddStates(176, 177);
-                            }
-                            break;
-                        case 121:
-                            if ((0x1000000010000L & l) != 0L) {
-                                jjAddStates(178, 179);
-                            }
-                            break;
-                        case 124:
-                            if ((0x100000001000000L & l) != 0L) {
-                                jjCheckNAdd(125);
-                            }
-                            break;
-                        case 125:
-                            if ((0x7e0000007eL & l) != 0L) {
-                                jjCheckNAddStates(129, 131);
-                            }
-                            break;
-                        case 127:
-                            if ((0x1000000010000L & l) != 0L) {
-                                jjAddStates(180, 181);
-                            }
-                            break;
-                        default:
-                            break;
-                    }
-                } while (i != startsAt);
-            } else {
-                int hiByte = (curChar >> 8);
-                int i1 = hiByte >> 6;
-                long l1 = 1L << (hiByte & 077);
-                int i2 = (curChar & 0xff) >> 6;
-                long l2 = 1L << (curChar & 077);
-                do {
-                    switch (jjstateSet[--i]) {
-                        case 0:
-                            if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
-                                break;
-                            if (kind > 103)
-                                kind = 103;
-                        {
-                            jjCheckNAdd(43);
-                        }
-                        break;
-                        case 13:
-                            if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                                jjstateSet[jjnewStateCnt++] = 14;
-                            break;
-                        case 28:
-                            if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
-                                jjAddStates(20, 23);
-                            }
-                            break;
-                        case 43:
-                            if (!jjCanMove_2(hiByte, i1, i2, l1, l2))
-                                break;
-                            if (kind > 103)
-                                kind = 103;
-                        {
-                            jjCheckNAdd(43);
-                        }
-                        break;
-                        case 46:
-                            if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
-                                break;
-                            if (kind > 31)
-                                kind = 31;
-                        {
-                            jjAddStates(0, 2);
-                        }
-                        break;
-                        case 51:
-                            if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 32)
-                                kind = 32;
-                            break;
-                        default:
-                            if (i1 == 0 || l1 == 0 || i2 == 0 || l2 == 0) break;
-                            else break;
-                    }
-                } while (i != startsAt);
+         return -1;
+      case 1:
+         if ((active0 & 0xeff9ffe000000000L) != 0L || (active1 & 0x3ffffffL) != 0L)
+         {
+            if (jjmatchedPos != 1)
+            {
+               jjmatchedKind = 103;
+               jjmatchedPos = 1;
             }
-            if (kind != 0x7fffffff) {
-                jjmatchedKind = kind;
-                jjmatchedPos = curPos;
-                kind = 0x7fffffff;
+            return 43;
+         }
+         if ((active0 & 0x1006000000000000L) != 0L)
+            return 43;
+         if ((active0 & 0x200000000L) != 0L)
+            return 50;
+         return -1;
+      case 2:
+         if ((active0 & 0x400000000000000L) != 0L || (active1 & 0x400013L) != 0L)
+            return 43;
+         if ((active0 & 0xebfdffe000000000L) != 0L || (active1 & 0x3bfffecL) != 0L)
+         {
+            if (jjmatchedPos != 2)
+            {
+               jjmatchedKind = 103;
+               jjmatchedPos = 2;
             }
-            ++curPos;
-            if ((i = jjnewStateCnt) == (startsAt = 130 - (jjnewStateCnt = startsAt)))
-                return curPos;
-            try {
-                curChar = input_stream.readChar();
-            } catch (java.io.IOException e) {
-                return curPos;
+            return 43;
+         }
+         return -1;
+      case 3:
+         if ((active0 & 0xe3e5e9e000000000L) != 0L || (active1 & 0x31dffcaL) != 0L)
+         {
+            jjmatchedKind = 103;
+            jjmatchedPos = 3;
+            return 43;
+         }
+         if ((active0 & 0x818160000000000L) != 0L || (active1 & 0xa20024L) != 0L)
+            return 43;
+         return -1;
+      case 4:
+         if ((active0 & 0xe02580e000000000L) != 0L || (active1 & 0x111b7caL) != 0L)
+         {
+            if (jjmatchedPos != 4)
+            {
+               jjmatchedKind = 103;
+               jjmatchedPos = 4;
             }
-        }
-    }
-
-    private int jjMoveStringLiteralDfa0_2() {
-        switch (curChar) {
-            case 42:
-                return jjMoveStringLiteralDfa1_2(0x800000000L);
-            default:
-                return 1;
-        }
-    }
-
-    private int jjMoveStringLiteralDfa1_2(long active0) {
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            return 1;
-        }
-        switch (curChar) {
-            case 47:
-                if ((active0 & 0x800000000L) != 0L)
-                    return jjStopAtPos(1, 35);
-                break;
-            default:
-                return 2;
-        }
-        return 2;
-    }
-
-    private int jjMoveStringLiteralDfa0_1() {
-        switch (curChar) {
-            case 42:
-                return jjMoveStringLiteralDfa1_1(0x400000000L);
-            default:
-                return 1;
-        }
-    }
-
-    private int jjMoveStringLiteralDfa1_1(long active0) {
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            return 1;
-        }
-        switch (curChar) {
-            case 47:
-                if ((active0 & 0x400000000L) != 0L)
-                    return jjStopAtPos(1, 34);
-                break;
-            default:
-                return 2;
-        }
-        return 2;
-    }
-
-    static final int[] jjnextStates = {
-            46, 47, 49, 54, 55, 56, 57, 58, 59, 62, 9, 69, 72, 79, 82, 93,
-            78, 68, 45, 52, 28, 29, 36, 37, 13, 15, 26, 95, 99, 102, 106, 110,
-            113, 117, 124, 2, 4, 9, 11, 1, 4, 9, 7, 9, 10, 6, 7, 9,
-            10, 1, 2, 4, 9, 11, 28, 29, 39, 36, 37, 61, 62, 9, 59, 62,
-            9, 68, 65, 9, 67, 64, 65, 9, 67, 61, 59, 62, 9, 68, 69, 72,
-            78, 75, 9, 77, 74, 75, 9, 77, 71, 69, 72, 78, 79, 82, 93, 83,
-            86, 9, 84, 86, 9, 92, 89, 9, 91, 88, 89, 9, 91, 83, 84, 86,
-            9, 92, 81, 79, 82, 93, 97, 98, 56, 100, 101, 56, 104, 105, 56, 118,
-            119, 125, 126, 127, 2, 3, 5, 6, 7, 8, 16, 17, 19, 30, 38, 40,
-            54, 55, 57, 58, 59, 60, 63, 64, 65, 66, 69, 70, 73, 74, 75, 76,
-            79, 80, 84, 85, 87, 88, 89, 90, 100, 101, 104, 105, 111, 112, 115, 116,
-            120, 121, 122, 123, 128, 129,
-    };
-
-    private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) {
-        switch (hiByte) {
-            case 0:
-                return ((jjbitVec2[i2] & l2) != 0L);
-            default:
-                if ((jjbitVec0[i1] & l1) != 0L)
-                    return true;
-                return false;
-        }
-    }
-
-    private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2) {
-        switch (hiByte) {
-            case 0:
-                return ((jjbitVec4[i2] & l2) != 0L);
-            case 2:
-                return ((jjbitVec5[i2] & l2) != 0L);
-            case 3:
-                return ((jjbitVec6[i2] & l2) != 0L);
-            case 4:
-                return ((jjbitVec7[i2] & l2) != 0L);
-            case 5:
-                return ((jjbitVec8[i2] & l2) != 0L);
-            case 6:
-                return ((jjbitVec9[i2] & l2) != 0L);
-            case 7:
-                return ((jjbitVec10[i2] & l2) != 0L);
-            case 9:
-                return ((jjbitVec11[i2] & l2) != 0L);
-            case 10:
-                return ((jjbitVec12[i2] & l2) != 0L);
-            case 11:
-                return ((jjbitVec13[i2] & l2) != 0L);
-            case 12:
-                return ((jjbitVec14[i2] & l2) != 0L);
-            case 13:
-                return ((jjbitVec15[i2] & l2) != 0L);
-            case 14:
-                return ((jjbitVec16[i2] & l2) != 0L);
-            case 15:
-                return ((jjbitVec17[i2] & l2) != 0L);
-            case 16:
-                return ((jjbitVec18[i2] & l2) != 0L);
-            case 17:
-                return ((jjbitVec19[i2] & l2) != 0L);
-            case 18:
-                return ((jjbitVec20[i2] & l2) != 0L);
-            case 19:
-                return ((jjbitVec21[i2] & l2) != 0L);
-            case 20:
-                return ((jjbitVec0[i2] & l2) != 0L);
-            case 22:
-                return ((jjbitVec22[i2] & l2) != 0L);
-            case 23:
-                return ((jjbitVec23[i2] & l2) != 0L);
-            case 24:
-                return ((jjbitVec24[i2] & l2) != 0L);
-            case 25:
-                return ((jjbitVec25[i2] & l2) != 0L);
-            case 29:
-                return ((jjbitVec26[i2] & l2) != 0L);
-            case 30:
-                return ((jjbitVec27[i2] & l2) != 0L);
-            case 31:
-                return ((jjbitVec28[i2] & l2) != 0L);
-            case 32:
-                return ((jjbitVec29[i2] & l2) != 0L);
-            case 33:
-                return ((jjbitVec30[i2] & l2) != 0L);
-            case 48:
-                return ((jjbitVec31[i2] & l2) != 0L);
-            case 49:
-                return ((jjbitVec32[i2] & l2) != 0L);
-            case 77:
-                return ((jjbitVec33[i2] & l2) != 0L);
-            case 159:
-                return ((jjbitVec34[i2] & l2) != 0L);
-            case 164:
-                return ((jjbitVec35[i2] & l2) != 0L);
-            case 215:
-                return ((jjbitVec36[i2] & l2) != 0L);
-            case 216:
-                return ((jjbitVec37[i2] & l2) != 0L);
-            case 250:
-                return ((jjbitVec38[i2] & l2) != 0L);
-            case 251:
-                return ((jjbitVec39[i2] & l2) != 0L);
-            case 253:
-                return ((jjbitVec40[i2] & l2) != 0L);
-            case 254:
-                return ((jjbitVec41[i2] & l2) != 0L);
-            case 255:
-                return ((jjbitVec42[i2] & l2) != 0L);
-            default:
-                if ((jjbitVec3[i1] & l1) != 0L)
-                    return true;
-                return false;
-        }
-    }
-
-    private static final boolean jjCanMove_2(int hiByte, int i1, int i2, long l1, long l2) {
-        switch (hiByte) {
-            case 0:
-                return ((jjbitVec43[i2] & l2) != 0L);
-            case 2:
-                return ((jjbitVec5[i2] & l2) != 0L);
-            case 3:
-                return ((jjbitVec44[i2] & l2) != 0L);
-            case 4:
-                return ((jjbitVec45[i2] & l2) != 0L);
-            case 5:
-                return ((jjbitVec46[i2] & l2) != 0L);
-            case 6:
-                return ((jjbitVec47[i2] & l2) != 0L);
-            case 7:
-                return ((jjbitVec48[i2] & l2) != 0L);
-            case 9:
-                return ((jjbitVec49[i2] & l2) != 0L);
-            case 10:
-                return ((jjbitVec50[i2] & l2) != 0L);
-            case 11:
-                return ((jjbitVec51[i2] & l2) != 0L);
-            case 12:
-                return ((jjbitVec52[i2] & l2) != 0L);
-            case 13:
-                return ((jjbitVec53[i2] & l2) != 0L);
-            case 14:
-                return ((jjbitVec54[i2] & l2) != 0L);
-            case 15:
-                return ((jjbitVec55[i2] & l2) != 0L);
-            case 16:
-                return ((jjbitVec56[i2] & l2) != 0L);
-            case 17:
-                return ((jjbitVec19[i2] & l2) != 0L);
-            case 18:
-                return ((jjbitVec20[i2] & l2) != 0L);
-            case 19:
-                return ((jjbitVec57[i2] & l2) != 0L);
-            case 20:
-                return ((jjbitVec0[i2] & l2) != 0L);
-            case 22:
-                return ((jjbitVec22[i2] & l2) != 0L);
-            case 23:
-                return ((jjbitVec58[i2] & l2) != 0L);
-            case 24:
-                return ((jjbitVec59[i2] & l2) != 0L);
-            case 25:
-                return ((jjbitVec60[i2] & l2) != 0L);
-            case 29:
-                return ((jjbitVec26[i2] & l2) != 0L);
-            case 30:
-                return ((jjbitVec27[i2] & l2) != 0L);
-            case 31:
-                return ((jjbitVec28[i2] & l2) != 0L);
-            case 32:
-                return ((jjbitVec61[i2] & l2) != 0L);
-            case 33:
-                return ((jjbitVec30[i2] & l2) != 0L);
-            case 48:
-                return ((jjbitVec62[i2] & l2) != 0L);
-            case 49:
-                return ((jjbitVec32[i2] & l2) != 0L);
-            case 77:
-                return ((jjbitVec33[i2] & l2) != 0L);
-            case 159:
-                return ((jjbitVec34[i2] & l2) != 0L);
-            case 164:
-                return ((jjbitVec35[i2] & l2) != 0L);
-            case 215:
-                return ((jjbitVec36[i2] & l2) != 0L);
-            case 216:
-                return ((jjbitVec63[i2] & l2) != 0L);
-            case 220:
-                return ((jjbitVec64[i2] & l2) != 0L);
-            case 221:
-                return ((jjbitVec65[i2] & l2) != 0L);
-            case 250:
-                return ((jjbitVec38[i2] & l2) != 0L);
-            case 251:
-                return ((jjbitVec66[i2] & l2) != 0L);
-            case 253:
-                return ((jjbitVec40[i2] & l2) != 0L);
-            case 254:
-                return ((jjbitVec67[i2] & l2) != 0L);
-            case 255:
-                return ((jjbitVec68[i2] & l2) != 0L);
-            default:
-                if ((jjbitVec3[i1] & l1) != 0L)
-                    return true;
-                return false;
-        }
-    }
-
-    /**
-     * Token literal values.
-     */
-    public static final String[] jjstrLiteralImages = {
-            "", null, null, null, null, null, null, null, null, null, null, null, null,
-            null, null, null, null, null, null, null, null, null, null, null, null, null, null,
-            null, null, null, null, null, null, null, null, null, null,
-            "\141\142\163\164\162\141\143\164", "\141\163\163\145\162\164", "\142\157\157\154\145\141\156",
-            "\142\162\145\141\153", "\142\171\164\145", "\143\141\163\145", "\143\141\164\143\150",
-            "\143\150\141\162", "\143\154\141\163\163", "\143\157\156\163\164",
-            "\143\157\156\164\151\156\165\145", "\144\145\146\141\165\154\164", "\144\157", "\144\157\165\142\154\145",
-            "\145\154\163\145", "\145\156\165\155", "\145\170\164\145\156\144\163", "\146\141\154\163\145",
-            "\146\151\156\141\154", "\146\151\156\141\154\154\171", "\146\154\157\141\164", "\146\157\162",
-            "\147\157\164\157", "\151\146", "\151\155\160\154\145\155\145\156\164\163",
-            "\151\155\160\157\162\164", "\151\156\163\164\141\156\143\145\157\146", "\151\156\164",
-            "\151\156\164\145\162\146\141\143\145", "\154\157\156\147", "\156\141\164\151\166\145", "\156\145\167",
-            "\156\165\154\154", "\160\141\143\153\141\147\145", "\160\162\151\166\141\164\145",
-            "\160\162\157\164\145\143\164\145\144", "\160\165\142\154\151\143", "\162\145\164\165\162\156",
-            "\163\150\157\162\164", "\163\164\141\164\151\143", "\163\164\162\151\143\164\146\160",
-            "\163\165\160\145\162", "\163\167\151\164\143\150",
-            "\163\171\156\143\150\162\157\156\151\172\145\144", "\164\150\151\163", "\164\150\162\157\167", "\164\150\162\157\167\163",
-            "\164\162\141\156\163\151\145\156\164", "\164\162\165\145", "\164\162\171", "\166\157\151\144",
-            "\166\157\154\141\164\151\154\145", "\167\150\151\154\145", null, null, null, null, null, null, null, null, null,
-            null, null, null, null, null, null, null, "\50", "\51", "\173", "\175", "\133",
-            "\135", "\73", "\54", "\56", "\100", "\75", "\74", "\41", "\176", "\77", "\72",
-            "\75\75", "\74\75", "\76\75", "\41\75", "\174\174", "\46\46", "\53\53", "\55\55", "\53",
-            "\55", "\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\53\75", "\55\75",
-            "\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\45\75", "\74\74\75", "\76\76\75",
-            "\76\76\76\75", "\56\56\56", "\55\76", "\72\72", "\76\76\76", "\76\76", "\76", "\32",};
-
-    protected Token jjFillToken() {
-        final Token t;
-        final String curTokenImage;
-        final int beginLine;
-        final int endLine;
-        final int beginColumn;
-        final int endColumn;
-        String im = jjstrLiteralImages[jjmatchedKind];
-        curTokenImage = (im == null) ? input_stream.GetImage() : im;
-        beginLine = input_stream.getBeginLine();
-        beginColumn = input_stream.getBeginColumn();
-        endLine = input_stream.getEndLine();
-        endColumn = input_stream.getEndColumn();
-        t = ASTParser.GTToken.newToken(jjmatchedKind, curTokenImage);
-
-        t.beginLine = beginLine;
-        t.endLine = endLine;
-        t.beginColumn = beginColumn;
-        t.endColumn = endColumn;
-
-        return t;
-    }
-
-    int curLexState = 0;
-    int defaultLexState = 0;
-    int jjnewStateCnt;
-    int jjround;
-    int jjmatchedPos;
-    int jjmatchedKind;
-
-    /**
-     * Get the next Token.
-     */
-    public Token getNextToken() {
-        Token specialToken = null;
-        Token matchedToken;
-        int curPos = 0;
-
-        EOFLoop:
-        for (; ; ) {
-            try {
-                curChar = input_stream.BeginToken();
-            } catch (Exception e) {
-                jjmatchedKind = 0;
-                jjmatchedPos = -1;
-                matchedToken = jjFillToken();
-                matchedToken.specialToken = specialToken;
-                CommonTokenAction(matchedToken);
-                return matchedToken;
+            return 43;
+         }
+         if ((active0 & 0x3c0690000000000L) != 0L || (active1 & 0x20c4800L) != 0L)
+            return 43;
+         return -1;
+      case 5:
+         if ((active0 & 0x4004004000000000L) != 0L || (active1 & 0x89608L) != 0L)
+            return 43;
+         if ((active0 & 0xa12180a000000000L) != 0L || (active1 & 0x11121c2L) != 0L)
+         {
+            jjmatchedKind = 103;
+            jjmatchedPos = 5;
+            return 43;
+         }
+         return -1;
+      case 6:
+         if ((active0 & 0x121008000000000L) != 0L || (active1 & 0xc0L) != 0L)
+            return 43;
+         if ((active0 & 0xa000802000000000L) != 0L || (active1 & 0x1112102L) != 0L)
+         {
+            jjmatchedKind = 103;
+            jjmatchedPos = 6;
+            return 43;
+         }
+         return -1;
+      case 7:
+         if ((active0 & 0xa000000000000000L) != 0L || (active1 & 0x110102L) != 0L)
+         {
+            jjmatchedKind = 103;
+            jjmatchedPos = 7;
+            return 43;
+         }
+         if ((active0 & 0x802000000000L) != 0L || (active1 & 0x1002000L) != 0L)
+            return 43;
+         return -1;
+      case 8:
+         if ((active1 & 0x100102L) != 0L)
+            return 43;
+         if ((active0 & 0xa000000000000000L) != 0L || (active1 & 0x10000L) != 0L)
+         {
+            jjmatchedKind = 103;
+            jjmatchedPos = 8;
+            return 43;
+         }
+         return -1;
+      case 9:
+         if ((active0 & 0xa000000000000000L) != 0L)
+            return 43;
+         if ((active1 & 0x10000L) != 0L)
+         {
+            jjmatchedKind = 103;
+            jjmatchedPos = 9;
+            return 43;
+         }
+         return -1;
+      case 10:
+         if ((active1 & 0x10000L) != 0L)
+         {
+            jjmatchedKind = 103;
+            jjmatchedPos = 10;
+            return 43;
+         }
+         return -1;
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_0(int pos, long active0, long active1, long active2){
+   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1, active2), pos + 1);
+}
+private int jjStopAtPos(int pos, int kind)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   return pos + 1;
+}
+private int jjMoveStringLiteralDfa0_0(){
+   switch(curChar)
+   {
+      case 26:
+         return jjStopAtPos(0, 156);
+      case 33:
+         jjmatchedKind = 118;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000000000000L, 0x0L);
+      case 37:
+         jjmatchedKind = 137;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x40000L);
+      case 38:
+         jjmatchedKind = 134;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x8000000000000000L, 0x8000L);
+      case 40:
+         return jjStopAtPos(0, 106);
+      case 41:
+         return jjStopAtPos(0, 107);
+      case 42:
+         jjmatchedKind = 132;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x2000L);
+      case 43:
+         jjmatchedKind = 130;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x801L);
+      case 44:
+         return jjStopAtPos(0, 113);
+      case 45:
+         jjmatchedKind = 131;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x801002L);
+      case 46:
+         jjmatchedKind = 114;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x400000L);
+      case 47:
+         jjmatchedKind = 133;
+         return jjMoveStringLiteralDfa1_0(0x200000000L, 0x0L, 0x4000L);
+      case 58:
+         jjmatchedKind = 121;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x1000000L);
+      case 59:
+         return jjStopAtPos(0, 112);
+      case 60:
+         jjmatchedKind = 117;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x800000000000000L, 0x80400L);
+      case 61:
+         jjmatchedKind = 116;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x400000000000000L, 0x0L);
+      case 62:
+         jjmatchedKind = 155;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x1000000000000000L, 0x6300000L);
+      case 63:
+         return jjStopAtPos(0, 120);
+      case 64:
+         return jjStopAtPos(0, 115);
+      case 91:
+         return jjStopAtPos(0, 110);
+      case 93:
+         return jjStopAtPos(0, 111);
+      case 94:
+         jjmatchedKind = 136;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x0L, 0x20000L);
+      case 97:
+         return jjMoveStringLiteralDfa1_0(0x6000000000L, 0x0L, 0x0L);
+      case 98:
+         return jjMoveStringLiteralDfa1_0(0x38000000000L, 0x0L, 0x0L);
+      case 99:
+         return jjMoveStringLiteralDfa1_0(0xfc0000000000L, 0x0L, 0x0L);
+      case 100:
+         return jjMoveStringLiteralDfa1_0(0x7000000000000L, 0x0L, 0x0L);
+      case 101:
+         return jjMoveStringLiteralDfa1_0(0x38000000000000L, 0x0L, 0x0L);
+      case 102:
+         return jjMoveStringLiteralDfa1_0(0x7c0000000000000L, 0x0L, 0x0L);
+      case 103:
+         return jjMoveStringLiteralDfa1_0(0x800000000000000L, 0x0L, 0x0L);
+      case 105:
+         return jjMoveStringLiteralDfa1_0(0xf000000000000000L, 0x3L, 0x0L);
+      case 108:
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x4L, 0x0L);
+      case 110:
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x38L, 0x0L);
+      case 112:
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x3c0L, 0x0L);
+      case 114:
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x400L, 0x0L);
+      case 115:
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x1f800L, 0x0L);
+      case 116:
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x7e0000L, 0x0L);
+      case 118:
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x1800000L, 0x0L);
+      case 119:
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000L, 0x0L);
+      case 123:
+         return jjStopAtPos(0, 108);
+      case 124:
+         jjmatchedKind = 135;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x4000000000000000L, 0x10000L);
+      case 125:
+         return jjStopAtPos(0, 109);
+      case 126:
+         return jjStopAtPos(0, 119);
+      case 133:
+         return jjStopAtPos(0, 6);
+      case 160:
+         return jjStopAtPos(0, 7);
+      case 5760:
+         return jjStopAtPos(0, 8);
+      case 6158:
+         return jjStopAtPos(0, 9);
+      case 8192:
+         return jjStopAtPos(0, 10);
+      case 8193:
+         return jjStopAtPos(0, 11);
+      case 8194:
+         return jjStopAtPos(0, 12);
+      case 8195:
+         return jjStopAtPos(0, 13);
+      case 8196:
+         return jjStopAtPos(0, 14);
+      case 8197:
+         return jjStopAtPos(0, 15);
+      case 8198:
+         return jjStopAtPos(0, 16);
+      case 8199:
+         return jjStopAtPos(0, 17);
+      case 8200:
+         return jjStopAtPos(0, 18);
+      case 8201:
+         return jjStopAtPos(0, 19);
+      case 8202:
+         return jjStopAtPos(0, 20);
+      case 8203:
+         return jjStopAtPos(0, 21);
+      case 8204:
+         return jjStopAtPos(0, 22);
+      case 8205:
+         return jjStopAtPos(0, 23);
+      case 8232:
+         return jjStopAtPos(0, 24);
+      case 8233:
+         return jjStopAtPos(0, 25);
+      case 8239:
+         return jjStopAtPos(0, 26);
+      case 8287:
+         return jjStopAtPos(0, 27);
+      case 8288:
+         return jjStopAtPos(0, 28);
+      case 12288:
+         return jjStopAtPos(0, 29);
+      case 65279:
+         return jjStopAtPos(0, 30);
+      default :
+         return jjMoveNfa_0(0, 0);
+   }
+}
+private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2){
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(0, active0, active1, active2);
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 38:
+         if ((active1 & 0x8000000000000000L) != 0L)
+            return jjStopAtPos(1, 127);
+         break;
+      case 42:
+         if ((active0 & 0x200000000L) != 0L)
+            return jjStartNfaWithStates_0(1, 33, 50);
+         break;
+      case 43:
+         if ((active2 & 0x1L) != 0L)
+            return jjStopAtPos(1, 128);
+         break;
+      case 45:
+         if ((active2 & 0x2L) != 0L)
+            return jjStopAtPos(1, 129);
+         break;
+      case 46:
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x400000L);
+      case 58:
+         if ((active2 & 0x1000000L) != 0L)
+            return jjStopAtPos(1, 152);
+         break;
+      case 60:
+         if ((active2 & 0x400L) != 0L)
+         {
+            jjmatchedKind = 138;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x80000L);
+      case 61:
+         if ((active1 & 0x400000000000000L) != 0L)
+            return jjStopAtPos(1, 122);
+         else if ((active1 & 0x800000000000000L) != 0L)
+            return jjStopAtPos(1, 123);
+         else if ((active1 & 0x1000000000000000L) != 0L)
+            return jjStopAtPos(1, 124);
+         else if ((active1 & 0x2000000000000000L) != 0L)
+            return jjStopAtPos(1, 125);
+         else if ((active2 & 0x800L) != 0L)
+            return jjStopAtPos(1, 139);
+         else if ((active2 & 0x1000L) != 0L)
+            return jjStopAtPos(1, 140);
+         else if ((active2 & 0x2000L) != 0L)
+            return jjStopAtPos(1, 141);
+         else if ((active2 & 0x4000L) != 0L)
+            return jjStopAtPos(1, 142);
+         else if ((active2 & 0x8000L) != 0L)
+            return jjStopAtPos(1, 143);
+         else if ((active2 & 0x10000L) != 0L)
+            return jjStopAtPos(1, 144);
+         else if ((active2 & 0x20000L) != 0L)
+            return jjStopAtPos(1, 145);
+         else if ((active2 & 0x40000L) != 0L)
+            return jjStopAtPos(1, 146);
+         break;
+      case 62:
+         if ((active2 & 0x800000L) != 0L)
+            return jjStopAtPos(1, 151);
+         else if ((active2 & 0x4000000L) != 0L)
+         {
+            jjmatchedKind = 154;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0L, active2, 0x2300000L);
+      case 97:
+         return jjMoveStringLiteralDfa2_0(active0, 0x400c0000000000L, active1, 0x48L, active2, 0L);
+      case 98:
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000L, active1, 0L, active2, 0L);
+      case 101:
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000000000000L, active1, 0x410L, active2, 0L);
+      case 102:
+         if ((active0 & 0x1000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(1, 60, 43);
+         break;
+      case 104:
+         return jjMoveStringLiteralDfa2_0(active0, 0x100000000000L, active1, 0x20e0800L, active2, 0L);
+      case 105:
+         return jjMoveStringLiteralDfa2_0(active0, 0x180000000000000L, active1, 0L, active2, 0L);
+      case 108:
+         return jjMoveStringLiteralDfa2_0(active0, 0x208200000000000L, active1, 0L, active2, 0L);
+      case 109:
+         return jjMoveStringLiteralDfa2_0(active0, 0x6000000000000000L, active1, 0L, active2, 0L);
+      case 110:
+         return jjMoveStringLiteralDfa2_0(active0, 0x8010000000000000L, active1, 0x3L, active2, 0L);
+      case 111:
+         if ((active0 & 0x2000000000000L) != 0L)
+         {
+            jjmatchedKind = 49;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_0(active0, 0xc04c08000000000L, active1, 0x1800004L, active2, 0L);
+      case 114:
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000000000L, active1, 0x700180L, active2, 0L);
+      case 115:
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L, active1, 0L, active2, 0L);
+      case 116:
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x3000L, active2, 0L);
+      case 117:
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4220L, active2, 0L);
+      case 119:
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000L, active2, 0L);
+      case 120:
+         return jjMoveStringLiteralDfa2_0(active0, 0x20000000000000L, active1, 0L, active2, 0L);
+      case 121:
+         return jjMoveStringLiteralDfa2_0(active0, 0x20000000000L, active1, 0x10000L, active2, 0L);
+      case 124:
+         if ((active1 & 0x4000000000000000L) != 0L)
+            return jjStopAtPos(1, 126);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(0, active0, active1, active2);
+}
+private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1, long old2, long active2){
+   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+      return jjStartNfa_0(0, old0, old1, old2);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(1, active0, active1, active2);
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 46:
+         if ((active2 & 0x400000L) != 0L)
+            return jjStopAtPos(2, 150);
+         break;
+      case 61:
+         if ((active2 & 0x80000L) != 0L)
+            return jjStopAtPos(2, 147);
+         else if ((active2 & 0x100000L) != 0L)
+            return jjStopAtPos(2, 148);
+         break;
+      case 62:
+         if ((active2 & 0x2000000L) != 0L)
+         {
+            jjmatchedKind = 153;
+            jjmatchedPos = 2;
+         }
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0L, active2, 0x200000L);
+      case 97:
+         return jjMoveStringLiteralDfa3_0(active0, 0x300000000000L, active1, 0x101000L, active2, 0L);
+      case 98:
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200L, active2, 0L);
+      case 99:
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40L, active2, 0L);
+      case 101:
+         return jjMoveStringLiteralDfa3_0(active0, 0x10000000000L, active1, 0L, active2, 0L);
+      case 102:
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L, active1, 0L, active2, 0L);
+      case 105:
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2828080L, active2, 0L);
+      case 108:
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000000000L, active1, 0x1000020L, active2, 0L);
+      case 110:
+         return jjMoveStringLiteralDfa3_0(active0, 0x180c00000000000L, active1, 0x10004L, active2, 0L);
+      case 111:
+         return jjMoveStringLiteralDfa3_0(active0, 0x200008000000000L, active1, 0x900L, active2, 0L);
+      case 112:
+         return jjMoveStringLiteralDfa3_0(active0, 0x6000000000000000L, active1, 0x4000L, active2, 0L);
+      case 114:
+         if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 58, 43);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0xc2000L, active2, 0L);
+      case 115:
+         return jjMoveStringLiteralDfa3_0(active0, 0x8008046000000000L, active1, 0L, active2, 0L);
+      case 116:
+         if ((active1 & 0x1L) != 0L)
+         {
+            jjmatchedKind = 64;
+            jjmatchedPos = 2;
+         }
+         return jjMoveStringLiteralDfa3_0(active0, 0x8200a0000000000L, active1, 0x40aL, active2, 0L);
+      case 117:
+         return jjMoveStringLiteralDfa3_0(active0, 0x14000000000000L, active1, 0x200000L, active2, 0L);
+      case 119:
+         if ((active1 & 0x10L) != 0L)
+            return jjStartNfaWithStates_0(2, 68, 43);
+         break;
+      case 121:
+         if ((active1 & 0x400000L) != 0L)
+            return jjStartNfaWithStates_0(2, 86, 43);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(1, active0, active1, active2);
+}
+private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1, long old2, long active2){
+   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+      return jjStartNfa_0(1, old0, old1, old2);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(2, active0, active1, active2);
+      return 3;
+   }
+   switch(curChar)
+   {
+      case 61:
+         if ((active2 & 0x200000L) != 0L)
+            return jjStopAtPos(3, 149);
+         break;
+      case 97:
+         return jjMoveStringLiteralDfa4_0(active0, 0x381010000000000L, active1, 0x1000000L, active2, 0L);
+      case 98:
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0L, active2, 0L);
+      case 99:
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000000L, active1, 0x10000L, active2, 0L);
+      case 100:
+         if ((active1 & 0x800000L) != 0L)
+            return jjStartNfaWithStates_0(3, 87, 43);
+         break;
+      case 101:
+         if ((active0 & 0x20000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 41, 43);
+         else if ((active0 & 0x40000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 42, 43);
+         else if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 51, 43);
+         else if ((active1 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_0(3, 85, 43);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20004000000000L, active1, 0x4002L, active2, 0L);
+      case 103:
+         if ((active1 & 0x4L) != 0L)
+            return jjStartNfaWithStates_0(3, 66, 43);
+         break;
+      case 105:
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x2008L, active2, 0L);
+      case 107:
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40L, active2, 0L);
+      case 108:
+         if ((active1 & 0x20L) != 0L)
+            return jjStartNfaWithStates_0(3, 69, 43);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2000008000000000L, active1, 0x2000200L, active2, 0L);
+      case 109:
+         if ((active0 & 0x10000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 52, 43);
+         break;
+      case 110:
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000L, active2, 0L);
+      case 111:
+         if ((active0 & 0x800000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 59, 43);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000000L, active1, 0xc0000L, active2, 0L);
+      case 114:
+         if ((active0 & 0x100000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 44, 43);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x800L, active2, 0L);
+      case 115:
+         if ((active1 & 0x20000L) != 0L)
+            return jjStartNfaWithStates_0(3, 81, 43);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40600000000000L, active1, 0L, active2, 0L);
+      case 116:
+         return jjMoveStringLiteralDfa4_0(active0, 0x8000802000000000L, active1, 0x9100L, active2, 0L);
+      case 117:
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400L, active2, 0L);
+      case 118:
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80L, active2, 0L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(2, active0, active1, active2);
+}
+private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1, long old2, long active2){
+   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+      return jjStartNfa_0(2, old0, old1, old2);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(3, active0, active1, 0L);
+      return 4;
+   }
+   switch(curChar)
+   {
+      case 97:
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0xc0L);
+      case 99:
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0xa000L);
+      case 101:
+         if ((active0 & 0x40000000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 54, 43);
+         else if ((active1 & 0x2000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 89, 43);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000008000000000L, active1, 0x100L);
+      case 104:
+         if ((active0 & 0x80000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 43, 43);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x10000L);
+      case 105:
+         return jjMoveStringLiteralDfa5_0(active0, 0x800000000000L, active1, 0x1200L);
+      case 107:
+         if ((active0 & 0x10000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 40, 43);
+         break;
+      case 108:
+         if ((active0 & 0x80000000000000L) != 0L)
+         {
+            jjmatchedKind = 55;
+            jjmatchedPos = 4;
+         }
+         return jjMoveStringLiteralDfa5_0(active0, 0x104000000000000L, active1, 0L);
+      case 110:
+         return jjMoveStringLiteralDfa5_0(active0, 0x20000000000000L, active1, 0L);
+      case 114:
+         if ((active1 & 0x4000L) != 0L)
+            return jjStartNfaWithStates_0(4, 78, 43);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4000006000000000L, active1, 0x402L);
+      case 115:
+         if ((active0 & 0x200000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 45, 43);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x100000L);
+      case 116:
+         if ((active0 & 0x400000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 46, 43);
+         else if ((active0 & 0x200000000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 57, 43);
+         else if ((active1 & 0x800L) != 0L)
+            return jjStartNfaWithStates_0(4, 75, 43);
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x1000000L);
+      case 117:
+         return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000L, active1, 0L);
+      case 118:
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x8L);
+      case 119:
+         if ((active1 & 0x40000L) != 0L)
+         {
+            jjmatchedKind = 82;
+            jjmatchedPos = 4;
+         }
+         return jjMoveStringLiteralDfa5_0(active0, 0L, active1, 0x80000L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(3, active0, active1, 0L);
+}
+private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_0(3, old0, old1, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(4, active0, active1, 0L);
+      return 5;
+   }
+   switch(curChar)
+   {
+      case 97:
+         return jjMoveStringLiteralDfa6_0(active0, 0xa000000000L, active1, 0L);
+      case 99:
+         if ((active1 & 0x200L) != 0L)
+            return jjStartNfaWithStates_0(5, 73, 43);
+         else if ((active1 & 0x1000L) != 0L)
+            return jjStartNfaWithStates_0(5, 76, 43);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100L);
+      case 100:
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000000000000L, active1, 0L);
+      case 101:
+         if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 50, 43);
+         else if ((active1 & 0x8L) != 0L)
+            return jjStartNfaWithStates_0(5, 67, 43);
+         break;
+      case 102:
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2L);
+      case 103:
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40L);
+      case 104:
+         if ((active1 & 0x8000L) != 0L)
+            return jjStartNfaWithStates_0(5, 79, 43);
+         break;
+      case 105:
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x1100000L);
+      case 108:
+         return jjMoveStringLiteralDfa6_0(active0, 0x101000000000000L, active1, 0L);
+      case 109:
+         return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000000L, active1, 0L);
+      case 110:
+         if ((active1 & 0x400L) != 0L)
+            return jjStartNfaWithStates_0(5, 74, 43);
+         return jjMoveStringLiteralDfa6_0(active0, 0x8000800000000000L, active1, 0L);
+      case 114:
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x10000L);
+      case 115:
+         if ((active1 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_0(5, 83, 43);
+         break;
+      case 116:
+         if ((active0 & 0x4000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 38, 43);
+         else if ((active0 & 0x4000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 62, 43);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x2080L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(4, active0, active1, 0L);
+}
+private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_0(4, old0, old1, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(5, active0, active1, 0L);
+      return 6;
+   }
+   switch(curChar)
+   {
+      case 97:
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2L);
+      case 99:
+         return jjMoveStringLiteralDfa7_0(active0, 0x8000002000000000L, active1, 0L);
+      case 101:
+         if ((active1 & 0x40L) != 0L)
+            return jjStartNfaWithStates_0(6, 70, 43);
+         else if ((active1 & 0x80L) != 0L)
+            return jjStartNfaWithStates_0(6, 71, 43);
+         return jjMoveStringLiteralDfa7_0(active0, 0x2000000000000000L, active1, 0x100000L);
+      case 102:
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x2000L);
+      case 108:
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x1000000L);
+      case 110:
+         if ((active0 & 0x8000000000L) != 0L)
+            return jjStartNfaWithStates_0(6, 39, 43);
+         break;
+      case 111:
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x10000L);
+      case 115:
+         if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_0(6, 53, 43);
+         break;
+      case 116:
+         if ((active0 & 0x1000000000000L) != 0L)
+            return jjStartNfaWithStates_0(6, 48, 43);
+         return jjMoveStringLiteralDfa7_0(active0, 0L, active1, 0x100L);
+      case 117:
+         return jjMoveStringLiteralDfa7_0(active0, 0x800000000000L, active1, 0L);
+      case 121:
+         if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_0(6, 56, 43);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(5, active0, active1, 0L);
+}
+private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_0(5, old0, old1, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(6, active0, active1, 0L);
+      return 7;
+   }
+   switch(curChar)
+   {
+      case 99:
+         return jjMoveStringLiteralDfa8_0(active0, 0L, active1, 0x2L);
+      case 101:
+         if ((active0 & 0x800000000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 47, 43);
+         else if ((active1 & 0x1000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 88, 43);
+         return jjMoveStringLiteralDfa8_0(active0, 0x8000000000000000L, active1, 0x100L);
+      case 110:
+         return jjMoveStringLiteralDfa8_0(active0, 0x2000000000000000L, active1, 0x110000L);
+      case 112:
+         if ((active1 & 0x2000L) != 0L)
+            return jjStartNfaWithStates_0(7, 77, 43);
+         break;
+      case 116:
+         if ((active0 & 0x2000000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 37, 43);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(6, active0, active1, 0L);
+}
+private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_0(6, old0, old1, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(7, active0, active1, 0L);
+      return 8;
+   }
+   switch(curChar)
+   {
+      case 100:
+         if ((active1 & 0x100L) != 0L)
+            return jjStartNfaWithStates_0(8, 72, 43);
+         break;
+      case 101:
+         if ((active1 & 0x2L) != 0L)
+            return jjStartNfaWithStates_0(8, 65, 43);
+         break;
+      case 105:
+         return jjMoveStringLiteralDfa9_0(active0, 0L, active1, 0x10000L);
+      case 111:
+         return jjMoveStringLiteralDfa9_0(active0, 0x8000000000000000L, active1, 0L);
+      case 116:
+         if ((active1 & 0x100000L) != 0L)
+            return jjStartNfaWithStates_0(8, 84, 43);
+         return jjMoveStringLiteralDfa9_0(active0, 0x2000000000000000L, active1, 0L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(7, active0, active1, 0L);
+}
+private int jjMoveStringLiteralDfa9_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_0(7, old0, old1, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(8, active0, active1, 0L);
+      return 9;
+   }
+   switch(curChar)
+   {
+      case 102:
+         if ((active0 & 0x8000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(9, 63, 43);
+         break;
+      case 115:
+         if ((active0 & 0x2000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(9, 61, 43);
+         break;
+      case 122:
+         return jjMoveStringLiteralDfa10_0(active0, 0L, active1, 0x10000L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(8, active0, active1, 0L);
+}
+private int jjMoveStringLiteralDfa10_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_0(8, old0, old1, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(9, 0L, active1, 0L);
+      return 10;
+   }
+   switch(curChar)
+   {
+      case 101:
+         return jjMoveStringLiteralDfa11_0(active1, 0x10000L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(9, 0L, active1, 0L);
+}
+private int jjMoveStringLiteralDfa11_0(long old1, long active1){
+   if (((active1 &= old1)) == 0L)
+      return jjStartNfa_0(9, 0L, old1, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(10, 0L, active1, 0L);
+      return 11;
+   }
+   switch(curChar)
+   {
+      case 100:
+         if ((active1 & 0x10000L) != 0L)
+            return jjStartNfaWithStates_0(11, 80, 43);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(10, 0L, active1, 0L);
+}
+private int jjStartNfaWithStates_0(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_0(state, pos + 1);
+}
+static final long[] jjbitVec0 = {
+   0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
+};
+static final long[] jjbitVec2 = {
+   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
+};
+static final long[] jjbitVec3 = {
+   0xfff0000000200002L, 0xffffffffffffdfffL, 0xfffff00f7fffffffL, 0x12000000007fffffL
+};
+static final long[] jjbitVec4 = {
+   0x0L, 0x0L, 0x420043c00000000L, 0xff7fffffff7fffffL
+};
+static final long[] jjbitVec5 = {
+   0x7fffffffffffffL, 0xffffffffffff0000L, 0xffffffffffffffffL, 0x401f0003ffc3L
+};
+static final long[] jjbitVec6 = {
+   0x0L, 0x400000000000000L, 0xfffffffbffffd740L, 0xfbfffffffff7fffL
+};
+static final long[] jjbitVec7 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffffffc03L, 0x33fffffffff7fffL
+};
+static final long[] jjbitVec8 = {
+   0xfffe00000000ffffL, 0xfffffffe027fffffL, 0xffL, 0x707ffffff0000L
+};
+static final long[] jjbitVec9 = {
+   0x7fffffe00000000L, 0xfffec000000007ffL, 0xffffffffffffffffL, 0x9c00c060002fffffL
+};
+static final long[] jjbitVec10 = {
+   0xfffffffd0000L, 0xe000L, 0x2003fffffffffL, 0x0L
+};
+static final long[] jjbitVec11 = {
+   0x23fffffffffffff0L, 0x3ff010000L, 0x23c5fdfffff99fe0L, 0xf0003b0000000L
+};
+static final long[] jjbitVec12 = {
+   0x36dfdfffff987e0L, 0x1c00005e000000L, 0x23edfdfffffbbfe0L, 0x2000300010000L
+};
+static final long[] jjbitVec13 = {
+   0x23edfdfffff99fe0L, 0x20003b0000000L, 0x3bfc718d63dc7e8L, 0x200000000000000L
+};
+static final long[] jjbitVec14 = {
+   0x3effdfffffddfe0L, 0x300000000L, 0x23effdfffffddfe0L, 0x340000000L
+};
+static final long[] jjbitVec15 = {
+   0x3fffdfffffddfe0L, 0x300000000L, 0x2ffbfffffc7fffe0L, 0x7fL
+};
+static final long[] jjbitVec16 = {
+   0x800dfffffffffffeL, 0x7fL, 0x200decaefef02596L, 0x3000005fL
+};
+static final long[] jjbitVec17 = {
+   0x1L, 0x7fffffffeffL, 0xf00L, 0x0L
+};
+static final long[] jjbitVec18 = {
+   0x6fbffffffffL, 0x3f0000L, 0xffffffff00000000L, 0x1ffffffffff003fL
+};
+static final long[] jjbitVec19 = {
+   0xffffffffffffffffL, 0xffffffff83ffffffL, 0xffffff07ffffffffL, 0x3ffffffffffffffL
+};
+static final long[] jjbitVec20 = {
+   0xffffffffffffff7fL, 0xffffffff3d7f3d7fL, 0x7f3d7fffffff3d7fL, 0xffff7fffff7f7f3dL
+};
+static final long[] jjbitVec21 = {
+   0xffffffff7f3d7fffL, 0x7ffff7fL, 0xffffffff00000000L, 0x1fffffffffffffL
+};
+static final long[] jjbitVec22 = {
+   0xffffffffffffffffL, 0x7f9fffffffffffL, 0xffffffff07fffffeL, 0x1c7ffffffffffL
+};
+static final long[] jjbitVec23 = {
+   0x3ffff0003dfffL, 0x1dfff0003ffffL, 0xfffffffffffffL, 0x18800000L
+};
+static final long[] jjbitVec24 = {
+   0xffffffff00000000L, 0xffffffffffffffL, 0x1ffffffffffL, 0x0L
+};
+static final long[] jjbitVec25 = {
+   0x1fffffffL, 0x1f3fffffff0000L, 0x0L, 0x0L
+};
+static final long[] jjbitVec26 = {
+   0xffffffffffffffffL, 0xfffffffffffL, 0x0L, 0x0L
+};
+static final long[] jjbitVec27 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffff0fffffffL, 0x3ffffffffffffffL
+};
+static final long[] jjbitVec28 = {
+   0xffffffff3f3fffffL, 0x3fffffffaaff3f3fL, 0x5fdfffffffffffffL, 0x1fdc1fff0fcf1fdcL
+};
+static final long[] jjbitVec29 = {
+   0x8000000000000000L, 0x8002000000100001L, 0x3ffff00000000L, 0x0L
+};
+static final long[] jjbitVec30 = {
+   0xe3fbbd503e2ffc84L, 0xffffffff000003e0L, 0xfL, 0x0L
+};
+static final long[] jjbitVec31 = {
+   0x1f3e03fe000000e0L, 0xfffffffffffffffeL, 0xfffffffee07fffffL, 0xffffffffffffffffL
+};
+static final long[] jjbitVec32 = {
+   0xfffe1fffffffffe0L, 0xffffffffffffffffL, 0xffffff00007fffL, 0xffff000000000000L
+};
+static final long[] jjbitVec33 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0x3fffffffffffffL, 0x0L
+};
+static final long[] jjbitVec34 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0x3fffffffffL, 0x0L
+};
+static final long[] jjbitVec35 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0x1fffL, 0x0L
+};
+static final long[] jjbitVec36 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffL, 0x0L
+};
+static final long[] jjbitVec37 = {
+   0x6L, 0x0L, 0x0L, 0x0L
+};
+static final long[] jjbitVec38 = {
+   0xffff3fffffffffffL, 0x7ffffffffffL, 0x0L, 0x0L
+};
+static final long[] jjbitVec39 = {
+   0x5f7ffdffa0f8007fL, 0xffffffffffffffdbL, 0x3ffffffffffffL, 0xfffffffffff80000L
+};
+static final long[] jjbitVec40 = {
+   0x3fffffffffffffffL, 0xffffffffffff0000L, 0xfffffffffffcffffL, 0x1fff0000000000ffL
+};
+static final long[] jjbitVec41 = {
+   0x18000000000000L, 0xffdf02000000e000L, 0xffffffffffffffffL, 0x1fffffffffffffffL
+};
+static final long[] jjbitVec42 = {
+   0x87fffffe00000010L, 0xffffffe007fffffeL, 0x7fffffffffffffffL, 0x631cfcfcfcL
+};
+static final long[] jjbitVec43 = {
+   0x0L, 0x0L, 0x420243cffffffffL, 0xff7fffffff7fffffL
+};
+static final long[] jjbitVec44 = {
+   0xffffffffffffffffL, 0x400ffffe0ffffffL, 0xfffffffbffffd740L, 0xfbfffffffff7fffL
+};
+static final long[] jjbitVec45 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffffffc7bL, 0x33fffffffff7fffL
+};
+static final long[] jjbitVec46 = {
+   0xfffe00000000ffffL, 0xfffffffe027fffffL, 0xbbfffffbfffe00ffL, 0x707ffffff0016L
+};
+static final long[] jjbitVec47 = {
+   0x7fffffe003f000fL, 0xffffc3ff01ffffffL, 0xffffffffffffffffL, 0x9ffffdffbfefffffL
+};
+static final long[] jjbitVec48 = {
+   0xffffffffffff8000L, 0xe7ffL, 0x3ffffffffffffL, 0x0L
+};
+static final long[] jjbitVec49 = {
+   0xf3fffffffffffffeL, 0xffcfff1f3fffL, 0xf3c5fdfffff99feeL, 0xfffcfb080399fL
+};
+static final long[] jjbitVec50 = {
+   0xd36dfdfffff987eeL, 0x1fffc05e003987L, 0xf3edfdfffffbbfeeL, 0x2ffcf00013bbfL
+};
+static final long[] jjbitVec51 = {
+   0xf3edfdfffff99feeL, 0x2ffc3b0c0398fL, 0xc3bfc718d63dc7ecL, 0x200ff8000803dc7L
+};
+static final long[] jjbitVec52 = {
+   0xc3effdfffffddfeeL, 0xffc300603ddfL, 0xf3effdfffffddfecL, 0xffc340603ddfL
+};
+static final long[] jjbitVec53 = {
+   0xc3fffdfffffddfecL, 0xffc300803dcfL, 0x2ffbfffffc7fffecL, 0xc0000ff5f847fL
+};
+static final long[] jjbitVec54 = {
+   0x87fffffffffffffeL, 0x3ff7fffL, 0x3bffecaefef02596L, 0x33ff3f5fL
+};
+static final long[] jjbitVec55 = {
+   0xc2a003ff03000001L, 0xfffe07fffffffeffL, 0x1ffffffffeff0fdfL, 0x40L
+};
+static final long[] jjbitVec56 = {
+   0x3c7f6fbffffffffL, 0x3ff03ffL, 0xffffffff00000000L, 0x1ffffffffff003fL
+};
+static final long[] jjbitVec57 = {
+   0xffffffff7f3d7fffL, 0x3fe0007ffff7fL, 0xffffffff00000000L, 0x1fffffffffffffL
+};
+static final long[] jjbitVec58 = {
+   0x1fffff001fdfffL, 0xddfff000fffffL, 0xffffffffffffffffL, 0x3ff388fffffL
+};
+static final long[] jjbitVec59 = {
+   0xffffffff03ff3800L, 0xffffffffffffffL, 0x3ffffffffffL, 0x0L
+};
+static final long[] jjbitVec60 = {
+   0xfff0fff1fffffffL, 0x1f3fffffffffc0L, 0x0L, 0x0L
+};
+static final long[] jjbitVec61 = {
+   0x80007c000000f000L, 0x8002fc0f00100001L, 0x3ffff00000000L, 0x7e21fff0000L
+};
+static final long[] jjbitVec62 = {
+   0x1f3efffe000000e0L, 0xfffffffffffffffeL, 0xfffffffee67fffffL, 0xffffffffffffffffL
+};
+static final long[] jjbitVec63 = {
+   0x10000000000006L, 0x0L, 0x0L, 0x0L
+};
+static final long[] jjbitVec64 = {
+   0x3L, 0x0L, 0x0L, 0x0L
+};
+static final long[] jjbitVec65 = {
+   0x0L, 0x800000000000000L, 0x0L, 0x0L
+};
+static final long[] jjbitVec66 = {
+   0x5f7ffdffe0f8007fL, 0xffffffffffffffdbL, 0x3ffffffffffffL, 0xfffffffffff80000L
+};
+static final long[] jjbitVec67 = {
+   0x18000f0000ffffL, 0xffdf02000000e000L, 0xffffffffffffffffL, 0x9fffffffffffffffL
+};
+static final long[] jjbitVec68 = {
+   0x87fffffe03ff0010L, 0xffffffe007fffffeL, 0x7fffffffffffffffL, 0xe0000631cfcfcfcL
+};
+private int jjMoveNfa_0(int startState, int curPos)
+{
+   int startsAt = 0;
+   jjnewStateCnt = 130;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 45:
+                  if (curChar == 42)
+                     jjstateSet[jjnewStateCnt++] = 50;
+                  else if (curChar == 47)
+                  {
+                     if (kind > 31)
+                        kind = 31;
+                     { jjCheckNAddStates(0, 2); }
+                  }
+                  break;
+               case 0:
+                  if ((0x3ff000000000000L & l) != 0L)
+                  {
+                     if (kind > 91)
+                        kind = 91;
+                     { jjCheckNAddStates(3, 17); }
+                  }
+                  else if (curChar == 47)
+                     { jjAddStates(18, 19); }
+                  else if (curChar == 36)
+                  {
+                     if (kind > 103)
+                        kind = 103;
+                     { jjCheckNAdd(43); }
+                  }
+                  else if (curChar == 34)
+                     { jjCheckNAddStates(20, 23); }
+                  else if (curChar == 39)
+                     { jjAddStates(24, 26); }
+                  else if (curChar == 46)
+                     { jjCheckNAdd(1); }
+                  if (curChar == 48)
+                     { jjAddStates(27, 34); }
+                  break;
+               case 1:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(35, 38); }
+                  break;
+               case 2:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(2, 3); }
+                  break;
+               case 3:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(39, 41); }
+                  break;
+               case 5:
+                  if ((0x280000000000L & l) != 0L)
+                     { jjCheckNAdd(6); }
+                  break;
+               case 6:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(42, 44); }
+                  break;
+               case 7:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(7, 8); }
+                  break;
+               case 8:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddTwoStates(6, 9); }
+                  break;
+               case 10:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(45, 48); }
+                  break;
+               case 11:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(49, 53); }
+                  break;
+               case 12:
+                  if (curChar == 39)
+                     { jjAddStates(24, 26); }
+                  break;
+               case 13:
+                  if ((0xffffff7fffffdbffL & l) != 0L)
+                     { jjCheckNAdd(14); }
+                  break;
+               case 14:
+                  if (curChar == 39 && kind > 101)
+                     kind = 101;
+                  break;
+               case 16:
+                  if ((0x8400000000L & l) != 0L)
+                     { jjCheckNAdd(14); }
+                  break;
+               case 17:
+                  if ((0xff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(18, 14); }
+                  break;
+               case 18:
+                  if ((0xff000000000000L & l) != 0L)
+                     { jjCheckNAdd(14); }
+                  break;
+               case 19:
+                  if ((0xf000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 20;
+                  break;
+               case 20:
+                  if ((0xff000000000000L & l) != 0L)
+                     { jjCheckNAdd(18); }
+                  break;
+               case 22:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 23;
+                  break;
+               case 23:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 24;
+                  break;
+               case 24:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 25;
+                  break;
+               case 25:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAdd(14); }
+                  break;
+               case 27:
+                  if (curChar == 34)
+                     { jjCheckNAddStates(20, 23); }
+                  break;
+               case 28:
+                  if ((0xfffffffbffffdbffL & l) != 0L)
+                     { jjCheckNAddStates(20, 23); }
+                  break;
+               case 30:
+                  if ((0x8400000000L & l) != 0L)
+                     { jjCheckNAddStates(20, 23); }
+                  break;
+               case 32:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 33;
+                  break;
+               case 33:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 34;
+                  break;
+               case 34:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 35;
+                  break;
+               case 35:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(20, 23); }
+                  break;
+               case 37:
+                  if (curChar == 34 && kind > 102)
+                     kind = 102;
+                  break;
+               case 38:
+                  if ((0xff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(54, 58); }
+                  break;
+               case 39:
+                  if ((0xff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(20, 23); }
+                  break;
+               case 40:
+                  if ((0xf000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 41;
+                  break;
+               case 41:
+                  if ((0xff000000000000L & l) != 0L)
+                     { jjCheckNAdd(39); }
+                  break;
+               case 42:
+                  if (curChar != 36)
+                     break;
+                  if (kind > 103)
+                     kind = 103;
+                  { jjCheckNAdd(43); }
+                  break;
+               case 43:
+                  if ((0x3ff00100fffc1ffL & l) == 0L)
+                     break;
+                  if (kind > 103)
+                     kind = 103;
+                  { jjCheckNAdd(43); }
+                  break;
+               case 44:
+                  if (curChar == 47)
+                     { jjAddStates(18, 19); }
+                  break;
+               case 46:
+                  if ((0xffffffffffffdbffL & l) == 0L)
+                     break;
+                  if (kind > 31)
+                     kind = 31;
+                  { jjCheckNAddStates(0, 2); }
+                  break;
+               case 47:
+                  if ((0x2400L & l) != 0L && kind > 31)
+                     kind = 31;
+                  break;
+               case 48:
+                  if (curChar == 10 && kind > 31)
+                     kind = 31;
+                  break;
+               case 49:
+                  if (curChar == 13)
+                     jjstateSet[jjnewStateCnt++] = 48;
+                  break;
+               case 50:
+                  if (curChar == 42)
+                     jjstateSet[jjnewStateCnt++] = 51;
+                  break;
+               case 51:
+                  if ((0xffff7fffffffffffL & l) != 0L && kind > 32)
+                     kind = 32;
+                  break;
+               case 52:
+                  if (curChar == 42)
+                     jjstateSet[jjnewStateCnt++] = 50;
+                  break;
+               case 53:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 91)
+                     kind = 91;
+                  { jjCheckNAddStates(3, 17); }
+                  break;
+               case 54:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(54, 55); }
+                  break;
+               case 55:
+               case 98:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAdd(56); }
+                  break;
+               case 57:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(57, 58); }
+                  break;
+               case 58:
+               case 109:
+                  if ((0x3ff000000000000L & l) != 0L && kind > 91)
+                     kind = 91;
+                  break;
+               case 59:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(59, 60); }
+                  break;
+               case 60:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(59, 61); }
+                  break;
+               case 61:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(62, 65); }
+                  break;
+               case 63:
+                  if ((0x280000000000L & l) != 0L)
+                     { jjCheckNAdd(64); }
+                  break;
+               case 64:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(66, 68); }
+                  break;
+               case 65:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(65, 66); }
+                  break;
+               case 66:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(64, 9); }
+                  break;
+               case 67:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(69, 72); }
+                  break;
+               case 68:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(73, 77); }
+                  break;
+               case 69:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(69, 70); }
+                  break;
+               case 70:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(71, 72); }
+                  break;
+               case 71:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(78, 80); }
+                  break;
+               case 73:
+                  if ((0x280000000000L & l) != 0L)
+                     { jjCheckNAdd(74); }
+                  break;
+               case 74:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(81, 83); }
+                  break;
+               case 75:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(75, 76); }
+                  break;
+               case 76:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddTwoStates(74, 9); }
+                  break;
+               case 77:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(84, 87); }
+                  break;
+               case 78:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(88, 91); }
+                  break;
+               case 79:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(79, 80); }
+                  break;
+               case 80:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(81, 82); }
+                  break;
+               case 81:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(92, 94); }
+                  break;
+               case 82:
+                  if (curChar != 46)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(95, 97); }
+                  break;
+               case 83:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(98, 101); }
+                  break;
+               case 84:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(84, 85); }
+                  break;
+               case 85:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(95, 97); }
+                  break;
+               case 87:
+                  if ((0x280000000000L & l) != 0L)
+                     { jjCheckNAdd(88); }
+                  break;
+               case 88:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(102, 104); }
+                  break;
+               case 89:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(89, 90); }
+                  break;
+               case 90:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddTwoStates(88, 9); }
+                  break;
+               case 91:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(105, 108); }
+                  break;
+               case 92:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddStates(109, 113); }
+                  break;
+               case 93:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(114, 117); }
+                  break;
+               case 94:
+                  if (curChar == 48)
+                     { jjAddStates(27, 34); }
+                  break;
+               case 96:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(118, 120); }
+                  break;
+               case 97:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(97, 98); }
+                  break;
+               case 99:
+                  if ((0xff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(121, 123); }
+                  break;
+               case 100:
+                  if ((0xff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(100, 101); }
+                  break;
+               case 101:
+                  if ((0xff000000000000L & l) != 0L)
+                     { jjCheckNAdd(56); }
+                  break;
+               case 103:
+                  if ((0x3000000000000L & l) != 0L)
+                     { jjCheckNAddStates(124, 126); }
+                  break;
+               case 104:
+                  if ((0x3000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(104, 105); }
+                  break;
+               case 105:
+                  if ((0x3000000000000L & l) != 0L)
+                     { jjCheckNAdd(56); }
+                  break;
+               case 107:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 91)
+                     kind = 91;
+                  { jjCheckNAddTwoStates(108, 109); }
+                  break;
+               case 108:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(108, 109); }
+                  break;
+               case 110:
+                  if ((0xff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 91)
+                     kind = 91;
+                  { jjCheckNAddTwoStates(111, 112); }
+                  break;
+               case 111:
+                  if ((0xff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(111, 112); }
+                  break;
+               case 112:
+                  if ((0xff000000000000L & l) != 0L && kind > 91)
+                     kind = 91;
+                  break;
+               case 114:
+                  if ((0x3000000000000L & l) == 0L)
+                     break;
+                  if (kind > 91)
+                     kind = 91;
+                  { jjCheckNAddTwoStates(115, 116); }
+                  break;
+               case 115:
+                  if ((0x3000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(115, 116); }
+                  break;
+               case 116:
+                  if ((0x3000000000000L & l) != 0L && kind > 91)
+                     kind = 91;
+                  break;
+               case 118:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjAddStates(127, 128); }
+                  break;
+               case 119:
+                  if (curChar == 46)
+                     { jjCheckNAdd(120); }
+                  break;
+               case 120:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(120, 121); }
+                  break;
+               case 122:
+                  if ((0x280000000000L & l) != 0L)
+                     { jjCheckNAdd(123); }
+                  break;
+               case 123:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddTwoStates(123, 9); }
+                  break;
+               case 125:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     { jjCheckNAddStates(129, 131); }
+                  break;
+               case 126:
+                  if (curChar == 46)
+                     { jjCheckNAdd(127); }
+                  break;
+               case 128:
+                  if ((0x280000000000L & l) != 0L)
+                     { jjCheckNAdd(129); }
+                  break;
+               case 129:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 96)
+                     kind = 96;
+                  { jjCheckNAddTwoStates(129, 9); }
+                  break;
+               default : break;
             }
-            image = jjimage;
-            image.setLength(0);
-            jjimageLen = 0;
-
-            for (; ; ) {
-                switch (curLexState) {
-                    case 0:
-                        try {
-                            input_stream.backup(0);
-                            while (curChar <= 32 && (0x100003600L & (1L << curChar)) != 0L)
-                                curChar = input_stream.BeginToken();
-                        } catch (java.io.IOException e1) {
-                            continue EOFLoop;
-                        }
-                        jjmatchedKind = 0x7fffffff;
-                        jjmatchedPos = 0;
-                        curPos = jjMoveStringLiteralDfa0_0();
-                        break;
-                    case 1:
-                        jjmatchedKind = 0x7fffffff;
-                        jjmatchedPos = 0;
-                        curPos = jjMoveStringLiteralDfa0_1();
-                        if (jjmatchedPos == 0 && jjmatchedKind > 36) {
-                            jjmatchedKind = 36;
-                        }
-                        break;
-                    case 2:
-                        jjmatchedKind = 0x7fffffff;
-                        jjmatchedPos = 0;
-                        curPos = jjMoveStringLiteralDfa0_2();
-                        if (jjmatchedPos == 0 && jjmatchedKind > 36) {
-                            jjmatchedKind = 36;
-                        }
-                        break;
-                }
-                if (jjmatchedKind != 0x7fffffff) {
-                    if (jjmatchedPos + 1 < curPos)
-                        input_stream.backup(curPos - jjmatchedPos - 1);
-                    if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) {
-                        matchedToken = jjFillToken();
-                        matchedToken.specialToken = specialToken;
-                        TokenLexicalActions(matchedToken);
-                        if (jjnewLexState[jjmatchedKind] != -1)
-                            curLexState = jjnewLexState[jjmatchedKind];
-                        CommonTokenAction(matchedToken);
-                        return matchedToken;
-                    } else if ((jjtoSkip[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) {
-                        if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) {
-                            matchedToken = jjFillToken();
-                            if (specialToken == null)
-                                specialToken = matchedToken;
-                            else {
-                                matchedToken.specialToken = specialToken;
-                                specialToken = (specialToken.next = matchedToken);
-                            }
-                            SkipLexicalActions(matchedToken);
-                        } else
-                            SkipLexicalActions(null);
-                        if (jjnewLexState[jjmatchedKind] != -1)
-                            curLexState = jjnewLexState[jjmatchedKind];
-                        continue EOFLoop;
-                    }
-                    MoreLexicalActions();
-                    if (jjnewLexState[jjmatchedKind] != -1)
-                        curLexState = jjnewLexState[jjmatchedKind];
-                    curPos = 0;
-                    jjmatchedKind = 0x7fffffff;
-                    try {
-                        curChar = input_stream.readChar();
-                        continue;
-                    } catch (java.io.IOException e1) {
-                    }
-                }
-                int error_line = input_stream.getEndLine();
-                int error_column = input_stream.getEndColumn();
-                String error_after = null;
-                boolean EOFSeen = false;
-                try {
-                    input_stream.readChar();
-                    input_stream.backup(1);
-                } catch (java.io.IOException e1) {
-                    EOFSeen = true;
-                    error_after = curPos <= 1 ? "" : input_stream.GetImage();
-                    if (curChar == '\n' || curChar == '\r') {
-                        error_line++;
-                        error_column = 0;
-                    } else
-                        error_column++;
-                }
-                if (!EOFSeen) {
-                    input_stream.backup(1);
-                    error_after = curPos <= 1 ? "" : input_stream.GetImage();
-                }
-                throw new TokenMgrException(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrException.LEXICAL_ERROR);
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((0x7fffffe87fffffeL & l) == 0L)
+                     break;
+                  if (kind > 103)
+                     kind = 103;
+                  { jjCheckNAdd(43); }
+                  break;
+               case 2:
+                  if (curChar == 95)
+                     { jjAddStates(132, 133); }
+                  break;
+               case 4:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjAddStates(134, 135); }
+                  break;
+               case 7:
+                  if (curChar == 95)
+                     { jjAddStates(136, 137); }
+                  break;
+               case 9:
+                  if ((0x5000000050L & l) != 0L && kind > 96)
+                     kind = 96;
+                  break;
+               case 13:
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     { jjCheckNAdd(14); }
+                  break;
+               case 15:
+                  if (curChar == 92)
+                     { jjAddStates(138, 140); }
+                  break;
+               case 16:
+                  if ((0x14404410000000L & l) != 0L)
+                     { jjCheckNAdd(14); }
+                  break;
+               case 21:
+                  if (curChar == 117)
+                     jjstateSet[jjnewStateCnt++] = 22;
+                  break;
+               case 22:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 23;
+                  break;
+               case 23:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 24;
+                  break;
+               case 24:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 25;
+                  break;
+               case 25:
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjCheckNAdd(14); }
+                  break;
+               case 26:
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 21;
+                  break;
+               case 28:
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     { jjCheckNAddStates(20, 23); }
+                  break;
+               case 29:
+                  if (curChar == 92)
+                     { jjAddStates(141, 143); }
+                  break;
+               case 30:
+                  if ((0x14404410000000L & l) != 0L)
+                     { jjCheckNAddStates(20, 23); }
+                  break;
+               case 31:
+                  if (curChar == 117)
+                     jjstateSet[jjnewStateCnt++] = 32;
+                  break;
+               case 32:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 33;
+                  break;
+               case 33:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 34;
+                  break;
+               case 34:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 35;
+                  break;
+               case 35:
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjCheckNAddStates(20, 23); }
+                  break;
+               case 36:
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 31;
+                  break;
+               case 43:
+                  if ((0x87fffffe87fffffeL & l) == 0L)
+                     break;
+                  if (kind > 103)
+                     kind = 103;
+                  { jjCheckNAdd(43); }
+                  break;
+               case 46:
+                  if (kind > 31)
+                     kind = 31;
+                  { jjAddStates(0, 2); }
+                  break;
+               case 51:
+                  if (kind > 32)
+                     kind = 32;
+                  break;
+               case 54:
+                  if (curChar == 95)
+                     { jjAddStates(144, 145); }
+                  break;
+               case 56:
+                  if ((0x100000001000L & l) != 0L && kind > 90)
+                     kind = 90;
+                  break;
+               case 57:
+                  if (curChar == 95)
+                     { jjAddStates(146, 147); }
+                  break;
+               case 59:
+                  if (curChar == 95)
+                     { jjAddStates(148, 149); }
+                  break;
+               case 62:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjAddStates(150, 151); }
+                  break;
+               case 65:
+                  if (curChar == 95)
+                     { jjAddStates(152, 153); }
+                  break;
+               case 69:
+                  if (curChar == 95)
+                     { jjAddStates(154, 155); }
+                  break;
+               case 72:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjAddStates(156, 157); }
+                  break;
+               case 75:
+                  if (curChar == 95)
+                     { jjAddStates(158, 159); }
+                  break;
+               case 79:
+                  if (curChar == 95)
+                     { jjAddStates(160, 161); }
+                  break;
+               case 84:
+                  if (curChar == 95)
+                     { jjAddStates(162, 163); }
+                  break;
+               case 86:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjAddStates(164, 165); }
+                  break;
+               case 89:
+                  if (curChar == 95)
+                     { jjAddStates(166, 167); }
+                  break;
+               case 95:
+                  if ((0x100000001000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 96;
+                  break;
+               case 96:
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjCheckNAddStates(118, 120); }
+                  break;
+               case 97:
+                  if ((0x7e8000007eL & l) != 0L)
+                     { jjCheckNAddTwoStates(97, 98); }
+                  break;
+               case 98:
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjCheckNAdd(56); }
+                  break;
+               case 100:
+                  if (curChar == 95)
+                     { jjAddStates(168, 169); }
+                  break;
+               case 102:
+                  if ((0x400000004L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 103;
+                  break;
+               case 104:
+                  if (curChar == 95)
+                     { jjAddStates(170, 171); }
+                  break;
+               case 106:
+                  if ((0x100000001000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 107;
+                  break;
+               case 107:
+                  if ((0x7e0000007eL & l) == 0L)
+                     break;
+                  if (kind > 91)
+                     kind = 91;
+                  { jjCheckNAddTwoStates(108, 109); }
+                  break;
+               case 108:
+                  if ((0x7e8000007eL & l) != 0L)
+                     { jjCheckNAddTwoStates(108, 109); }
+                  break;
+               case 109:
+                  if ((0x7e0000007eL & l) != 0L && kind > 91)
+                     kind = 91;
+                  break;
+               case 111:
+                  if (curChar == 95)
+                     { jjAddStates(172, 173); }
+                  break;
+               case 113:
+                  if ((0x400000004L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 114;
+                  break;
+               case 115:
+                  if (curChar == 95)
+                     { jjAddStates(174, 175); }
+                  break;
+               case 117:
+                  if ((0x100000001000000L & l) != 0L)
+                     { jjCheckNAddTwoStates(118, 119); }
+                  break;
+               case 118:
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjCheckNAddTwoStates(118, 119); }
+                  break;
+               case 120:
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjAddStates(176, 177); }
+                  break;
+               case 121:
+                  if ((0x1000000010000L & l) != 0L)
+                     { jjAddStates(178, 179); }
+                  break;
+               case 124:
+                  if ((0x100000001000000L & l) != 0L)
+                     { jjCheckNAdd(125); }
+                  break;
+               case 125:
+                  if ((0x7e0000007eL & l) != 0L)
+                     { jjCheckNAddStates(129, 131); }
+                  break;
+               case 127:
+                  if ((0x1000000010000L & l) != 0L)
+                     { jjAddStates(180, 181); }
+                  break;
+               default : break;
             }
-        }
-    }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int hiByte = (curChar >> 8);
+         int i1 = hiByte >> 6;
+         long l1 = 1L << (hiByte & 077);
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
+                     break;
+                  if (kind > 103)
+                     kind = 103;
+                  { jjCheckNAdd(43); }
+                  break;
+               case 13:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     jjstateSet[jjnewStateCnt++] = 14;
+                  break;
+               case 28:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjAddStates(20, 23); }
+                  break;
+               case 43:
+                  if (!jjCanMove_2(hiByte, i1, i2, l1, l2))
+                     break;
+                  if (kind > 103)
+                     kind = 103;
+                  { jjCheckNAdd(43); }
+                  break;
+               case 46:
+                  if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     break;
+                  if (kind > 31)
+                     kind = 31;
+                  { jjAddStates(0, 2); }
+                  break;
+               case 51:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 32)
+                     kind = 32;
+                  break;
+               default : if (i1 == 0 || l1 == 0 || i2 == 0 ||  l2 == 0) break; else break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 130 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private int jjMoveStringLiteralDfa0_2(){
+   switch(curChar)
+   {
+      case 42:
+         return jjMoveStringLiteralDfa1_2(0x800000000L);
+      default :
+         return 1;
+   }
+}
+private int jjMoveStringLiteralDfa1_2(long active0){
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 47:
+         if ((active0 & 0x800000000L) != 0L)
+            return jjStopAtPos(1, 35);
+         break;
+      default :
+         return 2;
+   }
+   return 2;
+}
+private int jjMoveStringLiteralDfa0_1(){
+   switch(curChar)
+   {
+      case 42:
+         return jjMoveStringLiteralDfa1_1(0x400000000L);
+      default :
+         return 1;
+   }
+}
+private int jjMoveStringLiteralDfa1_1(long active0){
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 47:
+         if ((active0 & 0x400000000L) != 0L)
+            return jjStopAtPos(1, 34);
+         break;
+      default :
+         return 2;
+   }
+   return 2;
+}
+static final int[] jjnextStates = {
+   46, 47, 49, 54, 55, 56, 57, 58, 59, 62, 9, 69, 72, 79, 82, 93, 
+   78, 68, 45, 52, 28, 29, 36, 37, 13, 15, 26, 95, 99, 102, 106, 110, 
+   113, 117, 124, 2, 4, 9, 11, 1, 4, 9, 7, 9, 10, 6, 7, 9, 
+   10, 1, 2, 4, 9, 11, 28, 29, 39, 36, 37, 61, 62, 9, 59, 62, 
+   9, 68, 65, 9, 67, 64, 65, 9, 67, 61, 59, 62, 9, 68, 69, 72, 
+   78, 75, 9, 77, 74, 75, 9, 77, 71, 69, 72, 78, 79, 82, 93, 83, 
+   86, 9, 84, 86, 9, 92, 89, 9, 91, 88, 89, 9, 91, 83, 84, 86, 
+   9, 92, 81, 79, 82, 93, 97, 98, 56, 100, 101, 56, 104, 105, 56, 118, 
+   119, 125, 126, 127, 2, 3, 5, 6, 7, 8, 16, 17, 19, 30, 38, 40, 
+   54, 55, 57, 58, 59, 60, 63, 64, 65, 66, 69, 70, 73, 74, 75, 76, 
+   79, 80, 84, 85, 87, 88, 89, 90, 100, 101, 104, 105, 111, 112, 115, 116, 
+   120, 121, 122, 123, 128, 129, 
+};
+private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
+{
+   switch(hiByte)
+   {
+      case 0:
+         return ((jjbitVec2[i2] & l2) != 0L);
+      default :
+         if ((jjbitVec0[i1] & l1) != 0L)
+            return true;
+         return false;
+   }
+}
+private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2)
+{
+   switch(hiByte)
+   {
+      case 0:
+         return ((jjbitVec4[i2] & l2) != 0L);
+      case 2:
+         return ((jjbitVec5[i2] & l2) != 0L);
+      case 3:
+         return ((jjbitVec6[i2] & l2) != 0L);
+      case 4:
+         return ((jjbitVec7[i2] & l2) != 0L);
+      case 5:
+         return ((jjbitVec8[i2] & l2) != 0L);
+      case 6:
+         return ((jjbitVec9[i2] & l2) != 0L);
+      case 7:
+         return ((jjbitVec10[i2] & l2) != 0L);
+      case 9:
+         return ((jjbitVec11[i2] & l2) != 0L);
+      case 10:
+         return ((jjbitVec12[i2] & l2) != 0L);
+      case 11:
+         return ((jjbitVec13[i2] & l2) != 0L);
+      case 12:
+         return ((jjbitVec14[i2] & l2) != 0L);
+      case 13:
+         return ((jjbitVec15[i2] & l2) != 0L);
+      case 14:
+         return ((jjbitVec16[i2] & l2) != 0L);
+      case 15:
+         return ((jjbitVec17[i2] & l2) != 0L);
+      case 16:
+         return ((jjbitVec18[i2] & l2) != 0L);
+      case 17:
+         return ((jjbitVec19[i2] & l2) != 0L);
+      case 18:
+         return ((jjbitVec20[i2] & l2) != 0L);
+      case 19:
+         return ((jjbitVec21[i2] & l2) != 0L);
+      case 20:
+         return ((jjbitVec0[i2] & l2) != 0L);
+      case 22:
+         return ((jjbitVec22[i2] & l2) != 0L);
+      case 23:
+         return ((jjbitVec23[i2] & l2) != 0L);
+      case 24:
+         return ((jjbitVec24[i2] & l2) != 0L);
+      case 25:
+         return ((jjbitVec25[i2] & l2) != 0L);
+      case 29:
+         return ((jjbitVec26[i2] & l2) != 0L);
+      case 30:
+         return ((jjbitVec27[i2] & l2) != 0L);
+      case 31:
+         return ((jjbitVec28[i2] & l2) != 0L);
+      case 32:
+         return ((jjbitVec29[i2] & l2) != 0L);
+      case 33:
+         return ((jjbitVec30[i2] & l2) != 0L);
+      case 48:
+         return ((jjbitVec31[i2] & l2) != 0L);
+      case 49:
+         return ((jjbitVec32[i2] & l2) != 0L);
+      case 77:
+         return ((jjbitVec33[i2] & l2) != 0L);
+      case 159:
+         return ((jjbitVec34[i2] & l2) != 0L);
+      case 164:
+         return ((jjbitVec35[i2] & l2) != 0L);
+      case 215:
+         return ((jjbitVec36[i2] & l2) != 0L);
+      case 216:
+         return ((jjbitVec37[i2] & l2) != 0L);
+      case 250:
+         return ((jjbitVec38[i2] & l2) != 0L);
+      case 251:
+         return ((jjbitVec39[i2] & l2) != 0L);
+      case 253:
+         return ((jjbitVec40[i2] & l2) != 0L);
+      case 254:
+         return ((jjbitVec41[i2] & l2) != 0L);
+      case 255:
+         return ((jjbitVec42[i2] & l2) != 0L);
+      default :
+         if ((jjbitVec3[i1] & l1) != 0L)
+            return true;
+         return false;
+   }
+}
+private static final boolean jjCanMove_2(int hiByte, int i1, int i2, long l1, long l2)
+{
+   switch(hiByte)
+   {
+      case 0:
+         return ((jjbitVec43[i2] & l2) != 0L);
+      case 2:
+         return ((jjbitVec5[i2] & l2) != 0L);
+      case 3:
+         return ((jjbitVec44[i2] & l2) != 0L);
+      case 4:
+         return ((jjbitVec45[i2] & l2) != 0L);
+      case 5:
+         return ((jjbitVec46[i2] & l2) != 0L);
+      case 6:
+         return ((jjbitVec47[i2] & l2) != 0L);
+      case 7:
+         return ((jjbitVec48[i2] & l2) != 0L);
+      case 9:
+         return ((jjbitVec49[i2] & l2) != 0L);
+      case 10:
+         return ((jjbitVec50[i2] & l2) != 0L);
+      case 11:
+         return ((jjbitVec51[i2] & l2) != 0L);
+      case 12:
+         return ((jjbitVec52[i2] & l2) != 0L);
+      case 13:
+         return ((jjbitVec53[i2] & l2) != 0L);
+      case 14:
+         return ((jjbitVec54[i2] & l2) != 0L);
+      case 15:
+         return ((jjbitVec55[i2] & l2) != 0L);
+      case 16:
+         return ((jjbitVec56[i2] & l2) != 0L);
+      case 17:
+         return ((jjbitVec19[i2] & l2) != 0L);
+      case 18:
+         return ((jjbitVec20[i2] & l2) != 0L);
+      case 19:
+         return ((jjbitVec57[i2] & l2) != 0L);
+      case 20:
+         return ((jjbitVec0[i2] & l2) != 0L);
+      case 22:
+         return ((jjbitVec22[i2] & l2) != 0L);
+      case 23:
+         return ((jjbitVec58[i2] & l2) != 0L);
+      case 24:
+         return ((jjbitVec59[i2] & l2) != 0L);
+      case 25:
+         return ((jjbitVec60[i2] & l2) != 0L);
+      case 29:
+         return ((jjbitVec26[i2] & l2) != 0L);
+      case 30:
+         return ((jjbitVec27[i2] & l2) != 0L);
+      case 31:
+         return ((jjbitVec28[i2] & l2) != 0L);
+      case 32:
+         return ((jjbitVec61[i2] & l2) != 0L);
+      case 33:
+         return ((jjbitVec30[i2] & l2) != 0L);
+      case 48:
+         return ((jjbitVec62[i2] & l2) != 0L);
+      case 49:
+         return ((jjbitVec32[i2] & l2) != 0L);
+      case 77:
+         return ((jjbitVec33[i2] & l2) != 0L);
+      case 159:
+         return ((jjbitVec34[i2] & l2) != 0L);
+      case 164:
+         return ((jjbitVec35[i2] & l2) != 0L);
+      case 215:
+         return ((jjbitVec36[i2] & l2) != 0L);
+      case 216:
+         return ((jjbitVec63[i2] & l2) != 0L);
+      case 220:
+         return ((jjbitVec64[i2] & l2) != 0L);
+      case 221:
+         return ((jjbitVec65[i2] & l2) != 0L);
+      case 250:
+         return ((jjbitVec38[i2] & l2) != 0L);
+      case 251:
+         return ((jjbitVec66[i2] & l2) != 0L);
+      case 253:
+         return ((jjbitVec40[i2] & l2) != 0L);
+      case 254:
+         return ((jjbitVec67[i2] & l2) != 0L);
+      case 255:
+         return ((jjbitVec68[i2] & l2) != 0L);
+      default :
+         if ((jjbitVec3[i1] & l1) != 0L)
+            return true;
+         return false;
+   }
+}
 
-    void SkipLexicalActions(Token matchedToken) {
-        switch (jjmatchedKind) {
-            default:
-                break;
-        }
-    }
+/** Token literal values. */
+public static final String[] jjstrLiteralImages = {
+"", null, null, null, null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, null, null, null, null, 
+"\141\142\163\164\162\141\143\164", "\141\163\163\145\162\164", "\142\157\157\154\145\141\156", 
+"\142\162\145\141\153", "\142\171\164\145", "\143\141\163\145", "\143\141\164\143\150", 
+"\143\150\141\162", "\143\154\141\163\163", "\143\157\156\163\164", 
+"\143\157\156\164\151\156\165\145", "\144\145\146\141\165\154\164", "\144\157", "\144\157\165\142\154\145", 
+"\145\154\163\145", "\145\156\165\155", "\145\170\164\145\156\144\163", "\146\141\154\163\145", 
+"\146\151\156\141\154", "\146\151\156\141\154\154\171", "\146\154\157\141\164", "\146\157\162", 
+"\147\157\164\157", "\151\146", "\151\155\160\154\145\155\145\156\164\163", 
+"\151\155\160\157\162\164", "\151\156\163\164\141\156\143\145\157\146", "\151\156\164", 
+"\151\156\164\145\162\146\141\143\145", "\154\157\156\147", "\156\141\164\151\166\145", "\156\145\167", 
+"\156\165\154\154", "\160\141\143\153\141\147\145", "\160\162\151\166\141\164\145", 
+"\160\162\157\164\145\143\164\145\144", "\160\165\142\154\151\143", "\162\145\164\165\162\156", 
+"\163\150\157\162\164", "\163\164\141\164\151\143", "\163\164\162\151\143\164\146\160", 
+"\163\165\160\145\162", "\163\167\151\164\143\150", 
+"\163\171\156\143\150\162\157\156\151\172\145\144", "\164\150\151\163", "\164\150\162\157\167", "\164\150\162\157\167\163", 
+"\164\162\141\156\163\151\145\156\164", "\164\162\165\145", "\164\162\171", "\166\157\151\144", 
+"\166\157\154\141\164\151\154\145", "\167\150\151\154\145", null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, null, "\50", "\51", "\173", "\175", "\133", 
+"\135", "\73", "\54", "\56", "\100", "\75", "\74", "\41", "\176", "\77", "\72", 
+"\75\75", "\74\75", "\76\75", "\41\75", "\174\174", "\46\46", "\53\53", "\55\55", "\53", 
+"\55", "\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\53\75", "\55\75", 
+"\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\45\75", "\74\74\75", "\76\76\75", 
+"\76\76\76\75", "\56\56\56", "\55\76", "\72\72", "\76\76\76", "\76\76", "\76", "\32", };
+protected Token jjFillToken()
+{
+   final Token t;
+   final String curTokenImage;
+   final int beginLine;
+   final int endLine;
+   final int beginColumn;
+   final int endColumn;
+   String im = jjstrLiteralImages[jjmatchedKind];
+   curTokenImage = (im == null) ? input_stream.GetImage() : im;
+   beginLine = input_stream.getBeginLine();
+   beginColumn = input_stream.getBeginColumn();
+   endLine = input_stream.getEndLine();
+   endColumn = input_stream.getEndColumn();
+   t = ASTParser.GTToken.newToken(jjmatchedKind, curTokenImage);
+
+   t.beginLine = beginLine;
+   t.endLine = endLine;
+   t.beginColumn = beginColumn;
+   t.endColumn = endColumn;
+
+   return t;
+}
 
-    void MoreLexicalActions() {
-        jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
-        switch (jjmatchedKind) {
-            case 32:
-                image.append(input_stream.GetSuffix(jjimageLen));
-                jjimageLen = 0;
-                input_stream.backup(1);
-                break;
-            default:
-                break;
+int curLexState = 0;
+int defaultLexState = 0;
+int jjnewStateCnt;
+int jjround;
+int jjmatchedPos;
+int jjmatchedKind;
+
+/** Get the next Token. */
+public Token getNextToken() 
+{
+  Token specialToken = null;
+  Token matchedToken;
+  int curPos = 0;
+
+  EOFLoop :
+  for (;;)
+  {
+   try
+   {
+      curChar = input_stream.BeginToken();
+   }
+   catch(Exception e)
+   {
+      jjmatchedKind = 0;
+      jjmatchedPos = -1;
+      matchedToken = jjFillToken();
+      matchedToken.specialToken = specialToken;
+      CommonTokenAction(matchedToken);
+      return matchedToken;
+   }
+   image = jjimage;
+   image.setLength(0);
+   jjimageLen = 0;
+
+   for (;;)
+   {
+     switch(curLexState)
+     {
+       case 0:
+         try { input_stream.backup(0);
+            while (curChar <= 32 && (0x100003600L & (1L << curChar)) != 0L)
+               curChar = input_stream.BeginToken();
+         }
+         catch (java.io.IOException e1) { continue EOFLoop; }
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_0();
+         break;
+       case 1:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_1();
+         if (jjmatchedPos == 0 && jjmatchedKind > 36)
+         {
+            jjmatchedKind = 36;
+         }
+         break;
+       case 2:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_2();
+         if (jjmatchedPos == 0 && jjmatchedKind > 36)
+         {
+            jjmatchedKind = 36;
+         }
+         break;
+     }
+     if (jjmatchedKind != 0x7fffffff)
+     {
+        if (jjmatchedPos + 1 < curPos)
+           input_stream.backup(curPos - jjmatchedPos - 1);
+        if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+        {
+           matchedToken = jjFillToken();
+           matchedToken.specialToken = specialToken;
+           TokenLexicalActions(matchedToken);
+       if (jjnewLexState[jjmatchedKind] != -1)
+         curLexState = jjnewLexState[jjmatchedKind];
+           CommonTokenAction(matchedToken);
+           return matchedToken;
         }
-    }
-
-    void TokenLexicalActions(Token matchedToken) {
-        switch (jjmatchedKind) {
-            case 153:
-                image.append(jjstrLiteralImages[153]);
-                lengthOfMatch = jjstrLiteralImages[153].length();
-                matchedToken.kind = GT;
-                ((ASTParser.GTToken) matchedToken).realKind = RUNSIGNEDSHIFT;
-                input_stream.backup(2);
-                break;
-            case 154:
-                image.append(jjstrLiteralImages[154]);
-                lengthOfMatch = jjstrLiteralImages[154].length();
-                matchedToken.kind = GT;
-                ((ASTParser.GTToken) matchedToken).realKind = RSIGNEDSHIFT;
-                input_stream.backup(1);
-                break;
-            default:
-                break;
+        else if ((jjtoSkip[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+        {
+           if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+           {
+              matchedToken = jjFillToken();
+              if (specialToken == null)
+                 specialToken = matchedToken;
+              else
+              {
+                 matchedToken.specialToken = specialToken;
+                 specialToken = (specialToken.next = matchedToken);
+              }
+              SkipLexicalActions(matchedToken);
+           }
+           else
+              SkipLexicalActions(null);
+         if (jjnewLexState[jjmatchedKind] != -1)
+           curLexState = jjnewLexState[jjmatchedKind];
+           continue EOFLoop;
         }
-    }
-
-    private void jjCheckNAdd(int state) {
-        if (jjrounds[state] != jjround) {
-            jjstateSet[jjnewStateCnt++] = state;
-            jjrounds[state] = jjround;
+        MoreLexicalActions();
+      if (jjnewLexState[jjmatchedKind] != -1)
+        curLexState = jjnewLexState[jjmatchedKind];
+        curPos = 0;
+        jjmatchedKind = 0x7fffffff;
+        try {
+           curChar = input_stream.readChar();
+           continue;
         }
-    }
-
-    private void jjAddStates(int start, int end) {
-        do {
-            jjstateSet[jjnewStateCnt++] = jjnextStates[start];
-        } while (start++ != end);
-    }
+        catch (java.io.IOException e1) { }
+     }
+     int error_line = input_stream.getEndLine();
+     int error_column = input_stream.getEndColumn();
+     String error_after = null;
+     boolean EOFSeen = false;
+     try { input_stream.readChar(); input_stream.backup(1); }
+     catch (java.io.IOException e1) {
+        EOFSeen = true;
+        error_after = curPos <= 1 ? "" : input_stream.GetImage();
+        if (curChar == '\n' || curChar == '\r') {
+           error_line++;
+           error_column = 0;
+        }
+        else
+           error_column++;
+     }
+     if (!EOFSeen) {
+        input_stream.backup(1);
+        error_after = curPos <= 1 ? "" : input_stream.GetImage();
+     }
+     throw new TokenMgrException(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrException.LEXICAL_ERROR);
+   }
+  }
+}
 
-    private void jjCheckNAddTwoStates(int state1, int state2) {
-        jjCheckNAdd(state1);
-        jjCheckNAdd(state2);
-    }
+void SkipLexicalActions(Token matchedToken)
+{
+   switch(jjmatchedKind)
+   {
+      default :
+         break;
+   }
+}
+void MoreLexicalActions()
+{
+   jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
+   switch(jjmatchedKind)
+   {
+      case 32 :
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+                   input_stream.backup(1);
+         break;
+      default :
+         break;
+   }
+}
+void TokenLexicalActions(Token matchedToken)
+{
+   switch(jjmatchedKind)
+   {
+      case 153 :
+        image.append(jjstrLiteralImages[153]);
+        lengthOfMatch = jjstrLiteralImages[153].length();
+     matchedToken.kind = GT;
+     ((ASTParser.GTToken)matchedToken).realKind = RUNSIGNEDSHIFT;
+     input_stream.backup(2);
+         break;
+      case 154 :
+        image.append(jjstrLiteralImages[154]);
+        lengthOfMatch = jjstrLiteralImages[154].length();
+     matchedToken.kind = GT;
+     ((ASTParser.GTToken)matchedToken).realKind = RSIGNEDSHIFT;
+     input_stream.backup(1);
+         break;
+      default :
+         break;
+   }
+}
+private void jjCheckNAdd(int state)
+{
+   if (jjrounds[state] != jjround)
+   {
+      jjstateSet[jjnewStateCnt++] = state;
+      jjrounds[state] = jjround;
+   }
+}
+private void jjAddStates(int start, int end)
+{
+   do {
+      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
+   } while (start++ != end);
+}
+private void jjCheckNAddTwoStates(int state1, int state2)
+{
+   jjCheckNAdd(state1);
+   jjCheckNAdd(state2);
+}
 
-    private void jjCheckNAddStates(int start, int end) {
-        do {
-            jjCheckNAdd(jjnextStates[start]);
-        } while (start++ != end);
-    }
+private void jjCheckNAddStates(int start, int end)
+{
+   do {
+      jjCheckNAdd(jjnextStates[start]);
+   } while (start++ != end);
+}
 
-    /**
-     * Constructor.
-     */
-    public ASTParserTokenManager(JavaCharStream stream) {
+    /** Constructor. */
+    public ASTParserTokenManager(JavaCharStream stream){
 
-        if (JavaCharStream.staticFlag)
+      if (JavaCharStream.staticFlag)
             throw new RuntimeException("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
 
-        input_stream = stream;
-    }
-
-    /**
-     * Constructor.
-     */
-    public ASTParserTokenManager(JavaCharStream stream, int lexState) {
-        ReInit(stream);
-        SwitchTo(lexState);
-    }
-
-    /**
-     * Reinitialise parser.
-     */
-    public void ReInit(JavaCharStream stream) {
-
-        jjmatchedPos = jjnewStateCnt = 0;
-        curLexState = defaultLexState;
-        input_stream = stream;
-        ReInitRounds();
-    }
-
-    private void ReInitRounds() {
-        int i;
-        jjround = 0x80000001;
-        for (i = 130; i-- > 0; )
-            jjrounds[i] = 0x80000000;
-    }
-
-    /**
-     * Reinitialise parser.
-     */
-    public void ReInit(JavaCharStream stream, int lexState) {
-
-        ReInit(stream);
-        SwitchTo(lexState);
-    }
-
-    /**
-     * Switch to specified lex state.
-     */
-    public void SwitchTo(int lexState) {
-        if (lexState >= 3 || lexState < 0)
-            throw new TokenMgrException("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrException.INVALID_LEXICAL_STATE);
-        else
-            curLexState = lexState;
-    }
-
-    /**
-     * Lexer state names.
-     */
-    public static final String[] lexStateNames = {
-            "DEFAULT",
-            "IN_JAVA_DOC_COMMENT",
-            "IN_MULTI_LINE_COMMENT",
-    };
-
-    /**
-     * Lex State array.
-     */
-    public static final int[] jjnewLexState = {
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, 1, 2, 0, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1,
-    };
-    static final long[] jjtoToken = {
-            0xffffffe000000001L, 0xfffffce10fffffffL, 0x1fffffffL,
-    };
-    static final long[] jjtoSkip = {
-            0xcfffffffeL, 0x0L, 0x0L,
-    };
-    static final long[] jjtoSpecial = {
-            0xc80000000L, 0x0L, 0x0L,
-    };
-    static final long[] jjtoMore = {
-            0x1300000000L, 0x0L, 0x0L,
-    };
-    protected JavaCharStream input_stream;
+    input_stream = stream;
+  }
+
+  /** Constructor. */
+  public ASTParserTokenManager (JavaCharStream stream, int lexState){
+    ReInit(stream);
+    SwitchTo(lexState);
+  }
+
+  /** Reinitialise parser. */
+  public void ReInit(JavaCharStream stream)
+  {
+	
+    jjmatchedPos = jjnewStateCnt = 0;
+    curLexState = defaultLexState;
+    input_stream = stream;
+    ReInitRounds();
+  }
+
+  private void ReInitRounds()
+  {
+    int i;
+    jjround = 0x80000001;
+    for (i = 130; i-- > 0;)
+      jjrounds[i] = 0x80000000;
+  }
+
+  /** Reinitialise parser. */
+  public void ReInit( JavaCharStream stream, int lexState)
+  {
+  
+    ReInit( stream);
+    SwitchTo(lexState);
+  }
+
+  /** Switch to specified lex state. */
+  public void SwitchTo(int lexState)
+  {
+    if (lexState >= 3 || lexState < 0)
+      throw new TokenMgrException("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrException.INVALID_LEXICAL_STATE);
+    else
+      curLexState = lexState;
+  }
+
+/** Lexer state names. */
+public static final String[] lexStateNames = {
+   "DEFAULT",
+   "IN_JAVA_DOC_COMMENT",
+   "IN_MULTI_LINE_COMMENT",
+};
+
+/** Lex State array. */
+public static final int[] jjnewLexState = {
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, 1, 2, 0, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, 
+};
+static final long[] jjtoToken = {
+   0xffffffe000000001L, 0xfffffce10fffffffL, 0x1fffffffL, 
+};
+static final long[] jjtoSkip = {
+   0xcfffffffeL, 0x0L, 0x0L, 
+};
+static final long[] jjtoSpecial = {
+   0xc80000000L, 0x0L, 0x0L, 
+};
+static final long[] jjtoMore = {
+   0x1300000000L, 0x0L, 0x0L, 
+};
+    protected JavaCharStream  input_stream;
 
     private final int[] jjrounds = new int[130];
     private final int[] jjstateSet = new int[2 * 130];
@@ -2803,6 +2638,6 @@ public void SwitchTo(int lexState) {
     private StringBuilder image = jjimage;
     private int jjimageLen;
     private int lengthOfMatch;
-
+    
     protected int curChar;
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/JavaCharStream.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/JavaCharStream.java
index 21812fcd70..da924dbe0a 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/JavaCharStream.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/JavaCharStream.java
@@ -18,527 +18,543 @@
  * An implementation of interface CharStream, where the stream is assumed to
  * contain only ASCII characters (with java-like unicode escape processing).
  */
-
+ 
 
 public
-class JavaCharStream {
-    /**
-     * Whether parser is static.
-     */
-    public static final boolean staticFlag = false;
-
-
-    static final int hexval(char c) throws java.io.IOException {
-        switch (c) {
-            case '0':
-                return 0;
-            case '1':
-                return 1;
-            case '2':
-                return 2;
-            case '3':
-                return 3;
-            case '4':
-                return 4;
-            case '5':
-                return 5;
-            case '6':
-                return 6;
-            case '7':
-                return 7;
-            case '8':
-                return 8;
-            case '9':
-                return 9;
-
-            case 'a':
-            case 'A':
-                return 10;
-            case 'b':
-            case 'B':
-                return 11;
-            case 'c':
-            case 'C':
-                return 12;
-            case 'd':
-            case 'D':
-                return 13;
-            case 'e':
-            case 'E':
-                return 14;
-            case 'f':
-            case 'F':
-                return 15;
-        }
-
-        throw new java.io.IOException(); // Should never come here
-    }
-
-    /**
-     * Position in buffer.
-     */
-    public int bufpos = -1;
-    int bufsize;
-    int available;
-    int tokenBegin;
-    protected int bufline[];
-    protected int bufcolumn[];
-
-    protected int column = 0;
-    protected int line = 1;
-
-    protected boolean prevCharIsCR = false;
-    protected boolean prevCharIsLF = false;
-
-    protected Provider inputStream;
-
-    protected char[] nextCharBuf;
-    protected char[] buffer;
-    protected int maxNextCharInd = 0;
-    protected int nextCharInd = -1;
-    protected int inBuf = 0;
-    protected int tabSize = 1;
-    protected boolean trackLineColumn = true;
-
-    public void setTabSize(int i) {
-        tabSize = i;
+class JavaCharStream
+{
+  /** Whether parser is static. */
+  public static final boolean staticFlag = false;
+
+
+  static final int hexval(char c) throws java.io.IOException {
+    switch(c)
+    {
+       case '0' :
+          return 0;
+       case '1' :
+          return 1;
+       case '2' :
+          return 2;
+       case '3' :
+          return 3;
+       case '4' :
+          return 4;
+       case '5' :
+          return 5;
+       case '6' :
+          return 6;
+       case '7' :
+          return 7;
+       case '8' :
+          return 8;
+       case '9' :
+          return 9;
+
+       case 'a' :
+       case 'A' :
+          return 10;
+       case 'b' :
+       case 'B' :
+          return 11;
+       case 'c' :
+       case 'C' :
+          return 12;
+       case 'd' :
+       case 'D' :
+          return 13;
+       case 'e' :
+       case 'E' :
+          return 14;
+       case 'f' :
+       case 'F' :
+          return 15;
     }
 
-    public int getTabSize(int i) {
-        return tabSize;
+    throw new java.io.IOException(); // Should never come here
+  }
+
+/** Position in buffer. */
+  public int bufpos = -1;
+  int bufsize;
+  int available;
+  int tokenBegin;
+  protected int bufline[];
+  protected int bufcolumn[];
+
+  protected int column = 0;
+  protected int line = 1;
+
+  protected boolean prevCharIsCR = false;
+  protected boolean prevCharIsLF = false;
+
+  protected Provider inputStream;
+
+  protected char[] nextCharBuf;
+  protected char[] buffer;
+  protected int maxNextCharInd = 0;
+  protected int nextCharInd = -1;
+  protected int inBuf = 0;
+  protected int tabSize = 1;
+  protected boolean trackLineColumn = true;
+
+  public void setTabSize(int i) { tabSize = i; }
+  public int getTabSize(int i) { return tabSize; }
+
+  protected void ExpandBuff(boolean wrapAround)
+  {
+    char[] newbuffer = new char[bufsize + 2048];
+    int newbufline[] = new int[bufsize + 2048];
+    int newbufcolumn[] = new int[bufsize + 2048];
+
+    try
+    {
+      if (wrapAround)
+      {
+        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+        System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
+        buffer = newbuffer;
+
+        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+        System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
+        bufline = newbufline;
+
+        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+        System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
+        bufcolumn = newbufcolumn;
+
+        bufpos += (bufsize - tokenBegin);
     }
+    else
+    {
+        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+        buffer = newbuffer;
 
-    protected void ExpandBuff(boolean wrapAround) {
-        char[] newbuffer = new char[bufsize + 2048];
-        int newbufline[] = new int[bufsize + 2048];
-        int newbufcolumn[] = new int[bufsize + 2048];
+        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+        bufline = newbufline;
 
-        try {
-            if (wrapAround) {
-                System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-                System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
-                buffer = newbuffer;
+        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+        bufcolumn = newbufcolumn;
 
-                System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-                System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
-                bufline = newbufline;
+        bufpos -= tokenBegin;
+      }
+    }
+    catch (Exception t)
+    {
+      throw new RuntimeException(t.getMessage());
+    }
 
-                System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-                System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
-                bufcolumn = newbufcolumn;
+    available = (bufsize += 2048);
+    tokenBegin = 0;
+  }
+
+  protected void FillBuff() throws java.io.IOException
+  {
+    int i;
+    if (maxNextCharInd == 4096)
+      maxNextCharInd = nextCharInd = 0;
+
+    try {
+      if ((i = inputStream.read(nextCharBuf, maxNextCharInd,
+                                          4096 - maxNextCharInd)) == -1)
+      {
+        inputStream.close();
+        throw new java.io.IOException();
+      }
+      else
+         maxNextCharInd += i;
+      return;
+    }
+    catch(java.io.IOException e) {
+      if (bufpos != 0)
+      {
+        --bufpos;
+        backup(0);
+      }
+      else
+      {
+        bufline[bufpos] = line;
+        bufcolumn[bufpos] = column;
+      }
+      throw e;
+    }
+  }
 
-                bufpos += (bufsize - tokenBegin);
-            } else {
-                System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-                buffer = newbuffer;
+  protected char ReadByte() throws java.io.IOException
+  {
+    if (++nextCharInd >= maxNextCharInd)
+      FillBuff();
 
-                System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-                bufline = newbufline;
+    return nextCharBuf[nextCharInd];
+  }
 
-                System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-                bufcolumn = newbufcolumn;
+/** @return starting character for token. */
+  public char BeginToken() throws java.io.IOException
+  {
+    if (inBuf > 0)
+    {
+      --inBuf;
 
-                bufpos -= tokenBegin;
-            }
-        } catch (Exception t) {
-            throw new RuntimeException(t.getMessage());
-        }
+      if (++bufpos == bufsize)
+        bufpos = 0;
 
-        available = (bufsize += 2048);
-        tokenBegin = 0;
+      tokenBegin = bufpos;
+      return buffer[bufpos];
     }
 
-    protected void FillBuff() throws java.io.IOException {
-        int i;
-        if (maxNextCharInd == 4096)
-            maxNextCharInd = nextCharInd = 0;
-
-        try {
-            if ((i = inputStream.read(nextCharBuf, maxNextCharInd,
-                    4096 - maxNextCharInd)) == -1) {
-                inputStream.close();
-                throw new java.io.IOException();
-            } else
-                maxNextCharInd += i;
-            return;
-        } catch (java.io.IOException e) {
-            if (bufpos != 0) {
-                --bufpos;
-                backup(0);
-            } else {
-                bufline[bufpos] = line;
-                bufcolumn[bufpos] = column;
-            }
-            throw e;
-        }
+    tokenBegin = 0;
+    bufpos = -1;
+
+    return readChar();
+  }
+
+  protected void AdjustBuffSize()
+  {
+    if (available == bufsize)
+    {
+      if (tokenBegin > 2048)
+      {
+        bufpos = 0;
+        available = tokenBegin;
+      }
+      else
+        ExpandBuff(false);
     }
-
-    protected char ReadByte() throws java.io.IOException {
-        if (++nextCharInd >= maxNextCharInd)
-            FillBuff();
-
-        return nextCharBuf[nextCharInd];
+    else if (available > tokenBegin)
+      available = bufsize;
+    else if ((tokenBegin - available) < 2048)
+      ExpandBuff(true);
+    else
+      available = tokenBegin;
+  }
+
+  protected void UpdateLineColumn(char c)
+  {
+    column++;
+
+    if (prevCharIsLF)
+    {
+      prevCharIsLF = false;
+      line += (column = 1);
     }
-
-    /**
-     * @return starting character for token.
-     */
-    public char BeginToken() throws java.io.IOException {
-        if (inBuf > 0) {
-            --inBuf;
-
-            if (++bufpos == bufsize)
-                bufpos = 0;
-
-            tokenBegin = bufpos;
-            return buffer[bufpos];
-        }
-
-        tokenBegin = 0;
-        bufpos = -1;
-
-        return readChar();
+    else if (prevCharIsCR)
+    {
+      prevCharIsCR = false;
+      if (c == '\n')
+      {
+        prevCharIsLF = true;
+      }
+      else
+        line += (column = 1);
     }
 
-    protected void AdjustBuffSize() {
-        if (available == bufsize) {
-            if (tokenBegin > 2048) {
-                bufpos = 0;
-                available = tokenBegin;
-            } else
-                ExpandBuff(false);
-        } else if (available > tokenBegin)
-            available = bufsize;
-        else if ((tokenBegin - available) < 2048)
-            ExpandBuff(true);
-        else
-            available = tokenBegin;
+    switch (c)
+    {
+      case '\r' :
+        prevCharIsCR = true;
+        break;
+      case '\n' :
+        prevCharIsLF = true;
+        break;
+      case '\t' :
+        column--;
+        column += (tabSize - (column % tabSize));
+        break;
+      default :
+        break;
     }
 
-    protected void UpdateLineColumn(char c) {
-        column++;
-
-        if (prevCharIsLF) {
-            prevCharIsLF = false;
-            line += (column = 1);
-        } else if (prevCharIsCR) {
-            prevCharIsCR = false;
-            if (c == '\n') {
-                prevCharIsLF = true;
-            } else
-                line += (column = 1);
-        }
+    bufline[bufpos] = line;
+    bufcolumn[bufpos] = column;
+  }
 
-        switch (c) {
-            case '\r':
-                prevCharIsCR = true;
-                break;
-            case '\n':
-                prevCharIsLF = true;
-                break;
-            case '\t':
-                column--;
-                column += (tabSize - (column % tabSize));
-                break;
-            default:
-                break;
-        }
+/** Read a character. */
+  public char readChar() throws java.io.IOException
+  {
+    if (inBuf > 0)
+    {
+      --inBuf;
 
-        bufline[bufpos] = line;
-        bufcolumn[bufpos] = column;
+      if (++bufpos == bufsize)
+        bufpos = 0;
+
+      return buffer[bufpos];
     }
 
-    /**
-     * Read a character.
-     */
-    public char readChar() throws java.io.IOException {
-        if (inBuf > 0) {
-            --inBuf;
+    char c;
 
-            if (++bufpos == bufsize)
-                bufpos = 0;
+    if (++bufpos == available)
+      AdjustBuffSize();
 
-            return buffer[bufpos];
-        }
+    if ((buffer[bufpos] = c = ReadByte()) == '\\')
+    {
+      UpdateLineColumn(c);
 
-        char c;
+      int backSlashCnt = 1;
 
+      for (;;) // Read all the backslashes
+      {
         if (++bufpos == available)
-            AdjustBuffSize();
+          AdjustBuffSize();
 
-        if ((buffer[bufpos] = c = ReadByte()) == '\\') {
+        try
+        {
+          if ((buffer[bufpos] = c = ReadByte()) != '\\')
+          {
             UpdateLineColumn(c);
-
-            int backSlashCnt = 1;
-
-            for (; ; ) // Read all the backslashes
+            // found a non-backslash char.
+            if ((c == 'u') && ((backSlashCnt & 1) == 1))
             {
-                if (++bufpos == available)
-                    AdjustBuffSize();
-
-                try {
-                    if ((buffer[bufpos] = c = ReadByte()) != '\\') {
-                        UpdateLineColumn(c);
-                        // found a non-backslash char.
-                        if ((c == 'u') && ((backSlashCnt & 1) == 1)) {
-                            if (--bufpos < 0)
-                                bufpos = bufsize - 1;
-
-                            break;
-                        }
-
-                        backup(backSlashCnt);
-                        return '\\';
-                    }
-                } catch (java.io.IOException e) {
-                    // We are returning one backslash so we should only backup (count-1)
-                    if (backSlashCnt > 1)
-                        backup(backSlashCnt - 1);
-
-                    return '\\';
-                }
-
-                UpdateLineColumn(c);
-                backSlashCnt++;
-            }
-
-            // Here, we have seen an odd number of backslash's followed by a 'u'
-            try {
-                while ((c = ReadByte()) == 'u')
-                    ++column;
+              if (--bufpos < 0)
+                bufpos = bufsize - 1;
 
-                buffer[bufpos] = c = (char) (hexval(c) << 12 |
-                        hexval(ReadByte()) << 8 |
-                        hexval(ReadByte()) << 4 |
-                        hexval(ReadByte()));
-
-                column += 4;
-            } catch (java.io.IOException e) {
-                throw new RuntimeException("Invalid escape character at line " + line +
-                        " column " + column + ".");
+              break;
             }
 
-            if (backSlashCnt == 1)
-                return c;
-            else {
-                backup(backSlashCnt - 1);
-                return '\\';
-            }
-        } else {
-            UpdateLineColumn(c);
-            return c;
+            backup(backSlashCnt);
+            return '\\';
+          }
         }
-    }
+        catch(java.io.IOException e)
+        {
+	  // We are returning one backslash so we should only backup (count-1)
+          if (backSlashCnt > 1)
+            backup(backSlashCnt-1);
 
-    @Deprecated
-    /**
-     * @deprecated
-     * @see #getEndColumn
-     */
-    public int getColumn() {
-        return bufcolumn[bufpos];
-    }
+          return '\\';
+        }
 
-    @Deprecated
-    /**
-     * @deprecated
-     * @see #getEndLine
-     */
-    public int getLine() {
-        return bufline[bufpos];
+        UpdateLineColumn(c);
+        backSlashCnt++;
+      }
+
+      // Here, we have seen an odd number of backslash's followed by a 'u'
+      try
+      {
+        while ((c = ReadByte()) == 'u')
+          ++column;
+
+        buffer[bufpos] = c = (char)(hexval(c) << 12 |
+                                    hexval(ReadByte()) << 8 |
+                                    hexval(ReadByte()) << 4 |
+                                    hexval(ReadByte()));
+
+        column += 4;
+      }
+      catch(java.io.IOException e)
+      {
+        throw new RuntimeException("Invalid escape character at line " + line +
+                                         " column " + column + ".");
+      }
+
+      if (backSlashCnt == 1)
+        return c;
+      else
+      {
+        backup(backSlashCnt - 1);
+        return '\\';
+      }
     }
-
-    /**
-     * Get end column.
-     */
-    public int getEndColumn() {
-        return bufcolumn[bufpos];
+    else
+    {
+      UpdateLineColumn(c);
+      return c;
     }
-
-    /**
-     * Get end line.
-     */
-    public int getEndLine() {
-        return bufline[bufpos];
+  }
+
+  @Deprecated
+  /**
+   * @deprecated
+   * @see #getEndColumn
+   */
+  public int getColumn() {
+    return bufcolumn[bufpos];
+  }
+
+  @Deprecated
+  /**
+   * @deprecated
+   * @see #getEndLine
+   */
+  public int getLine() {
+    return bufline[bufpos];
+  }
+
+/** Get end column. */
+  public int getEndColumn() {
+    return bufcolumn[bufpos];
+  }
+
+/** Get end line. */
+  public int getEndLine() {
+    return bufline[bufpos];
+  }
+
+/** @return column of token start */
+  public int getBeginColumn() {
+    return bufcolumn[tokenBegin];
+  }
+
+/** @return line number of token start */
+  public int getBeginLine() {
+    return bufline[tokenBegin];
+  }
+
+/** Retreat. */
+  public void backup(int amount) {
+
+    inBuf += amount;
+    if ((bufpos -= amount) < 0)
+      bufpos += bufsize;
+  }
+
+/** Constructor. */
+  public JavaCharStream(Provider dstream,
+                 int startline, int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    available = bufsize = buffersize;
+    buffer = new char[buffersize];
+    bufline = new int[buffersize];
+    bufcolumn = new int[buffersize];
+    nextCharBuf = new char[4096];
+  }
+
+/** Constructor. */
+  public JavaCharStream(Provider dstream,
+                                        int startline, int startcolumn)
+  {
+    this(dstream, startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(Provider dstream)
+  {
+    this(dstream, 1, 1, 4096);
+  }
+/** Reinitialise. */
+  public void ReInit(Provider dstream,
+                 int startline, int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    if (buffer == null || buffersize != buffer.length)
+    {
+      available = bufsize = buffersize;
+      buffer = new char[buffersize];
+      bufline = new int[buffersize];
+      bufcolumn = new int[buffersize];
+      nextCharBuf = new char[4096];
     }
-
-    /**
-     * @return column of token start
-     */
-    public int getBeginColumn() {
-        return bufcolumn[tokenBegin];
+    prevCharIsLF = prevCharIsCR = false;
+    tokenBegin = inBuf = maxNextCharInd = 0;
+    nextCharInd = bufpos = -1;
+  }
+
+/** Reinitialise. */
+  public void ReInit(Provider dstream,
+                                        int startline, int startcolumn)
+  {
+    ReInit(dstream, startline, startcolumn, 4096);
+  }
+
+/** Reinitialise. */
+  public void ReInit(Provider dstream)
+  {
+    ReInit(dstream, 1, 1, 4096);
+  }
+
+
+
+  /** @return token image as String */
+  public String GetImage()
+  {
+    if (bufpos >= tokenBegin)
+      return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
+    else
+      return new String(buffer, tokenBegin, bufsize - tokenBegin) +
+                              new String(buffer, 0, bufpos + 1);
+  }
+
+  /** @return suffix */
+  public char[] GetSuffix(int len)
+  {
+    char[] ret = new char[len];
+
+    if ((bufpos + 1) >= len)
+      System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
+    else
+    {
+      System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
+                                                        len - bufpos - 1);
+      System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
     }
 
-    /**
-     * @return line number of token start
-     */
-    public int getBeginLine() {
-        return bufline[tokenBegin];
+    return ret;
+  }
+
+  /** Set buffers back to null when finished. */
+  public void Done()
+  {
+    nextCharBuf = null;
+    buffer = null;
+    bufline = null;
+    bufcolumn = null;
+  }
+
+  /**
+   * Method to adjust line and column numbers for the start of a token.
+   */
+  public void adjustBeginLineColumn(int newLine, int newCol)
+  {
+    int start = tokenBegin;
+    int len;
+
+    if (bufpos >= tokenBegin)
+    {
+      len = bufpos - tokenBegin + inBuf + 1;
     }
-
-    /**
-     * Retreat.
-     */
-    public void backup(int amount) {
-
-        inBuf += amount;
-        if ((bufpos -= amount) < 0)
-            bufpos += bufsize;
+    else
+    {
+      len = bufsize - tokenBegin + bufpos + 1 + inBuf;
     }
 
-    /**
-     * Constructor.
-     */
-    public JavaCharStream(Provider dstream,
-                          int startline, int startcolumn, int buffersize) {
-        inputStream = dstream;
-        line = startline;
-        column = startcolumn - 1;
-
-        available = bufsize = buffersize;
-        buffer = new char[buffersize];
-        bufline = new int[buffersize];
-        bufcolumn = new int[buffersize];
-        nextCharBuf = new char[4096];
-    }
+    int i = 0, j = 0, k = 0;
+    int nextColDiff = 0, columnDiff = 0;
 
-    /**
-     * Constructor.
-     */
-    public JavaCharStream(Provider dstream,
-                          int startline, int startcolumn) {
-        this(dstream, startline, startcolumn, 4096);
+    while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
+    {
+      bufline[j] = newLine;
+      nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
+      bufcolumn[j] = newCol + columnDiff;
+      columnDiff = nextColDiff;
+      i++;
     }
 
-    /**
-     * Constructor.
-     */
-    public JavaCharStream(Provider dstream) {
-        this(dstream, 1, 1, 4096);
-    }
+    if (i < len)
+    {
+      bufline[j] = newLine++;
+      bufcolumn[j] = newCol + columnDiff;
 
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(Provider dstream,
-                       int startline, int startcolumn, int buffersize) {
-        inputStream = dstream;
-        line = startline;
-        column = startcolumn - 1;
-
-        if (buffer == null || buffersize != buffer.length) {
-            available = bufsize = buffersize;
-            buffer = new char[buffersize];
-            bufline = new int[buffersize];
-            bufcolumn = new int[buffersize];
-            nextCharBuf = new char[4096];
-        }
-        prevCharIsLF = prevCharIsCR = false;
-        tokenBegin = inBuf = maxNextCharInd = 0;
-        nextCharInd = bufpos = -1;
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(Provider dstream,
-                       int startline, int startcolumn) {
-        ReInit(dstream, startline, startcolumn, 4096);
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(Provider dstream) {
-        ReInit(dstream, 1, 1, 4096);
-    }
-
-
-    /**
-     * @return token image as String
-     */
-    public String GetImage() {
-        if (bufpos >= tokenBegin)
-            return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
+      while (i++ < len)
+      {
+        if (bufline[j = start % bufsize] != bufline[++start % bufsize])
+          bufline[j] = newLine++;
         else
-            return new String(buffer, tokenBegin, bufsize - tokenBegin) +
-                    new String(buffer, 0, bufpos + 1);
+          bufline[j] = newLine;
+      }
     }
 
-    /**
-     * @return suffix
-     */
-    public char[] GetSuffix(int len) {
-        char[] ret = new char[len];
-
-        if ((bufpos + 1) >= len)
-            System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
-        else {
-            System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
-                    len - bufpos - 1);
-            System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
-        }
-
-        return ret;
-    }
-
-    /**
-     * Set buffers back to null when finished.
-     */
-    public void Done() {
-        nextCharBuf = null;
-        buffer = null;
-        bufline = null;
-        bufcolumn = null;
-    }
-
-    /**
-     * Method to adjust line and column numbers for the start of a token.
-     */
-    public void adjustBeginLineColumn(int newLine, int newCol) {
-        int start = tokenBegin;
-        int len;
-
-        if (bufpos >= tokenBegin) {
-            len = bufpos - tokenBegin + inBuf + 1;
-        } else {
-            len = bufsize - tokenBegin + bufpos + 1 + inBuf;
-        }
-
-        int i = 0, j = 0, k = 0;
-        int nextColDiff = 0, columnDiff = 0;
-
-        while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize]) {
-            bufline[j] = newLine;
-            nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
-            bufcolumn[j] = newCol + columnDiff;
-            columnDiff = nextColDiff;
-            i++;
-        }
-
-        if (i < len) {
-            bufline[j] = newLine++;
-            bufcolumn[j] = newCol + columnDiff;
-
-            while (i++ < len) {
-                if (bufline[j = start % bufsize] != bufline[++start % bufsize])
-                    bufline[j] = newLine++;
-                else
-                    bufline[j] = newLine;
-            }
-        }
-
-        line = bufline[j];
-        column = bufcolumn[j];
-    }
-
-    boolean getTrackLineColumn() {
-        return trackLineColumn;
-    }
-
-    void setTrackLineColumn(boolean tlc) {
-        trackLineColumn = tlc;
-    }
+    line = bufline[j];
+    column = bufcolumn[j];
+  }
+  boolean getTrackLineColumn() { return trackLineColumn; }
+  void setTrackLineColumn(boolean tlc) { trackLineColumn = tlc; }
 
 }
 /* JavaCC - OriginalChecksum=9ab0136fd4b1e2a45a251f41181a5bd8 (do not edit this line) */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ParseException.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ParseException.java
index 2058f88ff4..32283676c2 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ParseException.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/ParseException.java
@@ -19,208 +19,209 @@
  * You can explicitly create objects of this exception type by
  * calling the method generateParseException in the generated
  * parser.
- * <p>
+ *
  * You can modify this class to customize your error reporting
  * mechanisms so long as you retain the public fields.
  */
 public class ParseException extends Exception {
 
-    /**
-     * The version identifier for this Serializable class.
-     * Increment only if the <i>serialized</i> form of the
-     * class changes.
-     */
-    private static final long serialVersionUID = 1L;
-
-    private static final String INDENT = "    ";
-
-    /**
-     * The end of line string (we do not use System.getProperty("") so that we are compatible with Android/GWT);
-     */
-    protected static String EOL = "\n";
-
-
-    public ParseException(Token currentTokenVal,
-                          int[][] expectedTokenSequencesVal,
-                          String[] tokenImageVal
-    ) {
-        this(currentTokenVal, expectedTokenSequencesVal, tokenImageVal, null);
+  /**
+   * The version identifier for this Serializable class.
+   * Increment only if the <i>serialized</i> form of the
+   * class changes.
+   */
+  private static final long serialVersionUID = 1L;
+
+  private static final String INDENT = "    ";
+  
+  /**
+   * The end of line string (we do not use System.getProperty("") so that we are compatible with Android/GWT);
+   */
+  protected static String EOL = "\n";
+
+  
+  public ParseException(Token currentTokenVal,
+          int[][] expectedTokenSequencesVal,
+          String[] tokenImageVal
+         )
+	{
+	  this (currentTokenVal, expectedTokenSequencesVal, tokenImageVal, null);
+	}
+  
+  
+  /**
+   * This constructor is used by the method "generateParseException"
+   * in the generated parser.  Calling this constructor generates
+   * a new object of this type with the fields "currentToken",
+   * "expectedTokenSequences", and "tokenImage" set.
+   */
+  public ParseException(Token currentTokenVal,
+                        int[][] expectedTokenSequencesVal,
+                        String[] tokenImageVal,
+                        String lexicalStateName
+                       )
+  {
+    super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal, lexicalStateName));
+    currentToken = currentTokenVal;
+    expectedTokenSequences = expectedTokenSequencesVal;
+    tokenImage = tokenImageVal;
+  }
+
+  /**
+   * The following constructors are for use by you for whatever
+   * purpose you can think of.  Constructing the exception in this
+   * manner makes the exception behave in the normal way - i.e., as
+   * documented in the class "Throwable".  The fields "errorToken",
+   * "expectedTokenSequences", and "tokenImage" do not contain
+   * relevant information.  The JavaCC generated code does not use
+   * these constructors.
+   */
+
+  public ParseException() {
+    super();
+  }
+
+  /** Constructor with message. */
+  public ParseException(String message) {
+    super(message);
+  }
+
+
+  /**
+   * This is the last token that has been consumed successfully.  If
+   * this object has been created due to a parse error, the token
+   * followng this token will (therefore) be the first error token.
+   */
+  public Token currentToken;
+
+  /**
+   * Each entry in this array is an array of integers.  Each array
+   * of integers represents a sequence of tokens (by their ordinal
+   * values) that is expected at this point of the parse.
+   */
+  public int[][] expectedTokenSequences;
+
+  /**
+   * This is a reference to the "tokenImage" array of the generated
+   * parser within which the parse error occurred.  This array is
+   * defined in the generated ...Constants interface.
+   */
+  public String[] tokenImage;
+
+  /**
+   * It uses "currentToken" and "expectedTokenSequences" to generate a parse
+   * error message and returns it.  If this object has been created
+   * due to a parse error, and you do not catch it (it gets thrown
+   * from the parser) the correct error message
+   * gets displayed.
+   */
+  private static String initialise(Token currentToken,
+                           int[][] expectedTokenSequences,
+                           String[] tokenImage,
+                           String lexicalStateName) {
+	StringBuilder sb = new StringBuilder();
+    StringBuffer expected = new StringBuffer();
+    
+    int maxSize = 0;
+    java.util.TreeSet<String> sortedOptions = new java.util.TreeSet<String>();
+    for (int i = 0; i < expectedTokenSequences.length; i++) {
+      if (maxSize < expectedTokenSequences[i].length) {
+        maxSize = expectedTokenSequences[i].length;
+      }
+      for (int j = 0; j < expectedTokenSequences[i].length; j++) {
+    	  sortedOptions.add(tokenImage[expectedTokenSequences[i][j]]);
+      }
     }
-
-
-    /**
-     * This constructor is used by the method "generateParseException"
-     * in the generated parser.  Calling this constructor generates
-     * a new object of this type with the fields "currentToken",
-     * "expectedTokenSequences", and "tokenImage" set.
-     */
-    public ParseException(Token currentTokenVal,
-                          int[][] expectedTokenSequencesVal,
-                          String[] tokenImageVal,
-                          String lexicalStateName
-    ) {
-        super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal, lexicalStateName));
-        currentToken = currentTokenVal;
-        expectedTokenSequences = expectedTokenSequencesVal;
-        tokenImage = tokenImageVal;
+    
+    for (String option : sortedOptions) {
+        expected.append(INDENT).append(option).append(EOL);
+      }
+    
+    sb.append("Encountered unexpected token:");
+    
+    Token tok = currentToken.next;
+    for (int i = 0; i < maxSize; i++) {
+      String tokenText = tok.image;
+  	  String escapedTokenText = add_escapes(tokenText);
+      if (i != 0) {
+      	sb.append(" ");
+      }
+      if (tok.kind == 0) {
+      	sb.append(tokenImage[0]);
+        break;
+      }
+      sb.append(" \"");
+	  sb.append(escapedTokenText);
+      sb.append("\"");
+      sb.append(" " + tokenImage[tok.kind]);
+      tok = tok.next;
     }
-
-    /**
-     * The following constructors are for use by you for whatever
-     * purpose you can think of.  Constructing the exception in this
-     * manner makes the exception behave in the normal way - i.e., as
-     * documented in the class "Throwable".  The fields "errorToken",
-     * "expectedTokenSequences", and "tokenImage" do not contain
-     * relevant information.  The JavaCC generated code does not use
-     * these constructors.
-     */
-
-    public ParseException() {
-        super();
-    }
-
-    /**
-     * Constructor with message.
-     */
-    public ParseException(String message) {
-        super(message);
+	sb.append(EOL).append(INDENT).append("at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn);
+	sb.append(".").append(EOL);
+    
+    if (expectedTokenSequences.length == 0) {
+        // Nothing to add here
+    } else {
+    	int numExpectedTokens = expectedTokenSequences.length;
+    	sb.append(EOL).append("Was expecting"+ (numExpectedTokens == 1 ? ":" : " one of:") + EOL + EOL);
+    	sb.append(expected.toString());
     }
-
-
-    /**
-     * This is the last token that has been consumed successfully.  If
-     * this object has been created due to a parse error, the token
-     * followng this token will (therefore) be the first error token.
-     */
-    public Token currentToken;
-
-    /**
-     * Each entry in this array is an array of integers.  Each array
-     * of integers represents a sequence of tokens (by their ordinal
-     * values) that is expected at this point of the parse.
-     */
-    public int[][] expectedTokenSequences;
-
-    /**
-     * This is a reference to the "tokenImage" array of the generated
-     * parser within which the parse error occurred.  This array is
-     * defined in the generated ...Constants interface.
-     */
-    public String[] tokenImage;
-
-    /**
-     * It uses "currentToken" and "expectedTokenSequences" to generate a parse
-     * error message and returns it.  If this object has been created
-     * due to a parse error, and you do not catch it (it gets thrown
-     * from the parser) the correct error message
-     * gets displayed.
-     */
-    private static String initialise(Token currentToken,
-                                     int[][] expectedTokenSequences,
-                                     String[] tokenImage,
-                                     String lexicalStateName) {
-        StringBuilder sb = new StringBuilder();
-        StringBuffer expected = new StringBuffer();
-
-        int maxSize = 0;
-        java.util.TreeSet<String> sortedOptions = new java.util.TreeSet<String>();
-        for (int i = 0; i < expectedTokenSequences.length; i++) {
-            if (maxSize < expectedTokenSequences[i].length) {
-                maxSize = expectedTokenSequences[i].length;
-            }
-            for (int j = 0; j < expectedTokenSequences[i].length; j++) {
-                sortedOptions.add(tokenImage[expectedTokenSequences[i][j]]);
-            }
-        }
-
-        for (String option : sortedOptions) {
-            expected.append(INDENT).append(option).append(EOL);
-        }
-
-        sb.append("Encountered unexpected token:");
-
-        Token tok = currentToken.next;
-        for (int i = 0; i < maxSize; i++) {
-            String tokenText = tok.image;
-            String escapedTokenText = add_escapes(tokenText);
-            if (i != 0) {
-                sb.append(" ");
-            }
-            if (tok.kind == 0) {
-                sb.append(tokenImage[0]);
-                break;
-            }
-            sb.append(" \"");
-            sb.append(escapedTokenText);
-            sb.append("\"");
-            sb.append(" " + tokenImage[tok.kind]);
-            tok = tok.next;
-        }
-        sb.append(EOL).append(INDENT).append("at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn);
-        sb.append(".").append(EOL);
-
-        if (expectedTokenSequences.length == 0) {
-            // Nothing to add here
-        } else {
-            int numExpectedTokens = expectedTokenSequences.length;
-            sb.append(EOL).append("Was expecting" + (numExpectedTokens == 1 ? ":" : " one of:") + EOL + EOL);
-            sb.append(expected.toString());
-        }
-        // 2013/07/30 --> Seems to be inaccurate as represents the readahead state, not the lexical state BEFORE the unknown token
+    // 2013/07/30 --> Seems to be inaccurate as represents the readahead state, not the lexical state BEFORE the unknown token
 //    if (lexicalStateName != null) {
 //    	sb.append(EOL).append("** Lexical State : ").append(lexicalStateName).append(EOL).append(EOL);
 //    }
-
-        return sb.toString();
-    }
-
-
-    /**
-     * Used to convert raw characters to their escaped version
-     * when these raw version cannot be used as part of an ASCII
-     * string literal.
-     */
-    static String add_escapes(String str) {
-        StringBuffer retval = new StringBuffer();
-        char ch;
-        for (int i = 0; i < str.length(); i++) {
-            switch (str.charAt(i)) {
-                case '\b':
-                    retval.append("\\b");
-                    continue;
-                case '\t':
-                    retval.append("\\t");
-                    continue;
-                case '\n':
-                    retval.append("\\n");
-                    continue;
-                case '\f':
-                    retval.append("\\f");
-                    continue;
-                case '\r':
-                    retval.append("\\r");
-                    continue;
-                case '\"':
-                    retval.append("\\\"");
-                    continue;
-                case '\'':
-                    retval.append("\\\'");
-                    continue;
-                case '\\':
-                    retval.append("\\\\");
-                    continue;
-                default:
-                    if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                        String s = "0000" + Integer.toString(ch, 16);
-                        retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-                    } else {
-                        retval.append(ch);
-                    }
-                    continue;
-            }
+    
+    return sb.toString();
+  }
+
+
+  /**
+   * Used to convert raw characters to their escaped version
+   * when these raw version cannot be used as part of an ASCII
+   * string literal.
+   */
+  static String add_escapes(String str) {
+      StringBuffer retval = new StringBuffer();
+      char ch;
+      for (int i = 0; i < str.length(); i++) {
+        switch (str.charAt(i))
+        {
+           case '\b':
+              retval.append("\\b");
+              continue;
+           case '\t':
+              retval.append("\\t");
+              continue;
+           case '\n':
+              retval.append("\\n");
+              continue;
+           case '\f':
+              retval.append("\\f");
+              continue;
+           case '\r':
+              retval.append("\\r");
+              continue;
+           case '\"':
+              retval.append("\\\"");
+              continue;
+           case '\'':
+              retval.append("\\\'");
+              continue;
+           case '\\':
+              retval.append("\\\\");
+              continue;
+           default:
+              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+                 String s = "0000" + Integer.toString(ch, 16);
+                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+              } else {
+                 retval.append(ch);
+              }
+              continue;
         }
-        return retval.toString();
-    }
+      }
+      return retval.toString();
+   }
 
 }
 /* JavaCC - OriginalChecksum=c0da6a86ac0d0ec8b633aeafa43e6e37 (do not edit this line) */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Provider.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Provider.java
index 02a2eb9c7c..13d71c5283 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Provider.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Provider.java
@@ -20,22 +20,20 @@
 public interface Provider {
     /**
      * Reads characters into an array
-     *
-     * @param buffer Destination buffer
-     * @param offset Offset at which to start storing characters
-     * @param len    The maximum possible number of characters to read
+     * @param buffer  Destination buffer
+     * @param offset   Offset at which to start storing characters
+     * @param len      The maximum possible number of characters to read
      * @return The number of characters read, or -1 if all read
-     * @throws IOException
+     * @exception  IOException
      */
     public int read(char buffer[], int offset, int len) throws IOException;
-
+    
     /**
      * Closes the stream and releases any system resources associated with
      * it.
-     *
-     * @throws IOException
+     * @exception IOException
      */
-    public void close() throws IOException;
-
+     public void close() throws IOException;
+    
 }
 /* JavaCC - OriginalChecksum=89684d4e3db82aa5e480d095c170b352 (do not edit this line) */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StreamProvider.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StreamProvider.java
index fbcd67e82f..2c30e16104 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StreamProvider.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StreamProvider.java
@@ -26,23 +26,23 @@
  */
 public class StreamProvider implements Provider {
 
-    Reader _reader;
+	Reader _reader;
 
-    public StreamProvider(Reader reader) {
-        _reader = reader;
-    }
+	public StreamProvider(Reader reader) {
+		_reader = reader;
+	}
+	
+	public StreamProvider(InputStream stream) throws IOException {
+		_reader = new BufferedReader(new InputStreamReader(stream));
+	}
+	
+	public StreamProvider(InputStream stream, String charsetName) throws IOException {
+		_reader = new BufferedReader(new InputStreamReader(stream, charsetName));
+	}
 
-    public StreamProvider(InputStream stream) throws IOException {
-        _reader = new BufferedReader(new InputStreamReader(stream));
-    }
-
-    public StreamProvider(InputStream stream, String charsetName) throws IOException {
-        _reader = new BufferedReader(new InputStreamReader(stream, charsetName));
-    }
-
-    @Override
-    public int read(char[] buffer, int off, int len) throws IOException {
-        int result = _reader.read(buffer, off, len);
+	@Override
+	public int read(char[] buffer, int off, int len) throws IOException {
+	   int result = _reader.read(buffer, off, len);
 
 	   /* CBA -- Added 2014/03/29 -- 
 	             This logic allows the generated Java code to be easily translated to C# (via sharpen) -
@@ -50,20 +50,20 @@ public int read(char[] buffer, int off, int len) throws IOException {
 	             See : http://msdn.microsoft.com/en-us/library/9kstw824(v=vs.110).aspx
 	             ** Technically, this is not required for java but the overhead is extremely low compared to the code generation benefits.
 	   */
+	   
+	   if (result == 0) {
+	      if (off < buffer.length && len > 0) {
+	        result = -1;
+	      }
+	   }
+	   
+		return result;
+	}
 
-        if (result == 0) {
-            if (off < buffer.length && len > 0) {
-                result = -1;
-            }
-        }
-
-        return result;
-    }
-
-    @Override
-    public void close() throws IOException {
-        _reader.close();
-    }
+	@Override
+	public void close() throws IOException {
+		_reader.close();
+	}
 
 }
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StringProvider.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StringProvider.java
index 056a442f75..83c3504c90 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StringProvider.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/StringProvider.java
@@ -14,47 +14,47 @@
  */
 package com.github.javaparser;
 
-
-import java.io.IOException;
-
-public class StringProvider implements Provider {
-
-    String _string;
-    int _position = 0;
-    int _size;
-
-    public StringProvider(String string) {
-        _string = string;
-        _size = string.length();
-    }
-
-    @Override
-    public int read(char[] cbuf, int off, int len) throws IOException {
-        int numCharsOutstandingInString = _size - _position;
-
-        if (numCharsOutstandingInString == 0) {
-            return -1;
-        }
-
-        int numBytesInBuffer = cbuf.length;
-        int numBytesToRead = numBytesInBuffer - off;
-        numBytesToRead = numBytesToRead > len ? len : numBytesToRead;
-
-        if (numBytesToRead > numCharsOutstandingInString) {
-            numBytesToRead = numCharsOutstandingInString;
-        }
-
-        _string.getChars(_position, _position + numBytesToRead, cbuf, off);
-
-        _position += numBytesToRead;
-
-        return numBytesToRead;
-    }
-
-    @Override
-    public void close() throws IOException {
-        _string = null;
-    }
-
-}
+	
+	import java.io.IOException;
+	
+	public class StringProvider implements Provider {
+
+		String _string;
+		int _position = 0;
+		int _size;
+		
+		public StringProvider(String string) {
+			_string = string;
+			_size = string.length();
+		}
+		
+		@Override
+		public int read(char[] cbuf, int off, int len) throws IOException {
+			int numCharsOutstandingInString = _size - _position;
+			
+			if (numCharsOutstandingInString == 0) {
+				return -1;
+			}
+			
+			int numBytesInBuffer = cbuf.length;
+			int numBytesToRead = numBytesInBuffer -off;
+			numBytesToRead = numBytesToRead > len ? len : numBytesToRead;
+			
+			if (numBytesToRead > numCharsOutstandingInString) {
+				numBytesToRead = numCharsOutstandingInString;
+			}
+			
+			_string.getChars(_position, _position + numBytesToRead, cbuf, off);
+			
+			_position += numBytesToRead;
+			
+			return numBytesToRead;
+		}
+
+		@Override
+		public void close() throws IOException {
+			_string = null;
+		}
+		
+	}
 /* JavaCC - OriginalChecksum=9873e92cad8666980a4c6d392c0c7ad4 (do not edit this line) */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Token.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Token.java
index 4af5ff3b71..2731d04279 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Token.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/Token.java
@@ -20,128 +20,124 @@
 
 public class Token implements java.io.Serializable {
 
-    /**
-     * The version identifier for this Serializable class.
-     * Increment only if the <i>serialized</i> form of the
-     * class changes.
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * An integer that describes the kind of this token.  This numbering
-     * system is determined by JavaCCParser, and a table of these numbers is
-     * stored in the file ...Constants.java.
-     */
-    public int kind;
-
-    /**
-     * The line number of the first character of this Token.
-     */
-    public int beginLine;
-    /**
-     * The column number of the first character of this Token.
-     */
-    public int beginColumn;
-    /**
-     * The line number of the last character of this Token.
-     */
-    public int endLine;
-    /**
-     * The column number of the last character of this Token.
-     */
-    public int endColumn;
-
-    /**
-     * The string image of the token.
-     */
-    public String image;
-
-    /**
-     * A reference to the next regular (non-special) token from the input
-     * stream.  If this is the last token from the input stream, or if the
-     * token manager has not read tokens beyond this one, this field is
-     * set to null.  This is true only if this token is also a regular
-     * token.  Otherwise, see below for a description of the contents of
-     * this field.
-     */
-    public Token next;
-
-    /**
-     * This field is used to access special tokens that occur prior to this
-     * token, but after the immediately preceding regular (non-special) token.
-     * If there are no such special tokens, this field is set to null.
-     * When there are more than one such special token, this field refers
-     * to the last of these special tokens, which in turn refers to the next
-     * previous special token through its specialToken field, and so on
-     * until the first special token (whose specialToken field is null).
-     * The next fields of special tokens refer to other special tokens that
-     * immediately follow it (without an intervening regular token).  If there
-     * is no such token, this field is null.
-     */
-    public Token specialToken;
-
-    /**
-     * An optional attribute value of the Token.
-     * Tokens which are not used as syntactic sugar will often contain
-     * meaningful values that will be used later on by the compiler or
-     * interpreter. This attribute value is often different from the image.
-     * Any subclass of Token that actually wants to return a non-null value can
-     * override this method as appropriate.
-     */
-    public Object getValue() {
-        return null;
+  /**
+   * The version identifier for this Serializable class.
+   * Increment only if the <i>serialized</i> form of the
+   * class changes.
+   */
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * An integer that describes the kind of this token.  This numbering
+   * system is determined by JavaCCParser, and a table of these numbers is
+   * stored in the file ...Constants.java.
+   */
+  public int kind;
+
+  /** The line number of the first character of this Token. */
+  public int beginLine;
+  /** The column number of the first character of this Token. */
+  public int beginColumn;
+  /** The line number of the last character of this Token. */
+  public int endLine;
+  /** The column number of the last character of this Token. */
+  public int endColumn;
+
+  /**
+   * The string image of the token.
+   */
+  public String image;
+
+  /**
+   * A reference to the next regular (non-special) token from the input
+   * stream.  If this is the last token from the input stream, or if the
+   * token manager has not read tokens beyond this one, this field is
+   * set to null.  This is true only if this token is also a regular
+   * token.  Otherwise, see below for a description of the contents of
+   * this field.
+   */
+  public Token next;
+
+  /**
+   * This field is used to access special tokens that occur prior to this
+   * token, but after the immediately preceding regular (non-special) token.
+   * If there are no such special tokens, this field is set to null.
+   * When there are more than one such special token, this field refers
+   * to the last of these special tokens, which in turn refers to the next
+   * previous special token through its specialToken field, and so on
+   * until the first special token (whose specialToken field is null).
+   * The next fields of special tokens refer to other special tokens that
+   * immediately follow it (without an intervening regular token).  If there
+   * is no such token, this field is null.
+   */
+  public Token specialToken;
+
+  /**
+   * An optional attribute value of the Token.
+   * Tokens which are not used as syntactic sugar will often contain
+   * meaningful values that will be used later on by the compiler or
+   * interpreter. This attribute value is often different from the image.
+   * Any subclass of Token that actually wants to return a non-null value can
+   * override this method as appropriate.
+   */
+  public Object getValue() {
+    return null;
+  }
+
+  /**
+   * No-argument constructor
+   */
+  public Token() {}
+
+  /**
+   * Constructs a new token for the specified Image.
+   */
+  public Token(int kind)
+  {
+    this(kind, null);
+  }
+
+  /**
+   * Constructs a new token for the specified Image and Kind.
+   */
+  public Token(int kind, String image)
+  {
+    this.kind = kind;
+    this.image = image;
+  }
+
+  /**
+   * Returns the image.
+   */
+  public String toString()
+  {
+    return image;
+  }
+
+  /**
+   * Returns a new Token object, by default. However, if you want, you
+   * can create and return subclass objects based on the value of ofKind.
+   * Simply add the cases to the switch for all those special cases.
+   * For example, if you have a subclass of Token called IDToken that
+   * you want to create if ofKind is ID, simply add something like :
+   *
+   *    case MyParserConstants.ID : return new IDToken(ofKind, image);
+   *
+   * to the following switch statement. Then you can cast matchedToken
+   * variable to the appropriate type and use sit in your lexical actions.
+   */
+  public static Token newToken(int ofKind, String image)
+  {
+    switch(ofKind)
+    {
+      default : return new Token(ofKind, image);
     }
+  }
 
-    /**
-     * No-argument constructor
-     */
-    public Token() {
-    }
-
-    /**
-     * Constructs a new token for the specified Image.
-     */
-    public Token(int kind) {
-        this(kind, null);
-    }
-
-    /**
-     * Constructs a new token for the specified Image and Kind.
-     */
-    public Token(int kind, String image) {
-        this.kind = kind;
-        this.image = image;
-    }
-
-    /**
-     * Returns the image.
-     */
-    public String toString() {
-        return image;
-    }
-
-    /**
-     * Returns a new Token object, by default. However, if you want, you
-     * can create and return subclass objects based on the value of ofKind.
-     * Simply add the cases to the switch for all those special cases.
-     * For example, if you have a subclass of Token called IDToken that
-     * you want to create if ofKind is ID, simply add something like :
-     * <p>
-     * case MyParserConstants.ID : return new IDToken(ofKind, image);
-     * <p>
-     * to the following switch statement. Then you can cast matchedToken
-     * variable to the appropriate type and use sit in your lexical actions.
-     */
-    public static Token newToken(int ofKind, String image) {
-        switch (ofKind) {
-            default:
-                return new Token(ofKind, image);
-        }
-    }
-
-    public static Token newToken(int ofKind) {
-        return newToken(ofKind, null);
-    }
+  public static Token newToken(int ofKind)
+  {
+    return newToken(ofKind, null);
+  }
 
 }
 /* JavaCC - OriginalChecksum=fd43051db65fcdc22df39a61d81bf7a4 (do not edit this line) */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrError.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrError.java
index 02afe0d7f9..09197e805c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrError.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrError.java
@@ -14,152 +14,146 @@
  */
 package com.github.javaparser;
 
-/**
- * Token Manager Error.
- */
-public class TokenMgrError extends Error {
+/** Token Manager Error. */
+public class TokenMgrError extends Error
+{
 
-    /**
-     * The version identifier for this Serializable class.
-     * Increment only if the <i>serialized</i> form of the
-     * class changes.
-     */
-    private static final long serialVersionUID = 1L;
+  /**
+   * The version identifier for this Serializable class.
+   * Increment only if the <i>serialized</i> form of the
+   * class changes.
+   */
+  private static final long serialVersionUID = 1L;
 
-    /*
-     * Ordinals for various reasons why an Error of this type can be thrown.
-     */
+  /*
+   * Ordinals for various reasons why an Error of this type can be thrown.
+   */
 
-    /**
-     * Lexical error occurred.
-     */
-    static final int LEXICAL_ERROR = 0;
+  /**
+   * Lexical error occurred.
+   */
+  static final int LEXICAL_ERROR = 0;
 
-    /**
-     * An attempt was made to create a second instance of a static token manager.
-     */
-    static final int STATIC_LEXER_ERROR = 1;
+  /**
+   * An attempt was made to create a second instance of a static token manager.
+   */
+  static final int STATIC_LEXER_ERROR = 1;
 
-    /**
-     * Tried to change to an invalid lexical state.
-     */
-    static final int INVALID_LEXICAL_STATE = 2;
+  /**
+   * Tried to change to an invalid lexical state.
+   */
+  static final int INVALID_LEXICAL_STATE = 2;
 
-    /**
-     * Detected (and bailed out of) an infinite loop in the token manager.
-     */
-    static final int LOOP_DETECTED = 3;
+  /**
+   * Detected (and bailed out of) an infinite loop in the token manager.
+   */
+  static final int LOOP_DETECTED = 3;
 
-    /**
-     * Indicates the reason why the exception is thrown. It will have
-     * one of the above 4 values.
-     */
-    int errorCode;
+  /**
+   * Indicates the reason why the exception is thrown. It will have
+   * one of the above 4 values.
+   */
+  int errorCode;
 
-    /**
-     * Replaces unprintable characters by their escaped (or unicode escaped)
-     * equivalents in the given string
-     */
-    protected static final String addEscapes(String str) {
-        StringBuffer retval = new StringBuffer();
-        char ch;
-        for (int i = 0; i < str.length(); i++) {
-            switch (str.charAt(i)) {
-                case 0:
-                    continue;
-                case '\b':
-                    retval.append("\\b");
-                    continue;
-                case '\t':
-                    retval.append("\\t");
-                    continue;
-                case '\n':
-                    retval.append("\\n");
-                    continue;
-                case '\f':
-                    retval.append("\\f");
-                    continue;
-                case '\r':
-                    retval.append("\\r");
-                    continue;
-                case '\"':
-                    retval.append("\\\"");
-                    continue;
-                case '\'':
-                    retval.append("\\\'");
-                    continue;
-                case '\\':
-                    retval.append("\\\\");
-                    continue;
-                default:
-                    if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                        String s = "0000" + Integer.toString(ch, 16);
-                        retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-                    } else {
-                        retval.append(ch);
-                    }
-                    continue;
-            }
-        }
-        return retval.toString();
+  /**
+   * Replaces unprintable characters by their escaped (or unicode escaped)
+   * equivalents in the given string
+   */
+  protected static final String addEscapes(String str) {
+    StringBuffer retval = new StringBuffer();
+    char ch;
+    for (int i = 0; i < str.length(); i++) {
+      switch (str.charAt(i))
+      {
+        case 0 :
+          continue;
+        case '\b':
+          retval.append("\\b");
+          continue;
+        case '\t':
+          retval.append("\\t");
+          continue;
+        case '\n':
+          retval.append("\\n");
+          continue;
+        case '\f':
+          retval.append("\\f");
+          continue;
+        case '\r':
+          retval.append("\\r");
+          continue;
+        case '\"':
+          retval.append("\\\"");
+          continue;
+        case '\'':
+          retval.append("\\\'");
+          continue;
+        case '\\':
+          retval.append("\\\\");
+          continue;
+        default:
+          if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+            String s = "0000" + Integer.toString(ch, 16);
+            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+          } else {
+            retval.append(ch);
+          }
+          continue;
+      }
     }
+    return retval.toString();
+  }
 
-    /**
-     * Returns a detailed message for the Error when it is thrown by the
-     * token manager to indicate a lexical error.
-     * Parameters :
-     * EOFSeen     : indicates if EOF caused the lexical error
-     * curLexState : lexical state in which this error occurred
-     * errorLine   : line number when the error occurred
-     * errorColumn : column number when the error occurred
-     * errorAfter  : prefix that was seen before this error occurred
-     * curchar     : the offending character
-     * Note: You can customize the lexical error message by modifying this method.
-     */
-    protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
-        return ("Lexical error at line " +
-                errorLine + ", column " +
-                errorColumn + ".  Encountered: " +
-                (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int) curChar + "), ") +
-                "after : \"" + addEscapes(errorAfter) + "\"");
-    }
+  /**
+   * Returns a detailed message for the Error when it is thrown by the
+   * token manager to indicate a lexical error.
+   * Parameters :
+   *    EOFSeen     : indicates if EOF caused the lexical error
+   *    curLexState : lexical state in which this error occurred
+   *    errorLine   : line number when the error occurred
+   *    errorColumn : column number when the error occurred
+   *    errorAfter  : prefix that was seen before this error occurred
+   *    curchar     : the offending character
+   * Note: You can customize the lexical error message by modifying this method.
+   */
+  protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
+    return("Lexical error at line " +
+          errorLine + ", column " +
+          errorColumn + ".  Encountered: " +
+          (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
+          "after : \"" + addEscapes(errorAfter) + "\"");
+  }
 
-    /**
-     * You can also modify the body of this method to customize your error messages.
-     * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
-     * of end-users concern, so you can return something like :
-     * <p>
-     * "Internal Error : Please file a bug report .... "
-     * <p>
-     * from this method for such cases in the release version of your parser.
-     */
-    public String getMessage() {
-        return super.getMessage();
-    }
+  /**
+   * You can also modify the body of this method to customize your error messages.
+   * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
+   * of end-users concern, so you can return something like :
+   *
+   *     "Internal Error : Please file a bug report .... "
+   *
+   * from this method for such cases in the release version of your parser.
+   */
+  public String getMessage() {
+    return super.getMessage();
+  }
 
-    /*
-     * Constructors of various flavors follow.
-     */
+  /*
+   * Constructors of various flavors follow.
+   */
 
-    /**
-     * No arg constructor.
-     */
-    public TokenMgrError() {
-    }
+  /** No arg constructor. */
+  public TokenMgrError() {
+  }
 
-    /**
-     * Constructor with message and reason.
-     */
-    public TokenMgrError(String message, int reason) {
-        super(message);
-        errorCode = reason;
-    }
+  /** Constructor with message and reason. */
+  public TokenMgrError(String message, int reason) {
+    super(message);
+    errorCode = reason;
+  }
 
-    /**
-     * Full Constructor.
-     */
-    public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
-        this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
-    }
+  /** Full Constructor. */
+  public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
+    this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
+  }
 }
 /* JavaCC - OriginalChecksum=f06c7e964b5c13a732337c2f3fb4f836 (do not edit this line) */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrException.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrException.java
index b0a10bc9d4..d290424fb7 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrException.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_new_src/javaparser-generated-sources/com/github/javaparser/TokenMgrException.java
@@ -14,151 +14,145 @@
  */
 package com.github.javaparser;
 
-/**
- * Token Manager Error.
- */
-public class TokenMgrException extends RuntimeException {
+/** Token Manager Error. */
+public class TokenMgrException extends RuntimeException
+{
 
-    /**
-     * The version identifier for this Serializable class.
-     * Increment only if the <i>serialized</i> form of the
-     * class changes.
-     */
-    private static final long serialVersionUID = 1L;
+  /**
+   * The version identifier for this Serializable class.
+   * Increment only if the <i>serialized</i> form of the
+   * class changes.
+   */
+  private static final long serialVersionUID = 1L;
 
-    /*
-     * Ordinals for various reasons why an Error of this type can be thrown.
-     */
+  /*
+   * Ordinals for various reasons why an Error of this type can be thrown.
+   */
 
-    /**
-     * Lexical error occurred.
-     */
-    public static final int LEXICAL_ERROR = 0;
+  /**
+   * Lexical error occurred.
+   */
+  public static final int LEXICAL_ERROR = 0;
 
-    /**
-     * An attempt was made to create a second instance of a static token manager.
-     */
-    public static final int STATIC_LEXER_ERROR = 1;
+  /**
+   * An attempt was made to create a second instance of a static token manager.
+   */
+  public static final int STATIC_LEXER_ERROR = 1;
 
-    /**
-     * Tried to change to an invalid lexical state.
-     */
-    public static final int INVALID_LEXICAL_STATE = 2;
+  /**
+   * Tried to change to an invalid lexical state.
+   */
+  public static final int INVALID_LEXICAL_STATE = 2;
 
-    /**
-     * Detected (and bailed out of) an infinite loop in the token manager.
-     */
-    public static final int LOOP_DETECTED = 3;
+  /**
+   * Detected (and bailed out of) an infinite loop in the token manager.
+   */
+  public static final int LOOP_DETECTED = 3;
 
-    /**
-     * Indicates the reason why the exception is thrown. It will have
-     * one of the above 4 values.
-     */
-    int errorCode;
+  /**
+   * Indicates the reason why the exception is thrown. It will have
+   * one of the above 4 values.
+   */
+  int errorCode;
 
-    /**
-     * Replaces unprintable characters by their escaped (or unicode escaped)
-     * equivalents in the given string
-     */
-    protected static final String addEscapes(String str) {
-        StringBuffer retval = new StringBuffer();
-        char ch;
-        for (int i = 0; i < str.length(); i++) {
-            switch (str.charAt(i)) {
-                case '\b':
-                    retval.append("\\b");
-                    continue;
-                case '\t':
-                    retval.append("\\t");
-                    continue;
-                case '\n':
-                    retval.append("\\n");
-                    continue;
-                case '\f':
-                    retval.append("\\f");
-                    continue;
-                case '\r':
-                    retval.append("\\r");
-                    continue;
-                case '\"':
-                    retval.append("\\\"");
-                    continue;
-                case '\'':
-                    retval.append("\\\'");
-                    continue;
-                case '\\':
-                    retval.append("\\\\");
-                    continue;
-                default:
-                    if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                        String s = "0000" + Integer.toString(ch, 16);
-                        retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-                    } else {
-                        retval.append(ch);
-                    }
-                    continue;
-            }
-        }
-        return retval.toString();
+  /**
+   * Replaces unprintable characters by their escaped (or unicode escaped)
+   * equivalents in the given string
+   */
+  protected static final String addEscapes(String str) {
+    StringBuffer retval = new StringBuffer();
+    char ch;
+    for (int i = 0; i < str.length(); i++) {
+      switch (str.charAt(i))
+      {
+        case '\b':
+          retval.append("\\b");
+          continue;
+        case '\t':
+          retval.append("\\t");
+          continue;
+        case '\n':
+          retval.append("\\n");
+          continue;
+        case '\f':
+          retval.append("\\f");
+          continue;
+        case '\r':
+          retval.append("\\r");
+          continue;
+        case '\"':
+          retval.append("\\\"");
+          continue;
+        case '\'':
+          retval.append("\\\'");
+          continue;
+        case '\\':
+          retval.append("\\\\");
+          continue;
+        default:
+          if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+            String s = "0000" + Integer.toString(ch, 16);
+            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+          } else {
+            retval.append(ch);
+          }
+          continue;
+      }
     }
+    return retval.toString();
+  }
 
-    /**
-     * Returns a detailed message for the Error when it is thrown by the
-     * token manager to indicate a lexical error.
-     * Parameters :
-     * EOFSeen     : indicates if EOF caused the lexical error
-     * curLexState : lexical state in which this error occurred
-     * errorLine   : line number when the error occurred
-     * errorColumn : column number when the error occurred
-     * errorAfter  : prefix that was seen before this error occurred
-     * curchar     : the offending character
-     * Note: You can customize the lexical error message by modifying this method.
-     */
-    protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {
-        char curChar1 = (char) curChar;
-        return ("Lexical error at line " +
-                errorLine + ", column " +
-                errorColumn + ".  Encountered: " +
-                (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar1)) + "\"") + " (" + (int) curChar + "), ") +
-                "after : \"" + addEscapes(errorAfter) + "\"");
-    }
+  /**
+   * Returns a detailed message for the Error when it is thrown by the
+   * token manager to indicate a lexical error.
+   * Parameters :
+   *    EOFSeen     : indicates if EOF caused the lexical error
+   *    curLexState : lexical state in which this error occurred
+   *    errorLine   : line number when the error occurred
+   *    errorColumn : column number when the error occurred
+   *    errorAfter  : prefix that was seen before this error occurred
+   *    curchar     : the offending character
+   * Note: You can customize the lexical error message by modifying this method.
+   */
+  protected static String LexicalErr(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar) {
+    char curChar1 = (char)curChar;
+    return("Lexical error at line " +
+          errorLine + ", column " +
+          errorColumn + ".  Encountered: " +
+          (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar1)) + "\"") + " (" + (int)curChar + "), ") +
+          "after : \"" + addEscapes(errorAfter) + "\"");
+  }
 
-    /**
-     * You can also modify the body of this method to customize your error messages.
-     * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
-     * of end-users concern, so you can return something like :
-     * <p>
-     * "Internal Error : Please file a bug report .... "
-     * <p>
-     * from this method for such cases in the release version of your parser.
-     */
-    public String getMessage() {
-        return super.getMessage();
-    }
+  /**
+   * You can also modify the body of this method to customize your error messages.
+   * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
+   * of end-users concern, so you can return something like :
+   *
+   *     "Internal Error : Please file a bug report .... "
+   *
+   * from this method for such cases in the release version of your parser.
+   */
+  public String getMessage() {
+    return super.getMessage();
+  }
 
-    /*
-     * Constructors of various flavors follow.
-     */
+  /*
+   * Constructors of various flavors follow.
+   */
 
-    /**
-     * No arg constructor.
-     */
-    public TokenMgrException() {
-    }
+  /** No arg constructor. */
+  public TokenMgrException() {
+  }
 
-    /**
-     * Constructor with message and reason.
-     */
-    public TokenMgrException(String message, int reason) {
-        super(message);
-        errorCode = reason;
-    }
+  /** Constructor with message and reason. */
+  public TokenMgrException(String message, int reason) {
+    super(message);
+    errorCode = reason;
+  }
 
-    /**
-     * Full Constructor.
-     */
-    public TokenMgrException(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) {
-        this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
-    }
+  /** Full Constructor. */
+  public TokenMgrException(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, int curChar, int reason) {
+    this(LexicalErr(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
+  }
 }
 /* JavaCC - OriginalChecksum=d2d40125d51af5fe5bc7e2ab87d062ad (do not edit this line) */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParser.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParser.java
index 9089096869..151cff21a9 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParser.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParser.java
@@ -15,7 +15,6 @@
 
 import java.io.*;
 import java.util.*;
-
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.comments.*;
@@ -34,7 +33,7 @@ void reset(InputStream in, String encoding) {
 
     private List add(List list, Object obj) {
         if (list == null) {
-            list = new LinkedList();
+                list = new LinkedList();
         }
         list.add(obj);
         return list;
@@ -42,26 +41,26 @@ private List add(List list, Object obj) {
 
     private List add(int pos, List list, Object obj) {
         if (list == null) {
-            list = new LinkedList();
+                list = new LinkedList();
         }
         list.add(pos, obj);
         return list;
     }
 
-    private class Modifier {
+        private class Modifier {
 
-        final int modifiers;
-        final List annotations;
-        final int beginLine;
-        final int beginColumn;
+                final int modifiers;
+                final List annotations;
+                final int beginLine;
+                final int beginColumn;
 
-        public Modifier(int beginLine, int beginColumn, int modifiers, List annotations) {
-            this.beginLine = beginLine;
-            this.beginColumn = beginColumn;
-            this.modifiers = modifiers;
-            this.annotations = annotations;
+                public Modifier(int beginLine, int beginColumn, int modifiers, List annotations) {
+                        this.beginLine = beginLine;
+                        this.beginColumn = beginColumn;
+                        this.modifiers = modifiers;
+                        this.annotations = annotations;
+                }
         }
-    }
 
     public int addModifier(int modifiers, int mod, Token token) {
         if ((ModifierSet.hasModifier(modifiers, mod))) {
@@ -85,27 +84,27 @@ private void throwParseException(Token token, String message) {
     }
 
     private Expression generateLambda(Expression ret, Statement lambdaBody) {
-        if (ret instanceof EnclosedExpr) {
-            Expression inner = ((EnclosedExpr) ret).getInner();
-            if (inner != null && inner instanceof NameExpr) {
-                VariableDeclaratorId id = new VariableDeclaratorId(inner.getBeginLine(), inner.getBeginColumn(), inner.getEndLine(), inner.getEndColumn(), ((NameExpr) inner).getName(), 0);
+            if (ret instanceof EnclosedExpr) {
+                Expression inner = ((EnclosedExpr) ret).getInner();
+                if (inner != null && inner instanceof NameExpr) {
+                    VariableDeclaratorId id = new VariableDeclaratorId(inner.getBeginLine(), inner.getBeginColumn(), inner.getEndLine(), inner.getEndColumn(), ((NameExpr)inner).getName(), 0);
+                    List params = add(null, new Parameter(ret.getBeginLine(), ret.getBeginColumn(), ret.getEndLine(), ret.getEndColumn(), 0, null, new UnknownType(), false, id));
+                    ret = new LambdaExpr(ret.getBeginLine(), ret.getBeginColumn(), lambdaBody.getEndLine(), lambdaBody.getEndColumn(), params, lambdaBody, true);
+                } else {
+                    ret = new LambdaExpr(ret.getBeginLine(), ret.getBeginColumn(), lambdaBody.getEndLine(), lambdaBody.getEndColumn(), null, lambdaBody, true);
+                }
+            } else if (ret instanceof NameExpr) {
+                    VariableDeclaratorId id = new VariableDeclaratorId(ret.getBeginLine(), ret.getBeginColumn(), ret.getEndLine(), ret.getEndColumn(), ((NameExpr)ret).getName(), 0);
                 List params = add(null, new Parameter(ret.getBeginLine(), ret.getBeginColumn(), ret.getEndLine(), ret.getEndColumn(), 0, null, new UnknownType(), false, id));
-                ret = new LambdaExpr(ret.getBeginLine(), ret.getBeginColumn(), lambdaBody.getEndLine(), lambdaBody.getEndColumn(), params, lambdaBody, true);
+                ret = new LambdaExpr(ret.getBeginLine(), ret.getBeginColumn(), ret.getEndLine(), ret.getEndColumn(), params, lambdaBody, false);
+            } else if (ret instanceof LambdaExpr) {
+                ((LambdaExpr) ret).setBody(lambdaBody);
+                ret.setEndLine(lambdaBody.getEndLine());
+                ret.setEndColumn(lambdaBody.getEndColumn());
             } else {
-                ret = new LambdaExpr(ret.getBeginLine(), ret.getBeginColumn(), lambdaBody.getEndLine(), lambdaBody.getEndColumn(), null, lambdaBody, true);
+                throw new ParseException("Failed to parse lambda expression! Please create an issue at https://github.com/javaparser/javaparser/issues");
             }
-        } else if (ret instanceof NameExpr) {
-            VariableDeclaratorId id = new VariableDeclaratorId(ret.getBeginLine(), ret.getBeginColumn(), ret.getEndLine(), ret.getEndColumn(), ((NameExpr) ret).getName(), 0);
-            List params = add(null, new Parameter(ret.getBeginLine(), ret.getBeginColumn(), ret.getEndLine(), ret.getEndColumn(), 0, null, new UnknownType(), false, id));
-            ret = new LambdaExpr(ret.getBeginLine(), ret.getBeginColumn(), ret.getEndLine(), ret.getEndColumn(), params, lambdaBody, false);
-        } else if (ret instanceof LambdaExpr) {
-            ((LambdaExpr) ret).setBody(lambdaBody);
-            ret.setEndLine(lambdaBody.getEndLine());
-            ret.setEndColumn(lambdaBody.getEndColumn());
-        } else {
-            throw new ParseException("Failed to parse lambda expression! Please create an issue at https://github.com/javaparser/javaparser/issues");
-        }
-        return ret;
+            return ret;
     }
 
     static final class GTToken extends Token {
@@ -124,14 +123,14 @@ public static Token newToken(int kind, String image) {
 
     private Token last_special_token = null;
 
-    /*****************************************
-     * THE JAVA LANGUAGE GRAMMAR STARTS HERE *
-     *****************************************/
+/*****************************************
+ * THE JAVA LANGUAGE GRAMMAR STARTS HERE *
+ *****************************************/
 
-    /*
-     * Program structuring syntax follows.
-     */
-    final public CompilationUnit CompilationUnit() {
+/*
+ * Program structuring syntax follows.
+ */
+  final public CompilationUnit CompilationUnit() {
         PackageDeclaration pakage = null;
         List imports = null;
         ImportDeclaration in = null;
@@ -139,483 +138,400 @@ final public CompilationUnit CompilationUnit() {
         TypeDeclaration tn = null;
         int line = -1;
         int column = 0;
-        if (jj_2_1(2147483647)) {
-            pakage = PackageDeclaration();
-            line = pakage.getBeginLine();
-            column = pakage.getBeginColumn();
-        } else {
-            ;
-        }
-        label_1:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case IMPORT:
-                    ;
-                    break;
-                default:
-                    jj_la1[0] = jj_gen;
-                    break label_1;
-            }
-            in = ImportDeclaration();
-            if (line == -1) {
-                line = in.getBeginLine();
-                column = in.getBeginColumn();
-            }
-            imports = add(imports, in);
-        }
-        label_2:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case ABSTRACT:
-                case CLASS:
-                case ENUM:
-                case FINAL:
-                case INTERFACE:
-                case NATIVE:
-                case PRIVATE:
-                case PROTECTED:
-                case PUBLIC:
-                case STATIC:
-                case STRICTFP:
-                case SYNCHRONIZED:
-                case TRANSIENT:
-                case VOLATILE:
-                case SEMICOLON:
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[1] = jj_gen;
-                    break label_2;
-            }
-            tn = TypeDeclaration();
-            if (line == -1) {
-                line = tn.getBeginLine();
-                column = tn.getBeginColumn();
-            }
-            types = add(types, tn);
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case 0:
-                jj_consume_token(0);
-                break;
-            case 131:
-                jj_consume_token(131);
-                break;
-            default:
-                jj_la1[2] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true)
-                return new CompilationUnit(line == -1 ? 0 : line, column, token.endLine, token.endColumn, pakage, imports, types);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public PackageDeclaration PackageDeclaration() {
+    if (jj_2_1(2147483647)) {
+      pakage = PackageDeclaration();
+                                                                   line = pakage.getBeginLine(); column = pakage.getBeginColumn();
+    } else {
+      ;
+    }
+    label_1:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case IMPORT:
+        ;
+        break;
+      default:
+        jj_la1[0] = jj_gen;
+        break label_1;
+      }
+      in = ImportDeclaration();
+                               if(line==-1){line = in.getBeginLine(); column = in.getBeginColumn();} imports = add(imports, in);
+    }
+    label_2:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case ABSTRACT:
+      case CLASS:
+      case ENUM:
+      case FINAL:
+      case INTERFACE:
+      case NATIVE:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case STATIC:
+      case STRICTFP:
+      case SYNCHRONIZED:
+      case TRANSIENT:
+      case VOLATILE:
+      case SEMICOLON:
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[1] = jj_gen;
+        break label_2;
+      }
+      tn = TypeDeclaration();
+                             if(line==-1){line = tn.getBeginLine(); column = tn.getBeginColumn();} types = add(types, tn);
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case 0:
+      jj_consume_token(0);
+      break;
+    case 131:
+      jj_consume_token(131);
+      break;
+    default:
+      jj_la1[2] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return new CompilationUnit(line == -1 ? 0 : line, column, token.endLine, token.endColumn,pakage, imports, types);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public PackageDeclaration PackageDeclaration() {
         List annotations = null;
         AnnotationExpr ann;
         NameExpr name;
         int line;
         int column;
-        label_3:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[3] = jj_gen;
-                    break label_3;
-            }
-            ann = Annotation();
-            annotations = add(annotations, ann);
-        }
-        jj_consume_token(PACKAGE);
-        line = token.beginLine;
-        column = token.beginColumn;
-        name = Name();
-        jj_consume_token(SEMICOLON);
-        {
-            if (true) return new PackageDeclaration(line, column, token.endLine, token.endColumn, annotations, name);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public ImportDeclaration ImportDeclaration() {
+    label_3:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[3] = jj_gen;
+        break label_3;
+      }
+      ann = Annotation();
+                       annotations = add(annotations, ann);
+    }
+    jj_consume_token(PACKAGE);
+             line=token.beginLine; column=token.beginColumn;
+    name = Name();
+    jj_consume_token(SEMICOLON);
+    {if (true) return new PackageDeclaration(line, column, token.endLine, token.endColumn,annotations, name);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public ImportDeclaration ImportDeclaration() {
         NameExpr name;
         boolean isStatic = false;
         boolean isAsterisk = false;
         int line;
         int column;
-        jj_consume_token(IMPORT);
-        line = token.beginLine;
-        column = token.beginColumn;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case STATIC:
-                jj_consume_token(STATIC);
-                isStatic = true;
-                break;
-            default:
-                jj_la1[4] = jj_gen;
-                ;
-        }
-        name = Name();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case DOT:
-                jj_consume_token(DOT);
-                jj_consume_token(STAR);
-                isAsterisk = true;
-                break;
-            default:
-                jj_la1[5] = jj_gen;
-                ;
-        }
-        jj_consume_token(SEMICOLON);
-        {
-            if (true)
-                return new ImportDeclaration(line, column, token.endLine, token.endColumn, name, isStatic, isAsterisk);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    /*
-     * Modifiers. We match all modifiers in a single rule to reduce the chances of
-     * syntax errors for simple modifier mistakes. It will also enable us to give
-     * better error messages.
-     */
-    final public Modifier Modifiers() {
-        int beginLine = -1;
-        int beginColumn = -1;
-        int modifiers = 0;
-        List annotations = null;
-        AnnotationExpr ann;
-        label_4:
-        while (true) {
-            if (jj_2_2(2)) {
-                ;
-            } else {
-                break label_4;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case PUBLIC:
-                    jj_consume_token(PUBLIC);
-                    modifiers = addModifier(modifiers, ModifierSet.PUBLIC, token);
-                    if (beginLine == -1) {
-                        beginLine = token.beginLine;
-                        beginColumn = token.beginColumn;
-                    }
-                    break;
-                case STATIC:
-                    jj_consume_token(STATIC);
-                    modifiers = addModifier(modifiers, ModifierSet.STATIC, token);
-                    if (beginLine == -1) {
-                        beginLine = token.beginLine;
-                        beginColumn = token.beginColumn;
-                    }
-                    break;
-                case PROTECTED:
-                    jj_consume_token(PROTECTED);
-                    modifiers = addModifier(modifiers, ModifierSet.PROTECTED, token);
-                    if (beginLine == -1) {
-                        beginLine = token.beginLine;
-                        beginColumn = token.beginColumn;
-                    }
-                    break;
-                case PRIVATE:
-                    jj_consume_token(PRIVATE);
-                    modifiers = addModifier(modifiers, ModifierSet.PRIVATE, token);
-                    if (beginLine == -1) {
-                        beginLine = token.beginLine;
-                        beginColumn = token.beginColumn;
-                    }
-                    break;
-                case FINAL:
-                    jj_consume_token(FINAL);
-                    modifiers = addModifier(modifiers, ModifierSet.FINAL, token);
-                    if (beginLine == -1) {
-                        beginLine = token.beginLine;
-                        beginColumn = token.beginColumn;
-                    }
-                    break;
-                case ABSTRACT:
-                    jj_consume_token(ABSTRACT);
-                    modifiers = addModifier(modifiers, ModifierSet.ABSTRACT, token);
-                    if (beginLine == -1) {
-                        beginLine = token.beginLine;
-                        beginColumn = token.beginColumn;
-                    }
-                    break;
-                case SYNCHRONIZED:
-                    jj_consume_token(SYNCHRONIZED);
-                    modifiers = addModifier(modifiers, ModifierSet.SYNCHRONIZED, token);
-                    if (beginLine == -1) {
-                        beginLine = token.beginLine;
-                        beginColumn = token.beginColumn;
-                    }
-                    break;
-                case NATIVE:
-                    jj_consume_token(NATIVE);
-                    modifiers = addModifier(modifiers, ModifierSet.NATIVE, token);
-                    if (beginLine == -1) {
-                        beginLine = token.beginLine;
-                        beginColumn = token.beginColumn;
-                    }
-                    break;
-                case TRANSIENT:
-                    jj_consume_token(TRANSIENT);
-                    modifiers = addModifier(modifiers, ModifierSet.TRANSIENT, token);
-                    if (beginLine == -1) {
-                        beginLine = token.beginLine;
-                        beginColumn = token.beginColumn;
-                    }
-                    break;
-                case VOLATILE:
-                    jj_consume_token(VOLATILE);
-                    modifiers = addModifier(modifiers, ModifierSet.VOLATILE, token);
-                    if (beginLine == -1) {
-                        beginLine = token.beginLine;
-                        beginColumn = token.beginColumn;
-                    }
-                    break;
-                case STRICTFP:
-                    jj_consume_token(STRICTFP);
-                    modifiers = addModifier(modifiers, ModifierSet.STRICTFP, token);
-                    if (beginLine == -1) {
-                        beginLine = token.beginLine;
-                        beginColumn = token.beginColumn;
-                    }
-                    break;
-                case AT:
-                    ann = Annotation();
-                    annotations = add(annotations, ann);
-                    if (beginLine == -1) {
-                        beginLine = ann.getBeginLine();
-                        beginColumn = ann.getBeginColumn();
-                    }
-                    break;
-                default:
-                    jj_la1[6] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        {
-            if (true) return new Modifier(beginLine, beginColumn, modifiers, annotations);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    /*
-     * Declaration syntax follows.
-     */
-    final public TypeDeclaration TypeDeclaration() {
-        Modifier modifier;
-        TypeDeclaration ret;
-
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case SEMICOLON:
-                jj_consume_token(SEMICOLON);
-                ret = new EmptyTypeDeclaration(token.beginLine, token.beginColumn, token.endLine, token.endColumn);
-                break;
-            case ABSTRACT:
-            case CLASS:
-            case ENUM:
-            case FINAL:
-            case INTERFACE:
-            case NATIVE:
-            case PRIVATE:
-            case PROTECTED:
-            case PUBLIC:
-            case STATIC:
-            case STRICTFP:
-            case SYNCHRONIZED:
-            case TRANSIENT:
-            case VOLATILE:
-            case AT:
-                modifier = Modifiers();
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case CLASS:
-                    case INTERFACE:
-                        ret = ClassOrInterfaceDeclaration(modifier);
-                        break;
-                    case ENUM:
-                        ret = EnumDeclaration(modifier);
-                        break;
-                    case AT:
-                        ret = AnnotationTypeDeclaration(modifier);
-                        break;
-                    default:
-                        jj_la1[7] = jj_gen;
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                }
-                break;
-            default:
-                jj_la1[8] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public ClassOrInterfaceDeclaration ClassOrInterfaceDeclaration(Modifier modifier) {
-        boolean isInterface = false;
-        NameExpr name;
-        List typePar = null;
-        List extList = null;
-        List impList = null;
-        List members;
-        int line = modifier.beginLine;
-        int column = modifier.beginColumn;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case CLASS:
-                jj_consume_token(CLASS);
-                break;
-            case INTERFACE:
-                jj_consume_token(INTERFACE);
-                isInterface = true;
-                break;
-            default:
-                jj_la1[9] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        if (line == -1) {
-            line = token.beginLine;
-            column = token.beginColumn;
-        }
-        name = Name();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case LT:
-                typePar = TypeParameters();
-                typePar.remove(0);
-                break;
-            default:
-                jj_la1[10] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case EXTENDS:
-                extList = ExtendsList(isInterface);
-                break;
-            default:
-                jj_la1[11] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case IMPLEMENTS:
-                impList = ImplementsList(isInterface);
-                break;
-            default:
-                jj_la1[12] = jj_gen;
-                ;
-        }
-        members = ClassOrInterfaceBody(isInterface);
-        ClassOrInterfaceDeclaration tmp = new ClassOrInterfaceDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, isInterface, null, typePar, extList, impList, members);
-        tmp.setNameExpr(name);
-        {
-            if (true) return tmp;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List ExtendsList(boolean isInterface) {
-        boolean extendsMoreThanOne = false;
-        List ret = new LinkedList();
-        ClassOrInterfaceType cit;
-        AnnotationExpr ann;
-        List annotations = null;
-        jj_consume_token(EXTENDS);
-        label_5:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[13] = jj_gen;
-                    break label_5;
-            }
-            ann = Annotation();
-            annotations = add(annotations, ann);
-        }
-        cit = ClassOrInterfaceType();
-        cit.setAnnotations(annotations);
-        ret.add(cit);
-        label_6:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case COMMA:
-                    ;
-                    break;
-                default:
-                    jj_la1[14] = jj_gen;
-                    break label_6;
-            }
-            jj_consume_token(COMMA);
-            cit = ClassOrInterfaceType();
-            ret.add(cit);
-            extendsMoreThanOne = true;
-        }
-        if (extendsMoreThanOne && !isInterface)
-            throwParseException(token, "A class cannot extend more than one other class");
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
+    jj_consume_token(IMPORT);
+            line=token.beginLine; column=token.beginColumn;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case STATIC:
+      jj_consume_token(STATIC);
+                                                                          isStatic = true;
+      break;
+    default:
+      jj_la1[4] = jj_gen;
+      ;
+    }
+    name = Name();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case DOT:
+      jj_consume_token(DOT);
+      jj_consume_token(STAR);
+                                                                                                                         isAsterisk = true;
+      break;
+    default:
+      jj_la1[5] = jj_gen;
+      ;
+    }
+    jj_consume_token(SEMICOLON);
+    {if (true) return new ImportDeclaration(line, column, token.endLine, token.endColumn,name, isStatic, isAsterisk);}
+    throw new Error("Missing return statement in function");
+  }
 
-    final public List ImplementsList(boolean isInterface) {
-        List ret = new LinkedList();
-        ClassOrInterfaceType cit;
-        AnnotationExpr ann;
-        List annotations = null;
-        jj_consume_token(IMPLEMENTS);
-        label_7:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[15] = jj_gen;
-                    break label_7;
-            }
-            ann = Annotation();
-            annotations = add(annotations, ann);
-        }
-        cit = ClassOrInterfaceType();
-        cit.setAnnotations(annotations);
-        ret.add(cit);
-        label_8:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case COMMA:
-                    ;
-                    break;
-                default:
-                    jj_la1[16] = jj_gen;
-                    break label_8;
-            }
-            jj_consume_token(COMMA);
-            cit = ClassOrInterfaceType();
-            ret.add(cit);
-        }
-        if (isInterface)
-            throwParseException(token, "An interface cannot implement other interfaces");
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
+/*
+ * Modifiers. We match all modifiers in a single rule to reduce the chances of
+ * syntax errors for simple modifier mistakes. It will also enable us to give
+ * better error messages.
+ */
+  final public Modifier Modifiers() {
+    int beginLine = -1;
+    int beginColumn = -1;
+    int modifiers = 0;
+    List annotations = null;
+    AnnotationExpr ann;
+    label_4:
+    while (true) {
+      if (jj_2_2(2)) {
+        ;
+      } else {
+        break label_4;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case PUBLIC:
+        jj_consume_token(PUBLIC);
+              modifiers = addModifier(modifiers, ModifierSet.PUBLIC, token); if(beginLine==-1) {beginLine=token.beginLine; beginColumn=token.beginColumn;}
+        break;
+      case STATIC:
+        jj_consume_token(STATIC);
+              modifiers = addModifier(modifiers, ModifierSet.STATIC, token); if(beginLine==-1) {beginLine=token.beginLine; beginColumn=token.beginColumn;}
+        break;
+      case PROTECTED:
+        jj_consume_token(PROTECTED);
+                 modifiers = addModifier(modifiers, ModifierSet.PROTECTED, token); if(beginLine==-1) {beginLine=token.beginLine; beginColumn=token.beginColumn;}
+        break;
+      case PRIVATE:
+        jj_consume_token(PRIVATE);
+               modifiers = addModifier(modifiers, ModifierSet.PRIVATE, token); if(beginLine==-1) {beginLine=token.beginLine; beginColumn=token.beginColumn;}
+        break;
+      case FINAL:
+        jj_consume_token(FINAL);
+             modifiers = addModifier(modifiers, ModifierSet.FINAL, token); if(beginLine==-1) {beginLine=token.beginLine; beginColumn=token.beginColumn;}
+        break;
+      case ABSTRACT:
+        jj_consume_token(ABSTRACT);
+                modifiers = addModifier(modifiers, ModifierSet.ABSTRACT, token); if(beginLine==-1) {beginLine=token.beginLine; beginColumn=token.beginColumn;}
+        break;
+      case SYNCHRONIZED:
+        jj_consume_token(SYNCHRONIZED);
+                    modifiers = addModifier(modifiers, ModifierSet.SYNCHRONIZED, token); if(beginLine==-1) {beginLine=token.beginLine; beginColumn=token.beginColumn;}
+        break;
+      case NATIVE:
+        jj_consume_token(NATIVE);
+              modifiers = addModifier(modifiers, ModifierSet.NATIVE, token); if(beginLine==-1) {beginLine=token.beginLine; beginColumn=token.beginColumn;}
+        break;
+      case TRANSIENT:
+        jj_consume_token(TRANSIENT);
+                 modifiers = addModifier(modifiers, ModifierSet.TRANSIENT, token); if(beginLine==-1) {beginLine=token.beginLine; beginColumn=token.beginColumn;}
+        break;
+      case VOLATILE:
+        jj_consume_token(VOLATILE);
+                modifiers = addModifier(modifiers, ModifierSet.VOLATILE, token); if(beginLine==-1) {beginLine=token.beginLine; beginColumn=token.beginColumn;}
+        break;
+      case STRICTFP:
+        jj_consume_token(STRICTFP);
+                modifiers = addModifier(modifiers, ModifierSet.STRICTFP, token);  if(beginLine==-1) {beginLine=token.beginLine; beginColumn=token.beginColumn;}
+        break;
+      case AT:
+        ann = Annotation();
+                        annotations = add(annotations, ann); if(beginLine==-1) {beginLine=ann.getBeginLine(); beginColumn=ann.getBeginColumn();}
+        break;
+      default:
+        jj_la1[6] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    {if (true) return new Modifier(beginLine, beginColumn, modifiers, annotations);}
+    throw new Error("Missing return statement in function");
+  }
 
-    final public EnumDeclaration EnumDeclaration(Modifier modifier) {
+/*
+ * Declaration syntax follows.
+ */
+  final public TypeDeclaration TypeDeclaration() {
+   Modifier modifier;
+   TypeDeclaration ret;
+
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case SEMICOLON:
+      jj_consume_token(SEMICOLON);
+          ret = new EmptyTypeDeclaration(token.beginLine, token.beginColumn, token.endLine, token.endColumn);
+      break;
+    case ABSTRACT:
+    case CLASS:
+    case ENUM:
+    case FINAL:
+    case INTERFACE:
+    case NATIVE:
+    case PRIVATE:
+    case PROTECTED:
+    case PUBLIC:
+    case STATIC:
+    case STRICTFP:
+    case SYNCHRONIZED:
+    case TRANSIENT:
+    case VOLATILE:
+    case AT:
+      modifier = Modifiers();
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case CLASS:
+      case INTERFACE:
+        ret = ClassOrInterfaceDeclaration(modifier);
+        break;
+      case ENUM:
+        ret = EnumDeclaration(modifier);
+        break;
+      case AT:
+        ret = AnnotationTypeDeclaration(modifier);
+        break;
+      default:
+        jj_la1[7] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      break;
+    default:
+      jj_la1[8] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public ClassOrInterfaceDeclaration ClassOrInterfaceDeclaration(Modifier modifier) {
+   boolean isInterface = false;
+   NameExpr name;
+   List typePar = null;
+   List extList = null;
+   List impList = null;
+   List members;
+   int line = modifier.beginLine;
+   int column = modifier.beginColumn;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case CLASS:
+      jj_consume_token(CLASS);
+      break;
+    case INTERFACE:
+      jj_consume_token(INTERFACE);
+                            isInterface = true;
+      break;
+    default:
+      jj_la1[9] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+                                                      if (line == -1) {line=token.beginLine; column=token.beginColumn;}
+    name = Name();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case LT:
+      typePar = TypeParameters();
+                                typePar.remove(0);
+      break;
+    default:
+      jj_la1[10] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case EXTENDS:
+      extList = ExtendsList(isInterface);
+      break;
+    default:
+      jj_la1[11] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case IMPLEMENTS:
+      impList = ImplementsList(isInterface);
+      break;
+    default:
+      jj_la1[12] = jj_gen;
+      ;
+    }
+    members = ClassOrInterfaceBody(isInterface);
+    ClassOrInterfaceDeclaration tmp = new ClassOrInterfaceDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, isInterface, null, typePar, extList, impList, members);
+    tmp.setNameExpr(name);
+    {if (true) return tmp;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List ExtendsList(boolean isInterface) {
+   boolean extendsMoreThanOne = false;
+   List ret = new LinkedList();
+   ClassOrInterfaceType cit;
+    AnnotationExpr ann;
+   List annotations = null;
+    jj_consume_token(EXTENDS);
+    label_5:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[13] = jj_gen;
+        break label_5;
+      }
+      ann = Annotation();
+                                     annotations = add(annotations, ann);
+    }
+    cit = ClassOrInterfaceType();
+                                                                                                            cit.setAnnotations(annotations); ret.add(cit);
+    label_6:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[14] = jj_gen;
+        break label_6;
+      }
+      jj_consume_token(COMMA);
+      cit = ClassOrInterfaceType();
+                                        ret.add(cit); extendsMoreThanOne = true;
+    }
+      if (extendsMoreThanOne && !isInterface)
+         throwParseException(token, "A class cannot extend more than one other class");
+     {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List ImplementsList(boolean isInterface) {
+   List ret = new LinkedList();
+   ClassOrInterfaceType cit;
+   AnnotationExpr ann;
+   List annotations = null;
+    jj_consume_token(IMPLEMENTS);
+    label_7:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[15] = jj_gen;
+        break label_7;
+      }
+      ann = Annotation();
+                                        annotations = add(annotations, ann);
+    }
+    cit = ClassOrInterfaceType();
+                                                                                                               cit.setAnnotations(annotations); ret.add(cit);
+    label_8:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[16] = jj_gen;
+        break label_8;
+      }
+      jj_consume_token(COMMA);
+      cit = ClassOrInterfaceType();
+                                        ret.add(cit);
+    }
+      if (isInterface)
+         throwParseException(token, "An interface cannot implement other interfaces");
+     {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public EnumDeclaration EnumDeclaration(Modifier modifier) {
         NameExpr name;
         List impList = null;
         EnumConstantDeclaration entry;
@@ -624,110 +540,105 @@ final public EnumDeclaration EnumDeclaration(Modifier modifier) {
         List members = null;
         int line = modifier.beginLine;
         int column = modifier.beginColumn;
-        jj_consume_token(ENUM);
-        if (line == -1) {
-            line = token.beginLine;
-            column = token.beginColumn;
-        }
-        name = Name();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case IMPLEMENTS:
-                impList = ImplementsList(false);
-                break;
-            default:
-                jj_la1[17] = jj_gen;
-                ;
-        }
-        jj_consume_token(LBRACE);
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case IDENTIFIER:
-            case AT:
-                entries = new LinkedList();
-                entry = EnumConstantDeclaration();
-                entries.add(entry);
-                label_9:
-                while (true) {
-                    if (jj_2_3(2)) {
-                        ;
-                    } else {
-                        break label_9;
-                    }
-                    jj_consume_token(COMMA);
-                    entry = EnumConstantDeclaration();
-                    entries.add(entry);
-                }
-                break;
-            default:
-                jj_la1[18] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case COMMA:
-                jj_consume_token(COMMA);
-                break;
-            default:
-                jj_la1[19] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case SEMICOLON:
-                jj_consume_token(SEMICOLON);
-                label_10:
-                while (true) {
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case ABSTRACT:
-                        case BOOLEAN:
-                        case BYTE:
-                        case CHAR:
-                        case CLASS:
-                        case _DEFAULT:
-                        case DOUBLE:
-                        case ENUM:
-                        case FINAL:
-                        case FLOAT:
-                        case INT:
-                        case INTERFACE:
-                        case LONG:
-                        case NATIVE:
-                        case PRIVATE:
-                        case PROTECTED:
-                        case PUBLIC:
-                        case SHORT:
-                        case STATIC:
-                        case STRICTFP:
-                        case SYNCHRONIZED:
-                        case TRANSIENT:
-                        case VOID:
-                        case VOLATILE:
-                        case IDENTIFIER:
-                        case LBRACE:
-                        case SEMICOLON:
-                        case AT:
-                        case LT:
-                            ;
-                            break;
-                        default:
-                            jj_la1[20] = jj_gen;
-                            break label_10;
-                    }
-                    member = ClassOrInterfaceBodyDeclaration(false);
-                    members = add(members, member);
-                }
-                break;
-            default:
-                jj_la1[21] = jj_gen;
-                ;
-        }
-        jj_consume_token(RBRACE);
-        EnumDeclaration tmp = new EnumDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, null, impList, entries, members);
-        tmp.setNameExpr(name);
-        {
-            if (true) return tmp;
+    jj_consume_token(ENUM);
+           if (line == -1) {line=token.beginLine; column=token.beginColumn;}
+    name = Name();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case IMPLEMENTS:
+      impList = ImplementsList(false);
+      break;
+    default:
+      jj_la1[17] = jj_gen;
+      ;
+    }
+    jj_consume_token(LBRACE);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case IDENTIFIER:
+    case AT:
+          entries = new LinkedList();
+      entry = EnumConstantDeclaration();
+                                            entries.add(entry);
+      label_9:
+      while (true) {
+        if (jj_2_3(2)) {
+          ;
+        } else {
+          break label_9;
         }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public EnumConstantDeclaration EnumConstantDeclaration() {
+        jj_consume_token(COMMA);
+        entry = EnumConstantDeclaration();
+                                                                                                                         entries.add(entry);
+      }
+      break;
+    default:
+      jj_la1[18] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case COMMA:
+      jj_consume_token(COMMA);
+      break;
+    default:
+      jj_la1[19] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case SEMICOLON:
+      jj_consume_token(SEMICOLON);
+      label_10:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case ABSTRACT:
+        case BOOLEAN:
+        case BYTE:
+        case CHAR:
+        case CLASS:
+        case _DEFAULT:
+        case DOUBLE:
+        case ENUM:
+        case FINAL:
+        case FLOAT:
+        case INT:
+        case INTERFACE:
+        case LONG:
+        case NATIVE:
+        case PRIVATE:
+        case PROTECTED:
+        case PUBLIC:
+        case SHORT:
+        case STATIC:
+        case STRICTFP:
+        case SYNCHRONIZED:
+        case TRANSIENT:
+        case VOID:
+        case VOLATILE:
+        case IDENTIFIER:
+        case LBRACE:
+        case SEMICOLON:
+        case AT:
+        case LT:
+          ;
+          break;
+        default:
+          jj_la1[20] = jj_gen;
+          break label_10;
+        }
+        member = ClassOrInterfaceBodyDeclaration(false);
+                                                                          members = add(members, member);
+      }
+      break;
+    default:
+      jj_la1[21] = jj_gen;
+      ;
+    }
+    jj_consume_token(RBRACE);
+      EnumDeclaration tmp = new EnumDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, null, impList, entries, members);
+      tmp.setNameExpr(name);
+      {if (true) return tmp;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public EnumConstantDeclaration EnumConstantDeclaration() {
         List annotations = null;
         AnnotationExpr ann;
         String name;
@@ -736,572 +647,528 @@ final public EnumConstantDeclaration EnumConstantDeclaration() {
         int line = -1;
         int column = -1;
 
-        label_11:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[22] = jj_gen;
-                    break label_11;
-            }
-            ann = Annotation();
-            annotations = add(annotations, ann);
-            if (line == -1) {
-                line = ann.getBeginLine();
-                column = ann.getBeginColumn();
-            }
-        }
-        jj_consume_token(IDENTIFIER);
-        name = token.image;
-        if (line == -1) {
-            line = token.beginLine;
-            column = token.beginColumn;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case LPAREN:
-                args = Arguments();
-                break;
-            default:
-                jj_la1[23] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case LBRACE:
-                classBody = ClassOrInterfaceBody(false);
-                break;
-            default:
-                jj_la1[24] = jj_gen;
-                ;
-        }
-        EnumConstantDeclaration tmp = new EnumConstantDeclaration(line, column, token.endLine, token.endColumn, annotations, name, args, classBody);
-
-        {
-            if (true) return tmp;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List TypeParameters() {
+    label_11:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[22] = jj_gen;
+        break label_11;
+      }
+      ann = Annotation();
+                         annotations = add(annotations, ann); if(line==-1){line=ann.getBeginLine(); column=ann.getBeginColumn();}
+    }
+    jj_consume_token(IDENTIFIER);
+                 name = token.image; if(line==-1){line=token.beginLine; column=token.beginColumn;}
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case LPAREN:
+      args = Arguments();
+      break;
+    default:
+      jj_la1[23] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case LBRACE:
+      classBody = ClassOrInterfaceBody(false);
+      break;
+    default:
+      jj_la1[24] = jj_gen;
+      ;
+    }
+      EnumConstantDeclaration tmp = new EnumConstantDeclaration(line, column, token.endLine, token.endColumn, annotations, name, args, classBody);
+
+      {if (true) return tmp;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List TypeParameters() {
         List ret = new LinkedList();
         TypeParameter tp;
         List annotations = null;
         AnnotationExpr ann;
-        jj_consume_token(LT);
-        ret.add(new int[]{token.beginLine, token.beginColumn});
-        label_12:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[25] = jj_gen;
-                    break label_12;
-            }
-            ann = Annotation();
-            annotations = add(annotations, ann);
-        }
-        tp = TypeParameter();
-        ret.add(tp);
-        tp.setAnnotations(annotations);
-        annotations = null;
-        label_13:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case COMMA:
-                    ;
-                    break;
-                default:
-                    jj_la1[26] = jj_gen;
-                    break label_13;
-            }
-            jj_consume_token(COMMA);
-            label_14:
-            while (true) {
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case AT:
-                        ;
-                        break;
-                    default:
-                        jj_la1[27] = jj_gen;
-                        break label_14;
-                }
-                ann = Annotation();
-                annotations = add(annotations, ann);
-            }
-            tp = TypeParameter();
-            ret.add(tp);
-            tp.setAnnotations(annotations);
-            annotations = null;
-        }
-        jj_consume_token(GT);
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public TypeParameter TypeParameter() {
+    jj_consume_token(LT);
+         ret.add(new int[]{token.beginLine, token.beginColumn});
+    label_12:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[25] = jj_gen;
+        break label_12;
+      }
+      ann = Annotation();
+                           annotations = add(annotations, ann);
+    }
+    tp = TypeParameter();
+                          ret.add(tp); tp.setAnnotations(annotations); annotations = null;
+    label_13:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[26] = jj_gen;
+        break label_13;
+      }
+      jj_consume_token(COMMA);
+      label_14:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case AT:
+          ;
+          break;
+        default:
+          jj_la1[27] = jj_gen;
+          break label_14;
+        }
+        ann = Annotation();
+                                 annotations = add(annotations, ann);
+      }
+      tp = TypeParameter();
+                                                                                                ret.add(tp); tp.setAnnotations(annotations); annotations = null;
+    }
+    jj_consume_token(GT);
+     {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public TypeParameter TypeParameter() {
         String name;
         List typeBound = null;
         int line;
         int column;
-        jj_consume_token(IDENTIFIER);
-        name = token.image;
-        line = token.beginLine;
-        column = token.beginColumn;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case EXTENDS:
-                typeBound = TypeBound();
-                break;
-            default:
-                jj_la1[28] = jj_gen;
-                ;
-        }
-        {
-            if (true) return new TypeParameter(line, column, token.endLine, token.endColumn, name, typeBound);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List TypeBound() {
+    jj_consume_token(IDENTIFIER);
+                  name = token.image; line=token.beginLine; column=token.beginColumn;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case EXTENDS:
+      typeBound = TypeBound();
+      break;
+    default:
+      jj_la1[28] = jj_gen;
+      ;
+    }
+     {if (true) return new TypeParameter(line, column, token.endLine, token.endColumn,name, typeBound);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List TypeBound() {
         List ret = new LinkedList();
         ClassOrInterfaceType cit;
         AnnotationExpr ann;
         List annotations = null;
-        jj_consume_token(EXTENDS);
-        label_15:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[29] = jj_gen;
-                    break label_15;
-            }
-            ann = Annotation();
-            annotations = add(annotations, ann);
-        }
-        cit = ClassOrInterfaceType();
-        cit.setAnnotations(annotations);
-        ret.add(cit);
-        annotations = null;
-        label_16:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case BIT_AND:
-                    ;
-                    break;
-                default:
-                    jj_la1[30] = jj_gen;
-                    break label_16;
-            }
-            jj_consume_token(BIT_AND);
-            label_17:
-            while (true) {
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case AT:
-                        ;
-                        break;
-                    default:
-                        jj_la1[31] = jj_gen;
-                        break label_17;
-                }
-                ann = Annotation();
-                annotations = add(annotations, ann);
-            }
-            cit = ClassOrInterfaceType();
-            cit.setAnnotations(annotations);
-            ret.add(cit);
-            annotations = null;
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List ClassOrInterfaceBody(boolean isInterface) {
+    jj_consume_token(EXTENDS);
+    label_15:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[29] = jj_gen;
+        break label_15;
+      }
+      ann = Annotation();
+                                     annotations = add(annotations, ann);
+    }
+    cit = ClassOrInterfaceType();
+                                                                                                            cit.setAnnotations(annotations); ret.add(cit); annotations=null;
+    label_16:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case BIT_AND:
+        ;
+        break;
+      default:
+        jj_la1[30] = jj_gen;
+        break label_16;
+      }
+      jj_consume_token(BIT_AND);
+      label_17:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case AT:
+          ;
+          break;
+        default:
+          jj_la1[31] = jj_gen;
+          break label_17;
+        }
+        ann = Annotation();
+                                   annotations = add(annotations, ann);
+      }
+      cit = ClassOrInterfaceType();
+                                                                                                           cit.setAnnotations(annotations); ret.add(cit); annotations=null;
+    }
+     {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List ClassOrInterfaceBody(boolean isInterface) {
         List ret = new LinkedList();
         BodyDeclaration member;
-        jj_consume_token(LBRACE);
-        label_18:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case ABSTRACT:
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case CLASS:
-                case _DEFAULT:
-                case DOUBLE:
-                case ENUM:
-                case FINAL:
-                case FLOAT:
-                case INT:
-                case INTERFACE:
-                case LONG:
-                case NATIVE:
-                case PRIVATE:
-                case PROTECTED:
-                case PUBLIC:
-                case SHORT:
-                case STATIC:
-                case STRICTFP:
-                case SYNCHRONIZED:
-                case TRANSIENT:
-                case VOID:
-                case VOLATILE:
-                case IDENTIFIER:
-                case LBRACE:
-                case SEMICOLON:
-                case AT:
-                case LT:
-                    ;
-                    break;
-                default:
-                    jj_la1[32] = jj_gen;
-                    break label_18;
-            }
-            member = ClassOrInterfaceBodyDeclaration(isInterface);
-            ret.add(member);
-        }
-        jj_consume_token(RBRACE);
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public BodyDeclaration ClassOrInterfaceBodyDeclaration(boolean isInterface) {
-        boolean isNestedInterface = false;
-        Modifier modifier;
-        Modifier modifier2 = null;
-        int aux = 0;
-        BodyDeclaration ret;
-        boolean isDefault = false;
-
-        if (jj_2_6(2)) {
-            ret = InitializerDeclaration();
-            if (isInterface)
+    jj_consume_token(LBRACE);
+    label_18:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case ABSTRACT:
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case CLASS:
+      case _DEFAULT:
+      case DOUBLE:
+      case ENUM:
+      case FINAL:
+      case FLOAT:
+      case INT:
+      case INTERFACE:
+      case LONG:
+      case NATIVE:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case SHORT:
+      case STATIC:
+      case STRICTFP:
+      case SYNCHRONIZED:
+      case TRANSIENT:
+      case VOID:
+      case VOLATILE:
+      case IDENTIFIER:
+      case LBRACE:
+      case SEMICOLON:
+      case AT:
+      case LT:
+        ;
+        break;
+      default:
+        jj_la1[32] = jj_gen;
+        break label_18;
+      }
+      member = ClassOrInterfaceBodyDeclaration(isInterface);
+                                                                ret.add(member);
+    }
+    jj_consume_token(RBRACE);
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public BodyDeclaration ClassOrInterfaceBodyDeclaration(boolean isInterface) {
+   boolean isNestedInterface = false;
+   Modifier modifier;
+   Modifier modifier2 = null;
+   int aux = 0;
+   BodyDeclaration ret;
+   boolean isDefault = false;
+
+    if (jj_2_6(2)) {
+      ret = InitializerDeclaration();
+             if (isInterface)
                 throwParseException(token, "An interface cannot have initializers");
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case ABSTRACT:
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case CLASS:
-                case _DEFAULT:
-                case DOUBLE:
-                case ENUM:
-                case FINAL:
-                case FLOAT:
-                case INT:
-                case INTERFACE:
-                case LONG:
-                case NATIVE:
-                case PRIVATE:
-                case PROTECTED:
-                case PUBLIC:
-                case SHORT:
-                case STATIC:
-                case STRICTFP:
-                case SYNCHRONIZED:
-                case TRANSIENT:
-                case VOID:
-                case VOLATILE:
-                case IDENTIFIER:
-                case AT:
-                case LT:
-                    modifier = Modifiers();
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case _DEFAULT:
-                            jj_consume_token(_DEFAULT);
-                            modifier2 = Modifiers();
-                            if (!isInterface) {
-                                throwParseException(token, "An interface cannot have default members");
-                            }
-                            isDefault = true;
-                            break;
-                        default:
-                            jj_la1[33] = jj_gen;
-                            ;
-                    }
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case CLASS:
-                        case INTERFACE:
-                            ret = ClassOrInterfaceDeclaration(modifier);
-                            break;
-                        case ENUM:
-                            ret = EnumDeclaration(modifier);
-                            break;
-                        case AT:
-                            ret = AnnotationTypeDeclaration(modifier);
-                            break;
-                        default:
-                            jj_la1[34] = jj_gen;
-                            if (jj_2_4(2147483647)) {
-                                ret = ConstructorDeclaration(modifier);
-                            } else if (jj_2_5(2147483647)) {
-                                ret = FieldDeclaration(modifier);
-                            } else {
-                                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                    case BOOLEAN:
-                                    case BYTE:
-                                    case CHAR:
-                                    case DOUBLE:
-                                    case FLOAT:
-                                    case INT:
-                                    case LONG:
-                                    case SHORT:
-                                    case VOID:
-                                    case IDENTIFIER:
-                                    case LT:
-                                        ret = MethodDeclaration(modifier);
-                                        if (isDefault && ret != null && ((MethodDeclaration) ret).getBody() == null) {
-                                            throwParseException(token, "\"default\" methods must have a body");
-                                        }
-                                        ((MethodDeclaration) ret).setDefault(isDefault);
-                                        if (modifier2 != null) {
-                                            aux = modifier2.modifiers;
-                                        }
-                                        ((MethodDeclaration) ret).setModifiers(addModifier(modifier.modifiers, aux, token));
-                                        break;
-                                    default:
-                                        jj_la1[35] = jj_gen;
-                                        jj_consume_token(-1);
-                                        throw new ParseException();
-                                }
-                            }
-                    }
-                    if (isDefault && !(ret instanceof MethodDeclaration)) {
-                        throwParseException(token, "Just methods can have the keyword \"default\".");
-                    }
-                    break;
-                case SEMICOLON:
-                    jj_consume_token(SEMICOLON);
-                    ret = new EmptyMemberDeclaration(token.beginLine, token.beginColumn, token.endLine, token.endColumn);
-                    break;
-                default:
-                    jj_la1[36] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case ABSTRACT:
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case CLASS:
+      case _DEFAULT:
+      case DOUBLE:
+      case ENUM:
+      case FINAL:
+      case FLOAT:
+      case INT:
+      case INTERFACE:
+      case LONG:
+      case NATIVE:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case SHORT:
+      case STATIC:
+      case STRICTFP:
+      case SYNCHRONIZED:
+      case TRANSIENT:
+      case VOID:
+      case VOLATILE:
+      case IDENTIFIER:
+      case AT:
+      case LT:
+        modifier = Modifiers();
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case _DEFAULT:
+          jj_consume_token(_DEFAULT);
+          modifier2 = Modifiers();
+            if(!isInterface)
+            {
+              throwParseException(token, "An interface cannot have default members");
+            }
+            isDefault = true;
+          break;
+        default:
+          jj_la1[33] = jj_gen;
+          ;
+        }
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case CLASS:
+        case INTERFACE:
+          ret = ClassOrInterfaceDeclaration(modifier);
+          break;
+        case ENUM:
+          ret = EnumDeclaration(modifier);
+          break;
+        case AT:
+          ret = AnnotationTypeDeclaration(modifier);
+          break;
+        default:
+          jj_la1[34] = jj_gen;
+          if (jj_2_4(2147483647)) {
+            ret = ConstructorDeclaration(modifier);
+          } else if (jj_2_5(2147483647)) {
+            ret = FieldDeclaration(modifier);
+          } else {
+            switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+            case BOOLEAN:
+            case BYTE:
+            case CHAR:
+            case DOUBLE:
+            case FLOAT:
+            case INT:
+            case LONG:
+            case SHORT:
+            case VOID:
+            case IDENTIFIER:
+            case LT:
+              ret = MethodDeclaration(modifier);
+                if(isDefault && ret!= null && ((MethodDeclaration)ret).getBody() == null)
+                {
+                  throwParseException(token, "\"default\" methods must have a body");
+                }
+                ((MethodDeclaration)ret).setDefault(isDefault);
+                if(modifier2!= null)
+                {
+                  aux = modifier2.modifiers;
+                }
+                ((MethodDeclaration)ret).setModifiers(addModifier(modifier.modifiers, aux, token));
+              break;
+            default:
+              jj_la1[35] = jj_gen;
+              jj_consume_token(-1);
+              throw new ParseException();
             }
+          }
         }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public FieldDeclaration FieldDeclaration(Modifier modifier) {
+            if(isDefault && ! (ret instanceof MethodDeclaration))
+            {
+              throwParseException(token, "Just methods can have the keyword \"default\".");
+            }
+        break;
+      case SEMICOLON:
+        jj_consume_token(SEMICOLON);
+                ret = new EmptyMemberDeclaration(token.beginLine, token.beginColumn, token.endLine, token.endColumn);
+        break;
+      default:
+        jj_la1[36] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public FieldDeclaration FieldDeclaration(Modifier modifier) {
         Type type;
         List variables = new LinkedList();
         VariableDeclarator val;
-        // Modifiers are already matched in the caller
-        type = Type();
-        val = VariableDeclarator();
-        variables.add(val);
-        label_19:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case COMMA:
-                    ;
-                    break;
-                default:
-                    jj_la1[37] = jj_gen;
-                    break label_19;
-            }
-            jj_consume_token(COMMA);
-            val = VariableDeclarator();
-            variables.add(val);
-        }
-        jj_consume_token(SEMICOLON);
+    // Modifiers are already matched in the caller
+      type = Type();
+    val = VariableDeclarator();
+                                     variables.add(val);
+    label_19:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[37] = jj_gen;
+        break label_19;
+      }
+      jj_consume_token(COMMA);
+      val = VariableDeclarator();
+                                     variables.add(val);
+    }
+    jj_consume_token(SEMICOLON);
         int line = modifier.beginLine;
         int column = modifier.beginColumn;
-        if (line == -1) {
-            line = type.getBeginLine();
-            column = type.getBeginColumn();
-        }
-        {
-            if (true)
-                return new FieldDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, type, variables);
-        }
-        throw new Error("Missing return statement in function");
-    }
+        if (line == -1) { line=type.getBeginLine(); column=type.getBeginColumn(); }
+        {if (true) return new FieldDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, type, variables);}
+    throw new Error("Missing return statement in function");
+  }
 
-    final public VariableDeclarator VariableDeclarator() {
+  final public VariableDeclarator VariableDeclarator() {
         VariableDeclaratorId id;
         Expression init = null;
-        id = VariableDeclaratorId();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case ASSIGN:
-                jj_consume_token(ASSIGN);
-                init = VariableInitializer();
-                break;
-            default:
-                jj_la1[38] = jj_gen;
-                ;
-        }
-        {
-            if (true)
-                return new VariableDeclarator(id.getBeginLine(), id.getBeginColumn(), token.endLine, token.endColumn, id, init);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public VariableDeclaratorId VariableDeclaratorId() {
+    id = VariableDeclaratorId();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ASSIGN:
+      jj_consume_token(ASSIGN);
+      init = VariableInitializer();
+      break;
+    default:
+      jj_la1[38] = jj_gen;
+      ;
+    }
+    {if (true) return new  VariableDeclarator(id.getBeginLine(), id.getBeginColumn(), token.endLine, token.endColumn, id, init);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public VariableDeclaratorId VariableDeclaratorId() {
         String name;
         int arrayCount = 0;
         int line;
         int column;
-        jj_consume_token(IDENTIFIER);
-        name = token.image;
-        line = token.beginLine;
-        column = token.beginColumn;
-        label_20:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case LBRACKET:
-                    ;
-                    break;
-                default:
-                    jj_la1[39] = jj_gen;
-                    break label_20;
-            }
-            jj_consume_token(LBRACKET);
-            jj_consume_token(RBRACKET);
-            arrayCount++;
-        }
-        {
-            if (true) return new VariableDeclaratorId(line, column, token.endLine, token.endColumn, name, arrayCount);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression VariableInitializer() {
+    jj_consume_token(IDENTIFIER);
+                 name = token.image; line=token.beginLine; column=token.beginColumn;
+    label_20:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LBRACKET:
+        ;
+        break;
+      default:
+        jj_la1[39] = jj_gen;
+        break label_20;
+      }
+      jj_consume_token(LBRACKET);
+      jj_consume_token(RBRACKET);
+                                                                                                   arrayCount++;
+    }
+    {if (true) return new VariableDeclaratorId(line, column, token.endLine, token.endColumn,name, arrayCount);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression VariableInitializer() {
         Expression ret;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case LBRACE:
-                ret = ArrayInitializer();
-                break;
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS:
-                ret = Expression();
-                break;
-            default:
-                jj_la1[40] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public ArrayInitializerExpr ArrayInitializer() {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case LBRACE:
+      ret = ArrayInitializer();
+      break;
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
+      ret = Expression();
+      break;
+    default:
+      jj_la1[40] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public ArrayInitializerExpr ArrayInitializer() {
         List values = null;
         Expression val;
         int line;
         int column;
-        jj_consume_token(LBRACE);
-        line = token.beginLine;
-        column = token.beginColumn;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case LBRACE:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS:
-                val = VariableInitializer();
-                values = add(values, val);
-                label_21:
-                while (true) {
-                    if (jj_2_7(2)) {
-                        ;
-                    } else {
-                        break label_21;
-                    }
-                    jj_consume_token(COMMA);
-                    val = VariableInitializer();
-                    values = add(values, val);
-                }
-                break;
-            default:
-                jj_la1[41] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case COMMA:
-                jj_consume_token(COMMA);
-                break;
-            default:
-                jj_la1[42] = jj_gen;
-                ;
-        }
-        jj_consume_token(RBRACE);
-        {
-            if (true) return new ArrayInitializerExpr(line, column, token.endLine, token.endColumn, values);
+    jj_consume_token(LBRACE);
+       line=token.beginLine; column=token.beginColumn;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
+      val = VariableInitializer();
+                                                                                        values = add(values, val);
+      label_21:
+      while (true) {
+        if (jj_2_7(2)) {
+          ;
+        } else {
+          break label_21;
         }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public MethodDeclaration MethodDeclaration(Modifier modifier) {
+        jj_consume_token(COMMA);
+        val = VariableInitializer();
+                                                                                                                                                                      values = add(values, val);
+      }
+      break;
+    default:
+      jj_la1[41] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case COMMA:
+      jj_consume_token(COMMA);
+      break;
+    default:
+      jj_la1[42] = jj_gen;
+      ;
+    }
+    jj_consume_token(RBRACE);
+    {if (true) return new ArrayInitializerExpr(line, column, token.endLine, token.endColumn,values);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public MethodDeclaration MethodDeclaration(Modifier modifier) {
         List typeParameters = null;
         Type type;
         NameExpr name;
@@ -1311,206 +1178,185 @@ final public MethodDeclaration MethodDeclaration(Modifier modifier) {
         BlockStmt block = null;
         int line = modifier.beginLine;
         int column = modifier.beginColumn;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case LT:
-                typeParameters = TypeParameters();
-                int[] lineCol = (int[]) typeParameters.remove(0);
-                if (line == -1) {
-                    line = lineCol[0];
-                    column = lineCol[1];
-                }
-                break;
-            default:
-                jj_la1[43] = jj_gen;
-                ;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case LT:
+      typeParameters = TypeParameters();
+                                        int[] lineCol=(int[])typeParameters.remove(0); if(line==-1){ line=lineCol[0]; column=lineCol[1];}
+      break;
+    default:
+      jj_la1[43] = jj_gen;
+      ;
+    }
+    type = ResultType();
+                        if(line==-1){line=type.getBeginLine(); column=type.getBeginColumn();}
+    name = Name();
+    parameters = FormalParameters();
+    label_22:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LBRACKET:
+        ;
+        break;
+      default:
+        jj_la1[44] = jj_gen;
+        break label_22;
+      }
+      jj_consume_token(LBRACKET);
+      jj_consume_token(RBRACKET);
+                                                            arrayCount++;
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case THROWS:
+      jj_consume_token(THROWS);
+      throws_ = NameList();
+      break;
+    default:
+      jj_la1[45] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case LBRACE:
+      block = Block();
+      break;
+    case SEMICOLON:
+      jj_consume_token(SEMICOLON);
+      break;
+    default:
+      jj_la1[46] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+      MethodDeclaration tmp = new MethodDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, typeParameters, type, null, parameters, arrayCount, throws_, block);
+      tmp.setNameExpr(name);
+      {if (true) return tmp;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List FormalParameters() {
+        List ret = null;
+        Parameter par;
+    jj_consume_token(LPAREN);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ABSTRACT:
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FINAL:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NATIVE:
+    case PRIVATE:
+    case PROTECTED:
+    case PUBLIC:
+    case SHORT:
+    case STATIC:
+    case STRICTFP:
+    case SYNCHRONIZED:
+    case TRANSIENT:
+    case VOLATILE:
+    case IDENTIFIER:
+    case AT:
+      par = FormalParameter();
+                                  ret = add(ret, par);
+      label_23:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case COMMA:
+          ;
+          break;
+        default:
+          jj_la1[47] = jj_gen;
+          break label_23;
         }
-        type = ResultType();
-        if (line == -1) {
-            line = type.getBeginLine();
-            column = type.getBeginColumn();
-        }
-        name = Name();
-        parameters = FormalParameters();
-        label_22:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case LBRACKET:
-                    ;
-                    break;
-                default:
-                    jj_la1[44] = jj_gen;
-                    break label_22;
-            }
-            jj_consume_token(LBRACKET);
-            jj_consume_token(RBRACKET);
-            arrayCount++;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case THROWS:
-                jj_consume_token(THROWS);
-                throws_ = NameList();
-                break;
-            default:
-                jj_la1[45] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case LBRACE:
-                block = Block();
-                break;
-            case SEMICOLON:
-                jj_consume_token(SEMICOLON);
-                break;
-            default:
-                jj_la1[46] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        MethodDeclaration tmp = new MethodDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, typeParameters, type, null, parameters, arrayCount, throws_, block);
-        tmp.setNameExpr(name);
-        {
-            if (true) return tmp;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List FormalParameters() {
-        List ret = null;
-        Parameter par;
-        jj_consume_token(LPAREN);
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case ABSTRACT:
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FINAL:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NATIVE:
-            case PRIVATE:
-            case PROTECTED:
-            case PUBLIC:
-            case SHORT:
-            case STATIC:
-            case STRICTFP:
-            case SYNCHRONIZED:
-            case TRANSIENT:
-            case VOLATILE:
-            case IDENTIFIER:
-            case AT:
-                par = FormalParameter();
-                ret = add(ret, par);
-                label_23:
-                while (true) {
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case COMMA:
-                            ;
-                            break;
-                        default:
-                            jj_la1[47] = jj_gen;
-                            break label_23;
-                    }
-                    jj_consume_token(COMMA);
-                    par = FormalParameter();
-                    ret = add(ret, par);
-                }
-                break;
-            default:
-                jj_la1[48] = jj_gen;
-                ;
-        }
-        jj_consume_token(RPAREN);
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List FormalLambdaParameters() {
-        List ret = null;
-        Parameter par;
         jj_consume_token(COMMA);
         par = FormalParameter();
-        ret = add(ret, par);
-        label_24:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case COMMA:
-                    ;
-                    break;
-                default:
-                    jj_la1[49] = jj_gen;
-                    break label_24;
-            }
-            jj_consume_token(COMMA);
-            par = FormalParameter();
-            ret = add(ret, par);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List InferredLambdaParameters() {
-        List ret = null;
-        VariableDeclaratorId id;
-        jj_consume_token(COMMA);
-        id = VariableDeclaratorId();
-        ret = add(ret, new Parameter(id.getBeginLine(), id.getBeginColumn(), id.getEndLine(), id.getEndColumn(), 0, null, new UnknownType(), false, id));
-        label_25:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case COMMA:
-                    ;
-                    break;
-                default:
-                    jj_la1[50] = jj_gen;
-                    break label_25;
-            }
-            jj_consume_token(COMMA);
-            id = VariableDeclaratorId();
-            ret = add(ret, new Parameter(id.getBeginLine(), id.getBeginColumn(), id.getEndLine(), id.getEndColumn(), 0, null, new UnknownType(), false, id));
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Parameter FormalParameter() {
+                                                                                         ret = add(ret, par);
+      }
+      break;
+    default:
+      jj_la1[48] = jj_gen;
+      ;
+    }
+    jj_consume_token(RPAREN);
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List FormalLambdaParameters() {
+  List ret = null;
+  Parameter par;
+    jj_consume_token(COMMA);
+    par = FormalParameter();
+                                   ret = add(ret, par);
+    label_24:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[49] = jj_gen;
+        break label_24;
+      }
+      jj_consume_token(COMMA);
+      par = FormalParameter();
+                                                                                           ret = add(ret, par);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List InferredLambdaParameters() {
+  List ret = null;
+  VariableDeclaratorId id;
+    jj_consume_token(COMMA);
+    id = VariableDeclaratorId();
+                                          ret = add(ret, new Parameter(id.getBeginLine(), id.getBeginColumn(), id.getEndLine(), id.getEndColumn(), 0, null, new UnknownType(), false, id));
+    label_25:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[50] = jj_gen;
+        break label_25;
+      }
+      jj_consume_token(COMMA);
+      id = VariableDeclaratorId();
+                                       ret = add(ret, new Parameter(id.getBeginLine(), id.getBeginColumn(), id.getEndLine(), id.getEndColumn(), 0, null, new UnknownType(), false, id));
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Parameter FormalParameter() {
         Modifier modifier;
         Type type;
         boolean isVarArg = false;
         VariableDeclaratorId id;
-        modifier = Modifiers();
-        type = Type();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case ELLIPSIS:
-                jj_consume_token(ELLIPSIS);
-                isVarArg = true;
-                break;
-            default:
-                jj_la1[51] = jj_gen;
-                ;
-        }
-        id = VariableDeclaratorId();
-        int line = modifier.beginLine;
-        int column = modifier.beginColumn;
-        if (line == -1) {
-            line = type.getBeginLine();
-            column = type.getBeginColumn();
-        }
-        {
-            if (true)
-                return new Parameter(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, type, isVarArg, id);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public ConstructorDeclaration ConstructorDeclaration(Modifier modifier) {
+    modifier = Modifiers();
+    type = Type();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ELLIPSIS:
+      jj_consume_token(ELLIPSIS);
+                                                 isVarArg = true;
+      break;
+    default:
+      jj_la1[51] = jj_gen;
+      ;
+    }
+    id = VariableDeclaratorId();
+    int line = modifier.beginLine;
+    int column = modifier.beginColumn;
+    if(line==-1){ line=type.getBeginLine(); column=type.getBeginColumn(); }
+    {if (true) return new Parameter(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, type, isVarArg, id);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public ConstructorDeclaration ConstructorDeclaration(Modifier modifier) {
         List typeParameters = null;
         NameExpr name;
         List parameters;
@@ -1523,368 +1369,323 @@ final public ConstructorDeclaration ConstructorDeclaration(Modifier modifier) {
         int bbColumn = 0;
         int beLine = 0;
         int beColumn = 0;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case LT:
-                typeParameters = TypeParameters();
-                int[] lineCol = (int[]) typeParameters.remove(0);
-                if (line == -1) {
-                    line = lineCol[0];
-                    column = lineCol[1];
-                }
-                break;
-            default:
-                jj_la1[52] = jj_gen;
-                ;
-        }
-        // Modifiers matched in the caller
-        name = SimpleName();
-        if (line == -1) {
-            line = token.beginLine;
-            column = token.beginColumn;
-        }
-        parameters = FormalParameters();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case THROWS:
-                jj_consume_token(THROWS);
-                throws_ = NameList();
-                break;
-            default:
-                jj_la1[53] = jj_gen;
-                ;
-        }
-        jj_consume_token(LBRACE);
-        bbLine = token.beginLine;
-        bbColumn = token.beginColumn;
-        if (jj_2_8(2147483647)) {
-            exConsInv = ExplicitConstructorInvocation();
-        } else {
-            ;
-        }
-        stmts = Statements();
-        jj_consume_token(RBRACE);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case LT:
+      typeParameters = TypeParameters();
+                                        int[] lineCol=(int[])typeParameters.remove(0); if(line==-1){ line=lineCol[0]; column=lineCol[1];}
+      break;
+    default:
+      jj_la1[52] = jj_gen;
+      ;
+    }
+    // Modifiers matched in the caller
+      name = SimpleName();
+                        if(line==-1){line=token.beginLine; column=token.beginColumn;}
+    parameters = FormalParameters();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case THROWS:
+      jj_consume_token(THROWS);
+      throws_ = NameList();
+      break;
+    default:
+      jj_la1[53] = jj_gen;
+      ;
+    }
+    jj_consume_token(LBRACE);
+        bbLine=token.beginLine; bbColumn=token.beginColumn;
+    if (jj_2_8(2147483647)) {
+      exConsInv = ExplicitConstructorInvocation();
+    } else {
+      ;
+    }
+    stmts = Statements();
+    jj_consume_token(RBRACE);
         if (exConsInv != null) {
-            stmts = add(0, stmts, exConsInv);
+                stmts = add(0, stmts, exConsInv);
         }
         ConstructorDeclaration tmp = new ConstructorDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, typeParameters, null, parameters, throws_, new BlockStmt(bbLine, bbColumn, token.endLine, token.endColumn, stmts));
-        tmp.setNameExpr(name);
-        {
-            if (true) return tmp;
-        }
-        throw new Error("Missing return statement in function");
-    }
+    tmp.setNameExpr(name);
+    {if (true) return tmp;}
+    throw new Error("Missing return statement in function");
+  }
 
-    final public ExplicitConstructorInvocationStmt ExplicitConstructorInvocation() {
+  final public ExplicitConstructorInvocationStmt ExplicitConstructorInvocation() {
         boolean isThis = false;
         List args;
         Expression expr = null;
         List typeArgs = null;
         int line = -1;
         int column = 0;
-        if (jj_2_10(2147483647)) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case LT:
-                case 132:
-                    typeArgs = TypeArguments();
-                    int[] lineCol = (int[]) typeArgs.remove(0);
-                    line = lineCol[0];
-                    column = lineCol[1];
-                    break;
-                default:
-                    jj_la1[54] = jj_gen;
-                    ;
-            }
-            jj_consume_token(THIS);
-            if (line == -1) {
-                line = token.beginLine;
-                column = token.beginColumn;
-            }
-            isThis = true;
-            args = Arguments();
-            jj_consume_token(SEMICOLON);
+    if (jj_2_10(2147483647)) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LT:
+      case 132:
+        typeArgs = TypeArguments();
+                                         int[] lineCol=(int[])typeArgs.remove(0); line=lineCol[0]; column=lineCol[1];
+        break;
+      default:
+        jj_la1[54] = jj_gen;
+        ;
+      }
+      jj_consume_token(THIS);
+                   if (line == -1) {line=token.beginLine; column=token.beginColumn;} isThis = true;
+      args = Arguments();
+      jj_consume_token(SEMICOLON);
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NEW:
+      case NULL:
+      case SHORT:
+      case SUPER:
+      case THIS:
+      case TRUE:
+      case VOID:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LT:
+      case 132:
+        if (jj_2_9(2147483647)) {
+          expr = PrimaryExpressionWithoutSuperSuffix();
+          jj_consume_token(DOT);
+                  line=expr.getBeginLine(); column=expr.getBeginColumn();
         } else {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FALSE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case NEW:
-                case NULL:
-                case SHORT:
-                case SUPER:
-                case THIS:
-                case TRUE:
-                case VOID:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case LT:
-                case 132:
-                    if (jj_2_9(2147483647)) {
-                        expr = PrimaryExpressionWithoutSuperSuffix();
-                        jj_consume_token(DOT);
-                        line = expr.getBeginLine();
-                        column = expr.getBeginColumn();
-                    } else {
-                        ;
-                    }
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case LT:
-                        case 132:
-                            typeArgs = TypeArguments();
-                            int[] lineCol = (int[]) typeArgs.remove(0);
-                            if (line == -1) {
-                                line = lineCol[0];
-                                column = lineCol[1];
-                            }
-                            break;
-                        default:
-                            jj_la1[55] = jj_gen;
-                            ;
-                    }
-                    jj_consume_token(SUPER);
-                    if (line == -1) {
-                        line = token.beginLine;
-                        column = token.beginColumn;
-                    }
-                    args = Arguments();
-                    jj_consume_token(SEMICOLON);
-                    break;
-                default:
-                    jj_la1[56] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        {
-            if (true)
-                return new ExplicitConstructorInvocationStmt(line, column, token.endLine, token.endColumn, typeArgs, isThis, expr, args);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List Statements() {
+          ;
+        }
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case LT:
+        case 132:
+          typeArgs = TypeArguments();
+                                        int[] lineCol=(int[])typeArgs.remove(0); if (line == -1) {line=lineCol[0]; column=lineCol[1];}
+          break;
+        default:
+          jj_la1[55] = jj_gen;
+          ;
+        }
+        jj_consume_token(SUPER);
+                   if (line == -1) {line=token.beginLine; column=token.beginColumn;}
+        args = Arguments();
+        jj_consume_token(SEMICOLON);
+        break;
+      default:
+        jj_la1[56] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    {if (true) return new ExplicitConstructorInvocationStmt(line, column, token.endLine, token.endColumn,typeArgs, isThis, expr, args);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List Statements() {
         List ret = null;
         Statement stmt;
-        label_26:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case ABSTRACT:
-                case ASSERT:
-                case BOOLEAN:
-                case BREAK:
-                case BYTE:
-                case CHAR:
-                case CLASS:
-                case CONTINUE:
-                case DO:
-                case DOUBLE:
-                case FALSE:
-                case FINAL:
-                case FLOAT:
-                case FOR:
-                case IF:
-                case INT:
-                case INTERFACE:
-                case LONG:
-                case NATIVE:
-                case NEW:
-                case NULL:
-                case PRIVATE:
-                case PROTECTED:
-                case PUBLIC:
-                case RETURN:
-                case SHORT:
-                case STATIC:
-                case STRICTFP:
-                case SUPER:
-                case SWITCH:
-                case SYNCHRONIZED:
-                case THIS:
-                case THROW:
-                case TRANSIENT:
-                case TRUE:
-                case TRY:
-                case VOID:
-                case VOLATILE:
-                case WHILE:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case LBRACE:
-                case SEMICOLON:
-                case AT:
-                case INCR:
-                case DECR:
-                    ;
-                    break;
-                default:
-                    jj_la1[57] = jj_gen;
-                    break label_26;
-            }
-            stmt = BlockStatement();
-            ret = add(ret, stmt);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public InitializerDeclaration InitializerDeclaration() {
+    label_26:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case ABSTRACT:
+      case ASSERT:
+      case BOOLEAN:
+      case BREAK:
+      case BYTE:
+      case CHAR:
+      case CLASS:
+      case CONTINUE:
+      case DO:
+      case DOUBLE:
+      case FALSE:
+      case FINAL:
+      case FLOAT:
+      case FOR:
+      case IF:
+      case INT:
+      case INTERFACE:
+      case LONG:
+      case NATIVE:
+      case NEW:
+      case NULL:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case RETURN:
+      case SHORT:
+      case STATIC:
+      case STRICTFP:
+      case SUPER:
+      case SWITCH:
+      case SYNCHRONIZED:
+      case THIS:
+      case THROW:
+      case TRANSIENT:
+      case TRUE:
+      case TRY:
+      case VOID:
+      case VOLATILE:
+      case WHILE:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LBRACE:
+      case SEMICOLON:
+      case AT:
+      case INCR:
+      case DECR:
+        ;
+        break;
+      default:
+        jj_la1[57] = jj_gen;
+        break label_26;
+      }
+      stmt = BlockStatement();
+                                    ret = add(ret, stmt);
+    }
+          {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public InitializerDeclaration InitializerDeclaration() {
         BlockStmt block;
         int line = -1;
         int column = 0;
         boolean isStatic = false;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case STATIC:
-                jj_consume_token(STATIC);
-                isStatic = true;
-                line = token.beginLine;
-                column = token.beginColumn;
-                break;
-            default:
-                jj_la1[58] = jj_gen;
-                ;
-        }
-        block = Block();
-        if (line == -1) {
-            line = block.getBeginLine();
-            column = block.getBeginColumn();
-        }
-        {
-            if (true) return new InitializerDeclaration(line, column, token.endLine, token.endColumn, isStatic, block);
-        }
-        throw new Error("Missing return statement in function");
-    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case STATIC:
+      jj_consume_token(STATIC);
+               isStatic = true; line=token.beginLine; column=token.beginColumn;
+      break;
+    default:
+      jj_la1[58] = jj_gen;
+      ;
+    }
+    block = Block();
+                                                                                                    if(line==-1){line=block.getBeginLine(); column=block.getBeginColumn();}
+    {if (true) return new InitializerDeclaration(line, column, token.endLine, token.endColumn, isStatic, block);}
+    throw new Error("Missing return statement in function");
+  }
 
-    /*
-     * Type, name and expression syntax follows.
-     */
-    final public Type Type() {
+/*
+ * Type, name and expression syntax follows.
+ */
+  final public Type Type() {
         Type ret;
-        if (jj_2_11(2)) {
-            ret = ReferenceType();
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case SHORT:
-                    ret = PrimitiveType();
-                    break;
-                default:
-                    jj_la1[59] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public ReferenceType ReferenceType() {
+    if (jj_2_11(2)) {
+      ret = ReferenceType();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case SHORT:
+        ret = PrimitiveType();
+        break;
+      default:
+        jj_la1[59] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+   {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public ReferenceType ReferenceType() {
         Type type;
         int arrayCount = 0;
         List annotations = null;
-        List accum = null;
+        List accum= null;
         AnnotationExpr ann;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case SHORT:
-                type = PrimitiveType();
-                label_27:
-                while (true) {
-                    label_28:
-                    while (true) {
-                        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                            case AT:
-                                ;
-                                break;
-                            default:
-                                jj_la1[60] = jj_gen;
-                                break label_28;
-                        }
-                        ann = Annotation();
-                        annotations = add(annotations, ann);
-                    }
-                    jj_consume_token(LBRACKET);
-                    jj_consume_token(RBRACKET);
-                    arrayCount++;
-                    accum = add(accum, annotations);
-                    annotations = null;
-                    if (jj_2_12(2)) {
-                        ;
-                    } else {
-                        break label_27;
-                    }
-                }
-                break;
-            case IDENTIFIER:
-                type = ClassOrInterfaceType();
-                label_29:
-                while (true) {
-                    if (jj_2_13(2)) {
-                        ;
-                    } else {
-                        break label_29;
-                    }
-                    label_30:
-                    while (true) {
-                        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                            case AT:
-                                ;
-                                break;
-                            default:
-                                jj_la1[61] = jj_gen;
-                                break label_30;
-                        }
-                        ann = Annotation();
-                        annotations = add(annotations, ann);
-                    }
-                    jj_consume_token(LBRACKET);
-                    jj_consume_token(RBRACKET);
-                    arrayCount++;
-                    accum = add(accum, annotations);
-                    annotations = null;
-                }
-                break;
-            default:
-                jj_la1[62] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true)
-                return new ReferenceType(type.getBeginLine(), type.getBeginColumn(), token.endLine, token.endColumn, type, arrayCount, null, accum);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case SHORT:
+      type = PrimitiveType();
+      label_27:
+      while (true) {
+        label_28:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case AT:
+            ;
+            break;
+          default:
+            jj_la1[60] = jj_gen;
+            break label_28;
+          }
+          ann = Annotation();
+                                                                  annotations = add(annotations, ann);
+        }
+        jj_consume_token(LBRACKET);
+        jj_consume_token(RBRACKET);
+                                                                                                                      arrayCount++; accum = add(accum, annotations); annotations= null;
+        if (jj_2_12(2)) {
+          ;
+        } else {
+          break label_27;
+        }
+      }
+      break;
+    case IDENTIFIER:
+      type = ClassOrInterfaceType();
+      label_29:
+      while (true) {
+        if (jj_2_13(2)) {
+          ;
+        } else {
+          break label_29;
         }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public ClassOrInterfaceType ClassOrInterfaceType() {
+        label_30:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case AT:
+            ;
+            break;
+          default:
+            jj_la1[61] = jj_gen;
+            break label_30;
+          }
+          ann = Annotation();
+                                                                         annotations = add(annotations, ann);
+        }
+        jj_consume_token(LBRACKET);
+        jj_consume_token(RBRACKET);
+                                                                                                                             arrayCount++; accum = add(accum, annotations); annotations= null;
+      }
+      break;
+    default:
+      jj_la1[62] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return new ReferenceType(type.getBeginLine(), type.getBeginColumn(), token.endLine, token.endColumn, type, arrayCount, null, accum);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public ClassOrInterfaceType ClassOrInterfaceType() {
         ClassOrInterfaceType ret;
         String name;
         List typeArgs = null;
@@ -1892,401 +1693,370 @@ final public ClassOrInterfaceType ClassOrInterfaceType() {
         int column;
         List annotations = null;
         AnnotationExpr ann;
-        jj_consume_token(IDENTIFIER);
-        line = token.beginLine;
-        column = token.beginColumn;
-        name = token.image;
-        if (jj_2_14(2)) {
-            typeArgs = TypeArguments();
-            typeArgs.remove(0);
-        } else {
-            ;
-        }
-        ret = new ClassOrInterfaceType(line, column, token.endLine, token.endColumn, null, name, typeArgs);
-        label_31:
-        while (true) {
-            if (jj_2_15(2)) {
-                ;
-            } else {
-                break label_31;
-            }
-            jj_consume_token(DOT);
-            label_32:
-            while (true) {
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case AT:
-                        ;
-                        break;
-                    default:
-                        jj_la1[63] = jj_gen;
-                        break label_32;
-                }
-                ann = Annotation();
-                annotations = add(annotations, ann);
-            }
-            jj_consume_token(IDENTIFIER);
-            name = token.image;
-            if (jj_2_16(2)) {
-                typeArgs = TypeArguments();
-                typeArgs.remove(0);
-            } else {
-                ;
-            }
-            ret = new ClassOrInterfaceType(line, column, token.endLine, token.endColumn, ret, name, typeArgs);
-            ret.setAnnotations(annotations);
-            annotations = null;
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List TypeArguments() {
+    jj_consume_token(IDENTIFIER);
+                line=token.beginLine; column=token.beginColumn;
+                                                                   name = token.image;
+    if (jj_2_14(2)) {
+      typeArgs = TypeArguments();
+                                             typeArgs.remove(0);
+    } else {
+      ;
+    }
+    ret = new ClassOrInterfaceType(line, column, token.endLine, token.endColumn,null, name, typeArgs);
+    label_31:
+    while (true) {
+      if (jj_2_15(2)) {
+        ;
+      } else {
+        break label_31;
+      }
+      jj_consume_token(DOT);
+      label_32:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case AT:
+          ;
+          break;
+        default:
+          jj_la1[63] = jj_gen;
+          break label_32;
+        }
+        ann = Annotation();
+                                                   annotations = add(annotations, ann);
+      }
+      jj_consume_token(IDENTIFIER);
+                                                                                                           name = token.image;
+      if (jj_2_16(2)) {
+        typeArgs = TypeArguments();
+                                                     typeArgs.remove(0);
+      } else {
+        ;
+      }
+                                                                              ret = new ClassOrInterfaceType(line, column, token.endLine, token.endColumn,ret, name, typeArgs); ret.setAnnotations(annotations); annotations = null;
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List TypeArguments() {
         List ret = new LinkedList();
         Type type;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case LT:
-                jj_consume_token(LT);
-                ret.add(new int[]{token.beginLine, token.beginColumn});
-                type = TypeArgument();
-                ret.add(type);
-                label_33:
-                while (true) {
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case COMMA:
-                            ;
-                            break;
-                        default:
-                            jj_la1[64] = jj_gen;
-                            break label_33;
-                    }
-                    jj_consume_token(COMMA);
-                    type = TypeArgument();
-                    ret.add(type);
-                }
-                jj_consume_token(GT);
-            {
-                if (true) return ret;
-            }
-            break;
-            case 132:
-                jj_consume_token(132);
-                ret.add(null);
-            {
-                if (true) return ret;
-            }
-            break;
-            default:
-                jj_la1[65] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case LT:
+      jj_consume_token(LT);
+           ret.add(new int[]{token.beginLine, token.beginColumn});
+      type = TypeArgument();
+                             ret.add(type);
+      label_33:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case COMMA:
+          ;
+          break;
+        default:
+          jj_la1[64] = jj_gen;
+          break label_33;
         }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Type TypeArgument() {
+        jj_consume_token(COMMA);
+        type = TypeArgument();
+                                                                            ret.add(type);
+      }
+      jj_consume_token(GT);
+     {if (true) return ret;}
+      break;
+    case 132:
+      jj_consume_token(132);
+          ret.add(null);
+     {if (true) return ret;}
+      break;
+    default:
+      jj_la1[65] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Type TypeArgument() {
         Type ret;
         List annotations = null;
         AnnotationExpr ann;
-        label_34:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[66] = jj_gen;
-                    break label_34;
-            }
-            ann = Annotation();
-            annotations = add(annotations, ann);
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case SHORT:
-            case IDENTIFIER:
-                ret = ReferenceType();
-                break;
-            case HOOK:
-                ret = Wildcard();
-                break;
-            default:
-                jj_la1[67] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        ret.setAnnotations(annotations);
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public WildcardType Wildcard() {
+    label_34:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[66] = jj_gen;
+        break label_34;
+      }
+      ann = Annotation();
+                          annotations = add(annotations, ann);
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case SHORT:
+    case IDENTIFIER:
+      ret = ReferenceType();
+      break;
+    case HOOK:
+      ret = Wildcard();
+      break;
+    default:
+      jj_la1[67] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+   ret.setAnnotations(annotations); {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public WildcardType Wildcard() {
         ReferenceType ext = null;
         ReferenceType sup = null;
         int line;
         int column;
         AnnotationExpr ann;
         List annotations = null;
-        jj_consume_token(HOOK);
-        line = token.beginLine;
-        column = token.beginColumn;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case EXTENDS:
-            case SUPER:
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case EXTENDS:
-                        jj_consume_token(EXTENDS);
-                        label_35:
-                        while (true) {
-                            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                case AT:
-                                    ;
-                                    break;
-                                default:
-                                    jj_la1[68] = jj_gen;
-                                    break label_35;
-                            }
-                            ann = Annotation();
-                            annotations = add(annotations, ann);
-                        }
-                        ext = ReferenceType();
-                        ext.setAnnotations(annotations);
-                        break;
-                    case SUPER:
-                        jj_consume_token(SUPER);
-                        label_36:
-                        while (true) {
-                            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                case AT:
-                                    ;
-                                    break;
-                                default:
-                                    jj_la1[69] = jj_gen;
-                                    break label_36;
-                            }
-                            ann = Annotation();
-                            annotations = add(annotations, ann);
-                        }
-                        sup = ReferenceType();
-                        sup.setAnnotations(annotations);
-                        break;
-                    default:
-                        jj_la1[70] = jj_gen;
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                }
-                break;
-            default:
-                jj_la1[71] = jj_gen;
-                ;
-        }
-        {
-            if (true) return new WildcardType(line, column, token.endLine, token.endColumn, ext, sup);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public PrimitiveType PrimitiveType() {
+    jj_consume_token(HOOK);
+        line=token.beginLine; column=token.beginColumn;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case EXTENDS:
+    case SUPER:
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case EXTENDS:
+        jj_consume_token(EXTENDS);
+        label_35:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case AT:
+            ;
+            break;
+          default:
+            jj_la1[68] = jj_gen;
+            break label_35;
+          }
+          ann = Annotation();
+                                                  annotations = add(annotations, ann);
+        }
+        ext = ReferenceType();
+                  ext.setAnnotations(annotations);
+        break;
+      case SUPER:
+        jj_consume_token(SUPER);
+        label_36:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case AT:
+            ;
+            break;
+          default:
+            jj_la1[69] = jj_gen;
+            break label_36;
+          }
+          ann = Annotation();
+                                                annotations = add(annotations, ann);
+        }
+        sup = ReferenceType();
+                  sup.setAnnotations(annotations);
+        break;
+      default:
+        jj_la1[70] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      break;
+    default:
+      jj_la1[71] = jj_gen;
+      ;
+    }
+     {if (true) return new WildcardType(line, column, token.endLine, token.endColumn,ext, sup);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public PrimitiveType PrimitiveType() {
         PrimitiveType ret;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case BOOLEAN:
-                jj_consume_token(BOOLEAN);
-                ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Boolean);
-                break;
-            case CHAR:
-                jj_consume_token(CHAR);
-                ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Char);
-                break;
-            case BYTE:
-                jj_consume_token(BYTE);
-                ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Byte);
-                break;
-            case SHORT:
-                jj_consume_token(SHORT);
-                ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Short);
-                break;
-            case INT:
-                jj_consume_token(INT);
-                ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Int);
-                break;
-            case LONG:
-                jj_consume_token(LONG);
-                ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Long);
-                break;
-            case FLOAT:
-                jj_consume_token(FLOAT);
-                ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Float);
-                break;
-            case DOUBLE:
-                jj_consume_token(DOUBLE);
-                ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Double);
-                break;
-            default:
-                jj_la1[72] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Type ResultType() {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BOOLEAN:
+      jj_consume_token(BOOLEAN);
+              ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Boolean);
+      break;
+    case CHAR:
+      jj_consume_token(CHAR);
+           ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Char);
+      break;
+    case BYTE:
+      jj_consume_token(BYTE);
+           ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Byte);
+      break;
+    case SHORT:
+      jj_consume_token(SHORT);
+            ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Short);
+      break;
+    case INT:
+      jj_consume_token(INT);
+          ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Int);
+      break;
+    case LONG:
+      jj_consume_token(LONG);
+           ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Long);
+      break;
+    case FLOAT:
+      jj_consume_token(FLOAT);
+            ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Float);
+      break;
+    case DOUBLE:
+      jj_consume_token(DOUBLE);
+             ret = new PrimitiveType(token.beginLine, token.beginColumn, token.endLine, token.endColumn, PrimitiveType.Primitive.Double);
+      break;
+    default:
+      jj_la1[72] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+  {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Type ResultType() {
         Type ret;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case VOID:
-                jj_consume_token(VOID);
-                ret = new VoidType(token.beginLine, token.beginColumn, token.endLine, token.endColumn);
-                break;
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case SHORT:
-            case IDENTIFIER:
-                ret = Type();
-                break;
-            default:
-                jj_la1[73] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public NameExpr Name() {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case VOID:
+      jj_consume_token(VOID);
+                   ret = new VoidType(token.beginLine, token.beginColumn, token.endLine, token.endColumn);
+      break;
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case SHORT:
+    case IDENTIFIER:
+      ret = Type();
+      break;
+    default:
+      jj_la1[73] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public NameExpr Name() {
         NameExpr ret;
-        jj_consume_token(IDENTIFIER);
-        ret = new NameExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image);
-        label_37:
-        while (true) {
-            if (jj_2_17(2)) {
-                ;
-            } else {
-                break label_37;
-            }
-            jj_consume_token(DOT);
-            jj_consume_token(IDENTIFIER);
-            ret = new QualifiedNameExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, token.image);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List ClassOrInterfaceTypeList() {
+    jj_consume_token(IDENTIFIER);
+                 ret = new NameExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image);
+    label_37:
+    while (true) {
+      if (jj_2_17(2)) {
+        ;
+      } else {
+        break label_37;
+      }
+      jj_consume_token(DOT);
+      jj_consume_token(IDENTIFIER);
+                                    ret = new QualifiedNameExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, token.image);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List ClassOrInterfaceTypeList() {
         List ret = new LinkedList();
         ClassOrInterfaceType type;
-        List annotations = null;
+        List annotations= null;
         AnnotationExpr ann;
-        label_38:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[74] = jj_gen;
-                    break label_38;
-            }
-            ann = Annotation();
-            annotations = add(annotations, ann);
-        }
-        type = ClassOrInterfaceType();
-        type.setAnnotations(annotations);
-        ret.add(type);
-        annotations = null;
-        label_39:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case COMMA:
-                    ;
-                    break;
-                default:
-                    jj_la1[75] = jj_gen;
-                    break label_39;
-            }
-            jj_consume_token(COMMA);
-            label_40:
-            while (true) {
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case AT:
-                        ;
-                        break;
-                    default:
-                        jj_la1[76] = jj_gen;
-                        break label_40;
-                }
-                ann = Annotation();
-                annotations = add(annotations, ann);
-            }
-            type = ClassOrInterfaceType();
-            type.setAnnotations(annotations);
-            ret.add(type);
-            annotations = null;
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public NameExpr SimpleName() {
-        NameExpr ret;
-        jj_consume_token(IDENTIFIER);
-        ret = new NameExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image);
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List NameList() {
+    label_38:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[74] = jj_gen;
+        break label_38;
+      }
+      ann = Annotation();
+                          annotations = add(annotations, ann);
+    }
+    type = ClassOrInterfaceType();
+                                                                                                    type.setAnnotations(annotations); ret.add(type); annotations=null;
+    label_39:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[75] = jj_gen;
+        break label_39;
+      }
+      jj_consume_token(COMMA);
+      label_40:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case AT:
+          ;
+          break;
+        default:
+          jj_la1[76] = jj_gen;
+          break label_40;
+        }
+        ann = Annotation();
+                                                                                                                                                                                                       annotations = add(annotations, ann);
+      }
+      type = ClassOrInterfaceType();
+                                                                                                                                                                                                                                                                                 type.setAnnotations(annotations); ret.add(type); annotations=null;
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public NameExpr SimpleName() {
+    NameExpr ret;
+    jj_consume_token(IDENTIFIER);
+                 ret = new NameExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image);
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List NameList() {
         List ret = new LinkedList();
         NameExpr name;
-        name = Name();
-        ret.add(name);
-        label_41:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case COMMA:
-                    ;
-                    break;
-                default:
-                    jj_la1[77] = jj_gen;
-                    break label_41;
-            }
-            jj_consume_token(COMMA);
-            name = Name();
-            ret.add(name);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
+    name = Name();
+                  ret.add(name);
+    label_41:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[77] = jj_gen;
+        break label_41;
+      }
+      jj_consume_token(COMMA);
+      name = Name();
+                                                          ret.add(name);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
 
-    /*
-     * Expression syntax follows.
-     */
-    final public Expression Expression() {
+/*
+ * Expression syntax follows.
+ */
+  final public Expression Expression() {
         Expression ret;
         AssignExpr.Operator op;
         Expression value;
@@ -2295,830 +2065,777 @@ final public Expression Expression() {
         List typeArgs = null;
         VariableDeclaratorId id = null;
         Expression inner = null;
-        ret = ConditionalExpression();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case ASSIGN:
-            case PLUSASSIGN:
-            case MINUSASSIGN:
-            case STARASSIGN:
-            case SLASHASSIGN:
-            case ANDASSIGN:
-            case ORASSIGN:
-            case XORASSIGN:
-            case REMASSIGN:
-            case LSHIFTASSIGN:
-            case RSIGNEDSHIFTASSIGN:
-            case RUNSIGNEDSHIFTASSIGN:
-            case ARROW:
-            case DOUBLECOLON:
-                if (jj_2_18(2)) {
-                    op = AssignmentOperator();
-                    value = Expression();
-                    ret = new AssignExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, value, op);
-                } else {
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case ARROW:
-                            jj_consume_token(ARROW);
-                            lambdaBody = LambdaBody();
-                            if (ret instanceof CastExpr) {
-                                inner = generateLambda(((CastExpr) ret).getExpr(), lambdaBody);
-                                ((CastExpr) ret).setExpr(inner);
-                            } else if (ret instanceof ConditionalExpr) {
-                                ConditionalExpr ce = (ConditionalExpr) ret;
-                                if (ce.getElseExpr() != null) {
-                                    ce.setElseExpr(generateLambda(ce.getElseExpr(), lambdaBody));
-                                }
-                            } else {
-                                ret = generateLambda(ret, lambdaBody);
-                            }
-                            break;
-                        case DOUBLECOLON:
-                            jj_consume_token(DOUBLECOLON);
-                            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                case LT:
-                                    typeArgs = TypeParameters();
-                                    typeArgs.remove(0);
-                                    break;
-                                default:
-                                    jj_la1[78] = jj_gen;
-                                    ;
-                            }
-                            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                case IDENTIFIER:
-                                    jj_consume_token(IDENTIFIER);
-                                    break;
-                                case NEW:
-                                    jj_consume_token(NEW);
-                                    break;
-                                default:
-                                    jj_la1[79] = jj_gen;
-                                    jj_consume_token(-1);
-                                    throw new ParseException();
-                            }
-                            ret = new MethodReferenceExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, typeArgs, token.image);
-                            break;
-                        default:
-                            jj_la1[80] = jj_gen;
-                            jj_consume_token(-1);
-                            throw new ParseException();
-                    }
-                }
-                break;
-            default:
-                jj_la1[81] = jj_gen;
-                ;
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public AssignExpr.Operator AssignmentOperator() {
-        AssignExpr.Operator ret;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case ASSIGN:
-                jj_consume_token(ASSIGN);
-                ret = AssignExpr.Operator.assign;
-                break;
-            case STARASSIGN:
-                jj_consume_token(STARASSIGN);
-                ret = AssignExpr.Operator.star;
-                break;
-            case SLASHASSIGN:
-                jj_consume_token(SLASHASSIGN);
-                ret = AssignExpr.Operator.slash;
-                break;
-            case REMASSIGN:
-                jj_consume_token(REMASSIGN);
-                ret = AssignExpr.Operator.rem;
-                break;
-            case PLUSASSIGN:
-                jj_consume_token(PLUSASSIGN);
-                ret = AssignExpr.Operator.plus;
-                break;
-            case MINUSASSIGN:
-                jj_consume_token(MINUSASSIGN);
-                ret = AssignExpr.Operator.minus;
-                break;
-            case LSHIFTASSIGN:
-                jj_consume_token(LSHIFTASSIGN);
-                ret = AssignExpr.Operator.lShift;
-                break;
-            case RSIGNEDSHIFTASSIGN:
-                jj_consume_token(RSIGNEDSHIFTASSIGN);
-                ret = AssignExpr.Operator.rSignedShift;
-                break;
-            case RUNSIGNEDSHIFTASSIGN:
-                jj_consume_token(RUNSIGNEDSHIFTASSIGN);
-                ret = AssignExpr.Operator.rUnsignedShift;
-                break;
-            case ANDASSIGN:
-                jj_consume_token(ANDASSIGN);
-                ret = AssignExpr.Operator.and;
-                break;
-            case XORASSIGN:
-                jj_consume_token(XORASSIGN);
-                ret = AssignExpr.Operator.xor;
-                break;
-            case ORASSIGN:
-                jj_consume_token(ORASSIGN);
-                ret = AssignExpr.Operator.or;
-                break;
-            default:
-                jj_la1[82] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression ConditionalExpression() {
+    ret = ConditionalExpression();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ASSIGN:
+    case PLUSASSIGN:
+    case MINUSASSIGN:
+    case STARASSIGN:
+    case SLASHASSIGN:
+    case ANDASSIGN:
+    case ORASSIGN:
+    case XORASSIGN:
+    case REMASSIGN:
+    case LSHIFTASSIGN:
+    case RSIGNEDSHIFTASSIGN:
+    case RUNSIGNEDSHIFTASSIGN:
+    case ARROW:
+    case DOUBLECOLON:
+      if (jj_2_18(2)) {
+        op = AssignmentOperator();
+        value = Expression();
+                                                     ret = new AssignExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, value, op);
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case ARROW:
+          jj_consume_token(ARROW);
+          lambdaBody = LambdaBody();
+     if (ret instanceof CastExpr)
+     {
+       inner = generateLambda(((CastExpr)ret).getExpr(), lambdaBody);
+       ((CastExpr)ret).setExpr(inner);
+     }
+     else if (ret instanceof ConditionalExpr){
+         ConditionalExpr ce = (ConditionalExpr) ret;
+         if(ce.getElseExpr() != null){
+            ce.setElseExpr(generateLambda(ce.getElseExpr(), lambdaBody));
+         }
+     }
+     else
+     {
+       ret = generateLambda(ret, lambdaBody);
+     }
+          break;
+        case DOUBLECOLON:
+          jj_consume_token(DOUBLECOLON);
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case LT:
+            typeArgs = TypeParameters();
+                                        typeArgs.remove(0);
+            break;
+          default:
+            jj_la1[78] = jj_gen;
+            ;
+          }
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case IDENTIFIER:
+            jj_consume_token(IDENTIFIER);
+            break;
+          case NEW:
+            jj_consume_token(NEW);
+            break;
+          default:
+            jj_la1[79] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
+   ret = new MethodReferenceExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, typeArgs, token.image);
+          break;
+        default:
+          jj_la1[80] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+      break;
+    default:
+      jj_la1[81] = jj_gen;
+      ;
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public AssignExpr.Operator AssignmentOperator() {
+        AssignExpr.Operator ret;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ASSIGN:
+      jj_consume_token(ASSIGN);
+               ret = AssignExpr.Operator.assign;
+      break;
+    case STARASSIGN:
+      jj_consume_token(STARASSIGN);
+               ret = AssignExpr.Operator.star;
+      break;
+    case SLASHASSIGN:
+      jj_consume_token(SLASHASSIGN);
+               ret = AssignExpr.Operator.slash;
+      break;
+    case REMASSIGN:
+      jj_consume_token(REMASSIGN);
+               ret = AssignExpr.Operator.rem;
+      break;
+    case PLUSASSIGN:
+      jj_consume_token(PLUSASSIGN);
+               ret = AssignExpr.Operator.plus;
+      break;
+    case MINUSASSIGN:
+      jj_consume_token(MINUSASSIGN);
+               ret = AssignExpr.Operator.minus;
+      break;
+    case LSHIFTASSIGN:
+      jj_consume_token(LSHIFTASSIGN);
+               ret = AssignExpr.Operator.lShift;
+      break;
+    case RSIGNEDSHIFTASSIGN:
+      jj_consume_token(RSIGNEDSHIFTASSIGN);
+               ret = AssignExpr.Operator.rSignedShift;
+      break;
+    case RUNSIGNEDSHIFTASSIGN:
+      jj_consume_token(RUNSIGNEDSHIFTASSIGN);
+               ret = AssignExpr.Operator.rUnsignedShift;
+      break;
+    case ANDASSIGN:
+      jj_consume_token(ANDASSIGN);
+               ret = AssignExpr.Operator.and;
+      break;
+    case XORASSIGN:
+      jj_consume_token(XORASSIGN);
+               ret = AssignExpr.Operator.xor;
+      break;
+    case ORASSIGN:
+      jj_consume_token(ORASSIGN);
+               ret = AssignExpr.Operator.or;
+      break;
+    default:
+      jj_la1[82] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression ConditionalExpression() {
         Expression ret;
         Expression left;
         Expression right;
-        ret = ConditionalOrExpression();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case HOOK:
-                jj_consume_token(HOOK);
-                left = Expression();
-                jj_consume_token(COLON);
-                right = ConditionalExpression();
-                ret = new ConditionalExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, left, right);
-                break;
-            default:
-                jj_la1[83] = jj_gen;
-                ;
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression ConditionalOrExpression() {
+    ret = ConditionalOrExpression();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case HOOK:
+      jj_consume_token(HOOK);
+      left = Expression();
+      jj_consume_token(COLON);
+      right = ConditionalExpression();
+                                                                  ret = new ConditionalExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, left, right);
+      break;
+    default:
+      jj_la1[83] = jj_gen;
+      ;
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression ConditionalOrExpression() {
         Expression ret;
         Expression right;
-        ret = ConditionalAndExpression();
-        label_42:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case SC_OR:
-                    ;
-                    break;
-                default:
-                    jj_la1[84] = jj_gen;
-                    break label_42;
-            }
-            jj_consume_token(SC_OR);
-            right = ConditionalAndExpression();
-            ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, BinaryExpr.Operator.or);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression ConditionalAndExpression() {
+    ret = ConditionalAndExpression();
+    label_42:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case SC_OR:
+        ;
+        break;
+      default:
+        jj_la1[84] = jj_gen;
+        break label_42;
+      }
+      jj_consume_token(SC_OR);
+      right = ConditionalAndExpression();
+                                                                               ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, BinaryExpr.Operator.or);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression ConditionalAndExpression() {
         Expression ret;
         Expression right;
-        ret = InclusiveOrExpression();
-        label_43:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case SC_AND:
-                    ;
-                    break;
-                default:
-                    jj_la1[85] = jj_gen;
-                    break label_43;
-            }
-            jj_consume_token(SC_AND);
-            right = InclusiveOrExpression();
-            ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, BinaryExpr.Operator.and);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression InclusiveOrExpression() {
+    ret = InclusiveOrExpression();
+    label_43:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case SC_AND:
+        ;
+        break;
+      default:
+        jj_la1[85] = jj_gen;
+        break label_43;
+      }
+      jj_consume_token(SC_AND);
+      right = InclusiveOrExpression();
+                                                                         ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, BinaryExpr.Operator.and);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression InclusiveOrExpression() {
         Expression ret;
         Expression right;
-        ret = ExclusiveOrExpression();
-        label_44:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case BIT_OR:
-                    ;
-                    break;
-                default:
-                    jj_la1[86] = jj_gen;
-                    break label_44;
-            }
-            jj_consume_token(BIT_OR);
-            right = ExclusiveOrExpression();
-            ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, BinaryExpr.Operator.binOr);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression ExclusiveOrExpression() {
+    ret = ExclusiveOrExpression();
+    label_44:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case BIT_OR:
+        ;
+        break;
+      default:
+        jj_la1[86] = jj_gen;
+        break label_44;
+      }
+      jj_consume_token(BIT_OR);
+      right = ExclusiveOrExpression();
+                                                                        ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, BinaryExpr.Operator.binOr);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression ExclusiveOrExpression() {
         Expression ret;
         Expression right;
-        ret = AndExpression();
-        label_45:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case XOR:
-                    ;
-                    break;
-                default:
-                    jj_la1[87] = jj_gen;
-                    break label_45;
-            }
-            jj_consume_token(XOR);
-            right = AndExpression();
-            ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, BinaryExpr.Operator.xor);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression AndExpression() {
+    ret = AndExpression();
+    label_45:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case XOR:
+        ;
+        break;
+      default:
+        jj_la1[87] = jj_gen;
+        break label_45;
+      }
+      jj_consume_token(XOR);
+      right = AndExpression();
+                                                        ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, BinaryExpr.Operator.xor);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression AndExpression() {
         Expression ret;
         Expression right;
-        ret = EqualityExpression();
-        label_46:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case BIT_AND:
-                    ;
-                    break;
-                default:
-                    jj_la1[88] = jj_gen;
-                    break label_46;
-            }
-            jj_consume_token(BIT_AND);
-            right = EqualityExpression();
-            ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, BinaryExpr.Operator.binAnd);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression EqualityExpression() {
+    ret = EqualityExpression();
+    label_46:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case BIT_AND:
+        ;
+        break;
+      default:
+        jj_la1[88] = jj_gen;
+        break label_46;
+      }
+      jj_consume_token(BIT_AND);
+      right = EqualityExpression();
+                                                                  ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, BinaryExpr.Operator.binAnd);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression EqualityExpression() {
         Expression ret;
         Expression right;
         BinaryExpr.Operator op;
-        ret = InstanceOfExpression();
-        label_47:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case EQ:
-                case NE:
-                    ;
-                    break;
-                default:
-                    jj_la1[89] = jj_gen;
-                    break label_47;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case EQ:
-                    jj_consume_token(EQ);
-                    op = BinaryExpr.Operator.equals;
-                    break;
-                case NE:
-                    jj_consume_token(NE);
-                    op = BinaryExpr.Operator.notEquals;
-                    break;
-                default:
-                    jj_la1[90] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-            right = InstanceOfExpression();
-            ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, op);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression InstanceOfExpression() {
+    ret = InstanceOfExpression();
+    label_47:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case EQ:
+      case NE:
+        ;
+        break;
+      default:
+        jj_la1[89] = jj_gen;
+        break label_47;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case EQ:
+        jj_consume_token(EQ);
+             op = BinaryExpr.Operator.equals;
+        break;
+      case NE:
+        jj_consume_token(NE);
+             op = BinaryExpr.Operator.notEquals;
+        break;
+      default:
+        jj_la1[90] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      right = InstanceOfExpression();
+                                       ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, op);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression InstanceOfExpression() {
         Expression ret;
         Type type;
-        ret = RelationalExpression();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case INSTANCEOF:
-                jj_consume_token(INSTANCEOF);
-                type = Type();
-                ret = new InstanceOfExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, type);
-                break;
-            default:
-                jj_la1[91] = jj_gen;
-                ;
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression RelationalExpression() {
+    ret = RelationalExpression();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case INSTANCEOF:
+      jj_consume_token(INSTANCEOF);
+      type = Type();
+                                                              ret = new InstanceOfExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, type);
+      break;
+    default:
+      jj_la1[91] = jj_gen;
+      ;
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression RelationalExpression() {
         Expression ret;
         Expression right;
         BinaryExpr.Operator op;
-        ret = ShiftExpression();
-        label_48:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case LT:
-                case LE:
-                case GE:
-                case GT:
-                    ;
-                    break;
-                default:
-                    jj_la1[92] = jj_gen;
-                    break label_48;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case LT:
-                    jj_consume_token(LT);
-                    op = BinaryExpr.Operator.less;
-                    break;
-                case GT:
-                    jj_consume_token(GT);
-                    op = BinaryExpr.Operator.greater;
-                    break;
-                case LE:
-                    jj_consume_token(LE);
-                    op = BinaryExpr.Operator.lessEquals;
-                    break;
-                case GE:
-                    jj_consume_token(GE);
-                    op = BinaryExpr.Operator.greaterEquals;
-                    break;
-                default:
-                    jj_la1[93] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-            right = ShiftExpression();
-            ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, op);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression ShiftExpression() {
+    ret = ShiftExpression();
+    label_48:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LT:
+      case LE:
+      case GE:
+      case GT:
+        ;
+        break;
+      default:
+        jj_la1[92] = jj_gen;
+        break label_48;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LT:
+        jj_consume_token(LT);
+                 op = BinaryExpr.Operator.less;
+        break;
+      case GT:
+        jj_consume_token(GT);
+                 op = BinaryExpr.Operator.greater;
+        break;
+      case LE:
+        jj_consume_token(LE);
+                 op = BinaryExpr.Operator.lessEquals;
+        break;
+      case GE:
+        jj_consume_token(GE);
+                 op = BinaryExpr.Operator.greaterEquals;
+        break;
+      default:
+        jj_la1[93] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      right = ShiftExpression();
+                                      ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, op);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression ShiftExpression() {
         Expression ret;
         Expression right;
         BinaryExpr.Operator op;
-        ret = AdditiveExpression();
-        label_49:
-        while (true) {
-            if (jj_2_19(1)) {
-                ;
-            } else {
-                break label_49;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case LSHIFT:
-                    jj_consume_token(LSHIFT);
-                    op = BinaryExpr.Operator.lShift;
-                    break;
-                default:
-                    jj_la1[94] = jj_gen;
-                    if (jj_2_20(1)) {
-                        RSIGNEDSHIFT();
-                        op = BinaryExpr.Operator.rSignedShift;
-                    } else if (jj_2_21(1)) {
-                        RUNSIGNEDSHIFT();
-                        op = BinaryExpr.Operator.rUnsignedShift;
-                    } else {
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                    }
-            }
-            right = AdditiveExpression();
-            ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, op);
-        }
-        {
-            if (true) return ret;
+    ret = AdditiveExpression();
+    label_49:
+    while (true) {
+      if (jj_2_19(1)) {
+        ;
+      } else {
+        break label_49;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LSHIFT:
+        jj_consume_token(LSHIFT);
+                             op = BinaryExpr.Operator.lShift;
+        break;
+      default:
+        jj_la1[94] = jj_gen;
+        if (jj_2_20(1)) {
+          RSIGNEDSHIFT();
+                             op = BinaryExpr.Operator.rSignedShift;
+        } else if (jj_2_21(1)) {
+          RUNSIGNEDSHIFT();
+                             op = BinaryExpr.Operator.rUnsignedShift;
+        } else {
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-        throw new Error("Missing return statement in function");
+      }
+      right = AdditiveExpression();
+                                         ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, op);
     }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
 
-    final public Expression AdditiveExpression() {
+  final public Expression AdditiveExpression() {
         Expression ret;
         Expression right;
         BinaryExpr.Operator op;
-        ret = MultiplicativeExpression();
-        label_50:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case PLUS:
-                case MINUS:
-                    ;
-                    break;
-                default:
-                    jj_la1[95] = jj_gen;
-                    break label_50;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case PLUS:
-                    jj_consume_token(PLUS);
-                    op = BinaryExpr.Operator.plus;
-                    break;
-                case MINUS:
-                    jj_consume_token(MINUS);
-                    op = BinaryExpr.Operator.minus;
-                    break;
-                default:
-                    jj_la1[96] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-            right = MultiplicativeExpression();
-            ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, op);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression MultiplicativeExpression() {
+    ret = MultiplicativeExpression();
+    label_50:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case PLUS:
+      case MINUS:
+        ;
+        break;
+      default:
+        jj_la1[95] = jj_gen;
+        break label_50;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case PLUS:
+        jj_consume_token(PLUS);
+                op = BinaryExpr.Operator.plus;
+        break;
+      case MINUS:
+        jj_consume_token(MINUS);
+                op = BinaryExpr.Operator.minus;
+        break;
+      default:
+        jj_la1[96] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      right = MultiplicativeExpression();
+                                               ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, op);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression MultiplicativeExpression() {
         Expression ret;
         Expression right;
         BinaryExpr.Operator op;
-        ret = UnaryExpression();
-        label_51:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case STAR:
-                case SLASH:
-                case REM:
-                    ;
-                    break;
-                default:
-                    jj_la1[97] = jj_gen;
-                    break label_51;
-            }
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case STAR:
-                    jj_consume_token(STAR);
-                    op = BinaryExpr.Operator.times;
-                    break;
-                case SLASH:
-                    jj_consume_token(SLASH);
-                    op = BinaryExpr.Operator.divide;
-                    break;
-                case REM:
-                    jj_consume_token(REM);
-                    op = BinaryExpr.Operator.remainder;
-                    break;
-                default:
-                    jj_la1[98] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-            right = UnaryExpression();
-            ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, op);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression UnaryExpression() {
+    ret = UnaryExpression();
+    label_51:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case STAR:
+      case SLASH:
+      case REM:
+        ;
+        break;
+      default:
+        jj_la1[97] = jj_gen;
+        break label_51;
+      }
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case STAR:
+        jj_consume_token(STAR);
+                op = BinaryExpr.Operator.times;
+        break;
+      case SLASH:
+        jj_consume_token(SLASH);
+                op = BinaryExpr.Operator.divide;
+        break;
+      case REM:
+        jj_consume_token(REM);
+                op = BinaryExpr.Operator.remainder;
+        break;
+      default:
+        jj_la1[98] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      right = UnaryExpression();
+                                      ret = new BinaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, right, op);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression UnaryExpression() {
         Expression ret;
         UnaryExpr.Operator op;
         int line = 0;
         int column = 0;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case INCR:
-                ret = PreIncrementExpression();
-                break;
-            case DECR:
-                ret = PreDecrementExpression();
-                break;
-            case PLUS:
-            case MINUS:
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case PLUS:
-                        jj_consume_token(PLUS);
-                        op = UnaryExpr.Operator.positive;
-                        line = token.beginLine;
-                        column = token.beginColumn;
-                        break;
-                    case MINUS:
-                        jj_consume_token(MINUS);
-                        op = UnaryExpr.Operator.negative;
-                        line = token.beginLine;
-                        column = token.beginColumn;
-                        break;
-                    default:
-                        jj_la1[99] = jj_gen;
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                }
-                ret = UnaryExpression();
-                if (op == UnaryExpr.Operator.negative) {
-                    if (ret instanceof IntegerLiteralExpr && ((IntegerLiteralExpr) ret).isMinValue()) {
-                        ret = new IntegerLiteralMinValueExpr(line, column, token.endLine, token.endColumn);
-                    } else if (ret instanceof LongLiteralExpr && ((LongLiteralExpr) ret).isMinValue()) {
-                        ret = new LongLiteralMinValueExpr(line, column, token.endLine, token.endColumn);
-                    } else {
-                        ret = new UnaryExpr(line, column, token.endLine, token.endColumn, ret, op);
-                    }
-                } else {
-                    ret = new UnaryExpr(line, column, token.endLine, token.endColumn, ret, op);
-                }
-                break;
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case BANG:
-            case TILDE:
-                ret = UnaryExpressionNotPlusMinus();
-                break;
-            default:
-                jj_la1[100] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression PreIncrementExpression() {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case INCR:
+      ret = PreIncrementExpression();
+      break;
+    case DECR:
+      ret = PreDecrementExpression();
+      break;
+    case PLUS:
+    case MINUS:
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case PLUS:
+        jj_consume_token(PLUS);
+                  op = UnaryExpr.Operator.positive; line=token.beginLine; column=token.beginColumn;
+        break;
+      case MINUS:
+        jj_consume_token(MINUS);
+                  op = UnaryExpr.Operator.negative; line=token.beginLine; column=token.beginColumn;
+        break;
+      default:
+        jj_la1[99] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      ret = UnaryExpression();
+                 if(op == UnaryExpr.Operator.negative) {
+                        if (ret instanceof IntegerLiteralExpr && ((IntegerLiteralExpr)ret).isMinValue()) {
+                                ret = new IntegerLiteralMinValueExpr(line, column, token.endLine, token.endColumn);
+                        } else if (ret instanceof LongLiteralExpr && ((LongLiteralExpr)ret).isMinValue()) {
+                                ret = new LongLiteralMinValueExpr(line, column, token.endLine, token.endColumn);
+                        } else {
+                                ret = new UnaryExpr(line, column, token.endLine, token.endColumn,ret, op);
+                        }
+                 } else {
+                        ret = new UnaryExpr(line, column, token.endLine, token.endColumn,ret, op);
+                 }
+      break;
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case BANG:
+    case TILDE:
+      ret = UnaryExpressionNotPlusMinus();
+      break;
+    default:
+      jj_la1[100] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression PreIncrementExpression() {
         Expression ret;
         int line;
         int column;
-        jj_consume_token(INCR);
-        line = token.beginLine;
-        column = token.beginColumn;
-        ret = UnaryExpression();
-        ret = new UnaryExpr(line, column, token.endLine, token.endColumn, ret, UnaryExpr.Operator.preIncrement);
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression PreDecrementExpression() {
+    jj_consume_token(INCR);
+        line=token.beginLine; column=token.beginColumn;
+    ret = UnaryExpression();
+                                                                                   ret = new UnaryExpr(line, column, token.endLine, token.endColumn,ret, UnaryExpr.Operator.preIncrement);
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression PreDecrementExpression() {
         Expression ret;
         int line;
         int column;
-        jj_consume_token(DECR);
-        line = token.beginLine;
-        column = token.beginColumn;
-        ret = UnaryExpression();
-        ret = new UnaryExpr(line, column, token.endLine, token.endColumn, ret, UnaryExpr.Operator.preDecrement);
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression UnaryExpressionNotPlusMinus() {
+    jj_consume_token(DECR);
+        line=token.beginLine; column=token.beginColumn;
+    ret = UnaryExpression();
+                                                                                   ret = new UnaryExpr(line, column, token.endLine, token.endColumn,ret, UnaryExpr.Operator.preDecrement);
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression UnaryExpressionNotPlusMinus() {
         Expression ret;
         UnaryExpr.Operator op;
         int line = 0;
         int column = 0;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case BANG:
-            case TILDE:
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case TILDE:
-                        jj_consume_token(TILDE);
-                        op = UnaryExpr.Operator.inverse;
-                        line = token.beginLine;
-                        column = token.beginColumn;
-                        break;
-                    case BANG:
-                        jj_consume_token(BANG);
-                        op = UnaryExpr.Operator.not;
-                        line = token.beginLine;
-                        column = token.beginColumn;
-                        break;
-                    default:
-                        jj_la1[101] = jj_gen;
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                }
-                ret = UnaryExpression();
-                ret = new UnaryExpr(line, column, token.endLine, token.endColumn, ret, op);
-                break;
-            default:
-                jj_la1[102] = jj_gen;
-                if (jj_2_22(2147483647)) {
-                    ret = CastExpression();
-                } else {
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case BOOLEAN:
-                        case BYTE:
-                        case CHAR:
-                        case DOUBLE:
-                        case FALSE:
-                        case FLOAT:
-                        case INT:
-                        case LONG:
-                        case NEW:
-                        case NULL:
-                        case SHORT:
-                        case SUPER:
-                        case THIS:
-                        case TRUE:
-                        case VOID:
-                        case LONG_LITERAL:
-                        case INTEGER_LITERAL:
-                        case FLOATING_POINT_LITERAL:
-                        case CHARACTER_LITERAL:
-                        case STRING_LITERAL:
-                        case IDENTIFIER:
-                        case LPAREN:
-                            ret = PostfixExpression();
-                            break;
-                        default:
-                            jj_la1[103] = jj_gen;
-                            jj_consume_token(-1);
-                            throw new ParseException();
-                    }
-                }
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression PostfixExpression() {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BANG:
+    case TILDE:
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case TILDE:
+        jj_consume_token(TILDE);
+                  op = UnaryExpr.Operator.inverse; line=token.beginLine; column=token.beginColumn;
+        break;
+      case BANG:
+        jj_consume_token(BANG);
+                  op = UnaryExpr.Operator.not;     line=token.beginLine; column=token.beginColumn;
+        break;
+      default:
+        jj_la1[101] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      ret = UnaryExpression();
+                                      ret = new UnaryExpr(line, column, token.endLine, token.endColumn,ret, op);
+      break;
+    default:
+      jj_la1[102] = jj_gen;
+      if (jj_2_22(2147483647)) {
+        ret = CastExpression();
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case BOOLEAN:
+        case BYTE:
+        case CHAR:
+        case DOUBLE:
+        case FALSE:
+        case FLOAT:
+        case INT:
+        case LONG:
+        case NEW:
+        case NULL:
+        case SHORT:
+        case SUPER:
+        case THIS:
+        case TRUE:
+        case VOID:
+        case LONG_LITERAL:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case CHARACTER_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+          ret = PostfixExpression();
+          break;
+        default:
+          jj_la1[103] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression PostfixExpression() {
         Expression ret;
         UnaryExpr.Operator op;
-        ret = PrimaryExpression();
-        if (jj_2_23(2)) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case INCR:
-                    jj_consume_token(INCR);
-                    op = UnaryExpr.Operator.posIncrement;
-                    break;
-                case DECR:
-                    jj_consume_token(DECR);
-                    op = UnaryExpr.Operator.posDecrement;
-                    break;
-                default:
-                    jj_la1[104] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-            ret = new UnaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, op);
-        } else {
-            ;
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression CastExpression() {
+    ret = PrimaryExpression();
+    if (jj_2_23(2)) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case INCR:
+        jj_consume_token(INCR);
+             op = UnaryExpr.Operator.posIncrement;
+        break;
+      case DECR:
+        jj_consume_token(DECR);
+             op = UnaryExpr.Operator.posDecrement;
+        break;
+      default:
+        jj_la1[104] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+        ret = new UnaryExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, op);
+    } else {
+      ;
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression CastExpression() {
         Expression ret;
         Type type;
         int line;
         int column;
         AnnotationExpr ann;
         List annotations = null;
-        jj_consume_token(LPAREN);
-        line = token.beginLine;
-        column = token.beginColumn;
-        label_52:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[105] = jj_gen;
-                    break label_52;
-            }
-            ann = Annotation();
-            annotations = add(annotations, ann);
-        }
-        if (jj_2_24(2)) {
-            type = PrimitiveType();
-            jj_consume_token(RPAREN);
-            ret = UnaryExpression();
-            type.setAnnotations(annotations);
-            ret = new CastExpr(line, column, token.endLine, token.endColumn, type, ret);
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case SHORT:
-                case IDENTIFIER:
-                    type = ReferenceType();
-                    jj_consume_token(RPAREN);
-                    ret = UnaryExpressionNotPlusMinus();
-                    type.setAnnotations(annotations);
-                    ret = new CastExpr(line, column, token.endLine, token.endColumn, type, ret);
-                    break;
-                default:
-                    jj_la1[106] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression PrimaryExpression() {
+    jj_consume_token(LPAREN);
+       line=token.beginLine; column=token.beginColumn;
+    label_52:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[105] = jj_gen;
+        break label_52;
+      }
+      ann = Annotation();
+                           annotations = add(annotations, ann);
+    }
+    if (jj_2_24(2)) {
+      type = PrimitiveType();
+      jj_consume_token(RPAREN);
+      ret = UnaryExpression();
+                                                               type.setAnnotations(annotations); ret = new CastExpr(line, column, token.endLine, token.endColumn,type, ret);
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case SHORT:
+      case IDENTIFIER:
+        type = ReferenceType();
+        jj_consume_token(RPAREN);
+        ret = UnaryExpressionNotPlusMinus();
+                                                                           type.setAnnotations(annotations); ret = new CastExpr(line, column, token.endLine, token.endColumn,type, ret);
+        break;
+      default:
+        jj_la1[106] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression PrimaryExpression() {
         Expression ret;
         Expression inner;
-        ret = PrimaryPrefix();
-        label_53:
-        while (true) {
-            if (jj_2_25(2)) {
-                ;
-            } else {
-                break label_53;
-            }
-            ret = PrimarySuffix(ret);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression PrimaryExpressionWithoutSuperSuffix() {
+    ret = PrimaryPrefix();
+    label_53:
+    while (true) {
+      if (jj_2_25(2)) {
+        ;
+      } else {
+        break label_53;
+      }
+      ret = PrimarySuffix(ret);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression PrimaryExpressionWithoutSuperSuffix() {
         Expression ret;
         Expression inner;
-        ret = PrimaryPrefix();
-        label_54:
-        while (true) {
-            if (jj_2_26(2147483647)) {
-                ;
-            } else {
-                break label_54;
-            }
-            ret = PrimarySuffixWithoutSuper(ret);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression PrimaryPrefix() {
+    ret = PrimaryPrefix();
+    label_54:
+    while (true) {
+      if (jj_2_26(2147483647)) {
+        ;
+      } else {
+        break label_54;
+      }
+      ret = PrimarySuffixWithoutSuper(ret);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression PrimaryPrefix() {
         Expression ret = null;
         NameExpr name;
         List typeArgs = null;
@@ -3130,524 +2847,506 @@ final public Expression PrimaryPrefix() {
         int column;
         Parameter p = null;
         VariableDeclaratorId id = null;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case FALSE:
-            case NULL:
-            case TRUE:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-                ret = Literal();
-                break;
-            case THIS:
-                jj_consume_token(THIS);
-                ret = new ThisExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, null);
-                break;
-            case SUPER:
-                jj_consume_token(SUPER);
-                ret = new SuperExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, null);
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case DOT:
-                        jj_consume_token(DOT);
-                        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                            case LT:
-                            case 132:
-                                typeArgs = TypeArguments();
-                                typeArgs.remove(0);
-                                break;
-                            default:
-                                jj_la1[107] = jj_gen;
-                                ;
-                        }
-                        name = SimpleName();
-                        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                            case LPAREN:
-                                args = Arguments();
-                                hasArgs = true;
-                                break;
-                            default:
-                                jj_la1[108] = jj_gen;
-                                ;
-                        }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case FALSE:
+    case NULL:
+    case TRUE:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+      ret = Literal();
+      break;
+    case THIS:
+      jj_consume_token(THIS);
+                   ret = new ThisExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, null);
+      break;
+    case SUPER:
+      jj_consume_token(SUPER);
+                    ret = new SuperExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, null);
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case DOT:
+        jj_consume_token(DOT);
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case LT:
+        case 132:
+          typeArgs = TypeArguments();
+                                        typeArgs.remove(0);
+          break;
+        default:
+          jj_la1[107] = jj_gen;
+          ;
+        }
+        name = SimpleName();
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case LPAREN:
+          args = Arguments();
+                                hasArgs=true;
+          break;
+        default:
+          jj_la1[108] = jj_gen;
+          ;
+        }
                         if (hasArgs) {
-                            MethodCallExpr m = new MethodCallExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, typeArgs, null, args);
-                            m.setNameExpr(name);
-                            ret = m;
-                        } else {
-                            FieldAccessExpr f = new FieldAccessExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, null, null);
-                            f.setFieldExpr(name);
-                            ret = f;
-                        }
-                        break;
-                    case DOUBLECOLON:
-                        jj_consume_token(DOUBLECOLON);
-                        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                            case LT:
-                                typeArgs = TypeParameters();
-                                typeArgs.remove(0);
-                                break;
-                            default:
-                                jj_la1[109] = jj_gen;
-                                ;
-                        }
-                        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                            case IDENTIFIER:
-                                jj_consume_token(IDENTIFIER);
-                                break;
-                            case NEW:
-                                jj_consume_token(NEW);
-                                break;
-                            default:
-                                jj_la1[110] = jj_gen;
-                                jj_consume_token(-1);
-                                throw new ParseException();
-                        }
-                        ret = new MethodReferenceExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, typeArgs, token.image);
-                        break;
-                    case LPAREN:
-                        args = Arguments();
-                        new MethodCallExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, typeArgs, null, args);
-                        break;
-                    default:
-                        jj_la1[111] = jj_gen;
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                }
-                break;
-            case LPAREN:
-                jj_consume_token(LPAREN);
-                line = token.beginLine;
-                column = token.beginColumn;
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case ABSTRACT:
-                    case BOOLEAN:
-                    case BYTE:
-                    case CHAR:
-                    case DOUBLE:
-                    case FALSE:
-                    case FINAL:
-                    case FLOAT:
-                    case INT:
-                    case LONG:
-                    case NATIVE:
-                    case NEW:
-                    case NULL:
-                    case PRIVATE:
-                    case PROTECTED:
-                    case PUBLIC:
-                    case SHORT:
-                    case STATIC:
-                    case STRICTFP:
-                    case SUPER:
-                    case SYNCHRONIZED:
-                    case THIS:
-                    case TRANSIENT:
-                    case TRUE:
-                    case VOID:
-                    case VOLATILE:
-                    case LONG_LITERAL:
-                    case INTEGER_LITERAL:
-                    case FLOATING_POINT_LITERAL:
-                    case CHARACTER_LITERAL:
-                    case STRING_LITERAL:
-                    case IDENTIFIER:
-                    case LPAREN:
-                    case AT:
-                    case BANG:
-                    case TILDE:
-                    case INCR:
-                    case DECR:
-                    case PLUS:
-                    case MINUS:
-                        if (jj_2_27(2147483647)) {
-                            p = FormalParameter();
-                            isLambda = true;
-                            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                case COMMA:
-                                    args = FormalLambdaParameters();
-                                    break;
-                                default:
-                                    jj_la1[112] = jj_gen;
-                                    ;
-                            }
+                                MethodCallExpr m = new MethodCallExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, typeArgs, null, args);
+                                m.setNameExpr(name);
+                                ret = m;
                         } else {
-                            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                case BOOLEAN:
-                                case BYTE:
-                                case CHAR:
-                                case DOUBLE:
-                                case FALSE:
-                                case FLOAT:
-                                case INT:
-                                case LONG:
-                                case NEW:
-                                case NULL:
-                                case SHORT:
-                                case SUPER:
-                                case THIS:
-                                case TRUE:
-                                case VOID:
-                                case LONG_LITERAL:
-                                case INTEGER_LITERAL:
-                                case FLOATING_POINT_LITERAL:
-                                case CHARACTER_LITERAL:
-                                case STRING_LITERAL:
-                                case IDENTIFIER:
-                                case LPAREN:
-                                case BANG:
-                                case TILDE:
-                                case INCR:
-                                case DECR:
-                                case PLUS:
-                                case MINUS:
-                                    ret = Expression();
-                                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                        case COMMA:
-                                            args = InferredLambdaParameters();
-                                            isLambda = true;
-                                            break;
-                                        default:
-                                            jj_la1[113] = jj_gen;
-                                            ;
-                                    }
-                                    break;
-                                default:
-                                    jj_la1[114] = jj_gen;
-                                    jj_consume_token(-1);
-                                    throw new ParseException();
-                            }
-                        }
-                        break;
-                    default:
-                        jj_la1[115] = jj_gen;
-                        ;
-                }
-                jj_consume_token(RPAREN);
-                if (!isLambda) {
-                    ret = new EnclosedExpr(line, column, token.endLine, token.endColumn, ret);
-                } else {
-                    if (ret != null) {
-                        if (ret instanceof NameExpr) {
-                            id = new VariableDeclaratorId(ret.getBeginLine(), ret.getBeginColumn(), ret.getEndLine(), ret.getEndColumn(), ((NameExpr) ret).getName(), 0);
-                            p = new Parameter(ret.getBeginLine(), ret.getBeginColumn(), ret.getEndLine(), ret.getEndColumn(), 0, null, new UnknownType(), false, id);
+                                FieldAccessExpr f = new FieldAccessExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, null, null);
+                                f.setFieldExpr(name);
+                                ret = f;
                         }
-
-                    }
-                    args = add(0, args, p);
-                    ret = new LambdaExpr(p.getBeginLine(), p.getBeginColumn(), token.endLine, token.endColumn, args, null, true);
-                }
-                break;
-            case NEW:
-                ret = AllocationExpression(null);
-                break;
+        break;
+      case DOUBLECOLON:
+        jj_consume_token(DOUBLECOLON);
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case LT:
+          typeArgs = TypeParameters();
+                                                    typeArgs.remove(0);
+          break;
+        default:
+          jj_la1[109] = jj_gen;
+          ;
+        }
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case IDENTIFIER:
+          jj_consume_token(IDENTIFIER);
+          break;
+        case NEW:
+          jj_consume_token(NEW);
+          break;
+        default:
+          jj_la1[110] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+                  ret = new MethodReferenceExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, typeArgs, token.image);
+        break;
+      case LPAREN:
+        args = Arguments();
+                             new MethodCallExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, typeArgs, null, args);
+        break;
+      default:
+        jj_la1[111] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      break;
+    case LPAREN:
+      jj_consume_token(LPAREN);
+               line=token.beginLine; column=token.beginColumn;
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case ABSTRACT:
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FINAL:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NATIVE:
+      case NEW:
+      case NULL:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case SHORT:
+      case STATIC:
+      case STRICTFP:
+      case SUPER:
+      case SYNCHRONIZED:
+      case THIS:
+      case TRANSIENT:
+      case TRUE:
+      case VOID:
+      case VOLATILE:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case AT:
+      case BANG:
+      case TILDE:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:
+        if (jj_2_27(2147483647)) {
+          p = FormalParameter();
+                                                                       isLambda = true;
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case COMMA:
+            args = FormalLambdaParameters();
+            break;
+          default:
+            jj_la1[112] = jj_gen;
+            ;
+          }
+        } else {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case BOOLEAN:
+          case BYTE:
+          case CHAR:
+          case DOUBLE:
+          case FALSE:
+          case FLOAT:
+          case INT:
+          case LONG:
+          case NEW:
+          case NULL:
+          case SHORT:
+          case SUPER:
+          case THIS:
+          case TRUE:
+          case VOID:
+          case LONG_LITERAL:
+          case INTEGER_LITERAL:
+          case FLOATING_POINT_LITERAL:
+          case CHARACTER_LITERAL:
+          case STRING_LITERAL:
+          case IDENTIFIER:
+          case LPAREN:
+          case BANG:
+          case TILDE:
+          case INCR:
+          case DECR:
+          case PLUS:
+          case MINUS:
+            ret = Expression();
+            switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+            case COMMA:
+              args = InferredLambdaParameters();
+                                                                          isLambda = true;
+              break;
             default:
-                jj_la1[119] = jj_gen;
-                if (jj_2_28(2147483647)) {
-                    type = ResultType();
-                    jj_consume_token(DOT);
-                    jj_consume_token(CLASS);
-                    ret = new ClassExpr(type.getBeginLine(), type.getBeginColumn(), token.endLine, token.endColumn, type);
-                } else if (jj_2_29(2147483647)) {
-                    type = ResultType();
-                    jj_consume_token(DOUBLECOLON);
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case LT:
-                            typeArgs = TypeParameters();
-                            typeArgs.remove(0);
-                            break;
-                        default:
-                            jj_la1[116] = jj_gen;
-                            ;
-                    }
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case IDENTIFIER:
-                            jj_consume_token(IDENTIFIER);
-                            break;
-                        case NEW:
-                            jj_consume_token(NEW);
-                            break;
-                        default:
-                            jj_la1[117] = jj_gen;
-                            jj_consume_token(-1);
-                            throw new ParseException();
-                    }
-                    ret = new TypeExpr(type.getBeginLine(), type.getBeginColumn(), type.getEndLine(), type.getEndColumn(), type);
-                    ret = new MethodReferenceExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, typeArgs, token.image);
-                } else {
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case IDENTIFIER:
-                            name = SimpleName();
-                            line = token.beginLine;
-                            column = token.beginColumn;
-                            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                case LPAREN:
-                                    args = Arguments();
-                                    hasArgs = true;
-                                    break;
-                                default:
-                                    jj_la1[118] = jj_gen;
-                                    ;
-                            }
-                            if (hasArgs) {
+              jj_la1[113] = jj_gen;
+              ;
+            }
+            break;
+          default:
+            jj_la1[114] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
+        }
+        break;
+      default:
+        jj_la1[115] = jj_gen;
+        ;
+      }
+      jj_consume_token(RPAREN);
+                           if(!isLambda) { ret = new EnclosedExpr(line, column, token.endLine, token.endColumn,ret);}
+                           else{
+                                  if(ret != null){
+                                          if(ret instanceof NameExpr)
+                                          {
+                                            id = new VariableDeclaratorId(ret.getBeginLine(), ret.getBeginColumn(), ret.getEndLine(), ret.getEndColumn(), ((NameExpr)ret).getName(), 0);
+                                            p = new Parameter(ret.getBeginLine(), ret.getBeginColumn(), ret.getEndLine(), ret.getEndColumn(), 0, null, new UnknownType(), false, id);
+                                          }
+
+                                        }
+                                        args = add(0, args, p);
+                                        ret = new LambdaExpr(p.getBeginLine(), p.getBeginColumn(), token.endLine, token.endColumn, args, null, true);
+                                }
+      break;
+    case NEW:
+      ret = AllocationExpression(null);
+      break;
+    default:
+      jj_la1[119] = jj_gen;
+      if (jj_2_28(2147483647)) {
+        type = ResultType();
+        jj_consume_token(DOT);
+        jj_consume_token(CLASS);
+                                             ret = new ClassExpr(type.getBeginLine(), type.getBeginColumn(), token.endLine, token.endColumn, type);
+      } else if (jj_2_29(2147483647)) {
+        type = ResultType();
+        jj_consume_token(DOUBLECOLON);
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case LT:
+          typeArgs = TypeParameters();
+                                                                  typeArgs.remove(0);
+          break;
+        default:
+          jj_la1[116] = jj_gen;
+          ;
+        }
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case IDENTIFIER:
+          jj_consume_token(IDENTIFIER);
+          break;
+        case NEW:
+          jj_consume_token(NEW);
+          break;
+        default:
+          jj_la1[117] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+                  ret = new TypeExpr(type.getBeginLine(), type.getBeginColumn(), type.getEndLine(), type.getEndColumn(), type);
+                  ret = new MethodReferenceExpr(ret.getBeginLine(), ret.getBeginColumn(), token.endLine, token.endColumn, ret, typeArgs, token.image);
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case IDENTIFIER:
+          name = SimpleName();
+                                      line=token.beginLine; column=token.beginColumn;
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case LPAREN:
+            args = Arguments();
+                                      hasArgs=true;
+            break;
+          default:
+            jj_la1[118] = jj_gen;
+            ;
+          }
+                        if (hasArgs) {
                                 MethodCallExpr m = new MethodCallExpr(line, column, token.endLine, token.endColumn, null, null, null, args);
                                 m.setNameExpr(name);
                                 ret = m;
-                            } else {
+                        } else {
                                 ret = name;
-                            }
-                            break;
-                        default:
-                            jj_la1[120] = jj_gen;
-                            jj_consume_token(-1);
-                            throw new ParseException();
-                    }
-                }
-        }
-        {
-            if (true) return ret;
+                        }
+          break;
+        default:
+          jj_la1[120] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-        throw new Error("Missing return statement in function");
+      }
     }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
 
-    final public Expression PrimarySuffix(Expression scope) {
+  final public Expression PrimarySuffix(Expression scope) {
         Expression ret;
-        if (jj_2_30(2)) {
-            ret = PrimarySuffixWithoutSuper(scope);
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case DOT:
-                    jj_consume_token(DOT);
-                    jj_consume_token(SUPER);
-                    ret = new SuperExpr(scope.getBeginLine(), scope.getBeginColumn(), token.endLine, token.endColumn, scope);
-                    break;
-                default:
-                    jj_la1[121] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression PrimarySuffixWithoutSuper(Expression scope) {
+    if (jj_2_30(2)) {
+      ret = PrimarySuffixWithoutSuper(scope);
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case DOT:
+        jj_consume_token(DOT);
+        jj_consume_token(SUPER);
+                      ret = new SuperExpr(scope.getBeginLine(), scope.getBeginColumn(), token.endLine, token.endColumn, scope);
+        break;
+      default:
+        jj_la1[121] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression PrimarySuffixWithoutSuper(Expression scope) {
         Expression ret;
         List typeArgs = null;
         List args = null;
         boolean hasArgs = false;
         NameExpr name;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case DOT:
-                jj_consume_token(DOT);
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case THIS:
-                        jj_consume_token(THIS);
-                        ret = new ThisExpr(scope.getBeginLine(), scope.getBeginColumn(), token.endLine, token.endColumn, scope);
-                        break;
-                    case NEW:
-                        ret = AllocationExpression(scope);
-                        break;
-                    default:
-                        jj_la1[124] = jj_gen;
-                        if (jj_2_31(2147483647)) {
-                            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                case LT:
-                                case 132:
-                                    typeArgs = TypeArguments();
-                                    typeArgs.remove(0);
-                                    break;
-                                default:
-                                    jj_la1[122] = jj_gen;
-                                    ;
-                            }
-                            name = SimpleName();
-                            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                case LPAREN:
-                                    args = Arguments();
-                                    hasArgs = true;
-                                    break;
-                                default:
-                                    jj_la1[123] = jj_gen;
-                                    ;
-                            }
-                            if (hasArgs) {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case DOT:
+      jj_consume_token(DOT);
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case THIS:
+        jj_consume_token(THIS);
+                         ret = new ThisExpr(scope.getBeginLine(), scope.getBeginColumn(), token.endLine, token.endColumn, scope);
+        break;
+      case NEW:
+        ret = AllocationExpression(scope);
+        break;
+      default:
+        jj_la1[124] = jj_gen;
+        if (jj_2_31(2147483647)) {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case LT:
+          case 132:
+            typeArgs = TypeArguments();
+                                              typeArgs.remove(0);
+            break;
+          default:
+            jj_la1[122] = jj_gen;
+            ;
+          }
+          name = SimpleName();
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case LPAREN:
+            args = Arguments();
+                                      hasArgs=true;
+            break;
+          default:
+            jj_la1[123] = jj_gen;
+            ;
+          }
+                        if (hasArgs) {
                                 MethodCallExpr m = new MethodCallExpr(scope.getBeginLine(), scope.getBeginColumn(), token.endLine, token.endColumn, scope, typeArgs, null, args);
                                 m.setNameExpr(name);
                                 ret = m;
-                            } else {
-                                FieldAccessExpr f = new FieldAccessExpr(scope.getBeginLine(), scope.getBeginColumn(), token.endLine, token.endColumn, scope, typeArgs, null);
+                        } else {
+                                FieldAccessExpr f =  new FieldAccessExpr(scope.getBeginLine(), scope.getBeginColumn(), token.endLine, token.endColumn, scope, typeArgs, null);
                                 f.setFieldExpr(name);
                                 ret = f;
-                            }
-                        } else {
-                            jj_consume_token(-1);
-                            throw new ParseException();
                         }
-                }
-                break;
-            case LBRACKET:
-                jj_consume_token(LBRACKET);
-                ret = Expression();
-                jj_consume_token(RBRACKET);
-                ret = new ArrayAccessExpr(scope.getBeginLine(), scope.getBeginColumn(), token.endLine, token.endColumn, scope, ret);
-                break;
-            default:
-                jj_la1[125] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression Literal() {
+        } else {
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+      break;
+    case LBRACKET:
+      jj_consume_token(LBRACKET);
+      ret = Expression();
+      jj_consume_token(RBRACKET);
+                                      ret = new ArrayAccessExpr(scope.getBeginLine(), scope.getBeginColumn(), token.endLine, token.endColumn, scope, ret);
+      break;
+    default:
+      jj_la1[125] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression Literal() {
         Expression ret;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case INTEGER_LITERAL:
-                jj_consume_token(INTEGER_LITERAL);
-                ret = new IntegerLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image);
-                break;
-            case LONG_LITERAL:
-                jj_consume_token(LONG_LITERAL);
-                ret = new LongLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image);
-                break;
-            case FLOATING_POINT_LITERAL:
-                jj_consume_token(FLOATING_POINT_LITERAL);
-                ret = new DoubleLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image);
-                break;
-            case CHARACTER_LITERAL:
-                jj_consume_token(CHARACTER_LITERAL);
-                ret = new CharLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image.substring(1, token.image.length() - 1));
-                break;
-            case STRING_LITERAL:
-                jj_consume_token(STRING_LITERAL);
-                ret = new StringLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image.substring(1, token.image.length() - 1));
-                break;
-            case FALSE:
-            case TRUE:
-                ret = BooleanLiteral();
-                break;
-            case NULL:
-                ret = NullLiteral();
-                break;
-            default:
-                jj_la1[126] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression BooleanLiteral() {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case INTEGER_LITERAL:
+      jj_consume_token(INTEGER_LITERAL);
+                        ret = new IntegerLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image);
+      break;
+    case LONG_LITERAL:
+      jj_consume_token(LONG_LITERAL);
+                        ret = new LongLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image);
+      break;
+    case FLOATING_POINT_LITERAL:
+      jj_consume_token(FLOATING_POINT_LITERAL);
+                        ret = new DoubleLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image);
+      break;
+    case CHARACTER_LITERAL:
+      jj_consume_token(CHARACTER_LITERAL);
+                ret = new CharLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image.substring(1, token.image.length()-1));
+      break;
+    case STRING_LITERAL:
+      jj_consume_token(STRING_LITERAL);
+                ret = new StringLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, token.image.substring(1, token.image.length()-1));
+      break;
+    case FALSE:
+    case TRUE:
+      ret = BooleanLiteral();
+      break;
+    case NULL:
+      ret = NullLiteral();
+      break;
+    default:
+      jj_la1[126] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression BooleanLiteral() {
         Expression ret;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case TRUE:
-                jj_consume_token(TRUE);
-                ret = new BooleanLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, true);
-                break;
-            case FALSE:
-                jj_consume_token(FALSE);
-                ret = new BooleanLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, false);
-                break;
-            default:
-                jj_la1[127] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression NullLiteral() {
-        jj_consume_token(NULL);
-        {
-            if (true) return new NullLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List Arguments() {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case TRUE:
+      jj_consume_token(TRUE);
+                   ret = new BooleanLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, true);
+      break;
+    case FALSE:
+      jj_consume_token(FALSE);
+                    ret = new BooleanLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn, false);
+      break;
+    default:
+      jj_la1[127] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression NullLiteral() {
+    jj_consume_token(NULL);
+    {if (true) return new NullLiteralExpr(token.beginLine, token.beginColumn, token.endLine, token.endColumn);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List Arguments() {
         List ret = null;
-        jj_consume_token(LPAREN);
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS:
-                ret = ArgumentList();
-                break;
-            default:
-                jj_la1[128] = jj_gen;
-                ;
-        }
-        jj_consume_token(RPAREN);
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List ArgumentList() {
+    jj_consume_token(LPAREN);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
+      ret = ArgumentList();
+      break;
+    default:
+      jj_la1[128] = jj_gen;
+      ;
+    }
+    jj_consume_token(RPAREN);
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List ArgumentList() {
         List ret = new LinkedList();
         Expression expr;
-        expr = Expression();
-        ret.add(expr);
-        label_55:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case COMMA:
-                    ;
-                    break;
-                default:
-                    jj_la1[129] = jj_gen;
-                    break label_55;
-            }
-            jj_consume_token(COMMA);
-            expr = Expression();
-            ret.add(expr);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression AllocationExpression(Expression scope) {
+    expr = Expression();
+                        ret.add(expr);
+    label_55:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[129] = jj_gen;
+        break label_55;
+      }
+      jj_consume_token(COMMA);
+      expr = Expression();
+                                                                     ret.add(expr);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression AllocationExpression(Expression scope) {
         Expression ret;
         ArrayCreationExpr arrayExpr;
         Type type;
@@ -3659,125 +3358,115 @@ final public Expression AllocationExpression(Expression scope) {
         int column;
         List annotations = null;
         AnnotationExpr ann;
-        jj_consume_token(NEW);
-        if (scope == null) {
-            line = token.beginLine;
-            column = token.beginColumn;
-        } else {
-            line = scope.getBeginLine();
-            column = scope.getBeginColumn();
-        }
-        label_56:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[130] = jj_gen;
-                    break label_56;
-            }
-            ann = Annotation();
-            annotations = add(annotations, ann);
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case SHORT:
-                type = PrimitiveType();
-                type.setAnnotations(annotations);
-                arr = ArrayDimsAndInits();
-                arrayExpr = new ArrayCreationExpr(line, column, token.endLine, token.endColumn, type, null, 0);
-                arrayExpr.setArraysAnnotations((List) arr[2]);
+    jj_consume_token(NEW);
+          if(scope==null) {line=token.beginLine; column=token.beginColumn;} else {line=scope.getBeginLine(); column=scope.getBeginColumn();}
+    label_56:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[130] = jj_gen;
+        break label_56;
+      }
+      ann = Annotation();
+                          annotations = add(annotations, ann);
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case SHORT:
+      type = PrimitiveType();
+                                  type.setAnnotations(annotations);
+      arr = ArrayDimsAndInits();
+            arrayExpr = new ArrayCreationExpr(line, column, token.endLine, token.endColumn, type, null, 0);
+            arrayExpr.setArraysAnnotations((List)arr[2]);
                 if (arr[0] instanceof Integer) {
-                    arrayExpr.setArrayCount(((Integer) arr[0]).intValue());
-                    arrayExpr.setInitializer((ArrayInitializerExpr) arr[1]);
+                    arrayExpr.setArrayCount(((Integer)arr[0]).intValue());
+                    arrayExpr.setInitializer((ArrayInitializerExpr)arr[1]);
                 } else {
-                    arrayExpr.setArrayCount(((Integer) arr[1]).intValue());
-                    arrayExpr.setDimensions((List) arr[0]);
+                    arrayExpr.setArrayCount(((Integer)arr[1]).intValue());
+                    arrayExpr.setDimensions((List)arr[0]);
                 }
                 ret = arrayExpr;
-                break;
-            case IDENTIFIER:
-            case LT:
-            case 132:
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case LT:
-                    case 132:
-                        typeArgs = TypeArguments();
-                        label_57:
-                        while (true) {
-                            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                case AT:
-                                    ;
-                                    break;
-                                default:
-                                    jj_la1[131] = jj_gen;
-                                    break label_57;
-                            }
-                            ann = Annotation();
-                            annotations = add(annotations, ann);
-                        }
-                        typeArgs.remove(0);
-                        break;
-                    default:
-                        jj_la1[132] = jj_gen;
-                        ;
-                }
-                type = ClassOrInterfaceType();
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case LBRACKET:
-                    case AT:
-                        arr = ArrayDimsAndInits();
-                        type.setAnnotations(annotations);
-                        arrayExpr = new ArrayCreationExpr(line, column, token.endLine, token.endColumn, type, null, 0);
-                        arrayExpr.setArraysAnnotations((List) arr[2]);
+      break;
+    case IDENTIFIER:
+    case LT:
+    case 132:
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LT:
+      case 132:
+        typeArgs = TypeArguments();
+        label_57:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case AT:
+            ;
+            break;
+          default:
+            jj_la1[131] = jj_gen;
+            break label_57;
+          }
+          ann = Annotation();
+                                                               annotations = add(annotations, ann);
+        }
+                                                                                                        typeArgs.remove(0);
+        break;
+      default:
+        jj_la1[132] = jj_gen;
+        ;
+      }
+      type = ClassOrInterfaceType();
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LBRACKET:
+      case AT:
+        arr = ArrayDimsAndInits();
+                                         type.setAnnotations(annotations); arrayExpr = new ArrayCreationExpr(line, column, token.endLine, token.endColumn, type, null, 0);
+                    arrayExpr.setArraysAnnotations((List)arr[2]);
                         if (arr[0] instanceof Integer) {
-                            arrayExpr.setArrayCount(((Integer) arr[0]).intValue());
-                            arrayExpr.setInitializer((ArrayInitializerExpr) arr[1]);
+                                arrayExpr.setArrayCount(((Integer)arr[0]).intValue());
+                            arrayExpr.setInitializer((ArrayInitializerExpr)arr[1]);
                         } else {
-                            arrayExpr.setArrayCount(((Integer) arr[1]).intValue());
-                            arrayExpr.setDimensions((List) arr[0]);
+                                arrayExpr.setArrayCount(((Integer)arr[1]).intValue());
+                            arrayExpr.setDimensions((List)arr[0]);
                         }
                         ret = arrayExpr;
-                        break;
-                    case LPAREN:
-                        args = Arguments();
-                        if (jj_2_32(2)) {
-                            anonymousBody = ClassOrInterfaceBody(false);
-                        } else {
-                            ;
-                        }
-                        type.setAnnotations(annotations);
-                        ret = new ObjectCreationExpr(line, column, token.endLine, token.endColumn, scope, (ClassOrInterfaceType) type, typeArgs, args, anonymousBody);
-                        break;
-                    default:
-                        jj_la1[133] = jj_gen;
-                        jj_consume_token(-1);
-                        throw new ParseException();
-                }
-                break;
-            default:
-                jj_la1[134] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
+        break;
+      case LPAREN:
+        args = Arguments();
+        if (jj_2_32(2)) {
+          anonymousBody = ClassOrInterfaceBody(false);
+        } else {
+          ;
+        }
+                type.setAnnotations(annotations); ret = new ObjectCreationExpr(line, column, token.endLine, token.endColumn, scope, (ClassOrInterfaceType) type, typeArgs, args, anonymousBody);
+        break;
+      default:
+        jj_la1[133] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      break;
+    default:
+      jj_la1[134] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
 
-    /*
-     * The third LOOKAHEAD specification below is to parse to PrimarySuffix
-     * if there is an expression between the "[...]".
-     */
-    final public Object[] ArrayDimsAndInits() {
+/*
+ * The third LOOKAHEAD specification below is to parse to PrimarySuffix
+ * if there is an expression between the "[...]".
+ */
+  final public Object[] ArrayDimsAndInits() {
         Object[] ret = new Object[3];
         Expression expr;
         List inits = null;
@@ -3785,409 +3474,375 @@ final public Object[] ArrayDimsAndInits() {
         List accum = null;
         List annotations = null;
         AnnotationExpr ann;
-        label_58:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[135] = jj_gen;
-                    break label_58;
-            }
-            ann = Annotation();
-            annotations = add(annotations, ann);
-        }
-        if (jj_2_35(2)) {
-            label_59:
-            while (true) {
-                jj_consume_token(LBRACKET);
-                expr = Expression();
-                accum = add(accum, annotations);
-                annotations = null;
-                inits = add(inits, expr);
-                jj_consume_token(RBRACKET);
-                if (jj_2_33(2)) {
-                    ;
-                } else {
-                    break label_59;
-                }
-            }
-            label_60:
-            while (true) {
-                if (jj_2_34(2)) {
-                    ;
-                } else {
-                    break label_60;
-                }
-                label_61:
-                while (true) {
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case AT:
-                            ;
-                            break;
-                        default:
-                            jj_la1[136] = jj_gen;
-                            break label_61;
-                    }
-                    ann = Annotation();
-                    annotations = add(annotations, ann);
-                }
-                jj_consume_token(LBRACKET);
-                jj_consume_token(RBRACKET);
-                i++;
-            }
-            accum = add(accum, annotations);
-            annotations = null;
-            ret[0] = inits;
-            ret[1] = new Integer(i);
+    label_58:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[135] = jj_gen;
+        break label_58;
+      }
+      ann = Annotation();
+                          annotations = add(annotations, ann);
+    }
+    if (jj_2_35(2)) {
+      label_59:
+      while (true) {
+        jj_consume_token(LBRACKET);
+        expr = Expression();
+                                                   accum = add(accum, annotations); annotations=null; inits = add(inits, expr);
+        jj_consume_token(RBRACKET);
+        if (jj_2_33(2)) {
+          ;
         } else {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case LBRACKET:
-                    label_62:
-                    while (true) {
-                        jj_consume_token(LBRACKET);
-                        jj_consume_token(RBRACKET);
-                        i++;
-                        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                            case LBRACKET:
-                                ;
-                                break;
-                            default:
-                                jj_la1[137] = jj_gen;
-                                break label_62;
-                        }
-                    }
-                    expr = ArrayInitializer();
-                    accum = add(accum, annotations);
-                    annotations = null;
-                    ret[0] = new Integer(i);
-                    ret[1] = expr;
-                    break;
-                default:
-                    jj_la1[138] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
+          break label_59;
         }
-        ret[2] = accum;
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    /*
-     * Statement syntax follows.
-     */
-    final public Statement Statement() {
-        Statement ret;
-        if (jj_2_36(2)) {
-            ret = LabeledStatement();
+      }
+      label_60:
+      while (true) {
+        if (jj_2_34(2)) {
+          ;
         } else {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case ASSERT:
-                    ret = AssertStatement();
-                    break;
-                case LBRACE:
-                    ret = Block();
-                    break;
-                case SEMICOLON:
-                    ret = EmptyStatement();
-                    break;
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FALSE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case NEW:
-                case NULL:
-                case SHORT:
-                case SUPER:
-                case THIS:
-                case TRUE:
-                case VOID:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case INCR:
-                case DECR:
-                    ret = StatementExpression();
-                    break;
-                case SWITCH:
-                    ret = SwitchStatement();
-                    break;
-                case IF:
-                    ret = IfStatement();
-                    break;
-                case WHILE:
-                    ret = WhileStatement();
-                    break;
-                case DO:
-                    ret = DoStatement();
-                    break;
-                case FOR:
-                    ret = ForStatement();
-                    break;
-                case BREAK:
-                    ret = BreakStatement();
-                    break;
-                case CONTINUE:
-                    ret = ContinueStatement();
-                    break;
-                case RETURN:
-                    ret = ReturnStatement();
-                    break;
-                case THROW:
-                    ret = ThrowStatement();
-                    break;
-                case SYNCHRONIZED:
-                    ret = SynchronizedStatement();
-                    break;
-                case TRY:
-                    ret = TryStatement();
-                    break;
-                default:
-                    jj_la1[139] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        {
-            if (true) return ret;
+          break label_60;
         }
-        throw new Error("Missing return statement in function");
-    }
+        label_61:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case AT:
+            ;
+            break;
+          default:
+            jj_la1[136] = jj_gen;
+            break label_61;
+          }
+          ann = Annotation();
+                                                                                                                                                                                annotations = add(annotations, ann);
+        }
+        jj_consume_token(LBRACKET);
+        jj_consume_token(RBRACKET);
+                                                                                                                                                                                                                                    i++;
+      }
+                                                                                                                                                                                                                                                 accum = add(accum, annotations); annotations=null; ret[0] = inits; ret[1] = new Integer(i);
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case LBRACKET:
+        label_62:
+        while (true) {
+          jj_consume_token(LBRACKET);
+          jj_consume_token(RBRACKET);
+                      i++;
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case LBRACKET:
+            ;
+            break;
+          default:
+            jj_la1[137] = jj_gen;
+            break label_62;
+          }
+        }
+        expr = ArrayInitializer();
+                                                            accum = add(accum, annotations);annotations=null;  ret[0] = new Integer(i); ret[1] = expr;
+        break;
+      default:
+        jj_la1[138] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    ret[2]=accum; {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
 
-    final public AssertStmt AssertStatement() {
+/*
+ * Statement syntax follows.
+ */
+  final public Statement Statement() {
+        Statement ret;
+    if (jj_2_36(2)) {
+      ret = LabeledStatement();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case ASSERT:
+        ret = AssertStatement();
+        break;
+      case LBRACE:
+        ret = Block();
+        break;
+      case SEMICOLON:
+        ret = EmptyStatement();
+        break;
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NEW:
+      case NULL:
+      case SHORT:
+      case SUPER:
+      case THIS:
+      case TRUE:
+      case VOID:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case INCR:
+      case DECR:
+        ret = StatementExpression();
+        break;
+      case SWITCH:
+        ret = SwitchStatement();
+        break;
+      case IF:
+        ret = IfStatement();
+        break;
+      case WHILE:
+        ret = WhileStatement();
+        break;
+      case DO:
+        ret = DoStatement();
+        break;
+      case FOR:
+        ret = ForStatement();
+        break;
+      case BREAK:
+        ret = BreakStatement();
+        break;
+      case CONTINUE:
+        ret = ContinueStatement();
+        break;
+      case RETURN:
+        ret = ReturnStatement();
+        break;
+      case THROW:
+        ret = ThrowStatement();
+        break;
+      case SYNCHRONIZED:
+        ret = SynchronizedStatement();
+        break;
+      case TRY:
+        ret = TryStatement();
+        break;
+      default:
+        jj_la1[139] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public AssertStmt AssertStatement() {
         Expression check;
         Expression msg = null;
         int line;
         int column;
-        jj_consume_token(ASSERT);
-        line = token.beginLine;
-        column = token.beginColumn;
-        check = Expression();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case COLON:
-                jj_consume_token(COLON);
-                msg = Expression();
-                break;
-            default:
-                jj_la1[140] = jj_gen;
-                ;
-        }
-        jj_consume_token(SEMICOLON);
-        {
-            if (true) return new AssertStmt(line, column, token.endLine, token.endColumn, check, msg);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public LabeledStmt LabeledStatement() {
+    jj_consume_token(ASSERT);
+            line=token.beginLine; column=token.beginColumn;
+    check = Expression();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case COLON:
+      jj_consume_token(COLON);
+      msg = Expression();
+      break;
+    default:
+      jj_la1[140] = jj_gen;
+      ;
+    }
+    jj_consume_token(SEMICOLON);
+    {if (true) return new AssertStmt(line, column, token.endLine, token.endColumn,check, msg);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public LabeledStmt LabeledStatement() {
         String label;
         Statement stmt;
         int line;
         int column;
-        jj_consume_token(IDENTIFIER);
-        line = token.beginLine;
-        column = token.beginColumn;
-        label = token.image;
-        jj_consume_token(COLON);
-        stmt = Statement();
-        {
-            if (true) return new LabeledStmt(line, column, token.endLine, token.endColumn, label, stmt);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public BlockStmt Block() {
+    jj_consume_token(IDENTIFIER);
+                line=token.beginLine; column=token.beginColumn;
+                                                                   label = token.image;
+    jj_consume_token(COLON);
+    stmt = Statement();
+    {if (true) return new LabeledStmt(line, column, token.endLine, token.endColumn,label, stmt);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public BlockStmt Block() {
         List stmts;
         int beginLine;
         int beginColumn;
-        jj_consume_token(LBRACE);
-        beginLine = token.beginLine;
-        beginColumn = token.beginColumn;
-        stmts = Statements();
-        jj_consume_token(RBRACE);
-        {
-            if (true) return new BlockStmt(beginLine, beginColumn, token.endLine, token.endColumn, stmts);
-        }
-        throw new Error("Missing return statement in function");
-    }
+    jj_consume_token(LBRACE);
+       beginLine=token.beginLine; beginColumn=token.beginColumn;
+    stmts = Statements();
+    jj_consume_token(RBRACE);
+    {if (true) return new BlockStmt(beginLine, beginColumn, token.endLine, token.endColumn, stmts);}
+    throw new Error("Missing return statement in function");
+  }
 
-    /*
-     * Classes inside block stametents can only be abstract or final. The semantic must check it.
-     */
-    final public Statement BlockStatement() {
+/*
+ * Classes inside block stametents can only be abstract or final. The semantic must check it.
+ */
+  final public Statement BlockStatement() {
         Statement ret;
         Expression expr;
         ClassOrInterfaceDeclaration typeDecl;
         Modifier modifier;
-        if (jj_2_37(2147483647)) {
-
-            modifier = Modifiers();
-            typeDecl = ClassOrInterfaceDeclaration(modifier);
-            ret = new TypeDeclarationStmt(typeDecl.getBeginLine(), typeDecl.getBeginColumn(), token.endLine, token.endColumn, typeDecl);
-        } else if (jj_2_38(2147483647)) {
-            expr = VariableDeclarationExpression();
-            jj_consume_token(SEMICOLON);
+    if (jj_2_37(2147483647)) {
+
+      modifier = Modifiers();
+      typeDecl = ClassOrInterfaceDeclaration(modifier);
+                                                             ret = new TypeDeclarationStmt(typeDecl.getBeginLine(), typeDecl.getBeginColumn(), token.endLine, token.endColumn, typeDecl);
+    } else if (jj_2_38(2147483647)) {
+      expr = VariableDeclarationExpression();
+      jj_consume_token(SEMICOLON);
             ret = new ExpressionStmt(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr);
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case ASSERT:
-                case BOOLEAN:
-                case BREAK:
-                case BYTE:
-                case CHAR:
-                case CONTINUE:
-                case DO:
-                case DOUBLE:
-                case FALSE:
-                case FLOAT:
-                case FOR:
-                case IF:
-                case INT:
-                case LONG:
-                case NEW:
-                case NULL:
-                case RETURN:
-                case SHORT:
-                case SUPER:
-                case SWITCH:
-                case SYNCHRONIZED:
-                case THIS:
-                case THROW:
-                case TRUE:
-                case TRY:
-                case VOID:
-                case WHILE:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case LBRACE:
-                case SEMICOLON:
-                case INCR:
-                case DECR:
-                    ret = Statement();
-                    break;
-                default:
-                    jj_la1[141] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public VariableDeclarationExpr VariableDeclarationExpression() {
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case ASSERT:
+      case BOOLEAN:
+      case BREAK:
+      case BYTE:
+      case CHAR:
+      case CONTINUE:
+      case DO:
+      case DOUBLE:
+      case FALSE:
+      case FLOAT:
+      case FOR:
+      case IF:
+      case INT:
+      case LONG:
+      case NEW:
+      case NULL:
+      case RETURN:
+      case SHORT:
+      case SUPER:
+      case SWITCH:
+      case SYNCHRONIZED:
+      case THIS:
+      case THROW:
+      case TRUE:
+      case TRY:
+      case VOID:
+      case WHILE:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case LBRACE:
+      case SEMICOLON:
+      case INCR:
+      case DECR:
+        ret = Statement();
+        break;
+      default:
+        jj_la1[141] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public VariableDeclarationExpr VariableDeclarationExpression() {
         Modifier modifier;
         Type type;
         List vars = new LinkedList();
         VariableDeclarator var;
-        modifier = Modifiers();
-        type = Type();
-        var = VariableDeclarator();
-        vars.add(var);
-        label_63:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case COMMA:
-                    ;
-                    break;
-                default:
-                    jj_la1[142] = jj_gen;
-                    break label_63;
-            }
-            jj_consume_token(COMMA);
-            var = VariableDeclarator();
-            vars.add(var);
-        }
-        int line = modifier.beginLine;
-        int column = modifier.beginColumn;
-        if (line == -1) {
-            line = type.getBeginLine();
-            column = type.getBeginColumn();
-        }
-        {
-            if (true)
-                return new VariableDeclarationExpr(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, type, vars);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public EmptyStmt EmptyStatement() {
-        jj_consume_token(SEMICOLON);
-        {
-            if (true) return new EmptyStmt(token.beginLine, token.beginColumn, token.endLine, token.endColumn);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Statement LambdaBody() {
-        Expression expr;
-        Statement n = null;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS:
-                expr = Expression();
-                n = new ExpressionStmt(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr);
-                break;
-            case LBRACE:
-                n = Block();
-                break;
-            default:
-                jj_la1[143] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return n;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public ExpressionStmt StatementExpression() {
+    modifier = Modifiers();
+    type = Type();
+    var = VariableDeclarator();
+                                                                    vars.add(var);
+    label_63:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[142] = jj_gen;
+        break label_63;
+      }
+      jj_consume_token(COMMA);
+      var = VariableDeclarator();
+                                                                                                                        vars.add(var);
+    }
+    int line = modifier.beginLine;
+    int column = modifier.beginColumn;
+    if(line==-1) {line=type.getBeginLine(); column=type.getBeginColumn(); }
+    {if (true) return new VariableDeclarationExpr(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, type, vars);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public EmptyStmt EmptyStatement() {
+    jj_consume_token(SEMICOLON);
+    {if (true) return new EmptyStmt(token.beginLine, token.beginColumn, token.endLine, token.endColumn);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Statement LambdaBody() {
+  Expression expr;
+  Statement n = null;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
+      expr = Expression();
+          n = new ExpressionStmt(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr);
+      break;
+    case LBRACE:
+      n = Block();
+      break;
+    default:
+      jj_la1[143] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+        {if (true) return n;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public ExpressionStmt StatementExpression() {
         Expression expr;
         AssignExpr.Operator op;
         Expression value;
@@ -4197,278 +3852,262 @@ final public ExpressionStmt StatementExpression() {
         VariableDeclaratorId id = null;
         List params = null;
         Expression inner = null;
-        if (jj_2_39(2)) {
-            expr = PreIncrementExpression();
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case DECR:
-                    expr = PreDecrementExpression();
-                    break;
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FALSE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case NEW:
-                case NULL:
-                case SHORT:
-                case SUPER:
-                case THIS:
-                case TRUE:
-                case VOID:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                    expr = PrimaryExpression();
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case ASSIGN:
-                        case INCR:
-                        case DECR:
-                        case PLUSASSIGN:
-                        case MINUSASSIGN:
-                        case STARASSIGN:
-                        case SLASHASSIGN:
-                        case ANDASSIGN:
-                        case ORASSIGN:
-                        case XORASSIGN:
-                        case REMASSIGN:
-                        case LSHIFTASSIGN:
-                        case RSIGNEDSHIFTASSIGN:
-                        case RUNSIGNEDSHIFTASSIGN:
-                        case ARROW:
-                        case DOUBLECOLON:
-                            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                case INCR:
-                                    jj_consume_token(INCR);
-                                    expr = new UnaryExpr(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr, UnaryExpr.Operator.posIncrement);
-                                    break;
-                                case DECR:
-                                    jj_consume_token(DECR);
-                                    expr = new UnaryExpr(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr, UnaryExpr.Operator.posDecrement);
-                                    break;
-                                case ASSIGN:
-                                case PLUSASSIGN:
-                                case MINUSASSIGN:
-                                case STARASSIGN:
-                                case SLASHASSIGN:
-                                case ANDASSIGN:
-                                case ORASSIGN:
-                                case XORASSIGN:
-                                case REMASSIGN:
-                                case LSHIFTASSIGN:
-                                case RSIGNEDSHIFTASSIGN:
-                                case RUNSIGNEDSHIFTASSIGN:
-                                    op = AssignmentOperator();
-                                    value = Expression();
-                                    expr = new AssignExpr(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr, value, op);
-                                    break;
-                                case DOUBLECOLON:
-                                    jj_consume_token(DOUBLECOLON);
-                                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                        case LT:
-                                            typeArgs = TypeParameters();
-                                            typeArgs.remove(0);
-                                            break;
-                                        default:
-                                            jj_la1[144] = jj_gen;
-                                            ;
-                                    }
-                                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                                        case IDENTIFIER:
-                                            jj_consume_token(IDENTIFIER);
-                                            break;
-                                        case NEW:
-                                            jj_consume_token(NEW);
-                                            break;
-                                        default:
-                                            jj_la1[145] = jj_gen;
-                                            jj_consume_token(-1);
-                                            throw new ParseException();
-                                    }
-                                    expr = new MethodReferenceExpr(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr, typeArgs, token.image);
-                                    break;
-                                case ARROW:
-                                    jj_consume_token(ARROW);
-                                    lambdaBody = LambdaBody();
-                                    if (expr instanceof CastExpr) {
-                                        inner = generateLambda(((CastExpr) expr).getExpr(), lambdaBody);
-                                        ((CastExpr) expr).setExpr(inner);
-                                    } else {
-                                        expr = generateLambda(expr, lambdaBody);
-                                    }
-                                    break;
-                                default:
-                                    jj_la1[146] = jj_gen;
-                                    jj_consume_token(-1);
-                                    throw new ParseException();
-                            }
-                            break;
-                        default:
-                            jj_la1[147] = jj_gen;
-                            ;
-                    }
-                    break;
-                default:
-                    jj_la1[148] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
+    if (jj_2_39(2)) {
+      expr = PreIncrementExpression();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case DECR:
+        expr = PreDecrementExpression();
+        break;
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NEW:
+      case NULL:
+      case SHORT:
+      case SUPER:
+      case THIS:
+      case TRUE:
+      case VOID:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+        expr = PrimaryExpression();
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case ASSIGN:
+        case INCR:
+        case DECR:
+        case PLUSASSIGN:
+        case MINUSASSIGN:
+        case STARASSIGN:
+        case SLASHASSIGN:
+        case ANDASSIGN:
+        case ORASSIGN:
+        case XORASSIGN:
+        case REMASSIGN:
+        case LSHIFTASSIGN:
+        case RSIGNEDSHIFTASSIGN:
+        case RUNSIGNEDSHIFTASSIGN:
+        case ARROW:
+        case DOUBLECOLON:
+          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+          case INCR:
+            jj_consume_token(INCR);
+                   expr = new UnaryExpr(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr, UnaryExpr.Operator.posIncrement);
+            break;
+          case DECR:
+            jj_consume_token(DECR);
+                   expr = new UnaryExpr(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr, UnaryExpr.Operator.posDecrement);
+            break;
+          case ASSIGN:
+          case PLUSASSIGN:
+          case MINUSASSIGN:
+          case STARASSIGN:
+          case SLASHASSIGN:
+          case ANDASSIGN:
+          case ORASSIGN:
+          case XORASSIGN:
+          case REMASSIGN:
+          case LSHIFTASSIGN:
+          case RSIGNEDSHIFTASSIGN:
+          case RUNSIGNEDSHIFTASSIGN:
+            op = AssignmentOperator();
+            value = Expression();
+                                                             expr = new AssignExpr(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr, value, op);
+            break;
+          case DOUBLECOLON:
+            jj_consume_token(DOUBLECOLON);
+            switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+            case LT:
+              typeArgs = TypeParameters();
+                                                 typeArgs.remove(0);
+              break;
+            default:
+              jj_la1[144] = jj_gen;
+              ;
             }
-        }
-        jj_consume_token(SEMICOLON);
-        {
-            if (true)
-                return new ExpressionStmt(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public SwitchStmt SwitchStatement() {
+            switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+            case IDENTIFIER:
+              jj_consume_token(IDENTIFIER);
+              break;
+            case NEW:
+              jj_consume_token(NEW);
+              break;
+            default:
+              jj_la1[145] = jj_gen;
+              jj_consume_token(-1);
+              throw new ParseException();
+            }
+                                                                                                 expr = new MethodReferenceExpr(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr, typeArgs, token.image);
+            break;
+          case ARROW:
+            jj_consume_token(ARROW);
+            lambdaBody = LambdaBody();
+             if (expr instanceof CastExpr)
+             {
+           inner = generateLambda(((CastExpr)expr).getExpr(), lambdaBody);
+           ((CastExpr)expr).setExpr(inner);
+             }
+             else
+             {
+               expr = generateLambda(expr, lambdaBody);
+             }
+            break;
+          default:
+            jj_la1[146] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
+          break;
+        default:
+          jj_la1[147] = jj_gen;
+          ;
+        }
+        break;
+      default:
+        jj_la1[148] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    jj_consume_token(SEMICOLON);
+    {if (true) return new ExpressionStmt(expr.getBeginLine(), expr.getBeginColumn(), token.endLine, token.endColumn, expr);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public SwitchStmt SwitchStatement() {
         Expression selector;
         SwitchEntryStmt entry;
         List entries = null;
         int line;
         int column;
-        jj_consume_token(SWITCH);
-        line = token.beginLine;
-        column = token.beginColumn;
-        jj_consume_token(LPAREN);
-        selector = Expression();
-        jj_consume_token(RPAREN);
-        jj_consume_token(LBRACE);
-        label_64:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case CASE:
-                case _DEFAULT:
-                    ;
-                    break;
-                default:
-                    jj_la1[149] = jj_gen;
-                    break label_64;
-            }
-            entry = SwitchEntry();
-            entries = add(entries, entry);
-        }
-        jj_consume_token(RBRACE);
-        {
-            if (true) return new SwitchStmt(line, column, token.endLine, token.endColumn, selector, entries);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public SwitchEntryStmt SwitchEntry() {
+    jj_consume_token(SWITCH);
+            line=token.beginLine; column=token.beginColumn;
+    jj_consume_token(LPAREN);
+    selector = Expression();
+    jj_consume_token(RPAREN);
+    jj_consume_token(LBRACE);
+    label_64:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case CASE:
+      case _DEFAULT:
+        ;
+        break;
+      default:
+        jj_la1[149] = jj_gen;
+        break label_64;
+      }
+      entry = SwitchEntry();
+                              entries = add(entries, entry);
+    }
+    jj_consume_token(RBRACE);
+    {if (true) return new SwitchStmt(line, column, token.endLine, token.endColumn,selector, entries);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public SwitchEntryStmt SwitchEntry() {
         Expression label = null;
         List stmts;
         int line;
         int column;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case CASE:
-                jj_consume_token(CASE);
-                line = token.beginLine;
-                column = token.beginColumn;
-                label = Expression();
-                break;
-            case _DEFAULT:
-                jj_consume_token(_DEFAULT);
-                line = token.beginLine;
-                column = token.beginColumn;
-                break;
-            default:
-                jj_la1[150] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        jj_consume_token(COLON);
-        stmts = Statements();
-        {
-            if (true) return new SwitchEntryStmt(line, column, token.endLine, token.endColumn, label, stmts);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public IfStmt IfStatement() {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case CASE:
+      jj_consume_token(CASE);
+                  line=token.beginLine; column=token.beginColumn;
+      label = Expression();
+      break;
+    case _DEFAULT:
+      jj_consume_token(_DEFAULT);
+                     line=token.beginLine; column=token.beginColumn;
+      break;
+    default:
+      jj_la1[150] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    jj_consume_token(COLON);
+    stmts = Statements();
+    {if (true) return new SwitchEntryStmt(line, column, token.endLine, token.endColumn,label, stmts);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public IfStmt IfStatement() {
         Expression condition;
         Statement thenStmt;
         Statement elseStmt = null;
         int line;
         int column;
-        Comment thenCmmt = null;
-        Comment elseCmmt = null;
-        jj_consume_token(IF);
-        line = token.beginLine;
-        column = token.beginColumn;
-        jj_consume_token(LPAREN);
-        condition = Expression();
-        jj_consume_token(RPAREN);
-
-        thenStmt = Statement();
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case ELSE:
-                jj_consume_token(ELSE);
-
-                elseStmt = Statement();
-                break;
-            default:
-                jj_la1[151] = jj_gen;
-                ;
-        }
-        IfStmt tmp = new IfStmt(line, column, token.endLine, token.endColumn, condition, thenStmt, elseStmt);
-
-        thenStmt.setComment(thenCmmt);
-        if (elseStmt != null)
-            elseStmt.setComment(elseCmmt);
-        {
-            if (true) return tmp;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public WhileStmt WhileStatement() {
+    Comment thenCmmt = null;
+    Comment elseCmmt = null;
+    jj_consume_token(IF);
+        line=token.beginLine; column=token.beginColumn;
+    jj_consume_token(LPAREN);
+    condition = Expression();
+    jj_consume_token(RPAREN);
+
+    thenStmt = Statement();
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case ELSE:
+      jj_consume_token(ELSE);
+
+      elseStmt = Statement();
+      break;
+    default:
+      jj_la1[151] = jj_gen;
+      ;
+    }
+      IfStmt tmp = new IfStmt(line, column, token.endLine, token.endColumn,condition, thenStmt, elseStmt);
+
+      thenStmt.setComment(thenCmmt);
+      if (elseStmt != null)
+          elseStmt.setComment(elseCmmt);
+      {if (true) return tmp;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public WhileStmt WhileStatement() {
         Expression condition;
         Statement body;
         int line;
         int column;
-        jj_consume_token(WHILE);
-        line = token.beginLine;
-        column = token.beginColumn;
-        jj_consume_token(LPAREN);
-        condition = Expression();
-        jj_consume_token(RPAREN);
-        body = Statement();
-        {
-            if (true) return new WhileStmt(line, column, token.endLine, token.endColumn, condition, body);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public DoStmt DoStatement() {
+    jj_consume_token(WHILE);
+           line=token.beginLine; column=token.beginColumn;
+    jj_consume_token(LPAREN);
+    condition = Expression();
+    jj_consume_token(RPAREN);
+    body = Statement();
+    {if (true) return new WhileStmt(line, column, token.endLine, token.endColumn,condition, body);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public DoStmt DoStatement() {
         Expression condition;
         Statement body;
         int line;
         int column;
-        jj_consume_token(DO);
-        line = token.beginLine;
-        column = token.beginColumn;
-        body = Statement();
-        jj_consume_token(WHILE);
-        jj_consume_token(LPAREN);
-        condition = Expression();
-        jj_consume_token(RPAREN);
-        jj_consume_token(SEMICOLON);
-        {
-            if (true) return new DoStmt(line, column, token.endLine, token.endColumn, body, condition);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Statement ForStatement() {
+    jj_consume_token(DO);
+        line=token.beginLine; column=token.beginColumn;
+    body = Statement();
+    jj_consume_token(WHILE);
+    jj_consume_token(LPAREN);
+    condition = Expression();
+    jj_consume_token(RPAREN);
+    jj_consume_token(SEMICOLON);
+    {if (true) return new DoStmt(line, column, token.endLine, token.endColumn,body, condition);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Statement ForStatement() {
         String id = null;
         VariableDeclarationExpr varExpr = null;
         Expression expr = null;
@@ -4477,410 +4116,383 @@ final public Statement ForStatement() {
         Statement body;
         int line;
         int column;
-        jj_consume_token(FOR);
-        line = token.beginLine;
-        column = token.beginColumn;
-        jj_consume_token(LPAREN);
-        if (jj_2_40(2147483647)) {
-            varExpr = VariableDeclarationExpression();
-            jj_consume_token(COLON);
-            expr = Expression();
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case ABSTRACT:
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FALSE:
-                case FINAL:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case NATIVE:
-                case NEW:
-                case NULL:
-                case PRIVATE:
-                case PROTECTED:
-                case PUBLIC:
-                case SHORT:
-                case STATIC:
-                case STRICTFP:
-                case SUPER:
-                case SYNCHRONIZED:
-                case THIS:
-                case TRANSIENT:
-                case TRUE:
-                case VOID:
-                case VOLATILE:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case SEMICOLON:
-                case AT:
-                case BANG:
-                case TILDE:
-                case INCR:
-                case DECR:
-                case PLUS:
-                case MINUS:
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case ABSTRACT:
-                        case BOOLEAN:
-                        case BYTE:
-                        case CHAR:
-                        case DOUBLE:
-                        case FALSE:
-                        case FINAL:
-                        case FLOAT:
-                        case INT:
-                        case LONG:
-                        case NATIVE:
-                        case NEW:
-                        case NULL:
-                        case PRIVATE:
-                        case PROTECTED:
-                        case PUBLIC:
-                        case SHORT:
-                        case STATIC:
-                        case STRICTFP:
-                        case SUPER:
-                        case SYNCHRONIZED:
-                        case THIS:
-                        case TRANSIENT:
-                        case TRUE:
-                        case VOID:
-                        case VOLATILE:
-                        case LONG_LITERAL:
-                        case INTEGER_LITERAL:
-                        case FLOATING_POINT_LITERAL:
-                        case CHARACTER_LITERAL:
-                        case STRING_LITERAL:
-                        case IDENTIFIER:
-                        case LPAREN:
-                        case AT:
-                        case BANG:
-                        case TILDE:
-                        case INCR:
-                        case DECR:
-                        case PLUS:
-                        case MINUS:
-                            init = ForInit();
-                            break;
-                        default:
-                            jj_la1[152] = jj_gen;
-                            ;
-                    }
-                    jj_consume_token(SEMICOLON);
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case BOOLEAN:
-                        case BYTE:
-                        case CHAR:
-                        case DOUBLE:
-                        case FALSE:
-                        case FLOAT:
-                        case INT:
-                        case LONG:
-                        case NEW:
-                        case NULL:
-                        case SHORT:
-                        case SUPER:
-                        case THIS:
-                        case TRUE:
-                        case VOID:
-                        case LONG_LITERAL:
-                        case INTEGER_LITERAL:
-                        case FLOATING_POINT_LITERAL:
-                        case CHARACTER_LITERAL:
-                        case STRING_LITERAL:
-                        case IDENTIFIER:
-                        case LPAREN:
-                        case BANG:
-                        case TILDE:
-                        case INCR:
-                        case DECR:
-                        case PLUS:
-                        case MINUS:
-                            expr = Expression();
-                            break;
-                        default:
-                            jj_la1[153] = jj_gen;
-                            ;
-                    }
-                    jj_consume_token(SEMICOLON);
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case BOOLEAN:
-                        case BYTE:
-                        case CHAR:
-                        case DOUBLE:
-                        case FALSE:
-                        case FLOAT:
-                        case INT:
-                        case LONG:
-                        case NEW:
-                        case NULL:
-                        case SHORT:
-                        case SUPER:
-                        case THIS:
-                        case TRUE:
-                        case VOID:
-                        case LONG_LITERAL:
-                        case INTEGER_LITERAL:
-                        case FLOATING_POINT_LITERAL:
-                        case CHARACTER_LITERAL:
-                        case STRING_LITERAL:
-                        case IDENTIFIER:
-                        case LPAREN:
-                        case BANG:
-                        case TILDE:
-                        case INCR:
-                        case DECR:
-                        case PLUS:
-                        case MINUS:
-                            update = ForUpdate();
-                            break;
-                        default:
-                            jj_la1[154] = jj_gen;
-                            ;
-                    }
-                    break;
-                default:
-                    jj_la1[155] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
+    jj_consume_token(FOR);
+         line=token.beginLine; column=token.beginColumn;
+    jj_consume_token(LPAREN);
+    if (jj_2_40(2147483647)) {
+      varExpr = VariableDeclarationExpression();
+      jj_consume_token(COLON);
+      expr = Expression();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case ABSTRACT:
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FINAL:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NATIVE:
+      case NEW:
+      case NULL:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case SHORT:
+      case STATIC:
+      case STRICTFP:
+      case SUPER:
+      case SYNCHRONIZED:
+      case THIS:
+      case TRANSIENT:
+      case TRUE:
+      case VOID:
+      case VOLATILE:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case SEMICOLON:
+      case AT:
+      case BANG:
+      case TILDE:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case ABSTRACT:
+        case BOOLEAN:
+        case BYTE:
+        case CHAR:
+        case DOUBLE:
+        case FALSE:
+        case FINAL:
+        case FLOAT:
+        case INT:
+        case LONG:
+        case NATIVE:
+        case NEW:
+        case NULL:
+        case PRIVATE:
+        case PROTECTED:
+        case PUBLIC:
+        case SHORT:
+        case STATIC:
+        case STRICTFP:
+        case SUPER:
+        case SYNCHRONIZED:
+        case THIS:
+        case TRANSIENT:
+        case TRUE:
+        case VOID:
+        case VOLATILE:
+        case LONG_LITERAL:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case CHARACTER_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+        case AT:
+        case BANG:
+        case TILDE:
+        case INCR:
+        case DECR:
+        case PLUS:
+        case MINUS:
+          init = ForInit();
+          break;
+        default:
+          jj_la1[152] = jj_gen;
+          ;
         }
-        jj_consume_token(RPAREN);
-        body = Statement();
-        if (varExpr != null) {
-            {
-                if (true) return new ForeachStmt(line, column, token.endLine, token.endColumn, varExpr, expr, body);
-            }
+        jj_consume_token(SEMICOLON);
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case BOOLEAN:
+        case BYTE:
+        case CHAR:
+        case DOUBLE:
+        case FALSE:
+        case FLOAT:
+        case INT:
+        case LONG:
+        case NEW:
+        case NULL:
+        case SHORT:
+        case SUPER:
+        case THIS:
+        case TRUE:
+        case VOID:
+        case LONG_LITERAL:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case CHARACTER_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+        case BANG:
+        case TILDE:
+        case INCR:
+        case DECR:
+        case PLUS:
+        case MINUS:
+          expr = Expression();
+          break;
+        default:
+          jj_la1[153] = jj_gen;
+          ;
         }
-        {
-            if (true) return new ForStmt(line, column, token.endLine, token.endColumn, init, expr, update, body);
+        jj_consume_token(SEMICOLON);
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case BOOLEAN:
+        case BYTE:
+        case CHAR:
+        case DOUBLE:
+        case FALSE:
+        case FLOAT:
+        case INT:
+        case LONG:
+        case NEW:
+        case NULL:
+        case SHORT:
+        case SUPER:
+        case THIS:
+        case TRUE:
+        case VOID:
+        case LONG_LITERAL:
+        case INTEGER_LITERAL:
+        case FLOATING_POINT_LITERAL:
+        case CHARACTER_LITERAL:
+        case STRING_LITERAL:
+        case IDENTIFIER:
+        case LPAREN:
+        case BANG:
+        case TILDE:
+        case INCR:
+        case DECR:
+        case PLUS:
+        case MINUS:
+          update = ForUpdate();
+          break;
+        default:
+          jj_la1[154] = jj_gen;
+          ;
+        }
+        break;
+      default:
+        jj_la1[155] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    jj_consume_token(RPAREN);
+    body = Statement();
+        if (varExpr != null) {
+                {if (true) return new ForeachStmt(line, column, token.endLine, token.endColumn,varExpr, expr, body);}
         }
-        throw new Error("Missing return statement in function");
-    }
+        {if (true) return new ForStmt(line, column, token.endLine, token.endColumn,init, expr, update, body);}
+    throw new Error("Missing return statement in function");
+  }
 
-    final public List ForInit() {
+  final public List ForInit() {
         List ret;
         Expression expr;
-        if (jj_2_41(2147483647)) {
-            expr = VariableDeclarationExpression();
-            ret = new LinkedList();
-            ret.add(expr);
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case DOUBLE:
-                case FALSE:
-                case FLOAT:
-                case INT:
-                case LONG:
-                case NEW:
-                case NULL:
-                case SHORT:
-                case SUPER:
-                case THIS:
-                case TRUE:
-                case VOID:
-                case LONG_LITERAL:
-                case INTEGER_LITERAL:
-                case FLOATING_POINT_LITERAL:
-                case CHARACTER_LITERAL:
-                case STRING_LITERAL:
-                case IDENTIFIER:
-                case LPAREN:
-                case BANG:
-                case TILDE:
-                case INCR:
-                case DECR:
-                case PLUS:
-                case MINUS:
-                    ret = ExpressionList();
-                    break;
-                default:
-                    jj_la1[156] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List ExpressionList() {
+    if (jj_2_41(2147483647)) {
+      expr = VariableDeclarationExpression();
+                                                   ret = new LinkedList(); ret.add(expr);
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case DOUBLE:
+      case FALSE:
+      case FLOAT:
+      case INT:
+      case LONG:
+      case NEW:
+      case NULL:
+      case SHORT:
+      case SUPER:
+      case THIS:
+      case TRUE:
+      case VOID:
+      case LONG_LITERAL:
+      case INTEGER_LITERAL:
+      case FLOATING_POINT_LITERAL:
+      case CHARACTER_LITERAL:
+      case STRING_LITERAL:
+      case IDENTIFIER:
+      case LPAREN:
+      case BANG:
+      case TILDE:
+      case INCR:
+      case DECR:
+      case PLUS:
+      case MINUS:
+        ret = ExpressionList();
+        break;
+      default:
+        jj_la1[156] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List ExpressionList() {
         List ret = new LinkedList();
         Expression expr;
-        expr = Expression();
-        ret.add(expr);
-        label_65:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case COMMA:
-                    ;
-                    break;
-                default:
-                    jj_la1[157] = jj_gen;
-                    break label_65;
-            }
-            jj_consume_token(COMMA);
-            expr = Expression();
-            ret.add(expr);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List ForUpdate() {
+    expr = Expression();
+                        ret.add(expr);
+    label_65:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[157] = jj_gen;
+        break label_65;
+      }
+      jj_consume_token(COMMA);
+      expr = Expression();
+                                                                      ret.add(expr);
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List ForUpdate() {
         List ret;
-        ret = ExpressionList();
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
+    ret = ExpressionList();
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
 
-    final public BreakStmt BreakStatement() {
+  final public BreakStmt BreakStatement() {
         String id = null;
         int line;
         int column;
-        jj_consume_token(BREAK);
-        line = token.beginLine;
-        column = token.beginColumn;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case IDENTIFIER:
-                jj_consume_token(IDENTIFIER);
-                id = token.image;
-                break;
-            default:
-                jj_la1[158] = jj_gen;
-                ;
-        }
-        jj_consume_token(SEMICOLON);
-        {
-            if (true) return new BreakStmt(line, column, token.endLine, token.endColumn, id);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public ContinueStmt ContinueStatement() {
+    jj_consume_token(BREAK);
+           line=token.beginLine; column=token.beginColumn;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case IDENTIFIER:
+      jj_consume_token(IDENTIFIER);
+                                                                             id = token.image;
+      break;
+    default:
+      jj_la1[158] = jj_gen;
+      ;
+    }
+    jj_consume_token(SEMICOLON);
+    {if (true) return new BreakStmt(line, column, token.endLine, token.endColumn,id);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public ContinueStmt ContinueStatement() {
         String id = null;
         int line;
         int column;
-        jj_consume_token(CONTINUE);
-        line = token.beginLine;
-        column = token.beginColumn;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case IDENTIFIER:
-                jj_consume_token(IDENTIFIER);
-                id = token.image;
-                break;
-            default:
-                jj_la1[159] = jj_gen;
-                ;
-        }
-        jj_consume_token(SEMICOLON);
-        {
-            if (true) return new ContinueStmt(line, column, token.endLine, token.endColumn, id);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public ReturnStmt ReturnStatement() {
+    jj_consume_token(CONTINUE);
+              line=token.beginLine; column=token.beginColumn;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case IDENTIFIER:
+      jj_consume_token(IDENTIFIER);
+                                                                                id = token.image;
+      break;
+    default:
+      jj_la1[159] = jj_gen;
+      ;
+    }
+    jj_consume_token(SEMICOLON);
+    {if (true) return new ContinueStmt(line, column, token.endLine, token.endColumn,id);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public ReturnStmt ReturnStatement() {
         Expression expr = null;
         int line;
         int column;
-        jj_consume_token(RETURN);
-        line = token.beginLine;
-        column = token.beginColumn;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS:
-                expr = Expression();
-                break;
-            default:
-                jj_la1[160] = jj_gen;
-                ;
-        }
-        jj_consume_token(SEMICOLON);
-        {
-            if (true) return new ReturnStmt(line, column, token.endLine, token.endColumn, expr);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public ThrowStmt ThrowStatement() {
+    jj_consume_token(RETURN);
+            line=token.beginLine; column=token.beginColumn;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
+      expr = Expression();
+      break;
+    default:
+      jj_la1[160] = jj_gen;
+      ;
+    }
+    jj_consume_token(SEMICOLON);
+    {if (true) return new ReturnStmt(line, column, token.endLine, token.endColumn,expr);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public ThrowStmt ThrowStatement() {
         Expression expr;
         int line;
         int column;
-        jj_consume_token(THROW);
-        line = token.beginLine;
-        column = token.beginColumn;
-        expr = Expression();
-        jj_consume_token(SEMICOLON);
-        {
-            if (true) return new ThrowStmt(line, column, token.endLine, token.endColumn, expr);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public SynchronizedStmt SynchronizedStatement() {
+    jj_consume_token(THROW);
+           line=token.beginLine; column=token.beginColumn;
+    expr = Expression();
+    jj_consume_token(SEMICOLON);
+    {if (true) return new ThrowStmt(line, column, token.endLine, token.endColumn,expr);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public SynchronizedStmt SynchronizedStatement() {
         Expression expr;
         BlockStmt block;
         int line;
         int column;
-        jj_consume_token(SYNCHRONIZED);
-        line = token.beginLine;
-        column = token.beginColumn;
-        jj_consume_token(LPAREN);
-        expr = Expression();
-        jj_consume_token(RPAREN);
-        block = Block();
-        {
-            if (true) return new SynchronizedStmt(line, column, token.endLine, token.endColumn, expr, block);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public TryStmt TryStatement() {
+    jj_consume_token(SYNCHRONIZED);
+                  line=token.beginLine; column=token.beginColumn;
+    jj_consume_token(LPAREN);
+    expr = Expression();
+    jj_consume_token(RPAREN);
+    block = Block();
+    {if (true) return new SynchronizedStmt(line, column, token.endLine, token.endColumn,expr, block);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public TryStmt TryStatement() {
         List resources = new LinkedList();
         BlockStmt tryBlock;
         BlockStmt finallyBlock = null;
@@ -4895,5290 +4507,4642 @@ final public TryStmt TryStatement() {
         int column;
         int cLine;
         int cColumn;
-        jj_consume_token(TRY);
-        line = token.beginLine;
-        column = token.beginColumn;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case LPAREN:
-                resources = ResourceSpecification();
-                break;
-            default:
-                jj_la1[161] = jj_gen;
-                ;
-        }
-        tryBlock = Block();
-        label_66:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case CATCH:
-                    ;
-                    break;
-                default:
-                    jj_la1[162] = jj_gen;
-                    break label_66;
-            }
-            jj_consume_token(CATCH);
-            cLine = token.beginLine;
-            cColumn = token.beginColumn;
-            jj_consume_token(LPAREN);
-            exceptModifier = Modifiers();
-            exceptType = Type();
-            exceptTypes.add(exceptType);
-            label_67:
-            while (true) {
-                switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                    case BIT_OR:
-                        ;
-                        break;
-                    default:
-                        jj_la1[163] = jj_gen;
-                        break label_67;
-                }
-                jj_consume_token(BIT_OR);
-                exceptType = Type();
-                exceptTypes.add(exceptType);
-            }
-            exceptId = VariableDeclaratorId();
-            jj_consume_token(RPAREN);
-            catchBlock = Block();
-            catchs = add(catchs, new CatchClause(cLine, cColumn, token.endLine, token.endColumn, exceptModifier.modifiers, exceptModifier.annotations, exceptTypes, exceptId, catchBlock));
-            exceptTypes = new LinkedList();
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case FINALLY:
-                jj_consume_token(FINALLY);
-                finallyBlock = Block();
-                break;
-            default:
-                jj_la1[164] = jj_gen;
-                ;
-        }
-        {
-            if (true)
-                return new TryStmt(line, column, token.endLine, token.endColumn, resources, tryBlock, catchs, finallyBlock);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List ResourceSpecification() {
-        List vars;
-        jj_consume_token(LPAREN);
-        vars = Resources();
-        if (jj_2_42(2)) {
-            jj_consume_token(SEMICOLON);
-        } else {
-            ;
-        }
-        jj_consume_token(RPAREN);
-        {
-            if (true) return vars;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List Resources() {
+    jj_consume_token(TRY);
+         line=token.beginLine; column=token.beginColumn;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case LPAREN:
+      resources = ResourceSpecification();
+      break;
+    default:
+      jj_la1[161] = jj_gen;
+      ;
+    }
+    tryBlock = Block();
+    label_66:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case CATCH:
+        ;
+        break;
+      default:
+        jj_la1[162] = jj_gen;
+        break label_66;
+      }
+      jj_consume_token(CATCH);
+                                 cLine=token.beginLine; cColumn=token.beginColumn;
+      jj_consume_token(LPAREN);
+      exceptModifier = Modifiers();
+      exceptType = Type();
+                                                                           exceptTypes.add(exceptType);
+      label_67:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case BIT_OR:
+          ;
+          break;
+        default:
+          jj_la1[163] = jj_gen;
+          break label_67;
+        }
+        jj_consume_token(BIT_OR);
+        exceptType = Type();
+                                                    exceptTypes.add(exceptType);
+      }
+      exceptId = VariableDeclaratorId();
+      jj_consume_token(RPAREN);
+      catchBlock = Block();
+                          catchs = add(catchs, new CatchClause(cLine, cColumn, token.endLine, token.endColumn, exceptModifier.modifiers, exceptModifier.annotations, exceptTypes, exceptId, catchBlock)); exceptTypes = new LinkedList();
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case FINALLY:
+      jj_consume_token(FINALLY);
+      finallyBlock = Block();
+      break;
+    default:
+      jj_la1[164] = jj_gen;
+      ;
+    }
+    {if (true) return new TryStmt(line, column, token.endLine, token.endColumn, resources, tryBlock, catchs, finallyBlock);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List ResourceSpecification() {
+List vars;
+    jj_consume_token(LPAREN);
+    vars = Resources();
+    if (jj_2_42(2)) {
+      jj_consume_token(SEMICOLON);
+    } else {
+      ;
+    }
+    jj_consume_token(RPAREN);
+    {if (true) return vars;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List Resources() {
         List vars = new LinkedList();
         VariableDeclarationExpr var;
-        /*this is a bit more lenient than we need to be, eg allowing access modifiers like private*/
-        var = VariableDeclarationExpression();
-        vars.add(var);
-        label_68:
-        while (true) {
-            if (jj_2_43(2)) {
-                ;
-            } else {
-                break label_68;
-            }
-            jj_consume_token(SEMICOLON);
-            var = VariableDeclarationExpression();
-            vars.add(var);
-        }
-        {
-            if (true) return vars;
-        }
-        throw new Error("Missing return statement in function");
+    /*this is a bit more lenient than we need to be, eg allowing access modifiers like private*/
+      var = VariableDeclarationExpression();
+                                         vars.add(var);
+    label_68:
+    while (true) {
+      if (jj_2_43(2)) {
+        ;
+      } else {
+        break label_68;
+      }
+      jj_consume_token(SEMICOLON);
+      var = VariableDeclarationExpression();
+                                                                                                                  vars.add(var);
+    }
+    {if (true) return vars;}
+    throw new Error("Missing return statement in function");
+  }
+
+/* We use productions to match >>>, >> and > so that we can keep the
+ * type declaration syntax with generics clean
+ */
+  final public void RUNSIGNEDSHIFT() {
+    if (getToken(1).kind == GT &&
+                    ((GTToken)getToken(1)).realKind == RUNSIGNEDSHIFT) {
+
+    } else {
+      jj_consume_token(-1);
+      throw new ParseException();
     }
+    jj_consume_token(GT);
+    jj_consume_token(GT);
+    jj_consume_token(GT);
+  }
 
-    /* We use productions to match >>>, >> and > so that we can keep the
-     * type declaration syntax with generics clean
-     */
-    final public void RUNSIGNEDSHIFT() {
-        if (getToken(1).kind == GT &&
-                ((GTToken) getToken(1)).realKind == RUNSIGNEDSHIFT) {
+  final public void RSIGNEDSHIFT() {
+    if (getToken(1).kind == GT &&
+                    ((GTToken)getToken(1)).realKind == RSIGNEDSHIFT) {
 
-        } else {
-            jj_consume_token(-1);
-            throw new ParseException();
-        }
-        jj_consume_token(GT);
-        jj_consume_token(GT);
-        jj_consume_token(GT);
-    }
-
-    final public void RSIGNEDSHIFT() {
-        if (getToken(1).kind == GT &&
-                ((GTToken) getToken(1)).realKind == RSIGNEDSHIFT) {
-
-        } else {
-            jj_consume_token(-1);
-            throw new ParseException();
-        }
-        jj_consume_token(GT);
-        jj_consume_token(GT);
+    } else {
+      jj_consume_token(-1);
+      throw new ParseException();
     }
+    jj_consume_token(GT);
+    jj_consume_token(GT);
+  }
 
-    /* Annotation syntax follows. */
-    final public AnnotationExpr Annotation() {
+/* Annotation syntax follows. */
+  final public AnnotationExpr Annotation() {
         AnnotationExpr ret;
-        if (jj_2_44(2147483647)) {
-            ret = NormalAnnotation();
-        } else if (jj_2_45(2147483647)) {
-            ret = SingleMemberAnnotation();
-        } else {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case AT:
-                    ret = MarkerAnnotation();
-                    break;
-                default:
-                    jj_la1[165] = jj_gen;
-                    jj_consume_token(-1);
-                    throw new ParseException();
-            }
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public NormalAnnotationExpr NormalAnnotation() {
+    if (jj_2_44(2147483647)) {
+      ret = NormalAnnotation();
+    } else if (jj_2_45(2147483647)) {
+      ret = SingleMemberAnnotation();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case AT:
+        ret = MarkerAnnotation();
+        break;
+      default:
+        jj_la1[165] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public NormalAnnotationExpr NormalAnnotation() {
         NameExpr name;
         List pairs = null;
         int line;
         int column;
-        jj_consume_token(AT);
-        line = token.beginLine;
-        column = token.beginColumn;
-        name = Name();
-        jj_consume_token(LPAREN);
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case IDENTIFIER:
-                pairs = MemberValuePairs();
-                break;
-            default:
-                jj_la1[166] = jj_gen;
-                ;
-        }
-        jj_consume_token(RPAREN);
-        {
-            if (true) return new NormalAnnotationExpr(line, column, token.endLine, token.endColumn, name, pairs);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public MarkerAnnotationExpr MarkerAnnotation() {
+    jj_consume_token(AT);
+        line=token.beginLine; column=token.beginColumn;
+    name = Name();
+    jj_consume_token(LPAREN);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case IDENTIFIER:
+      pairs = MemberValuePairs();
+      break;
+    default:
+      jj_la1[166] = jj_gen;
+      ;
+    }
+    jj_consume_token(RPAREN);
+     {if (true) return new NormalAnnotationExpr(line, column, token.endLine, token.endColumn,name, pairs);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public MarkerAnnotationExpr MarkerAnnotation() {
         NameExpr name;
         int line;
         int column;
-        jj_consume_token(AT);
-        line = token.beginLine;
-        column = token.beginColumn;
-        name = Name();
-        {
-            if (true) return new MarkerAnnotationExpr(line, column, token.endLine, token.endColumn, name);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public SingleMemberAnnotationExpr SingleMemberAnnotation() {
+    jj_consume_token(AT);
+       line=token.beginLine; column=token.beginColumn;
+    name = Name();
+    {if (true) return new MarkerAnnotationExpr(line, column, token.endLine, token.endColumn,name);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public SingleMemberAnnotationExpr SingleMemberAnnotation() {
         NameExpr name;
         Expression memberVal;
         int line;
         int column;
-        jj_consume_token(AT);
-        line = token.beginLine;
-        column = token.beginColumn;
-        name = Name();
-        jj_consume_token(LPAREN);
-        memberVal = MemberValue();
-        jj_consume_token(RPAREN);
-        {
-            if (true)
-                return new SingleMemberAnnotationExpr(line, column, token.endLine, token.endColumn, name, memberVal);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List MemberValuePairs() {
+    jj_consume_token(AT);
+       line=token.beginLine; column=token.beginColumn;
+    name = Name();
+    jj_consume_token(LPAREN);
+    memberVal = MemberValue();
+    jj_consume_token(RPAREN);
+    {if (true) return new SingleMemberAnnotationExpr(line, column, token.endLine, token.endColumn,name, memberVal);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List MemberValuePairs() {
         List ret = new LinkedList();
         MemberValuePair pair;
-        pair = MemberValuePair();
-        ret.add(pair);
-        label_69:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case COMMA:
-                    ;
-                    break;
-                default:
-                    jj_la1[167] = jj_gen;
-                    break label_69;
-            }
-            jj_consume_token(COMMA);
-            pair = MemberValuePair();
-            ret.add(pair);
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public MemberValuePair MemberValuePair() {
+    pair = MemberValuePair();
+                              ret.add(pair);
+    label_69:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case COMMA:
+        ;
+        break;
+      default:
+        jj_la1[167] = jj_gen;
+        break label_69;
+      }
+      jj_consume_token(COMMA);
+      pair = MemberValuePair();
+                                                                                ret.add(pair);
+    }
+     {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public MemberValuePair MemberValuePair() {
         String name;
         Expression value;
         int line;
         int column;
-        jj_consume_token(IDENTIFIER);
-        name = token.image;
-        line = token.beginLine;
-        column = token.beginColumn;
-        jj_consume_token(ASSIGN);
-        value = MemberValue();
-        {
-            if (true) return new MemberValuePair(line, column, token.endLine, token.endColumn, name, value);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression MemberValue() {
+    jj_consume_token(IDENTIFIER);
+                   name = token.image; line=token.beginLine; column=token.beginColumn;
+    jj_consume_token(ASSIGN);
+    value = MemberValue();
+      {if (true) return new MemberValuePair(line, column, token.endLine, token.endColumn,name, value);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression MemberValue() {
         Expression ret;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case AT:
-                ret = Annotation();
-                break;
-            case LBRACE:
-                ret = MemberValueArrayInitializer();
-                break;
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS:
-                ret = ConditionalExpression();
-                break;
-            default:
-                jj_la1[168] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression MemberValueArrayInitializer() {
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case AT:
+      ret = Annotation();
+      break;
+    case LBRACE:
+      ret = MemberValueArrayInitializer();
+      break;
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
+      ret = ConditionalExpression();
+      break;
+    default:
+      jj_la1[168] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression MemberValueArrayInitializer() {
         List ret = new LinkedList();
         Expression member;
         int line;
         int column;
-        jj_consume_token(LBRACE);
-        line = token.beginLine;
-        column = token.beginColumn;
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case DOUBLE:
-            case FALSE:
-            case FLOAT:
-            case INT:
-            case LONG:
-            case NEW:
-            case NULL:
-            case SHORT:
-            case SUPER:
-            case THIS:
-            case TRUE:
-            case VOID:
-            case LONG_LITERAL:
-            case INTEGER_LITERAL:
-            case FLOATING_POINT_LITERAL:
-            case CHARACTER_LITERAL:
-            case STRING_LITERAL:
-            case IDENTIFIER:
-            case LPAREN:
-            case LBRACE:
-            case AT:
-            case BANG:
-            case TILDE:
-            case INCR:
-            case DECR:
-            case PLUS:
-            case MINUS:
-                member = MemberValue();
-                ret.add(member);
-                label_70:
-                while (true) {
-                    if (jj_2_46(2)) {
-                        ;
-                    } else {
-                        break label_70;
-                    }
-                    jj_consume_token(COMMA);
-                    member = MemberValue();
-                    ret.add(member);
-                }
-                break;
-            default:
-                jj_la1[169] = jj_gen;
-                ;
-        }
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case COMMA:
-                jj_consume_token(COMMA);
-                break;
-            default:
-                jj_la1[170] = jj_gen;
-                ;
-        }
-        jj_consume_token(RBRACE);
-        {
-            if (true) return new ArrayInitializerExpr(line, column, token.endLine, token.endColumn, ret);
+    jj_consume_token(LBRACE);
+       line=token.beginLine; column=token.beginColumn;
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case DOUBLE:
+    case FALSE:
+    case FLOAT:
+    case INT:
+    case LONG:
+    case NEW:
+    case NULL:
+    case SHORT:
+    case SUPER:
+    case THIS:
+    case TRUE:
+    case VOID:
+    case LONG_LITERAL:
+    case INTEGER_LITERAL:
+    case FLOATING_POINT_LITERAL:
+    case CHARACTER_LITERAL:
+    case STRING_LITERAL:
+    case IDENTIFIER:
+    case LPAREN:
+    case LBRACE:
+    case AT:
+    case BANG:
+    case TILDE:
+    case INCR:
+    case DECR:
+    case PLUS:
+    case MINUS:
+      member = MemberValue();
+                                 ret.add(member);
+      label_70:
+      while (true) {
+        if (jj_2_46(2)) {
+          ;
+        } else {
+          break label_70;
         }
-        throw new Error("Missing return statement in function");
-    }
-
-    /* Annotation Types. */
-    final public AnnotationDeclaration AnnotationTypeDeclaration(Modifier modifier) {
+        jj_consume_token(COMMA);
+        member = MemberValue();
+                                                                                                ret.add(member);
+      }
+      break;
+    default:
+      jj_la1[169] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case COMMA:
+      jj_consume_token(COMMA);
+      break;
+    default:
+      jj_la1[170] = jj_gen;
+      ;
+    }
+    jj_consume_token(RBRACE);
+    {if (true) return new ArrayInitializerExpr(line, column, token.endLine, token.endColumn,ret);}
+    throw new Error("Missing return statement in function");
+  }
+
+/* Annotation Types. */
+  final public AnnotationDeclaration AnnotationTypeDeclaration(Modifier modifier) {
         NameExpr name;
         List members;
         int line = modifier.beginLine;
         int column = modifier.beginColumn;
-        jj_consume_token(AT);
-        if (line == -1) {
-            line = token.beginLine;
-            column = token.beginColumn;
-        }
-        jj_consume_token(INTERFACE);
-        name = Name();
-        members = AnnotationTypeBody();
-        AnnotationDeclaration tmp = new AnnotationDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, null, members);
-        tmp.setNameExpr(name);
-        {
-            if (true) return tmp;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public List AnnotationTypeBody() {
+    jj_consume_token(AT);
+        if (line == -1) {line=token.beginLine; column=token.beginColumn;}
+    jj_consume_token(INTERFACE);
+    name = Name();
+    members = AnnotationTypeBody();
+      AnnotationDeclaration tmp = new AnnotationDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, null, members);
+      tmp.setNameExpr(name);
+      {if (true) return tmp;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public List AnnotationTypeBody() {
         List ret = null;
         BodyDeclaration member;
-        jj_consume_token(LBRACE);
-        label_71:
-        while (true) {
-            switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                case ABSTRACT:
-                case BOOLEAN:
-                case BYTE:
-                case CHAR:
-                case CLASS:
-                case DOUBLE:
-                case ENUM:
-                case FINAL:
-                case FLOAT:
-                case INT:
-                case INTERFACE:
-                case LONG:
-                case NATIVE:
-                case PRIVATE:
-                case PROTECTED:
-                case PUBLIC:
-                case SHORT:
-                case STATIC:
-                case STRICTFP:
-                case SYNCHRONIZED:
-                case TRANSIENT:
-                case VOLATILE:
-                case IDENTIFIER:
-                case SEMICOLON:
-                case AT:
-                    ;
-                    break;
-                default:
-                    jj_la1[171] = jj_gen;
-                    break label_71;
-            }
-            member = AnnotationBodyDeclaration();
-            ret = add(ret, member);
-        }
-        jj_consume_token(RBRACE);
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public BodyDeclaration AnnotationBodyDeclaration() {
-        Modifier modifier;
-        BodyDeclaration ret;
-
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case SEMICOLON:
-                jj_consume_token(SEMICOLON);
-                ret = new EmptyTypeDeclaration(token.beginLine, token.beginColumn, token.endLine, token.endColumn);
-                break;
-            case ABSTRACT:
-            case BOOLEAN:
-            case BYTE:
-            case CHAR:
-            case CLASS:
-            case DOUBLE:
-            case ENUM:
-            case FINAL:
-            case FLOAT:
-            case INT:
-            case INTERFACE:
-            case LONG:
-            case NATIVE:
-            case PRIVATE:
-            case PROTECTED:
-            case PUBLIC:
-            case SHORT:
-            case STATIC:
-            case STRICTFP:
-            case SYNCHRONIZED:
-            case TRANSIENT:
-            case VOLATILE:
-            case IDENTIFIER:
-            case AT:
-                modifier = Modifiers();
-                if (jj_2_47(2147483647)) {
-                    ret = AnnotationTypeMemberDeclaration(modifier);
-                } else {
-                    switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-                        case CLASS:
-                        case INTERFACE:
-                            ret = ClassOrInterfaceDeclaration(modifier);
-                            break;
-                        case ENUM:
-                            ret = EnumDeclaration(modifier);
-                            break;
-                        case AT:
-                            ret = AnnotationTypeDeclaration(modifier);
-                            break;
-                        case BOOLEAN:
-                        case BYTE:
-                        case CHAR:
-                        case DOUBLE:
-                        case FLOAT:
-                        case INT:
-                        case LONG:
-                        case SHORT:
-                        case IDENTIFIER:
-                            ret = FieldDeclaration(modifier);
-                            break;
-                        default:
-                            jj_la1[172] = jj_gen;
-                            jj_consume_token(-1);
-                            throw new ParseException();
-                    }
-                }
-                break;
-            default:
-                jj_la1[173] = jj_gen;
-                jj_consume_token(-1);
-                throw new ParseException();
-        }
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public AnnotationMemberDeclaration AnnotationTypeMemberDeclaration(Modifier modifier) {
+    jj_consume_token(LBRACE);
+    label_71:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+      case ABSTRACT:
+      case BOOLEAN:
+      case BYTE:
+      case CHAR:
+      case CLASS:
+      case DOUBLE:
+      case ENUM:
+      case FINAL:
+      case FLOAT:
+      case INT:
+      case INTERFACE:
+      case LONG:
+      case NATIVE:
+      case PRIVATE:
+      case PROTECTED:
+      case PUBLIC:
+      case SHORT:
+      case STATIC:
+      case STRICTFP:
+      case SYNCHRONIZED:
+      case TRANSIENT:
+      case VOLATILE:
+      case IDENTIFIER:
+      case SEMICOLON:
+      case AT:
+        ;
+        break;
+      default:
+        jj_la1[171] = jj_gen;
+        break label_71;
+      }
+      member = AnnotationBodyDeclaration();
+                                               ret = add(ret, member);
+    }
+    jj_consume_token(RBRACE);
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public BodyDeclaration AnnotationBodyDeclaration() {
+   Modifier modifier;
+   BodyDeclaration ret;
+
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case SEMICOLON:
+      jj_consume_token(SEMICOLON);
+              ret = new EmptyTypeDeclaration(token.beginLine, token.beginColumn, token.endLine, token.endColumn);
+      break;
+    case ABSTRACT:
+    case BOOLEAN:
+    case BYTE:
+    case CHAR:
+    case CLASS:
+    case DOUBLE:
+    case ENUM:
+    case FINAL:
+    case FLOAT:
+    case INT:
+    case INTERFACE:
+    case LONG:
+    case NATIVE:
+    case PRIVATE:
+    case PROTECTED:
+    case PUBLIC:
+    case SHORT:
+    case STATIC:
+    case STRICTFP:
+    case SYNCHRONIZED:
+    case TRANSIENT:
+    case VOLATILE:
+    case IDENTIFIER:
+    case AT:
+      modifier = Modifiers();
+      if (jj_2_47(2147483647)) {
+        ret = AnnotationTypeMemberDeclaration(modifier);
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case CLASS:
+        case INTERFACE:
+          ret = ClassOrInterfaceDeclaration(modifier);
+          break;
+        case ENUM:
+          ret = EnumDeclaration(modifier);
+          break;
+        case AT:
+          ret = AnnotationTypeDeclaration(modifier);
+          break;
+        case BOOLEAN:
+        case BYTE:
+        case CHAR:
+        case DOUBLE:
+        case FLOAT:
+        case INT:
+        case LONG:
+        case SHORT:
+        case IDENTIFIER:
+          ret = FieldDeclaration(modifier);
+          break;
+        default:
+          jj_la1[172] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+      break;
+    default:
+      jj_la1[173] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public AnnotationMemberDeclaration AnnotationTypeMemberDeclaration(Modifier modifier) {
         Type type;
         String name;
         Expression defaultVal = null;
-        type = Type();
-        jj_consume_token(IDENTIFIER);
-        name = token.image;
-        jj_consume_token(LPAREN);
-        jj_consume_token(RPAREN);
-        switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
-            case _DEFAULT:
-                defaultVal = DefaultValue();
-                break;
-            default:
-                jj_la1[174] = jj_gen;
-                ;
-        }
-        jj_consume_token(SEMICOLON);
-        int line = modifier.beginLine;
-        int column = modifier.beginColumn;
-        {
-            if (line == -1) {
-                line = type.getBeginLine();
-                column = type.getBeginColumn();
-            }
-        }
-        {
-            if (true)
-                return new AnnotationMemberDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, type, name, defaultVal);
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    final public Expression DefaultValue() {
+    type = Type();
+    jj_consume_token(IDENTIFIER);
+                               name = token.image;
+    jj_consume_token(LPAREN);
+    jj_consume_token(RPAREN);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case _DEFAULT:
+      defaultVal = DefaultValue();
+      break;
+    default:
+      jj_la1[174] = jj_gen;
+      ;
+    }
+    jj_consume_token(SEMICOLON);
+    int line = modifier.beginLine;
+    int column = modifier.beginColumn;
+    { if (line == -1) {line=type.getBeginLine(); column=type.getBeginColumn();} }
+    {if (true) return new AnnotationMemberDeclaration(line, column, token.endLine, token.endColumn, modifier.modifiers, modifier.annotations, type, name, defaultVal);}
+    throw new Error("Missing return statement in function");
+  }
+
+  final public Expression DefaultValue() {
         Expression ret;
-        jj_consume_token(_DEFAULT);
-        ret = MemberValue();
-        {
-            if (true) return ret;
-        }
-        throw new Error("Missing return statement in function");
-    }
-
-    private boolean jj_2_1(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_1();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(0, xla);
-        }
-    }
-
-    private boolean jj_2_2(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_2();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(1, xla);
-        }
-    }
-
-    private boolean jj_2_3(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_3();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(2, xla);
-        }
-    }
-
-    private boolean jj_2_4(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_4();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(3, xla);
-        }
-    }
+    jj_consume_token(_DEFAULT);
+    ret = MemberValue();
+    {if (true) return ret;}
+    throw new Error("Missing return statement in function");
+  }
+
+  private boolean jj_2_1(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_1(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(0, xla); }
+  }
+
+  private boolean jj_2_2(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_2(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(1, xla); }
+  }
+
+  private boolean jj_2_3(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_3(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(2, xla); }
+  }
+
+  private boolean jj_2_4(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_4(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(3, xla); }
+  }
+
+  private boolean jj_2_5(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_5(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(4, xla); }
+  }
+
+  private boolean jj_2_6(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_6(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(5, xla); }
+  }
+
+  private boolean jj_2_7(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_7(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(6, xla); }
+  }
+
+  private boolean jj_2_8(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_8(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(7, xla); }
+  }
+
+  private boolean jj_2_9(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_9(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(8, xla); }
+  }
+
+  private boolean jj_2_10(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_10(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(9, xla); }
+  }
+
+  private boolean jj_2_11(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_11(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(10, xla); }
+  }
+
+  private boolean jj_2_12(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_12(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(11, xla); }
+  }
+
+  private boolean jj_2_13(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_13(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(12, xla); }
+  }
+
+  private boolean jj_2_14(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_14(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(13, xla); }
+  }
+
+  private boolean jj_2_15(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_15(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(14, xla); }
+  }
+
+  private boolean jj_2_16(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_16(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(15, xla); }
+  }
+
+  private boolean jj_2_17(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_17(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(16, xla); }
+  }
+
+  private boolean jj_2_18(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_18(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(17, xla); }
+  }
+
+  private boolean jj_2_19(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_19(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(18, xla); }
+  }
+
+  private boolean jj_2_20(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_20(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(19, xla); }
+  }
+
+  private boolean jj_2_21(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_21(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(20, xla); }
+  }
+
+  private boolean jj_2_22(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_22(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(21, xla); }
+  }
+
+  private boolean jj_2_23(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_23(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(22, xla); }
+  }
+
+  private boolean jj_2_24(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_24(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(23, xla); }
+  }
+
+  private boolean jj_2_25(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_25(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(24, xla); }
+  }
+
+  private boolean jj_2_26(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_26(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(25, xla); }
+  }
+
+  private boolean jj_2_27(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_27(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(26, xla); }
+  }
+
+  private boolean jj_2_28(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_28(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(27, xla); }
+  }
+
+  private boolean jj_2_29(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_29(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(28, xla); }
+  }
+
+  private boolean jj_2_30(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_30(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(29, xla); }
+  }
+
+  private boolean jj_2_31(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_31(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(30, xla); }
+  }
+
+  private boolean jj_2_32(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_32(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(31, xla); }
+  }
+
+  private boolean jj_2_33(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_33(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(32, xla); }
+  }
+
+  private boolean jj_2_34(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_34(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(33, xla); }
+  }
+
+  private boolean jj_2_35(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_35(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(34, xla); }
+  }
+
+  private boolean jj_2_36(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_36(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(35, xla); }
+  }
+
+  private boolean jj_2_37(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_37(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(36, xla); }
+  }
+
+  private boolean jj_2_38(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_38(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(37, xla); }
+  }
+
+  private boolean jj_2_39(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_39(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(38, xla); }
+  }
+
+  private boolean jj_2_40(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_40(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(39, xla); }
+  }
+
+  private boolean jj_2_41(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_41(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(40, xla); }
+  }
+
+  private boolean jj_2_42(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_42(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(41, xla); }
+  }
+
+  private boolean jj_2_43(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_43(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(42, xla); }
+  }
+
+  private boolean jj_2_44(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_44(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(43, xla); }
+  }
+
+  private boolean jj_2_45(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_45(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(44, xla); }
+  }
+
+  private boolean jj_2_46(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_46(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(45, xla); }
+  }
+
+  private boolean jj_2_47(int xla) {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return !jj_3_47(); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(46, xla); }
+  }
+
+  private boolean jj_3R_172() {
+    if (jj_3R_168()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_207()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_294() {
+    if (jj_3R_133()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_25()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_422() {
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_155() {
+    if (jj_3R_94()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_201()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_424() {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_437()) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_438()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3_24() {
+    if (jj_3R_107()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_174()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_88() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_421() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_423() {
+    if (jj_3R_436()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_388() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_172()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_361() {
+    if (jj_scan_token(TRY)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_423()) jj_scanpos = xsp;
+    if (jj_3R_128()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_424()) {
+    jj_scanpos = xsp;
+    if (jj_3R_425()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_154() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_302() {
+    if (jj_3R_87()) return true;
+    if (jj_3R_172()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_388()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_104() {
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_154()) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3_24()) {
+    jj_scanpos = xsp;
+    if (jj_3R_155()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_241() {
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_420() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_106() {
+    if (jj_scan_token(DECR)) return true;
+    return false;
+  }
+
+  private boolean jj_3_23() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_105()) {
+    jj_scanpos = xsp;
+    if (jj_3R_106()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_105() {
+    if (jj_scan_token(INCR)) return true;
+    return false;
+  }
+
+  private boolean jj_3_5() {
+    if (jj_3R_87()) return true;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_88()) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_scan_token(88)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(91)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(87)) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_86() {
+    if (jj_3R_125()) return true;
+    return false;
+  }
+
+  private boolean jj_3_22() {
+    if (jj_3R_104()) return true;
+    return false;
+  }
+
+  private boolean jj_3_4() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_86()) jj_scanpos = xsp;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_216() {
+    if (jj_3R_245()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_267() {
+    if (jj_3R_294()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_23()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_277() {
+    if (jj_3R_303()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_360() {
+    if (jj_scan_token(SYNCHRONIZED)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_100()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_128()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_271() {
+    if (jj_scan_token(_DEFAULT)) return true;
+    if (jj_3R_116()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_276() {
+    if (jj_3R_302()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_235() {
+    if (jj_3R_104()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_236() {
+    if (jj_3R_267()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_266() {
+    if (jj_scan_token(BANG)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_275() {
+    if (jj_3R_301()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_265() {
+    if (jj_scan_token(TILDE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_274() {
+    if (jj_3R_300()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_234() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_265()) {
+    jj_scanpos = xsp;
+    if (jj_3R_266()) return true;
+    }
+    if (jj_3R_174()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_273() {
+    if (jj_3R_299()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_272() {
+    if (jj_3R_298()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_359() {
+    if (jj_scan_token(THROW)) return true;
+    if (jj_3R_100()) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_201() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_234()) {
+    jj_scanpos = xsp;
+    if (jj_3R_235()) {
+    jj_scanpos = xsp;
+    if (jj_3R_236()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_358() {
+    if (jj_scan_token(RETURN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_422()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_461() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_240() {
+    if (jj_3R_116()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_271()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_272()) {
+    jj_scanpos = xsp;
+    if (jj_3R_273()) {
+    jj_scanpos = xsp;
+    if (jj_3R_274()) {
+    jj_scanpos = xsp;
+    if (jj_3R_275()) {
+    jj_scanpos = xsp;
+    if (jj_3R_276()) {
+    jj_scanpos = xsp;
+    if (jj_3R_277()) return true;
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_242() {
+    if (jj_scan_token(DECR)) return true;
+    if (jj_3R_174()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_357() {
+    if (jj_scan_token(CONTINUE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_421()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3_6() {
+    if (jj_3R_89()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_417() {
+    if (jj_scan_token(ELSE)) return true;
+    if (jj_3R_306()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_118() {
+    if (jj_scan_token(INCR)) return true;
+    if (jj_3R_174()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_435() {
+    if (jj_3R_452()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_211() {
+    if (jj_3R_201()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_206() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_6()) {
+    jj_scanpos = xsp;
+    if (jj_3R_240()) {
+    jj_scanpos = xsp;
+    if (jj_3R_241()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_356() {
+    if (jj_scan_token(BREAK)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_420()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_171() {
+    if (jj_3R_206()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_452() {
+    if (jj_3R_459()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_279() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_244() {
+    if (jj_scan_token(MINUS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_113() {
+    if (jj_scan_token(LBRACE)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_171()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_305() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_243() {
+    if (jj_scan_token(PLUS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_210() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_243()) {
+    jj_scanpos = xsp;
+    if (jj_3R_244()) return true;
+    }
+    if (jj_3R_174()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_209() {
+    if (jj_3R_242()) return true;
+    return false;
+  }
+
+  private boolean jj_3_41() {
+    if (jj_3R_116()) return true;
+    if (jj_3R_87()) return true;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_208() {
+    if (jj_3R_118()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_280() {
+    if (jj_scan_token(BIT_AND)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_305()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_198()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_459() {
+    if (jj_3R_100()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_461()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_245() {
+    if (jj_scan_token(EXTENDS)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_279()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_198()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_280()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_458() {
+    if (jj_3R_459()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_434() {
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_457() {
+    if (jj_3R_117()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_174() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_208()) {
+    jj_scanpos = xsp;
+    if (jj_3R_209()) {
+    jj_scanpos = xsp;
+    if (jj_3R_210()) {
+    jj_scanpos = xsp;
+    if (jj_3R_211()) return true;
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_430() {
+    if (jj_scan_token(REM)) return true;
+    return false;
+  }
+
+  private boolean jj_3_3() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_85()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_429() {
+    if (jj_scan_token(SLASH)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_182() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_216()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_428() {
+    if (jj_scan_token(STAR)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_451() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_457()) {
+    jj_scanpos = xsp;
+    if (jj_3R_458()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_412() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_428()) {
+    jj_scanpos = xsp;
+    if (jj_3R_429()) {
+    jj_scanpos = xsp;
+    if (jj_3R_430()) return true;
+    }
+    }
+    if (jj_3R_174()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_217() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_408() {
+    if (jj_3R_113()) return true;
+    return false;
+  }
+
+  private boolean jj_3_40() {
+    if (jj_3R_117()) return true;
+    if (jj_scan_token(COLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_376() {
+    if (jj_3R_174()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_412()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_183() {
+    if (jj_scan_token(COMMA)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_217()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_182()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_181() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_433() {
+    if (jj_3R_451()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_414() {
+    if (jj_scan_token(MINUS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_413() {
+    if (jj_scan_token(PLUS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_125() {
+    if (jj_scan_token(LT)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_181()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_182()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_183()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(GT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_419() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_433()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_434()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_435()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_402() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_413()) {
+    jj_scanpos = xsp;
+    if (jj_3R_414()) return true;
+    }
+    if (jj_3R_376()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_418() {
+    if (jj_3R_117()) return true;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_372() {
+    if (jj_3R_376()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_402()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_355() {
+    if (jj_scan_token(FOR)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_418()) {
+    jj_scanpos = xsp;
+    if (jj_3R_419()) return true;
+    }
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_306()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_407() {
+    if (jj_3R_187()) return true;
+    return false;
+  }
+
+  private boolean jj_3_21() {
+    if (jj_3R_103()) return true;
+    return false;
+  }
+
+  private boolean jj_3_20() {
+    if (jj_3R_102()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_124() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_101() {
+    if (jj_scan_token(LSHIFT)) return true;
+    return false;
+  }
+
+  private boolean jj_3_19() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_101()) {
+    jj_scanpos = xsp;
+    if (jj_3_20()) {
+    jj_scanpos = xsp;
+    if (jj_3_21()) return true;
+    }
+    }
+    if (jj_3R_372()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_85() {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_124()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(IDENTIFIER)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_407()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_408()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_398() {
+    if (jj_3R_206()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_373() {
+    if (jj_scan_token(INSTANCEOF)) return true;
+    if (jj_3R_87()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_354() {
+    if (jj_scan_token(DO)) return true;
+    if (jj_3R_306()) return true;
+    if (jj_scan_token(WHILE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_100()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_370() {
+    if (jj_3R_372()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_19()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_383() {
+    if (jj_scan_token(SEMICOLON)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_398()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_395() {
+    if (jj_scan_token(GE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_394() {
+    if (jj_scan_token(LE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_393() {
+    if (jj_scan_token(GT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_392() {
+    if (jj_scan_token(LT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_377() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_392()) {
+    jj_scanpos = xsp;
+    if (jj_3R_393()) {
+    jj_scanpos = xsp;
+    if (jj_3R_394()) {
+    jj_scanpos = xsp;
+    if (jj_3R_395()) return true;
+    }
+    }
+    }
+    if (jj_3R_370()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_353() {
+    if (jj_scan_token(WHILE)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_100()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_306()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_382() {
+    if (jj_3R_85()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_3()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_368() {
+    if (jj_3R_370()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_377()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_381() {
+    if (jj_3R_397()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_369() {
+    if (jj_scan_token(BIT_AND)) return true;
+    if (jj_3R_345()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_299() {
+    if (jj_scan_token(ENUM)) return true;
+    if (jj_3R_119()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_381()) jj_scanpos = xsp;
+    if (jj_scan_token(LBRACE)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_382()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(88)) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_383()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_364() {
+    if (jj_3R_368()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_373()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_352() {
+    if (jj_scan_token(IF)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_100()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_306()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_417()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_405() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_375() {
+    if (jj_scan_token(NE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_374() {
+    if (jj_scan_token(EQ)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_371() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_374()) {
+    jj_scanpos = xsp;
+    if (jj_3R_375()) return true;
+    }
+    if (jj_3R_364()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_365() {
+    if (jj_scan_token(XOR)) return true;
+    if (jj_3R_315()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_346() {
+    if (jj_scan_token(BIT_OR)) return true;
+    if (jj_3R_293()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_406() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_198()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_345() {
+    if (jj_3R_364()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_371()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_450() {
+    if (jj_scan_token(_DEFAULT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_449() {
+    if (jj_scan_token(CASE)) return true;
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_397() {
+    if (jj_scan_token(IMPLEMENTS)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_405()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_198()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_406()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_403() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_316() {
+    if (jj_scan_token(SC_AND)) return true;
+    if (jj_3R_264()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_315() {
+    if (jj_3R_345()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_369()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_432() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_449()) {
+    jj_scanpos = xsp;
+    if (jj_3R_450()) return true;
+    }
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_184()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_295() {
+    if (jj_scan_token(SC_OR)) return true;
+    if (jj_3R_233()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_404() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_198()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_396() {
+    if (jj_scan_token(EXTENDS)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_403()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_198()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_404()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_293() {
+    if (jj_3R_315()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_365()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_416() {
+    if (jj_3R_432()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_351() {
+    if (jj_scan_token(SWITCH)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_100()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_scan_token(LBRACE)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_416()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_319() {
+    if (jj_scan_token(INTERFACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_264() {
+    if (jj_3R_293()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_346()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_380() {
+    if (jj_3R_397()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_173() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_172()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_379() {
+    if (jj_3R_396()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_378() {
+    if (jj_3R_125()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_456() {
+    if (jj_3R_125()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_233() {
+    if (jj_3R_264()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_316()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_298() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(20)) {
+    jj_scanpos = xsp;
+    if (jj_3R_319()) return true;
+    }
+    if (jj_3R_119()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_378()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_379()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_380()) jj_scanpos = xsp;
+    if (jj_3R_113()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_448() {
+    if (jj_scan_token(ARROW)) return true;
+    if (jj_3R_296()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_447() {
+    if (jj_scan_token(DOUBLECOLON)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_456()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(78)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(43)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_446() {
+    if (jj_3R_99()) return true;
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_445() {
+    if (jj_scan_token(DECR)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_200() {
+    if (jj_3R_233()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_295()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_444() {
+    if (jj_scan_token(INCR)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_431() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_444()) {
+    jj_scanpos = xsp;
+    if (jj_3R_445()) {
+    jj_scanpos = xsp;
+    if (jj_3R_446()) {
+    jj_scanpos = xsp;
+    if (jj_3R_447()) {
+    jj_scanpos = xsp;
+    if (jj_3R_448()) return true;
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_367() {
+    if (jj_3R_294()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_431()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_366() {
+    if (jj_3R_242()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_268() {
+    if (jj_scan_token(HOOK)) return true;
+    if (jj_3R_100()) return true;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_151()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_151() {
+    if (jj_3R_200()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_268()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3_39() {
+    if (jj_3R_118()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_350() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_39()) {
+    jj_scanpos = xsp;
+    if (jj_3R_366()) {
+    jj_scanpos = xsp;
+    if (jj_3R_367()) return true;
+    }
+    }
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_150() {
+    if (jj_scan_token(ORASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_149() {
+    if (jj_scan_token(XORASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_148() {
+    if (jj_scan_token(ANDASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_147() {
+    if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_146() {
+    if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_145() {
+    if (jj_scan_token(LSHIFTASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_144() {
+    if (jj_scan_token(MINUSASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_143() {
+    if (jj_scan_token(PLUSASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_142() {
+    if (jj_scan_token(REMASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_141() {
+    if (jj_scan_token(SLASHASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_140() {
+    if (jj_scan_token(STARASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_139() {
+    if (jj_scan_token(ASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_318() {
+    if (jj_3R_128()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_99() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_139()) {
+    jj_scanpos = xsp;
+    if (jj_3R_140()) {
+    jj_scanpos = xsp;
+    if (jj_3R_141()) {
+    jj_scanpos = xsp;
+    if (jj_3R_142()) {
+    jj_scanpos = xsp;
+    if (jj_3R_143()) {
+    jj_scanpos = xsp;
+    if (jj_3R_144()) {
+    jj_scanpos = xsp;
+    if (jj_3R_145()) {
+    jj_scanpos = xsp;
+    if (jj_3R_146()) {
+    jj_scanpos = xsp;
+    if (jj_3R_147()) {
+    jj_scanpos = xsp;
+    if (jj_3R_148()) {
+    jj_scanpos = xsp;
+    if (jj_3R_149()) {
+    jj_scanpos = xsp;
+    if (jj_3R_150()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_84() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_83() {
+    if (jj_scan_token(STRICTFP)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_297() {
+    if (jj_3R_125()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_317() {
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_82() {
+    if (jj_scan_token(VOLATILE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_81() {
+    if (jj_scan_token(TRANSIENT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_114() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_80() {
+    if (jj_scan_token(NATIVE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_79() {
+    if (jj_scan_token(SYNCHRONIZED)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_270() {
+    if (jj_scan_token(DOUBLECOLON)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_297()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(78)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(43)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_296() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_317()) {
+    jj_scanpos = xsp;
+    if (jj_3R_318()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_78() {
+    if (jj_scan_token(ABSTRACT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_415() {
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_100()) return true;
+    return false;
+  }
 
-    private boolean jj_2_5(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_5();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(4, xla);
-        }
-    }
-
-    private boolean jj_2_6(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_6();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(5, xla);
-        }
-    }
-
-    private boolean jj_2_7(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_7();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(6, xla);
-        }
-    }
-
-    private boolean jj_2_8(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_8();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(7, xla);
-        }
-    }
-
-    private boolean jj_2_9(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_9();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(8, xla);
-        }
-    }
-
-    private boolean jj_2_10(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_10();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(9, xla);
-        }
-    }
-
-    private boolean jj_2_11(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_11();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(10, xla);
-        }
-    }
-
-    private boolean jj_2_12(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_12();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(11, xla);
-        }
-    }
-
-    private boolean jj_2_13(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_13();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(12, xla);
-        }
-    }
-
-    private boolean jj_2_14(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_14();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(13, xla);
-        }
-    }
-
-    private boolean jj_2_15(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_15();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(14, xla);
-        }
-    }
-
-    private boolean jj_2_16(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_16();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(15, xla);
-        }
-    }
-
-    private boolean jj_2_17(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_17();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(16, xla);
-        }
-    }
-
-    private boolean jj_2_18(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_18();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(17, xla);
-        }
-    }
-
-    private boolean jj_2_19(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_19();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(18, xla);
-        }
-    }
-
-    private boolean jj_2_20(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_20();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(19, xla);
-        }
-    }
-
-    private boolean jj_2_21(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_21();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(20, xla);
-        }
-    }
-
-    private boolean jj_2_22(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_22();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(21, xla);
-        }
-    }
-
-    private boolean jj_2_23(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_23();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(22, xla);
-        }
-    }
-
-    private boolean jj_2_24(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_24();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(23, xla);
-        }
-    }
-
-    private boolean jj_2_25(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_25();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(24, xla);
-        }
-    }
-
-    private boolean jj_2_26(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_26();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(25, xla);
-        }
-    }
-
-    private boolean jj_2_27(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_27();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(26, xla);
-        }
-    }
-
-    private boolean jj_2_28(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_28();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(27, xla);
-        }
-    }
-
-    private boolean jj_2_29(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_29();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(28, xla);
-        }
-    }
-
-    private boolean jj_2_30(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_30();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(29, xla);
-        }
-    }
-
-    private boolean jj_2_31(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_31();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(30, xla);
-        }
-    }
-
-    private boolean jj_2_32(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_32();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(31, xla);
-        }
-    }
-
-    private boolean jj_2_33(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_33();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(32, xla);
-        }
-    }
-
-    private boolean jj_2_34(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_34();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(33, xla);
-        }
-    }
-
-    private boolean jj_2_35(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_35();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(34, xla);
-        }
-    }
-
-    private boolean jj_2_36(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_36();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(35, xla);
-        }
-    }
-
-    private boolean jj_2_37(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_37();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(36, xla);
-        }
-    }
-
-    private boolean jj_2_38(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_38();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(37, xla);
-        }
-    }
-
-    private boolean jj_2_39(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_39();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(38, xla);
-        }
-    }
-
-    private boolean jj_2_40(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_40();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(39, xla);
-        }
-    }
-
-    private boolean jj_2_41(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_41();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(40, xla);
-        }
-    }
-
-    private boolean jj_2_42(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_42();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(41, xla);
-        }
-    }
-
-    private boolean jj_2_43(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_43();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(42, xla);
-        }
-    }
-
-    private boolean jj_2_44(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_44();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(43, xla);
-        }
-    }
-
-    private boolean jj_2_45(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_45();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(44, xla);
-        }
-    }
+  private boolean jj_3R_77() {
+    if (jj_scan_token(FINAL)) return true;
+    return false;
+  }
 
-    private boolean jj_2_46(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_46();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(45, xla);
-        }
-    }
+  private boolean jj_3R_76() {
+    if (jj_scan_token(PRIVATE)) return true;
+    return false;
+  }
 
-    private boolean jj_2_47(int xla) {
-        jj_la = xla;
-        jj_lastpos = jj_scanpos = token;
-        try {
-            return !jj_3_47();
-        } catch (LookaheadSuccess ls) {
-            return true;
-        } finally {
-            jj_save(46, xla);
-        }
+  private boolean jj_3R_75() {
+    if (jj_scan_token(PROTECTED)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_74() {
+    if (jj_scan_token(STATIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_349() {
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3_34() {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_114()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_73() {
+    if (jj_scan_token(PUBLIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3_2() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_73()) {
+    jj_scanpos = xsp;
+    if (jj_3R_74()) {
+    jj_scanpos = xsp;
+    if (jj_3R_75()) {
+    jj_scanpos = xsp;
+    if (jj_3R_76()) {
+    jj_scanpos = xsp;
+    if (jj_3R_77()) {
+    jj_scanpos = xsp;
+    if (jj_3R_78()) {
+    jj_scanpos = xsp;
+    if (jj_3R_79()) {
+    jj_scanpos = xsp;
+    if (jj_3R_80()) {
+    jj_scanpos = xsp;
+    if (jj_3R_81()) {
+    jj_scanpos = xsp;
+    if (jj_3R_82()) {
+    jj_scanpos = xsp;
+    if (jj_3R_83()) {
+    jj_scanpos = xsp;
+    if (jj_3R_84()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_116() {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_2()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3_18() {
+    if (jj_3R_99()) return true;
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_269() {
+    if (jj_scan_token(ARROW)) return true;
+    if (jj_3R_296()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_411() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_119()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_239() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_18()) {
+    jj_scanpos = xsp;
+    if (jj_3R_269()) {
+    jj_scanpos = xsp;
+    if (jj_3R_270()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3_38() {
+    if (jj_3R_117()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_117() {
+    if (jj_3R_116()) return true;
+    if (jj_3R_87()) return true;
+    if (jj_3R_172()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_173()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_100() {
+    if (jj_3R_151()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_239()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3_37() {
+    if (jj_3R_116()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(20)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(40)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_283() {
+    if (jj_3R_306()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_282() {
+    if (jj_3R_117()) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_281() {
+    if (jj_3R_116()) return true;
+    if (jj_3R_298()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_246() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_281()) {
+    jj_scanpos = xsp;
+    if (jj_3R_282()) {
+    jj_scanpos = xsp;
+    if (jj_3R_283()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_122() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_72() {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_122()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(PACKAGE)) return true;
+    if (jj_3R_119()) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3_1() {
+    if (jj_3R_72()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_401() {
+    if (jj_3R_119()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_411()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_128() {
+    if (jj_scan_token(LBRACE)) return true;
+    if (jj_3R_184()) return true;
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_227() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_115() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_scan_token(COLON)) return true;
+    if (jj_3R_306()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_348() {
+    if (jj_scan_token(ASSERT)) return true;
+    if (jj_3R_100()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_415()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3_17() {
+    if (jj_scan_token(DOT)) return true;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_119() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_17()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_339() {
+    if (jj_3R_361()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_338() {
+    if (jj_3R_360()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_337() {
+    if (jj_3R_359()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_170() {
+    if (jj_3R_87()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_336() {
+    if (jj_3R_358()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_169() {
+    if (jj_scan_token(VOID)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_335() {
+    if (jj_3R_357()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_334() {
+    if (jj_3R_356()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_333() {
+    if (jj_3R_355()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_332() {
+    if (jj_3R_354()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_331() {
+    if (jj_3R_353()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_111() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_169()) {
+    jj_scanpos = xsp;
+    if (jj_3R_170()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_330() {
+    if (jj_3R_352()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_329() {
+    if (jj_3R_351()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_328() {
+    if (jj_3R_350()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_327() {
+    if (jj_3R_349()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_326() {
+    if (jj_3R_128()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_163() {
+    if (jj_scan_token(DOUBLE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_325() {
+    if (jj_3R_348()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_162() {
+    if (jj_scan_token(FLOAT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_161() {
+    if (jj_scan_token(LONG)) return true;
+    return false;
+  }
+
+  private boolean jj_3_36() {
+    if (jj_3R_115()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_160() {
+    if (jj_scan_token(INT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_363() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_159() {
+    if (jj_scan_token(SHORT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_362() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_158() {
+    if (jj_scan_token(BYTE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_157() {
+    if (jj_scan_token(CHAR)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_156() {
+    if (jj_scan_token(BOOLEAN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_306() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_36()) {
+    jj_scanpos = xsp;
+    if (jj_3R_325()) {
+    jj_scanpos = xsp;
+    if (jj_3R_326()) {
+    jj_scanpos = xsp;
+    if (jj_3R_327()) {
+    jj_scanpos = xsp;
+    if (jj_3R_328()) {
+    jj_scanpos = xsp;
+    if (jj_3R_329()) {
+    jj_scanpos = xsp;
+    if (jj_3R_330()) {
+    jj_scanpos = xsp;
+    if (jj_3R_331()) {
+    jj_scanpos = xsp;
+    if (jj_3R_332()) {
+    jj_scanpos = xsp;
+    if (jj_3R_333()) {
+    jj_scanpos = xsp;
+    if (jj_3R_334()) {
+    jj_scanpos = xsp;
+    if (jj_3R_335()) {
+    jj_scanpos = xsp;
+    if (jj_3R_336()) {
+    jj_scanpos = xsp;
+    if (jj_3R_337()) {
+    jj_scanpos = xsp;
+    if (jj_3R_338()) {
+    jj_scanpos = xsp;
+    if (jj_3R_339()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_344() {
+    if (jj_scan_token(SUPER)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_363()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_94()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_107() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_156()) {
+    jj_scanpos = xsp;
+    if (jj_3R_157()) {
+    jj_scanpos = xsp;
+    if (jj_3R_158()) {
+    jj_scanpos = xsp;
+    if (jj_3R_159()) {
+    jj_scanpos = xsp;
+    if (jj_3R_160()) {
+    jj_scanpos = xsp;
+    if (jj_3R_161()) {
+    jj_scanpos = xsp;
+    if (jj_3R_162()) {
+    jj_scanpos = xsp;
+    if (jj_3R_163()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_342() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_343() {
+    if (jj_scan_token(EXTENDS)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_362()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_94()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_314() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_343()) {
+    jj_scanpos = xsp;
+    if (jj_3R_344()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_312() {
+    Token xsp;
+    if (jj_3R_342()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_342()) { jj_scanpos = xsp; break; }
     }
+    if (jj_3R_185()) return true;
+    return false;
+  }
 
-    private boolean jj_3R_172() {
-        if (jj_3R_168()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_207()) jj_scanpos = xsp;
-        return false;
-    }
+  private boolean jj_3_33() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_100()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
 
-    private boolean jj_3R_294() {
-        if (jj_3R_133()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_25()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_422() {
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_155() {
-        if (jj_3R_94()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_201()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_424() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_437()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        xsp = jj_scanpos;
-        if (jj_3R_438()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3_24() {
-        if (jj_3R_107()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_174()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_88() {
-        if (jj_scan_token(LBRACKET)) return true;
-        if (jj_scan_token(RBRACKET)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_421() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_423() {
-        if (jj_3R_436()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_388() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_172()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_361() {
-        if (jj_scan_token(TRY)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_423()) jj_scanpos = xsp;
-        if (jj_3R_128()) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_424()) {
-            jj_scanpos = xsp;
-            if (jj_3R_425()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_154() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_302() {
-        if (jj_3R_87()) return true;
-        if (jj_3R_172()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_388()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_104() {
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_154()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        xsp = jj_scanpos;
-        if (jj_3_24()) {
-            jj_scanpos = xsp;
-            if (jj_3R_155()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_241() {
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_420() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_106() {
-        if (jj_scan_token(DECR)) return true;
-        return false;
-    }
-
-    private boolean jj_3_23() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_105()) {
-            jj_scanpos = xsp;
-            if (jj_3R_106()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_105() {
-        if (jj_scan_token(INCR)) return true;
-        return false;
-    }
-
-    private boolean jj_3_5() {
-        if (jj_3R_87()) return true;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_88()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        xsp = jj_scanpos;
-        if (jj_scan_token(88)) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(91)) {
-                jj_scanpos = xsp;
-                if (jj_scan_token(87)) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_86() {
-        if (jj_3R_125()) return true;
-        return false;
-    }
-
-    private boolean jj_3_22() {
-        if (jj_3R_104()) return true;
-        return false;
-    }
-
-    private boolean jj_3_4() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_86()) jj_scanpos = xsp;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_216() {
-        if (jj_3R_245()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_267() {
-        if (jj_3R_294()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_23()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_277() {
-        if (jj_3R_303()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_360() {
-        if (jj_scan_token(SYNCHRONIZED)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_100()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_128()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_271() {
-        if (jj_scan_token(_DEFAULT)) return true;
-        if (jj_3R_116()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_276() {
-        if (jj_3R_302()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_235() {
-        if (jj_3R_104()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_236() {
-        if (jj_3R_267()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_266() {
-        if (jj_scan_token(BANG)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_275() {
-        if (jj_3R_301()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_265() {
-        if (jj_scan_token(TILDE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_274() {
-        if (jj_3R_300()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_234() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_265()) {
-            jj_scanpos = xsp;
-            if (jj_3R_266()) return true;
-        }
-        if (jj_3R_174()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_273() {
-        if (jj_3R_299()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_272() {
-        if (jj_3R_298()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_359() {
-        if (jj_scan_token(THROW)) return true;
-        if (jj_3R_100()) return true;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_201() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_234()) {
-            jj_scanpos = xsp;
-            if (jj_3R_235()) {
-                jj_scanpos = xsp;
-                if (jj_3R_236()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_358() {
-        if (jj_scan_token(RETURN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_422()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_461() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_240() {
-        if (jj_3R_116()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_271()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_272()) {
-            jj_scanpos = xsp;
-            if (jj_3R_273()) {
-                jj_scanpos = xsp;
-                if (jj_3R_274()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_275()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_276()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_277()) return true;
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_242() {
-        if (jj_scan_token(DECR)) return true;
-        if (jj_3R_174()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_357() {
-        if (jj_scan_token(CONTINUE)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_421()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3_6() {
-        if (jj_3R_89()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_417() {
-        if (jj_scan_token(ELSE)) return true;
-        if (jj_3R_306()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_118() {
-        if (jj_scan_token(INCR)) return true;
-        if (jj_3R_174()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_435() {
-        if (jj_3R_452()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_211() {
-        if (jj_3R_201()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_206() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_6()) {
-            jj_scanpos = xsp;
-            if (jj_3R_240()) {
-                jj_scanpos = xsp;
-                if (jj_3R_241()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_356() {
-        if (jj_scan_token(BREAK)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_420()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_171() {
-        if (jj_3R_206()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_452() {
-        if (jj_3R_459()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_279() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_244() {
-        if (jj_scan_token(MINUS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_113() {
-        if (jj_scan_token(LBRACE)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_171()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_305() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_243() {
-        if (jj_scan_token(PLUS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_210() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_243()) {
-            jj_scanpos = xsp;
-            if (jj_3R_244()) return true;
-        }
-        if (jj_3R_174()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_209() {
-        if (jj_3R_242()) return true;
-        return false;
-    }
-
-    private boolean jj_3_41() {
-        if (jj_3R_116()) return true;
-        if (jj_3R_87()) return true;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_208() {
-        if (jj_3R_118()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_280() {
-        if (jj_scan_token(BIT_AND)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_305()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_3R_198()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_459() {
-        if (jj_3R_100()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_461()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_245() {
-        if (jj_scan_token(EXTENDS)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_279()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_3R_198()) return true;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_280()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_458() {
-        if (jj_3R_459()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_434() {
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_457() {
-        if (jj_3R_117()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_174() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_208()) {
-            jj_scanpos = xsp;
-            if (jj_3R_209()) {
-                jj_scanpos = xsp;
-                if (jj_3R_210()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_211()) return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_430() {
-        if (jj_scan_token(REM)) return true;
-        return false;
-    }
-
-    private boolean jj_3_3() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_85()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_429() {
-        if (jj_scan_token(SLASH)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_182() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_216()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_428() {
-        if (jj_scan_token(STAR)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_451() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_457()) {
-            jj_scanpos = xsp;
-            if (jj_3R_458()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_412() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_428()) {
-            jj_scanpos = xsp;
-            if (jj_3R_429()) {
-                jj_scanpos = xsp;
-                if (jj_3R_430()) return true;
-            }
-        }
-        if (jj_3R_174()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_217() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_408() {
-        if (jj_3R_113()) return true;
-        return false;
-    }
-
-    private boolean jj_3_40() {
-        if (jj_3R_117()) return true;
-        if (jj_scan_token(COLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_376() {
-        if (jj_3R_174()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_412()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_183() {
-        if (jj_scan_token(COMMA)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_217()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_3R_182()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_181() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_433() {
-        if (jj_3R_451()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_414() {
-        if (jj_scan_token(MINUS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_413() {
-        if (jj_scan_token(PLUS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_125() {
-        if (jj_scan_token(LT)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_181()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_3R_182()) return true;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_183()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(GT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_419() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_433()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_434()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_435()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_402() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_413()) {
-            jj_scanpos = xsp;
-            if (jj_3R_414()) return true;
-        }
-        if (jj_3R_376()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_418() {
-        if (jj_3R_117()) return true;
-        if (jj_scan_token(COLON)) return true;
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_372() {
-        if (jj_3R_376()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_402()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_355() {
-        if (jj_scan_token(FOR)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_418()) {
-            jj_scanpos = xsp;
-            if (jj_3R_419()) return true;
-        }
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_306()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_407() {
-        if (jj_3R_187()) return true;
-        return false;
-    }
-
-    private boolean jj_3_21() {
-        if (jj_3R_103()) return true;
-        return false;
-    }
-
-    private boolean jj_3_20() {
-        if (jj_3R_102()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_124() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_101() {
-        if (jj_scan_token(LSHIFT)) return true;
-        return false;
-    }
-
-    private boolean jj_3_19() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_101()) {
-            jj_scanpos = xsp;
-            if (jj_3_20()) {
-                jj_scanpos = xsp;
-                if (jj_3_21()) return true;
-            }
-        }
-        if (jj_3R_372()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_85() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_124()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(IDENTIFIER)) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_407()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_408()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_398() {
-        if (jj_3R_206()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_373() {
-        if (jj_scan_token(INSTANCEOF)) return true;
-        if (jj_3R_87()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_354() {
-        if (jj_scan_token(DO)) return true;
-        if (jj_3R_306()) return true;
-        if (jj_scan_token(WHILE)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_100()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_370() {
-        if (jj_3R_372()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_19()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_383() {
-        if (jj_scan_token(SEMICOLON)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_398()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_395() {
-        if (jj_scan_token(GE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_394() {
-        if (jj_scan_token(LE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_393() {
-        if (jj_scan_token(GT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_392() {
-        if (jj_scan_token(LT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_377() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_392()) {
-            jj_scanpos = xsp;
-            if (jj_3R_393()) {
-                jj_scanpos = xsp;
-                if (jj_3R_394()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_395()) return true;
-                }
-            }
-        }
-        if (jj_3R_370()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_353() {
-        if (jj_scan_token(WHILE)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_100()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_306()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_382() {
-        if (jj_3R_85()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_3()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_368() {
-        if (jj_3R_370()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_377()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_381() {
-        if (jj_3R_397()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_369() {
-        if (jj_scan_token(BIT_AND)) return true;
-        if (jj_3R_345()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_299() {
-        if (jj_scan_token(ENUM)) return true;
-        if (jj_3R_119()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_381()) jj_scanpos = xsp;
-        if (jj_scan_token(LBRACE)) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_382()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(88)) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_383()) jj_scanpos = xsp;
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_364() {
-        if (jj_3R_368()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_373()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_352() {
-        if (jj_scan_token(IF)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_100()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_306()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_417()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_405() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_375() {
-        if (jj_scan_token(NE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_374() {
-        if (jj_scan_token(EQ)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_371() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_374()) {
-            jj_scanpos = xsp;
-            if (jj_3R_375()) return true;
-        }
-        if (jj_3R_364()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_365() {
-        if (jj_scan_token(XOR)) return true;
-        if (jj_3R_315()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_346() {
-        if (jj_scan_token(BIT_OR)) return true;
-        if (jj_3R_293()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_406() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_198()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_345() {
-        if (jj_3R_364()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_371()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_450() {
-        if (jj_scan_token(_DEFAULT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_449() {
-        if (jj_scan_token(CASE)) return true;
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_397() {
-        if (jj_scan_token(IMPLEMENTS)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_405()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_3R_198()) return true;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_406()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_403() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_316() {
-        if (jj_scan_token(SC_AND)) return true;
-        if (jj_3R_264()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_315() {
-        if (jj_3R_345()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_369()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_432() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_449()) {
-            jj_scanpos = xsp;
-            if (jj_3R_450()) return true;
-        }
-        if (jj_scan_token(COLON)) return true;
-        if (jj_3R_184()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_295() {
-        if (jj_scan_token(SC_OR)) return true;
-        if (jj_3R_233()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_404() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_198()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_396() {
-        if (jj_scan_token(EXTENDS)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_403()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_3R_198()) return true;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_404()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_293() {
-        if (jj_3R_315()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_365()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_416() {
-        if (jj_3R_432()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_351() {
-        if (jj_scan_token(SWITCH)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_100()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_scan_token(LBRACE)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_416()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_319() {
-        if (jj_scan_token(INTERFACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_264() {
-        if (jj_3R_293()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_346()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_380() {
-        if (jj_3R_397()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_173() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_172()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_379() {
-        if (jj_3R_396()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_378() {
-        if (jj_3R_125()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_456() {
-        if (jj_3R_125()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_233() {
-        if (jj_3R_264()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_316()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_298() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(20)) {
-            jj_scanpos = xsp;
-            if (jj_3R_319()) return true;
-        }
-        if (jj_3R_119()) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_378()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_379()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_380()) jj_scanpos = xsp;
-        if (jj_3R_113()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_448() {
-        if (jj_scan_token(ARROW)) return true;
-        if (jj_3R_296()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_447() {
-        if (jj_scan_token(DOUBLECOLON)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_456()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(78)) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(43)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_446() {
-        if (jj_3R_99()) return true;
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_445() {
-        if (jj_scan_token(DECR)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_200() {
-        if (jj_3R_233()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_295()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_444() {
-        if (jj_scan_token(INCR)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_431() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_444()) {
-            jj_scanpos = xsp;
-            if (jj_3R_445()) {
-                jj_scanpos = xsp;
-                if (jj_3R_446()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_447()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_448()) return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_367() {
-        if (jj_3R_294()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_431()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_366() {
-        if (jj_3R_242()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_268() {
-        if (jj_scan_token(HOOK)) return true;
-        if (jj_3R_100()) return true;
-        if (jj_scan_token(COLON)) return true;
-        if (jj_3R_151()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_151() {
-        if (jj_3R_200()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_268()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3_39() {
-        if (jj_3R_118()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_350() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_39()) {
-            jj_scanpos = xsp;
-            if (jj_3R_366()) {
-                jj_scanpos = xsp;
-                if (jj_3R_367()) return true;
-            }
-        }
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_150() {
-        if (jj_scan_token(ORASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_149() {
-        if (jj_scan_token(XORASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_148() {
-        if (jj_scan_token(ANDASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_147() {
-        if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_146() {
-        if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_145() {
-        if (jj_scan_token(LSHIFTASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_144() {
-        if (jj_scan_token(MINUSASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_143() {
-        if (jj_scan_token(PLUSASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_142() {
-        if (jj_scan_token(REMASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_141() {
-        if (jj_scan_token(SLASHASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_140() {
-        if (jj_scan_token(STARASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_139() {
-        if (jj_scan_token(ASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_318() {
-        if (jj_3R_128()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_99() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_139()) {
-            jj_scanpos = xsp;
-            if (jj_3R_140()) {
-                jj_scanpos = xsp;
-                if (jj_3R_141()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_142()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_143()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_144()) {
-                                jj_scanpos = xsp;
-                                if (jj_3R_145()) {
-                                    jj_scanpos = xsp;
-                                    if (jj_3R_146()) {
-                                        jj_scanpos = xsp;
-                                        if (jj_3R_147()) {
-                                            jj_scanpos = xsp;
-                                            if (jj_3R_148()) {
-                                                jj_scanpos = xsp;
-                                                if (jj_3R_149()) {
-                                                    jj_scanpos = xsp;
-                                                    if (jj_3R_150()) return true;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_84() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_83() {
-        if (jj_scan_token(STRICTFP)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_297() {
-        if (jj_3R_125()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_317() {
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_82() {
-        if (jj_scan_token(VOLATILE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_81() {
-        if (jj_scan_token(TRANSIENT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_114() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_80() {
-        if (jj_scan_token(NATIVE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_79() {
-        if (jj_scan_token(SYNCHRONIZED)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_270() {
-        if (jj_scan_token(DOUBLECOLON)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_297()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(78)) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(43)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_296() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_317()) {
-            jj_scanpos = xsp;
-            if (jj_3R_318()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_78() {
-        if (jj_scan_token(ABSTRACT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_415() {
-        if (jj_scan_token(COLON)) return true;
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_77() {
-        if (jj_scan_token(FINAL)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_76() {
-        if (jj_scan_token(PRIVATE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_75() {
-        if (jj_scan_token(PROTECTED)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_74() {
-        if (jj_scan_token(STATIC)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_349() {
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3_34() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_114()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(LBRACKET)) return true;
-        if (jj_scan_token(RBRACKET)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_73() {
-        if (jj_scan_token(PUBLIC)) return true;
-        return false;
-    }
-
-    private boolean jj_3_2() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_73()) {
-            jj_scanpos = xsp;
-            if (jj_3R_74()) {
-                jj_scanpos = xsp;
-                if (jj_3R_75()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_76()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_77()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_78()) {
-                                jj_scanpos = xsp;
-                                if (jj_3R_79()) {
-                                    jj_scanpos = xsp;
-                                    if (jj_3R_80()) {
-                                        jj_scanpos = xsp;
-                                        if (jj_3R_81()) {
-                                            jj_scanpos = xsp;
-                                            if (jj_3R_82()) {
-                                                jj_scanpos = xsp;
-                                                if (jj_3R_83()) {
-                                                    jj_scanpos = xsp;
-                                                    if (jj_3R_84()) return true;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_116() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_2()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3_18() {
-        if (jj_3R_99()) return true;
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_269() {
-        if (jj_scan_token(ARROW)) return true;
-        if (jj_3R_296()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_411() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_119()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_239() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_18()) {
-            jj_scanpos = xsp;
-            if (jj_3R_269()) {
-                jj_scanpos = xsp;
-                if (jj_3R_270()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3_38() {
-        if (jj_3R_117()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_117() {
-        if (jj_3R_116()) return true;
-        if (jj_3R_87()) return true;
-        if (jj_3R_172()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_173()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_100() {
-        if (jj_3R_151()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_239()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3_37() {
-        if (jj_3R_116()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(20)) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(40)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_283() {
-        if (jj_3R_306()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_282() {
-        if (jj_3R_117()) return true;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_281() {
-        if (jj_3R_116()) return true;
-        if (jj_3R_298()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_246() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_281()) {
-            jj_scanpos = xsp;
-            if (jj_3R_282()) {
-                jj_scanpos = xsp;
-                if (jj_3R_283()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_122() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_72() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_122()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(PACKAGE)) return true;
-        if (jj_3R_119()) return true;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3_1() {
-        if (jj_3R_72()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_401() {
-        if (jj_3R_119()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_411()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_128() {
-        if (jj_scan_token(LBRACE)) return true;
-        if (jj_3R_184()) return true;
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_227() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_115() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        if (jj_scan_token(COLON)) return true;
-        if (jj_3R_306()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_348() {
-        if (jj_scan_token(ASSERT)) return true;
-        if (jj_3R_100()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_415()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3_17() {
-        if (jj_scan_token(DOT)) return true;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_119() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_17()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_339() {
-        if (jj_3R_361()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_338() {
-        if (jj_3R_360()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_337() {
-        if (jj_3R_359()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_170() {
-        if (jj_3R_87()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_336() {
-        if (jj_3R_358()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_169() {
-        if (jj_scan_token(VOID)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_335() {
-        if (jj_3R_357()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_334() {
-        if (jj_3R_356()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_333() {
-        if (jj_3R_355()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_332() {
-        if (jj_3R_354()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_331() {
-        if (jj_3R_353()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_111() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_169()) {
-            jj_scanpos = xsp;
-            if (jj_3R_170()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_330() {
-        if (jj_3R_352()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_329() {
-        if (jj_3R_351()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_328() {
-        if (jj_3R_350()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_327() {
-        if (jj_3R_349()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_326() {
-        if (jj_3R_128()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_163() {
-        if (jj_scan_token(DOUBLE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_325() {
-        if (jj_3R_348()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_162() {
-        if (jj_scan_token(FLOAT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_161() {
-        if (jj_scan_token(LONG)) return true;
-        return false;
-    }
-
-    private boolean jj_3_36() {
-        if (jj_3R_115()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_160() {
-        if (jj_scan_token(INT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_363() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_159() {
-        if (jj_scan_token(SHORT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_362() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_158() {
-        if (jj_scan_token(BYTE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_157() {
-        if (jj_scan_token(CHAR)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_156() {
-        if (jj_scan_token(BOOLEAN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_306() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_36()) {
-            jj_scanpos = xsp;
-            if (jj_3R_325()) {
-                jj_scanpos = xsp;
-                if (jj_3R_326()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_327()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_328()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_329()) {
-                                jj_scanpos = xsp;
-                                if (jj_3R_330()) {
-                                    jj_scanpos = xsp;
-                                    if (jj_3R_331()) {
-                                        jj_scanpos = xsp;
-                                        if (jj_3R_332()) {
-                                            jj_scanpos = xsp;
-                                            if (jj_3R_333()) {
-                                                jj_scanpos = xsp;
-                                                if (jj_3R_334()) {
-                                                    jj_scanpos = xsp;
-                                                    if (jj_3R_335()) {
-                                                        jj_scanpos = xsp;
-                                                        if (jj_3R_336()) {
-                                                            jj_scanpos = xsp;
-                                                            if (jj_3R_337()) {
-                                                                jj_scanpos = xsp;
-                                                                if (jj_3R_338()) {
-                                                                    jj_scanpos = xsp;
-                                                                    if (jj_3R_339()) return true;
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_344() {
-        if (jj_scan_token(SUPER)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_363()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_3R_94()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_107() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_156()) {
-            jj_scanpos = xsp;
-            if (jj_3R_157()) {
-                jj_scanpos = xsp;
-                if (jj_3R_158()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_159()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_160()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_161()) {
-                                jj_scanpos = xsp;
-                                if (jj_3R_162()) {
-                                    jj_scanpos = xsp;
-                                    if (jj_3R_163()) return true;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_342() {
-        if (jj_scan_token(LBRACKET)) return true;
-        if (jj_scan_token(RBRACKET)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_343() {
-        if (jj_scan_token(EXTENDS)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_362()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_3R_94()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_314() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_343()) {
-            jj_scanpos = xsp;
-            if (jj_3R_344()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_312() {
-        Token xsp;
-        if (jj_3R_342()) return true;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_342()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_3R_185()) return true;
-        return false;
-    }
-
-    private boolean jj_3_33() {
-        if (jj_scan_token(LBRACKET)) return true;
-        if (jj_3R_100()) return true;
-        if (jj_scan_token(RBRACKET)) return true;
-        return false;
-    }
-
-    private boolean jj_3_32() {
-        if (jj_3R_113()) return true;
-        return false;
-    }
-
-    private boolean jj_3_35() {
-        Token xsp;
-        if (jj_3_33()) return true;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_33()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_34()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_229() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_199()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_311() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_289() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_311()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        xsp = jj_scanpos;
-        if (jj_3_35()) {
-            jj_scanpos = xsp;
-            if (jj_3R_312()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_313() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_263() {
-        if (jj_scan_token(HOOK)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_314()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_292() {
-        if (jj_3R_187()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_32()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_232() {
-        if (jj_3R_263()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_231() {
-        if (jj_3R_94()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_460() {
-        if (jj_3R_462()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_230() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_199() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_230()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        xsp = jj_scanpos;
-        if (jj_3R_231()) {
-            jj_scanpos = xsp;
-            if (jj_3R_232()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_291() {
-        if (jj_3R_289()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_96() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_98() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_290() {
-        if (jj_3R_97()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_313()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_138() {
-        if (jj_scan_token(132)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_262() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_290()) jj_scanpos = xsp;
-        if (jj_3R_198()) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_291()) {
-            jj_scanpos = xsp;
-            if (jj_3R_292()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_95() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_284() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3_13() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_96()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(LBRACKET)) return true;
-        if (jj_scan_token(RBRACKET)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_137() {
-        if (jj_scan_token(LT)) return true;
-        if (jj_3R_199()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_229()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(GT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_97() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_137()) {
-            jj_scanpos = xsp;
-            if (jj_3R_138()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3_16() {
-        if (jj_3R_97()) return true;
-        return false;
-    }
-
-    private boolean jj_3_15() {
-        if (jj_scan_token(DOT)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_98()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(IDENTIFIER)) return true;
-        xsp = jj_scanpos;
-        if (jj_3_16()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_261() {
-        if (jj_3R_107()) return true;
-        if (jj_3R_289()) return true;
-        return false;
-    }
-
-    private boolean jj_3_12() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_95()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(LBRACKET)) return true;
-        if (jj_scan_token(RBRACKET)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_386() {
-        if (jj_scan_token(THROWS)) return true;
-        if (jj_3R_401()) return true;
-        return false;
-    }
-
-    private boolean jj_3_14() {
-        if (jj_3R_97()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_260() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_198() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_14()) jj_scanpos = xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_15()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_225() {
-        if (jj_scan_token(NEW)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_260()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        xsp = jj_scanpos;
-        if (jj_3R_261()) {
-            jj_scanpos = xsp;
-            if (jj_3R_262()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_462() {
-        if (jj_scan_token(_DEFAULT)) return true;
-        if (jj_3R_121()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_136() {
-        if (jj_3R_198()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_13()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_135() {
-        if (jj_3R_107()) return true;
-        Token xsp;
-        if (jj_3_12()) return true;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_12()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_94() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_135()) {
-            jj_scanpos = xsp;
-            if (jj_3R_136()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_247() {
-        if (jj_3R_100()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_284()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_455() {
-        if (jj_3R_87()) return true;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_460()) jj_scanpos = xsp;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_219() {
-        if (jj_3R_247()) return true;
-        return false;
-    }
-
-    private boolean jj_3_47() {
-        if (jj_3R_87()) return true;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_443() {
-        if (jj_3R_302()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_442() {
-        if (jj_3R_300()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_187() {
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_219()) jj_scanpos = xsp;
-        if (jj_scan_token(RPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_126() {
-        if (jj_3R_107()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_441() {
-        if (jj_3R_299()) return true;
-        return false;
-    }
-
-    private boolean jj_3_11() {
-        if (jj_3R_94()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_440() {
-        if (jj_3R_298()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_87() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_11()) {
-            jj_scanpos = xsp;
-            if (jj_3R_126()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_439() {
-        if (jj_3R_455()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_286() {
-        if (jj_scan_token(NULL)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_308() {
-        if (jj_scan_token(FALSE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_307() {
-        if (jj_scan_token(TRUE)) return true;
-        return false;
-    }
-
-    private boolean jj_3_46() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_121()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_426() {
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_427() {
-        if (jj_3R_116()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_439()) {
-            jj_scanpos = xsp;
-            if (jj_3R_440()) {
-                jj_scanpos = xsp;
-                if (jj_3R_441()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_442()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_443()) return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_127() {
-        if (jj_scan_token(STATIC)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_89() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_127()) jj_scanpos = xsp;
-        if (jj_3R_128()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_285() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_307()) {
-            jj_scanpos = xsp;
-            if (jj_3R_308()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_409() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_426()) {
-            jj_scanpos = xsp;
-            if (jj_3R_427()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_254() {
-        if (jj_3R_286()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_218() {
-        if (jj_3R_246()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_253() {
-        if (jj_3R_285()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_184() {
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_218()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_399() {
-        if (jj_3R_409()) return true;
-        return false;
-    }
-
-    private boolean jj_3_9() {
-        if (jj_3R_92()) return true;
-        if (jj_scan_token(DOT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_252() {
-        if (jj_scan_token(STRING_LITERAL)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_251() {
-        if (jj_scan_token(CHARACTER_LITERAL)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_384() {
-        if (jj_scan_token(LBRACE)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_399()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_93() {
-        if (jj_3R_97()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_189() {
-        if (jj_3R_97()) return true;
-        return false;
-    }
-
-    private boolean jj_3_10() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_93()) jj_scanpos = xsp;
-        if (jj_scan_token(THIS)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_250() {
-        if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_188() {
-        if (jj_3R_92()) return true;
-        if (jj_scan_token(DOT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_249() {
-        if (jj_scan_token(LONG_LITERAL)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_132() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_188()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_189()) jj_scanpos = xsp;
-        if (jj_scan_token(SUPER)) return true;
-        if (jj_3R_187()) return true;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_186() {
-        if (jj_3R_97()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_248() {
-        if (jj_scan_token(INTEGER_LITERAL)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_131() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_186()) jj_scanpos = xsp;
-        if (jj_scan_token(THIS)) return true;
-        if (jj_3R_187()) return true;
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_300() {
-        if (jj_scan_token(AT)) return true;
-        if (jj_scan_token(INTERFACE)) return true;
-        if (jj_3R_119()) return true;
-        if (jj_3R_384()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_112() {
-        if (jj_3R_97()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_220() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_248()) {
-            jj_scanpos = xsp;
-            if (jj_3R_249()) {
-                jj_scanpos = xsp;
-                if (jj_3R_250()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_251()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_252()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_253()) {
-                                jj_scanpos = xsp;
-                                if (jj_3R_254()) return true;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_91() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_131()) {
-            jj_scanpos = xsp;
-            if (jj_3R_132()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_166() {
-        if (jj_scan_token(LBRACKET)) return true;
-        if (jj_3R_100()) return true;
-        if (jj_scan_token(RBRACKET)) return true;
-        return false;
-    }
-
-    private boolean jj_3_31() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_112()) jj_scanpos = xsp;
-        if (jj_scan_token(IDENTIFIER)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_324() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_323()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_347() {
-        if (jj_3R_121()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_46()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_238() {
-        if (jj_3R_187()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_237() {
-        if (jj_3R_97()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_278() {
-        if (jj_3R_304()) return true;
-        return false;
-    }
-
-    private boolean jj_3_8() {
-        if (jj_3R_91()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_204() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_237()) jj_scanpos = xsp;
-        if (jj_3R_227()) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_238()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_212() {
-        if (jj_scan_token(LBRACE)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_347()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(88)) jj_scanpos = xsp;
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3_7() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_90()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_203() {
-        if (jj_3R_225()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_167() {
-        if (jj_scan_token(ELLIPSIS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_202() {
-        if (jj_scan_token(THIS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_177() {
-        if (jj_3R_151()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_287() {
-        if (jj_3R_309()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_176() {
-        if (jj_3R_212()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_175() {
-        if (jj_3R_123()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_387() {
-        if (jj_3R_91()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_340() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_110()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_165() {
-        if (jj_scan_token(DOT)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_202()) {
-            jj_scanpos = xsp;
-            if (jj_3R_203()) {
-                jj_scanpos = xsp;
-                if (jj_3R_204()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_320() {
-        if (jj_3R_125()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_301() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_320()) jj_scanpos = xsp;
-        if (jj_3R_227()) return true;
-        if (jj_3R_385()) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_386()) jj_scanpos = xsp;
-        if (jj_scan_token(LBRACE)) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_387()) jj_scanpos = xsp;
-        if (jj_3R_184()) return true;
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_121() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_175()) {
-            jj_scanpos = xsp;
-            if (jj_3R_176()) {
-                jj_scanpos = xsp;
-                if (jj_3R_177()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_109() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_165()) {
-            jj_scanpos = xsp;
-            if (jj_3R_166()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_410() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_110()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_323() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        if (jj_scan_token(ASSIGN)) return true;
-        if (jj_3R_121()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_164() {
-        if (jj_scan_token(DOT)) return true;
-        if (jj_scan_token(SUPER)) return true;
-        return false;
-    }
-
-    private boolean jj_3_30() {
-        if (jj_3R_109()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_226() {
-        if (jj_3R_125()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_304() {
-        if (jj_3R_323()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_324()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_108() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_30()) {
-            jj_scanpos = xsp;
-            if (jj_3R_164()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_228() {
-        if (jj_3R_187()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_110() {
-        if (jj_3R_116()) return true;
-        if (jj_3R_87()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_167()) jj_scanpos = xsp;
-        if (jj_3R_168()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_197() {
-        if (jj_3R_227()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_228()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3_29() {
-        if (jj_3R_111()) return true;
-        if (jj_scan_token(DOUBLECOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_214() {
-        if (jj_scan_token(AT)) return true;
-        if (jj_3R_119()) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_121()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_389() {
-        if (jj_scan_token(LBRACKET)) return true;
-        if (jj_scan_token(RBRACKET)) return true;
-        return false;
-    }
-
-    private boolean jj_3_28() {
-        if (jj_3R_111()) return true;
-        if (jj_scan_token(DOT)) return true;
-        if (jj_scan_token(CLASS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_341() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_168()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_120() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        if (jj_scan_token(ASSIGN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_205() {
-        if (jj_scan_token(LBRACKET)) return true;
-        if (jj_scan_token(RBRACKET)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_288() {
-        if (jj_3R_310()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_310() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_168()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_341()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_196() {
-        if (jj_3R_111()) return true;
-        if (jj_scan_token(DOUBLECOLON)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_226()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(78)) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(43)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_215() {
-        if (jj_scan_token(AT)) return true;
-        if (jj_3R_119()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_322() {
-        if (jj_3R_90()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_7()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_195() {
-        if (jj_3R_111()) return true;
-        if (jj_scan_token(DOT)) return true;
-        if (jj_scan_token(CLASS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_194() {
-        if (jj_3R_225()) return true;
-        return false;
-    }
-
-    private boolean jj_3_27() {
-        if (jj_3R_110()) return true;
-        return false;
-    }
-
-    private boolean jj_3_45() {
-        if (jj_scan_token(AT)) return true;
-        if (jj_3R_119()) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_309() {
-        if (jj_scan_token(COMMA)) return true;
-        if (jj_3R_110()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_340()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3_43() {
-        if (jj_scan_token(SEMICOLON)) return true;
-        if (jj_3R_117()) return true;
-        return false;
-    }
-
-    private boolean jj_3_44() {
-        if (jj_scan_token(AT)) return true;
-        if (jj_3R_119()) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_120()) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(82)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_213() {
-        if (jj_scan_token(AT)) return true;
-        if (jj_3R_119()) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_278()) jj_scanpos = xsp;
-        if (jj_scan_token(RPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_400() {
-        if (jj_3R_110()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_410()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_180() {
-        if (jj_3R_215()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_259() {
-        if (jj_3R_100()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_288()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_258() {
-        if (jj_3R_110()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_287()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_179() {
-        if (jj_3R_214()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_224() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_258()) {
-            jj_scanpos = xsp;
-            if (jj_3R_259()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_385() {
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_400()) jj_scanpos = xsp;
-        if (jj_scan_token(RPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_178() {
-        if (jj_3R_213()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_257() {
-        if (jj_3R_125()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_193() {
-        if (jj_scan_token(LPAREN)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_224()) jj_scanpos = xsp;
-        if (jj_scan_token(RPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_222() {
-        if (jj_scan_token(DOUBLECOLON)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_257()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(78)) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(43)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_123() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_178()) {
-            jj_scanpos = xsp;
-            if (jj_3R_179()) {
-                jj_scanpos = xsp;
-                if (jj_3R_180()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_223() {
-        if (jj_3R_187()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_152() {
-        return false;
-    }
-
-    private boolean jj_3R_391() {
-        if (jj_3R_128()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_390() {
-        if (jj_scan_token(THROWS)) return true;
-        if (jj_3R_401()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_321() {
-        if (jj_3R_125()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_303() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_321()) jj_scanpos = xsp;
-        if (jj_3R_111()) return true;
-        if (jj_3R_119()) return true;
-        if (jj_3R_385()) return true;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_389()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        xsp = jj_scanpos;
-        if (jj_3R_390()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_391()) {
-            jj_scanpos = xsp;
-            if (jj_scan_token(87)) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_153() {
-        return false;
-    }
-
-    private boolean jj_3R_102() {
-        jj_lookingAhead = true;
-        jj_semLA = getToken(1).kind == GT &&
-                ((GTToken) getToken(1)).realKind == RSIGNEDSHIFT;
-        jj_lookingAhead = false;
-        if (!jj_semLA || jj_3R_152()) return true;
-        if (jj_scan_token(GT)) return true;
-        if (jj_scan_token(GT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_256() {
-        if (jj_3R_187()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_221() {
-        if (jj_scan_token(DOT)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_255()) jj_scanpos = xsp;
-        if (jj_3R_227()) return true;
-        xsp = jj_scanpos;
-        if (jj_3R_256()) jj_scanpos = xsp;
-        return false;
-    }
-
-    private boolean jj_3R_255() {
-        if (jj_3R_97()) return true;
-        return false;
-    }
-
-    private boolean jj_3_26() {
-        if (jj_3R_109()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_192() {
-        if (jj_scan_token(SUPER)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_221()) {
-            jj_scanpos = xsp;
-            if (jj_3R_222()) {
-                jj_scanpos = xsp;
-                if (jj_3R_223()) return true;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_103() {
-        jj_lookingAhead = true;
-        jj_semLA = getToken(1).kind == GT &&
-                ((GTToken) getToken(1)).realKind == RUNSIGNEDSHIFT;
-        jj_lookingAhead = false;
-        if (!jj_semLA || jj_3R_153()) return true;
-        if (jj_scan_token(GT)) return true;
-        if (jj_scan_token(GT)) return true;
-        if (jj_scan_token(GT)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_191() {
-        if (jj_scan_token(THIS)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_185() {
-        if (jj_scan_token(LBRACE)) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_322()) jj_scanpos = xsp;
-        xsp = jj_scanpos;
-        if (jj_scan_token(88)) jj_scanpos = xsp;
-        if (jj_scan_token(RBRACE)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_190() {
-        if (jj_3R_220()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_134() {
-        if (jj_3R_109()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_130() {
-        if (jj_3R_100()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_129() {
-        if (jj_3R_185()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_207() {
-        if (jj_scan_token(ASSIGN)) return true;
-        if (jj_3R_90()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_453() {
-        if (jj_3R_117()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3_43()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_133() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_190()) {
-            jj_scanpos = xsp;
-            if (jj_3R_191()) {
-                jj_scanpos = xsp;
-                if (jj_3R_192()) {
-                    jj_scanpos = xsp;
-                    if (jj_3R_193()) {
-                        jj_scanpos = xsp;
-                        if (jj_3R_194()) {
-                            jj_scanpos = xsp;
-                            if (jj_3R_195()) {
-                                jj_scanpos = xsp;
-                                if (jj_3R_196()) {
-                                    jj_scanpos = xsp;
-                                    if (jj_3R_197()) return true;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3_25() {
-        if (jj_3R_108()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_90() {
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3R_129()) {
-            jj_scanpos = xsp;
-            if (jj_3R_130()) return true;
-        }
-        return false;
-    }
-
-    private boolean jj_3R_454() {
-        if (jj_scan_token(BIT_OR)) return true;
-        if (jj_3R_87()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_438() {
-        if (jj_scan_token(FINALLY)) return true;
-        if (jj_3R_128()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_425() {
-        if (jj_scan_token(FINALLY)) return true;
-        if (jj_3R_128()) return true;
-        return false;
-    }
-
-    private boolean jj_3_42() {
-        if (jj_scan_token(SEMICOLON)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_436() {
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_453()) return true;
-        Token xsp;
-        xsp = jj_scanpos;
-        if (jj_3_42()) jj_scanpos = xsp;
-        if (jj_scan_token(RPAREN)) return true;
-        return false;
-    }
-
-    private boolean jj_3R_437() {
-        if (jj_scan_token(CATCH)) return true;
-        if (jj_scan_token(LPAREN)) return true;
-        if (jj_3R_116()) return true;
-        if (jj_3R_87()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_454()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        if (jj_3R_168()) return true;
-        if (jj_scan_token(RPAREN)) return true;
-        if (jj_3R_128()) return true;
-        return false;
-    }
-
-    private boolean jj_3R_168() {
-        if (jj_scan_token(IDENTIFIER)) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_205()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    private boolean jj_3R_92() {
-        if (jj_3R_133()) return true;
-        Token xsp;
-        while (true) {
-            xsp = jj_scanpos;
-            if (jj_3R_134()) {
-                jj_scanpos = xsp;
-                break;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Generated Token Manager.
-     */
-    public ASTParserTokenManager token_source;
-    JavaCharStream jj_input_stream;
-    /**
-     * Current token.
-     */
-    public Token token;
-    /**
-     * Next token.
-     */
-    public Token jj_nt;
-    private int jj_ntk;
-    private Token jj_scanpos, jj_lastpos;
-    private int jj_la;
-    /**
-     * Whether we are looking ahead.
-     */
-    private boolean jj_lookingAhead = false;
-    private boolean jj_semLA;
-    private int jj_gen;
-    final private int[] jj_la1 = new int[175];
-    static private int[] jj_la1_0;
-    static private int[] jj_la1_1;
-    static private int[] jj_la1_2;
-    static private int[] jj_la1_3;
-    static private int[] jj_la1_4;
-
-    static {
-        jj_la1_init_0();
-        jj_la1_init_1();
-        jj_la1_init_2();
-        jj_la1_init_3();
-        jj_la1_init_4();
-    }
-
-    private static void jj_la1_init_0() {
-        jj_la1_0 = new int[]{0x0, 0x48101000, 0x1, 0x0, 0x0, 0x0, 0x40001000, 0x8100000, 0x48101000, 0x100000, 0x0, 0x10000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4a995000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10000000, 0x0, 0x0, 0x0, 0x4a995000, 0x800000, 0x8100000, 0x2094000, 0x4a995000, 0x0, 0x0, 0x0, 0x22094000, 0x22094000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x42095000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x22094000, 0x6359f000, 0x0, 0x2094000, 0x0, 0x0, 0x2094000, 0x0, 0x0, 0x0, 0x0, 0x2094000, 0x0, 0x0, 0x10000000, 0x10000000, 0x2094000, 0x2094000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x22094000, 0x0, 0x0, 0x22094000, 0x0, 0x0, 0x2094000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x22094000, 0x62095000, 0x0, 0x0, 0x0, 0x20000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x20000000, 0x20000000, 0x22094000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2094000, 0x0, 0x0, 0x0, 0x0, 0x2349e000, 0x0, 0x2349e000, 0x0, 0x22094000, 0x0, 0x0, 0x0, 0x0, 0x22094000, 0x820000, 0x820000, 0x4000000, 0x62095000, 0x22094000, 0x22094000, 0x62095000, 0x22094000, 0x0, 0x0, 0x0, 0x22094000, 0x0, 0x40000, 0x0, 0x80000000, 0x0, 0x0, 0x0, 0x22094000, 0x22094000, 0x0, 0x4a195000, 0xa194000, 0x4a195000, 0x800000,};
-    }
-
-    private static void jj_la1_init_1() {
-        jj_la1_1 = new int[]{0x20, 0x8899c500, 0x0, 0x0, 0x80000, 0x0, 0x8899c400, 0x100, 0x8899c500, 0x100, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0x0, 0x10, 0x0, 0x0, 0xc89dc781, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc89dc781, 0x0, 0x100, 0x40040281, 0xc89dc781, 0x0, 0x0, 0x0, 0x51241a81, 0x51241a81, 0x0, 0x0, 0x0, 0x4000000, 0x0, 0x0, 0x889dc681, 0x0, 0x0, 0x0, 0x0, 0x4000000, 0x0, 0x0, 0x51241a81, 0xfbffdf8b, 0x80000, 0x40281, 0x0, 0x0, 0x40281, 0x0, 0x0, 0x0, 0x0, 0x40281, 0x0, 0x0, 0x200000, 0x200000, 0x40281, 0x40040281, 0x0, 0x0, 0x0, 0x0, 0x0, 0x800, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x51241a81, 0x0, 0x0, 0x51241a81, 0x0, 0x0, 0x40281, 0x0, 0x0, 0x0, 0x800, 0x0, 0x0, 0x0, 0x51241a81, 0xd9bdde81, 0x0, 0x800, 0x0, 0x11201800, 0x0, 0x0, 0x0, 0x0, 0x1000800, 0x0, 0x10001000, 0x10000000, 0x51241a81, 0x0, 0x0, 0x0, 0x0, 0x0, 0x40281, 0x0, 0x0, 0x0, 0x0, 0x73e61a8b, 0x0, 0x73e61a8b, 0x0, 0x51241a81, 0x0, 0x800, 0x0, 0x0, 0x51241a81, 0x0, 0x0, 0x0, 0xd9bdde81, 0x51241a81, 0x51241a81, 0xd9bdde81, 0x51241a81, 0x0, 0x0, 0x0, 0x51241a81, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x51241a81, 0x51241a81, 0x0, 0x889dc781, 0x40381, 0x889dc781, 0x0,};
-    }
-
-    private static void jj_la1_init_2() {
-        jj_la1_2 = new int[]{0x0, 0x4800000, 0x0, 0x4000000, 0x0, 0x2000000, 0x4000000, 0x4000000, 0x4800000, 0x0, 0x10000000, 0x0, 0x0, 0x4000000, 0x1000000, 0x4000000, 0x1000000, 0x0, 0x4004000, 0x1000000, 0x14884000, 0x800000, 0x4000000, 0x20000, 0x80000, 0x4000000, 0x1000000, 0x4000000, 0x0, 0x4000000, 0x0, 0x4000000, 0x14884000, 0x0, 0x4000000, 0x10004000, 0x14804000, 0x1000000, 0x8000000, 0x200000, 0x600a7086, 0x600a7086, 0x1000000, 0x10000000, 0x200000, 0x0, 0x880000, 0x1000000, 0x4004000, 0x1000000, 0x1000000, 0x0, 0x10000000, 0x0, 0x10000000, 0x10000000, 0x10027086, 0x48a7087, 0x0, 0x0, 0x4000000, 0x4000000, 0x4000, 0x4000000, 0x1000000, 0x10000000, 0x4000000, 0x80004000, 0x4000000, 0x4000000, 0x0, 0x0, 0x0, 0x4000, 0x4000000, 0x1000000, 0x4000000, 0x1000000, 0x10000000, 0x4000, 0x0, 0x8000000, 0x8000000, 0x80000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10000000, 0x10000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x60027086, 0x60000000, 0x60000000, 0x27086, 0x0, 0x4000000, 0x4000, 0x10000000, 0x20000, 0x10000000, 0x4000, 0x2020000, 0x1000000, 0x1000000, 0x60027086, 0x64027086, 0x10000000, 0x4000, 0x20000, 0x23086, 0x4000, 0x2000000, 0x10000000, 0x20000, 0x0, 0x2200000, 0x3086, 0x0, 0x60027086, 0x1000000, 0x4000000, 0x4000000, 0x10000000, 0x4220000, 0x10004000, 0x4000000, 0x4000000, 0x200000, 0x200000, 0x8a7087, 0x0, 0x8a7087, 0x1000000, 0x600a7086, 0x10000000, 0x4000, 0x8000000, 0x8000000, 0x27086, 0x0, 0x0, 0x0, 0x64027086, 0x60027086, 0x60027086, 0x64827086, 0x60027086, 0x1000000, 0x4000, 0x4000, 0x60027086, 0x20000, 0x0, 0x0, 0x0, 0x4000000, 0x4000, 0x1000000, 0x640a7086, 0x640a7086, 0x1000000, 0x4804000, 0x4004000, 0x4804000, 0x0,};
-    }
-
-    private static void jj_la1_init_3() {
-        jj_la1_3 = new int[]{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x780, 0x780, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x20000000, 0x0, 0x0, 0x0, 0x0, 0x0, 0x180, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xc0000000, 0xdffc0000, 0x1ffc0000, 0x0, 0x20, 0x40, 0x4000, 0x8000, 0x2000, 0x12, 0x12, 0x0, 0xc, 0xc, 0x20000, 0x600, 0x600, 0x11800, 0x11800, 0x600, 0x780, 0x0, 0x0, 0x0, 0x180, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x80000000, 0x0, 0x0, 0x780, 0x780, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x780, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x180, 0x1, 0x180, 0x0, 0x780, 0x0, 0x0, 0xdffc0180, 0xdffc0180, 0x100, 0x0, 0x0, 0x0, 0x780, 0x780, 0x780, 0x780, 0x780, 0x0, 0x0, 0x0, 0x780, 0x0, 0x0, 0x4000, 0x0, 0x0, 0x0, 0x0, 0x780, 0x780, 0x0, 0x0, 0x0, 0x0, 0x0,};
-    }
-
-    private static void jj_la1_init_4() {
-        jj_la1_4 = new int[]{0x0, 0x0, 0x8, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10, 0x10, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x4, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10, 0x0, 0x10, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,};
-    }
-
-    final private JJCalls[] jj_2_rtns = new JJCalls[47];
-    private boolean jj_rescan = false;
-    private int jj_gc = 0;
-
-    /**
-     * Constructor with InputStream.
-     */
-    public ASTParser(java.io.InputStream stream) {
-        this(stream, null);
-    }
-
-    /**
-     * Constructor with InputStream and supplied encoding
-     */
-    public ASTParser(java.io.InputStream stream, String encoding) {
-        try {
-            jj_input_stream = new JavaCharStream(stream, encoding, 1, 1);
-        } catch (java.io.UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-        token_source = new ASTParserTokenManager(jj_input_stream);
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 175; i++) jj_la1[i] = -1;
-        for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(java.io.InputStream stream) {
-        ReInit(stream, null);
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(java.io.InputStream stream, String encoding) {
-        try {
-            jj_input_stream.ReInit(stream, encoding, 1, 1);
-        } catch (java.io.UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-        token_source.ReInit(jj_input_stream);
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 175; i++) jj_la1[i] = -1;
-        for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
-    }
-
-    /**
-     * Constructor.
-     */
-    public ASTParser(java.io.Reader stream) {
-        jj_input_stream = new JavaCharStream(stream, 1, 1);
-        token_source = new ASTParserTokenManager(jj_input_stream);
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 175; i++) jj_la1[i] = -1;
-        for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(java.io.Reader stream) {
-        jj_input_stream.ReInit(stream, 1, 1);
-        token_source.ReInit(jj_input_stream);
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 175; i++) jj_la1[i] = -1;
-        for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
-    }
-
-    /**
-     * Constructor with generated Token Manager.
-     */
-    public ASTParser(ASTParserTokenManager tm) {
-        token_source = tm;
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 175; i++) jj_la1[i] = -1;
-        for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(ASTParserTokenManager tm) {
-        token_source = tm;
-        token = new Token();
-        jj_ntk = -1;
-        jj_gen = 0;
-        for (int i = 0; i < 175; i++) jj_la1[i] = -1;
-        for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
-    }
-
-    private Token jj_consume_token(int kind) {
-        Token oldToken;
-        if ((oldToken = token).next != null) token = token.next;
-        else token = token.next = token_source.getNextToken();
-        jj_ntk = -1;
-        if (token.kind == kind) {
-            jj_gen++;
-            if (++jj_gc > 100) {
-                jj_gc = 0;
-                for (int i = 0; i < jj_2_rtns.length; i++) {
-                    JJCalls c = jj_2_rtns[i];
-                    while (c != null) {
-                        if (c.gen < jj_gen) c.first = null;
-                        c = c.next;
-                    }
-                }
-            }
-            return token;
-        }
-        token = oldToken;
-        jj_kind = kind;
-        throw generateParseException();
-    }
-
-    static private final class LookaheadSuccess extends java.lang.Error {
-    }
-
-    final private LookaheadSuccess jj_ls = new LookaheadSuccess();
-
-    private boolean jj_scan_token(int kind) {
-        if (jj_scanpos == jj_lastpos) {
-            jj_la--;
-            if (jj_scanpos.next == null) {
-                jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
-            } else {
-                jj_lastpos = jj_scanpos = jj_scanpos.next;
-            }
-        } else {
-            jj_scanpos = jj_scanpos.next;
-        }
-        if (jj_rescan) {
-            int i = 0;
-            Token tok = token;
-            while (tok != null && tok != jj_scanpos) {
-                i++;
-                tok = tok.next;
-            }
-            if (tok != null) jj_add_error_token(kind, i);
-        }
-        if (jj_scanpos.kind != kind) return true;
-        if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
-        return false;
-    }
-
-
-    /**
-     * Get the next Token.
-     */
-    final public Token getNextToken() {
-        if (token.next != null) token = token.next;
-        else token = token.next = token_source.getNextToken();
-        jj_ntk = -1;
-        jj_gen++;
-        return token;
-    }
-
-    /**
-     * Get the specific Token.
-     */
-    final public Token getToken(int index) {
-        Token t = jj_lookingAhead ? jj_scanpos : token;
-        for (int i = 0; i < index; i++) {
-            if (t.next != null) t = t.next;
-            else t = t.next = token_source.getNextToken();
-        }
-        return t;
-    }
-
-    private int jj_ntk() {
-        if ((jj_nt = token.next) == null)
-            return (jj_ntk = (token.next = token_source.getNextToken()).kind);
-        else
-            return (jj_ntk = jj_nt.kind);
-    }
-
-    private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
-    private int[] jj_expentry;
-    private int jj_kind = -1;
-    private int[] jj_lasttokens = new int[100];
-    private int jj_endpos;
-
-    private void jj_add_error_token(int kind, int pos) {
-        if (pos >= 100) return;
-        if (pos == jj_endpos + 1) {
-            jj_lasttokens[jj_endpos++] = kind;
-        } else if (jj_endpos != 0) {
-            jj_expentry = new int[jj_endpos];
-            for (int i = 0; i < jj_endpos; i++) {
-                jj_expentry[i] = jj_lasttokens[i];
-            }
-            jj_entries_loop:
-            for (java.util.Iterator<?> it = jj_expentries.iterator(); it.hasNext(); ) {
-                int[] oldentry = (int[]) (it.next());
-                if (oldentry.length == jj_expentry.length) {
-                    for (int i = 0; i < jj_expentry.length; i++) {
-                        if (oldentry[i] != jj_expentry[i]) {
-                            continue jj_entries_loop;
-                        }
-                    }
-                    jj_expentries.add(jj_expentry);
-                    break jj_entries_loop;
-                }
-            }
-            if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;
-        }
-    }
-
-    /**
-     * Generate ParseException.
-     */
-    public ParseException generateParseException() {
-        jj_expentries.clear();
-        boolean[] la1tokens = new boolean[133];
-        if (jj_kind >= 0) {
-            la1tokens[jj_kind] = true;
-            jj_kind = -1;
-        }
-        for (int i = 0; i < 175; i++) {
-            if (jj_la1[i] == jj_gen) {
-                for (int j = 0; j < 32; j++) {
-                    if ((jj_la1_0[i] & (1 << j)) != 0) {
-                        la1tokens[j] = true;
-                    }
-                    if ((jj_la1_1[i] & (1 << j)) != 0) {
-                        la1tokens[32 + j] = true;
-                    }
-                    if ((jj_la1_2[i] & (1 << j)) != 0) {
-                        la1tokens[64 + j] = true;
-                    }
-                    if ((jj_la1_3[i] & (1 << j)) != 0) {
-                        la1tokens[96 + j] = true;
-                    }
-                    if ((jj_la1_4[i] & (1 << j)) != 0) {
-                        la1tokens[128 + j] = true;
-                    }
-                }
-            }
-        }
-        for (int i = 0; i < 133; i++) {
-            if (la1tokens[i]) {
-                jj_expentry = new int[1];
-                jj_expentry[0] = i;
-                jj_expentries.add(jj_expentry);
-            }
-        }
-        jj_endpos = 0;
-        jj_rescan_token();
-        jj_add_error_token(0, 0);
-        int[][] exptokseq = new int[jj_expentries.size()][];
-        for (int i = 0; i < jj_expentries.size(); i++) {
-            exptokseq[i] = jj_expentries.get(i);
-        }
-        return new ParseException(token, exptokseq, tokenImage);
-    }
-
-    /**
-     * Enable tracing.
-     */
-    final public void enable_tracing() {
-    }
-
-    /**
-     * Disable tracing.
-     */
-    final public void disable_tracing() {
-    }
-
-    private void jj_rescan_token() {
-        jj_rescan = true;
-        for (int i = 0; i < 47; i++) {
-            try {
-                JJCalls p = jj_2_rtns[i];
-                do {
-                    if (p.gen > jj_gen) {
-                        jj_la = p.arg;
-                        jj_lastpos = jj_scanpos = p.first;
-                        switch (i) {
-                            case 0:
-                                jj_3_1();
-                                break;
-                            case 1:
-                                jj_3_2();
-                                break;
-                            case 2:
-                                jj_3_3();
-                                break;
-                            case 3:
-                                jj_3_4();
-                                break;
-                            case 4:
-                                jj_3_5();
-                                break;
-                            case 5:
-                                jj_3_6();
-                                break;
-                            case 6:
-                                jj_3_7();
-                                break;
-                            case 7:
-                                jj_3_8();
-                                break;
-                            case 8:
-                                jj_3_9();
-                                break;
-                            case 9:
-                                jj_3_10();
-                                break;
-                            case 10:
-                                jj_3_11();
-                                break;
-                            case 11:
-                                jj_3_12();
-                                break;
-                            case 12:
-                                jj_3_13();
-                                break;
-                            case 13:
-                                jj_3_14();
-                                break;
-                            case 14:
-                                jj_3_15();
-                                break;
-                            case 15:
-                                jj_3_16();
-                                break;
-                            case 16:
-                                jj_3_17();
-                                break;
-                            case 17:
-                                jj_3_18();
-                                break;
-                            case 18:
-                                jj_3_19();
-                                break;
-                            case 19:
-                                jj_3_20();
-                                break;
-                            case 20:
-                                jj_3_21();
-                                break;
-                            case 21:
-                                jj_3_22();
-                                break;
-                            case 22:
-                                jj_3_23();
-                                break;
-                            case 23:
-                                jj_3_24();
-                                break;
-                            case 24:
-                                jj_3_25();
-                                break;
-                            case 25:
-                                jj_3_26();
-                                break;
-                            case 26:
-                                jj_3_27();
-                                break;
-                            case 27:
-                                jj_3_28();
-                                break;
-                            case 28:
-                                jj_3_29();
-                                break;
-                            case 29:
-                                jj_3_30();
-                                break;
-                            case 30:
-                                jj_3_31();
-                                break;
-                            case 31:
-                                jj_3_32();
-                                break;
-                            case 32:
-                                jj_3_33();
-                                break;
-                            case 33:
-                                jj_3_34();
-                                break;
-                            case 34:
-                                jj_3_35();
-                                break;
-                            case 35:
-                                jj_3_36();
-                                break;
-                            case 36:
-                                jj_3_37();
-                                break;
-                            case 37:
-                                jj_3_38();
-                                break;
-                            case 38:
-                                jj_3_39();
-                                break;
-                            case 39:
-                                jj_3_40();
-                                break;
-                            case 40:
-                                jj_3_41();
-                                break;
-                            case 41:
-                                jj_3_42();
-                                break;
-                            case 42:
-                                jj_3_43();
-                                break;
-                            case 43:
-                                jj_3_44();
-                                break;
-                            case 44:
-                                jj_3_45();
-                                break;
-                            case 45:
-                                jj_3_46();
-                                break;
-                            case 46:
-                                jj_3_47();
-                                break;
-                        }
-                    }
-                    p = p.next;
-                } while (p != null);
-            } catch (LookaheadSuccess ls) {
-            }
-        }
-        jj_rescan = false;
-    }
-
-    private void jj_save(int index, int xla) {
-        JJCalls p = jj_2_rtns[index];
-        while (p.gen > jj_gen) {
-            if (p.next == null) {
-                p = p.next = new JJCalls();
-                break;
-            }
-            p = p.next;
-        }
-        p.gen = jj_gen + xla - jj_la;
-        p.first = token;
-        p.arg = xla;
-    }
-
-    static final class JJCalls {
-        int gen;
-        Token first;
-        int arg;
-        JJCalls next;
-    }
+  private boolean jj_3_32() {
+    if (jj_3R_113()) return true;
+    return false;
+  }
+
+  private boolean jj_3_35() {
+    Token xsp;
+    if (jj_3_33()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_33()) { jj_scanpos = xsp; break; }
+    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_34()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_229() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_199()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_311() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_289() {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_311()) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3_35()) {
+    jj_scanpos = xsp;
+    if (jj_3R_312()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_313() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_263() {
+    if (jj_scan_token(HOOK)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_314()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_292() {
+    if (jj_3R_187()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_32()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_232() {
+    if (jj_3R_263()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_231() {
+    if (jj_3R_94()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_460() {
+    if (jj_3R_462()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_230() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_199() {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_230()) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_231()) {
+    jj_scanpos = xsp;
+    if (jj_3R_232()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_291() {
+    if (jj_3R_289()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_96() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_98() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_290() {
+    if (jj_3R_97()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_313()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_138() {
+    if (jj_scan_token(132)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_262() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_290()) jj_scanpos = xsp;
+    if (jj_3R_198()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_291()) {
+    jj_scanpos = xsp;
+    if (jj_3R_292()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_95() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_284() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3_13() {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_96()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_137() {
+    if (jj_scan_token(LT)) return true;
+    if (jj_3R_199()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_229()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(GT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_97() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_137()) {
+    jj_scanpos = xsp;
+    if (jj_3R_138()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3_16() {
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  private boolean jj_3_15() {
+    if (jj_scan_token(DOT)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_98()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(IDENTIFIER)) return true;
+    xsp = jj_scanpos;
+    if (jj_3_16()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_261() {
+    if (jj_3R_107()) return true;
+    if (jj_3R_289()) return true;
+    return false;
+  }
+
+  private boolean jj_3_12() {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_95()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_386() {
+    if (jj_scan_token(THROWS)) return true;
+    if (jj_3R_401()) return true;
+    return false;
+  }
+
+  private boolean jj_3_14() {
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_260() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_198() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_14()) jj_scanpos = xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_15()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_225() {
+    if (jj_scan_token(NEW)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_260()) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_261()) {
+    jj_scanpos = xsp;
+    if (jj_3R_262()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_462() {
+    if (jj_scan_token(_DEFAULT)) return true;
+    if (jj_3R_121()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_136() {
+    if (jj_3R_198()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_13()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_135() {
+    if (jj_3R_107()) return true;
+    Token xsp;
+    if (jj_3_12()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_12()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_94() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_135()) {
+    jj_scanpos = xsp;
+    if (jj_3R_136()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_247() {
+    if (jj_3R_100()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_284()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_455() {
+    if (jj_3R_87()) return true;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_460()) jj_scanpos = xsp;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_219() {
+    if (jj_3R_247()) return true;
+    return false;
+  }
+
+  private boolean jj_3_47() {
+    if (jj_3R_87()) return true;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_443() {
+    if (jj_3R_302()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_442() {
+    if (jj_3R_300()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_187() {
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_219()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_126() {
+    if (jj_3R_107()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_441() {
+    if (jj_3R_299()) return true;
+    return false;
+  }
+
+  private boolean jj_3_11() {
+    if (jj_3R_94()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_440() {
+    if (jj_3R_298()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_87() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_11()) {
+    jj_scanpos = xsp;
+    if (jj_3R_126()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_439() {
+    if (jj_3R_455()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_286() {
+    if (jj_scan_token(NULL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_308() {
+    if (jj_scan_token(FALSE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_307() {
+    if (jj_scan_token(TRUE)) return true;
+    return false;
+  }
+
+  private boolean jj_3_46() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_121()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_426() {
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_427() {
+    if (jj_3R_116()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_439()) {
+    jj_scanpos = xsp;
+    if (jj_3R_440()) {
+    jj_scanpos = xsp;
+    if (jj_3R_441()) {
+    jj_scanpos = xsp;
+    if (jj_3R_442()) {
+    jj_scanpos = xsp;
+    if (jj_3R_443()) return true;
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_127() {
+    if (jj_scan_token(STATIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_89() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_127()) jj_scanpos = xsp;
+    if (jj_3R_128()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_285() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_307()) {
+    jj_scanpos = xsp;
+    if (jj_3R_308()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_409() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_426()) {
+    jj_scanpos = xsp;
+    if (jj_3R_427()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_254() {
+    if (jj_3R_286()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_218() {
+    if (jj_3R_246()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_253() {
+    if (jj_3R_285()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_184() {
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_218()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_399() {
+    if (jj_3R_409()) return true;
+    return false;
+  }
+
+  private boolean jj_3_9() {
+    if (jj_3R_92()) return true;
+    if (jj_scan_token(DOT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_252() {
+    if (jj_scan_token(STRING_LITERAL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_251() {
+    if (jj_scan_token(CHARACTER_LITERAL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_384() {
+    if (jj_scan_token(LBRACE)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_399()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_93() {
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_189() {
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  private boolean jj_3_10() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_93()) jj_scanpos = xsp;
+    if (jj_scan_token(THIS)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_250() {
+    if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_188() {
+    if (jj_3R_92()) return true;
+    if (jj_scan_token(DOT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_249() {
+    if (jj_scan_token(LONG_LITERAL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_132() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_188()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_189()) jj_scanpos = xsp;
+    if (jj_scan_token(SUPER)) return true;
+    if (jj_3R_187()) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_186() {
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_248() {
+    if (jj_scan_token(INTEGER_LITERAL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_131() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_186()) jj_scanpos = xsp;
+    if (jj_scan_token(THIS)) return true;
+    if (jj_3R_187()) return true;
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_300() {
+    if (jj_scan_token(AT)) return true;
+    if (jj_scan_token(INTERFACE)) return true;
+    if (jj_3R_119()) return true;
+    if (jj_3R_384()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_112() {
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_220() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_248()) {
+    jj_scanpos = xsp;
+    if (jj_3R_249()) {
+    jj_scanpos = xsp;
+    if (jj_3R_250()) {
+    jj_scanpos = xsp;
+    if (jj_3R_251()) {
+    jj_scanpos = xsp;
+    if (jj_3R_252()) {
+    jj_scanpos = xsp;
+    if (jj_3R_253()) {
+    jj_scanpos = xsp;
+    if (jj_3R_254()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_91() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_131()) {
+    jj_scanpos = xsp;
+    if (jj_3R_132()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_166() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_3R_100()) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3_31() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_112()) jj_scanpos = xsp;
+    if (jj_scan_token(IDENTIFIER)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_324() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_323()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_347() {
+    if (jj_3R_121()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_46()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_238() {
+    if (jj_3R_187()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_237() {
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_278() {
+    if (jj_3R_304()) return true;
+    return false;
+  }
+
+  private boolean jj_3_8() {
+    if (jj_3R_91()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_204() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_237()) jj_scanpos = xsp;
+    if (jj_3R_227()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_238()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_212() {
+    if (jj_scan_token(LBRACE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_347()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(88)) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3_7() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_90()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_203() {
+    if (jj_3R_225()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_167() {
+    if (jj_scan_token(ELLIPSIS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_202() {
+    if (jj_scan_token(THIS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_177() {
+    if (jj_3R_151()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_287() {
+    if (jj_3R_309()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_176() {
+    if (jj_3R_212()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_175() {
+    if (jj_3R_123()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_387() {
+    if (jj_3R_91()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_340() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_110()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_165() {
+    if (jj_scan_token(DOT)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_202()) {
+    jj_scanpos = xsp;
+    if (jj_3R_203()) {
+    jj_scanpos = xsp;
+    if (jj_3R_204()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_320() {
+    if (jj_3R_125()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_301() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_320()) jj_scanpos = xsp;
+    if (jj_3R_227()) return true;
+    if (jj_3R_385()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_386()) jj_scanpos = xsp;
+    if (jj_scan_token(LBRACE)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_387()) jj_scanpos = xsp;
+    if (jj_3R_184()) return true;
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_121() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_175()) {
+    jj_scanpos = xsp;
+    if (jj_3R_176()) {
+    jj_scanpos = xsp;
+    if (jj_3R_177()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_109() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_165()) {
+    jj_scanpos = xsp;
+    if (jj_3R_166()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_410() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_110()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_323() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_scan_token(ASSIGN)) return true;
+    if (jj_3R_121()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_164() {
+    if (jj_scan_token(DOT)) return true;
+    if (jj_scan_token(SUPER)) return true;
+    return false;
+  }
+
+  private boolean jj_3_30() {
+    if (jj_3R_109()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_226() {
+    if (jj_3R_125()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_304() {
+    if (jj_3R_323()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_324()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_108() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_30()) {
+    jj_scanpos = xsp;
+    if (jj_3R_164()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_228() {
+    if (jj_3R_187()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_110() {
+    if (jj_3R_116()) return true;
+    if (jj_3R_87()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_167()) jj_scanpos = xsp;
+    if (jj_3R_168()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_197() {
+    if (jj_3R_227()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_228()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3_29() {
+    if (jj_3R_111()) return true;
+    if (jj_scan_token(DOUBLECOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_214() {
+    if (jj_scan_token(AT)) return true;
+    if (jj_3R_119()) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_121()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_389() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3_28() {
+    if (jj_3R_111()) return true;
+    if (jj_scan_token(DOT)) return true;
+    if (jj_scan_token(CLASS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_341() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_168()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_120() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    if (jj_scan_token(ASSIGN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_205() {
+    if (jj_scan_token(LBRACKET)) return true;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_288() {
+    if (jj_3R_310()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_310() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_168()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_341()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_196() {
+    if (jj_3R_111()) return true;
+    if (jj_scan_token(DOUBLECOLON)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_226()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(78)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(43)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_215() {
+    if (jj_scan_token(AT)) return true;
+    if (jj_3R_119()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_322() {
+    if (jj_3R_90()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_7()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_195() {
+    if (jj_3R_111()) return true;
+    if (jj_scan_token(DOT)) return true;
+    if (jj_scan_token(CLASS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_194() {
+    if (jj_3R_225()) return true;
+    return false;
+  }
+
+  private boolean jj_3_27() {
+    if (jj_3R_110()) return true;
+    return false;
+  }
+
+  private boolean jj_3_45() {
+    if (jj_scan_token(AT)) return true;
+    if (jj_3R_119()) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_309() {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_110()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_340()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3_43() {
+    if (jj_scan_token(SEMICOLON)) return true;
+    if (jj_3R_117()) return true;
+    return false;
+  }
+
+  private boolean jj_3_44() {
+    if (jj_scan_token(AT)) return true;
+    if (jj_3R_119()) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_120()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(82)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_213() {
+    if (jj_scan_token(AT)) return true;
+    if (jj_3R_119()) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_278()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_400() {
+    if (jj_3R_110()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_410()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_180() {
+    if (jj_3R_215()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_259() {
+    if (jj_3R_100()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_288()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_258() {
+    if (jj_3R_110()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_287()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_179() {
+    if (jj_3R_214()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_224() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_258()) {
+    jj_scanpos = xsp;
+    if (jj_3R_259()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_385() {
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_400()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_178() {
+    if (jj_3R_213()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_257() {
+    if (jj_3R_125()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_193() {
+    if (jj_scan_token(LPAREN)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_224()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_222() {
+    if (jj_scan_token(DOUBLECOLON)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_257()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(78)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(43)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_123() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_178()) {
+    jj_scanpos = xsp;
+    if (jj_3R_179()) {
+    jj_scanpos = xsp;
+    if (jj_3R_180()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_223() {
+    if (jj_3R_187()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_152() {
+    return false;
+  }
+
+  private boolean jj_3R_391() {
+    if (jj_3R_128()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_390() {
+    if (jj_scan_token(THROWS)) return true;
+    if (jj_3R_401()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_321() {
+    if (jj_3R_125()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_303() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_321()) jj_scanpos = xsp;
+    if (jj_3R_111()) return true;
+    if (jj_3R_119()) return true;
+    if (jj_3R_385()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_389()) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_390()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_391()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(87)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_153() {
+    return false;
+  }
+
+  private boolean jj_3R_102() {
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind == GT &&
+                ((GTToken)getToken(1)).realKind == RSIGNEDSHIFT;
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_152()) return true;
+    if (jj_scan_token(GT)) return true;
+    if (jj_scan_token(GT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_256() {
+    if (jj_3R_187()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_221() {
+    if (jj_scan_token(DOT)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_255()) jj_scanpos = xsp;
+    if (jj_3R_227()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_256()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_255() {
+    if (jj_3R_97()) return true;
+    return false;
+  }
+
+  private boolean jj_3_26() {
+    if (jj_3R_109()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_192() {
+    if (jj_scan_token(SUPER)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_221()) {
+    jj_scanpos = xsp;
+    if (jj_3R_222()) {
+    jj_scanpos = xsp;
+    if (jj_3R_223()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_103() {
+    jj_lookingAhead = true;
+    jj_semLA = getToken(1).kind == GT &&
+                ((GTToken)getToken(1)).realKind == RUNSIGNEDSHIFT;
+    jj_lookingAhead = false;
+    if (!jj_semLA || jj_3R_153()) return true;
+    if (jj_scan_token(GT)) return true;
+    if (jj_scan_token(GT)) return true;
+    if (jj_scan_token(GT)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_191() {
+    if (jj_scan_token(THIS)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_185() {
+    if (jj_scan_token(LBRACE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_322()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(88)) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_190() {
+    if (jj_3R_220()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_134() {
+    if (jj_3R_109()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_130() {
+    if (jj_3R_100()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_129() {
+    if (jj_3R_185()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_207() {
+    if (jj_scan_token(ASSIGN)) return true;
+    if (jj_3R_90()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_453() {
+    if (jj_3R_117()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_43()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_133() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_190()) {
+    jj_scanpos = xsp;
+    if (jj_3R_191()) {
+    jj_scanpos = xsp;
+    if (jj_3R_192()) {
+    jj_scanpos = xsp;
+    if (jj_3R_193()) {
+    jj_scanpos = xsp;
+    if (jj_3R_194()) {
+    jj_scanpos = xsp;
+    if (jj_3R_195()) {
+    jj_scanpos = xsp;
+    if (jj_3R_196()) {
+    jj_scanpos = xsp;
+    if (jj_3R_197()) return true;
+    }
+    }
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3_25() {
+    if (jj_3R_108()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_90() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_129()) {
+    jj_scanpos = xsp;
+    if (jj_3R_130()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_454() {
+    if (jj_scan_token(BIT_OR)) return true;
+    if (jj_3R_87()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_438() {
+    if (jj_scan_token(FINALLY)) return true;
+    if (jj_3R_128()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_425() {
+    if (jj_scan_token(FINALLY)) return true;
+    if (jj_3R_128()) return true;
+    return false;
+  }
+
+  private boolean jj_3_42() {
+    if (jj_scan_token(SEMICOLON)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_436() {
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_453()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_42()) jj_scanpos = xsp;
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_437() {
+    if (jj_scan_token(CATCH)) return true;
+    if (jj_scan_token(LPAREN)) return true;
+    if (jj_3R_116()) return true;
+    if (jj_3R_87()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_454()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_168()) return true;
+    if (jj_scan_token(RPAREN)) return true;
+    if (jj_3R_128()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_168() {
+    if (jj_scan_token(IDENTIFIER)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_205()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_92() {
+    if (jj_3R_133()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_134()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  /** Generated Token Manager. */
+  public ASTParserTokenManager token_source;
+  JavaCharStream jj_input_stream;
+  /** Current token. */
+  public Token token;
+  /** Next token. */
+  public Token jj_nt;
+  private int jj_ntk;
+  private Token jj_scanpos, jj_lastpos;
+  private int jj_la;
+  /** Whether we are looking ahead. */
+  private boolean jj_lookingAhead = false;
+  private boolean jj_semLA;
+  private int jj_gen;
+  final private int[] jj_la1 = new int[175];
+  static private int[] jj_la1_0;
+  static private int[] jj_la1_1;
+  static private int[] jj_la1_2;
+  static private int[] jj_la1_3;
+  static private int[] jj_la1_4;
+  static {
+      jj_la1_init_0();
+      jj_la1_init_1();
+      jj_la1_init_2();
+      jj_la1_init_3();
+      jj_la1_init_4();
+   }
+   private static void jj_la1_init_0() {
+      jj_la1_0 = new int[] {0x0,0x48101000,0x1,0x0,0x0,0x0,0x40001000,0x8100000,0x48101000,0x100000,0x0,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4a995000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x0,0x0,0x0,0x4a995000,0x800000,0x8100000,0x2094000,0x4a995000,0x0,0x0,0x0,0x22094000,0x22094000,0x0,0x0,0x0,0x0,0x0,0x0,0x42095000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x22094000,0x6359f000,0x0,0x2094000,0x0,0x0,0x2094000,0x0,0x0,0x0,0x0,0x2094000,0x0,0x0,0x10000000,0x10000000,0x2094000,0x2094000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x22094000,0x0,0x0,0x22094000,0x0,0x0,0x2094000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x22094000,0x62095000,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x20000000,0x22094000,0x0,0x0,0x0,0x0,0x0,0x2094000,0x0,0x0,0x0,0x0,0x2349e000,0x0,0x2349e000,0x0,0x22094000,0x0,0x0,0x0,0x0,0x22094000,0x820000,0x820000,0x4000000,0x62095000,0x22094000,0x22094000,0x62095000,0x22094000,0x0,0x0,0x0,0x22094000,0x0,0x40000,0x0,0x80000000,0x0,0x0,0x0,0x22094000,0x22094000,0x0,0x4a195000,0xa194000,0x4a195000,0x800000,};
+   }
+   private static void jj_la1_init_1() {
+      jj_la1_1 = new int[] {0x20,0x8899c500,0x0,0x0,0x80000,0x0,0x8899c400,0x100,0x8899c500,0x100,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0xc89dc781,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc89dc781,0x0,0x100,0x40040281,0xc89dc781,0x0,0x0,0x0,0x51241a81,0x51241a81,0x0,0x0,0x0,0x4000000,0x0,0x0,0x889dc681,0x0,0x0,0x0,0x0,0x4000000,0x0,0x0,0x51241a81,0xfbffdf8b,0x80000,0x40281,0x0,0x0,0x40281,0x0,0x0,0x0,0x0,0x40281,0x0,0x0,0x200000,0x200000,0x40281,0x40040281,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x51241a81,0x0,0x0,0x51241a81,0x0,0x0,0x40281,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x51241a81,0xd9bdde81,0x0,0x800,0x0,0x11201800,0x0,0x0,0x0,0x0,0x1000800,0x0,0x10001000,0x10000000,0x51241a81,0x0,0x0,0x0,0x0,0x0,0x40281,0x0,0x0,0x0,0x0,0x73e61a8b,0x0,0x73e61a8b,0x0,0x51241a81,0x0,0x800,0x0,0x0,0x51241a81,0x0,0x0,0x0,0xd9bdde81,0x51241a81,0x51241a81,0xd9bdde81,0x51241a81,0x0,0x0,0x0,0x51241a81,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x51241a81,0x51241a81,0x0,0x889dc781,0x40381,0x889dc781,0x0,};
+   }
+   private static void jj_la1_init_2() {
+      jj_la1_2 = new int[] {0x0,0x4800000,0x0,0x4000000,0x0,0x2000000,0x4000000,0x4000000,0x4800000,0x0,0x10000000,0x0,0x0,0x4000000,0x1000000,0x4000000,0x1000000,0x0,0x4004000,0x1000000,0x14884000,0x800000,0x4000000,0x20000,0x80000,0x4000000,0x1000000,0x4000000,0x0,0x4000000,0x0,0x4000000,0x14884000,0x0,0x4000000,0x10004000,0x14804000,0x1000000,0x8000000,0x200000,0x600a7086,0x600a7086,0x1000000,0x10000000,0x200000,0x0,0x880000,0x1000000,0x4004000,0x1000000,0x1000000,0x0,0x10000000,0x0,0x10000000,0x10000000,0x10027086,0x48a7087,0x0,0x0,0x4000000,0x4000000,0x4000,0x4000000,0x1000000,0x10000000,0x4000000,0x80004000,0x4000000,0x4000000,0x0,0x0,0x0,0x4000,0x4000000,0x1000000,0x4000000,0x1000000,0x10000000,0x4000,0x0,0x8000000,0x8000000,0x80000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000000,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x60027086,0x60000000,0x60000000,0x27086,0x0,0x4000000,0x4000,0x10000000,0x20000,0x10000000,0x4000,0x2020000,0x1000000,0x1000000,0x60027086,0x64027086,0x10000000,0x4000,0x20000,0x23086,0x4000,0x2000000,0x10000000,0x20000,0x0,0x2200000,0x3086,0x0,0x60027086,0x1000000,0x4000000,0x4000000,0x10000000,0x4220000,0x10004000,0x4000000,0x4000000,0x200000,0x200000,0x8a7087,0x0,0x8a7087,0x1000000,0x600a7086,0x10000000,0x4000,0x8000000,0x8000000,0x27086,0x0,0x0,0x0,0x64027086,0x60027086,0x60027086,0x64827086,0x60027086,0x1000000,0x4000,0x4000,0x60027086,0x20000,0x0,0x0,0x0,0x4000000,0x4000,0x1000000,0x640a7086,0x640a7086,0x1000000,0x4804000,0x4004000,0x4804000,0x0,};
+   }
+   private static void jj_la1_init_3() {
+      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x780,0x780,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x0,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0000000,0xdffc0000,0x1ffc0000,0x0,0x20,0x40,0x4000,0x8000,0x2000,0x12,0x12,0x0,0xc,0xc,0x20000,0x600,0x600,0x11800,0x11800,0x600,0x780,0x0,0x0,0x0,0x180,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,0x780,0x780,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x780,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x1,0x180,0x0,0x780,0x0,0x0,0xdffc0180,0xdffc0180,0x100,0x0,0x0,0x0,0x780,0x780,0x780,0x780,0x780,0x0,0x0,0x0,0x780,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x780,0x780,0x0,0x0,0x0,0x0,0x0,};
+   }
+   private static void jj_la1_init_4() {
+      jj_la1_4 = new int[] {0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+   }
+  final private JJCalls[] jj_2_rtns = new JJCalls[47];
+  private boolean jj_rescan = false;
+  private int jj_gc = 0;
+
+  /** Constructor with InputStream. */
+  public ASTParser(java.io.InputStream stream) {
+     this(stream, null);
+  }
+  /** Constructor with InputStream and supplied encoding */
+  public ASTParser(java.io.InputStream stream, String encoding) {
+    try { jj_input_stream = new JavaCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+    token_source = new ASTParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 175; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  /** Reinitialise. */
+  public void ReInit(java.io.InputStream stream) {
+     ReInit(stream, null);
+  }
+  /** Reinitialise. */
+  public void ReInit(java.io.InputStream stream, String encoding) {
+    try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 175; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  /** Constructor. */
+  public ASTParser(java.io.Reader stream) {
+    jj_input_stream = new JavaCharStream(stream, 1, 1);
+    token_source = new ASTParserTokenManager(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 175; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  /** Reinitialise. */
+  public void ReInit(java.io.Reader stream) {
+    jj_input_stream.ReInit(stream, 1, 1);
+    token_source.ReInit(jj_input_stream);
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 175; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  /** Constructor with generated Token Manager. */
+  public ASTParser(ASTParserTokenManager tm) {
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 175; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  /** Reinitialise. */
+  public void ReInit(ASTParserTokenManager tm) {
+    token_source = tm;
+    token = new Token();
+    jj_ntk = -1;
+    jj_gen = 0;
+    for (int i = 0; i < 175; i++) jj_la1[i] = -1;
+    for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+  }
+
+  private Token jj_consume_token(int kind) {
+    Token oldToken;
+    if ((oldToken = token).next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    if (token.kind == kind) {
+      jj_gen++;
+      if (++jj_gc > 100) {
+        jj_gc = 0;
+        for (int i = 0; i < jj_2_rtns.length; i++) {
+          JJCalls c = jj_2_rtns[i];
+          while (c != null) {
+            if (c.gen < jj_gen) c.first = null;
+            c = c.next;
+          }
+        }
+      }
+      return token;
+    }
+    token = oldToken;
+    jj_kind = kind;
+    throw generateParseException();
+  }
+
+  static private final class LookaheadSuccess extends java.lang.Error { }
+  final private LookaheadSuccess jj_ls = new LookaheadSuccess();
+  private boolean jj_scan_token(int kind) {
+    if (jj_scanpos == jj_lastpos) {
+      jj_la--;
+      if (jj_scanpos.next == null) {
+        jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
+      } else {
+        jj_lastpos = jj_scanpos = jj_scanpos.next;
+      }
+    } else {
+      jj_scanpos = jj_scanpos.next;
+    }
+    if (jj_rescan) {
+      int i = 0; Token tok = token;
+      while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
+      if (tok != null) jj_add_error_token(kind, i);
+    }
+    if (jj_scanpos.kind != kind) return true;
+    if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
+    return false;
+  }
+
+
+/** Get the next Token. */
+  final public Token getNextToken() {
+    if (token.next != null) token = token.next;
+    else token = token.next = token_source.getNextToken();
+    jj_ntk = -1;
+    jj_gen++;
+    return token;
+  }
+
+/** Get the specific Token. */
+  final public Token getToken(int index) {
+    Token t = jj_lookingAhead ? jj_scanpos : token;
+    for (int i = 0; i < index; i++) {
+      if (t.next != null) t = t.next;
+      else t = t.next = token_source.getNextToken();
+    }
+    return t;
+  }
+
+  private int jj_ntk() {
+    if ((jj_nt=token.next) == null)
+      return (jj_ntk = (token.next=token_source.getNextToken()).kind);
+    else
+      return (jj_ntk = jj_nt.kind);
+  }
+
+  private java.util.List<int[]> jj_expentries = new java.util.ArrayList<int[]>();
+  private int[] jj_expentry;
+  private int jj_kind = -1;
+  private int[] jj_lasttokens = new int[100];
+  private int jj_endpos;
+
+  private void jj_add_error_token(int kind, int pos) {
+    if (pos >= 100) return;
+    if (pos == jj_endpos + 1) {
+      jj_lasttokens[jj_endpos++] = kind;
+    } else if (jj_endpos != 0) {
+      jj_expentry = new int[jj_endpos];
+      for (int i = 0; i < jj_endpos; i++) {
+        jj_expentry[i] = jj_lasttokens[i];
+      }
+      jj_entries_loop: for (java.util.Iterator<?> it = jj_expentries.iterator(); it.hasNext();) {
+        int[] oldentry = (int[])(it.next());
+        if (oldentry.length == jj_expentry.length) {
+          for (int i = 0; i < jj_expentry.length; i++) {
+            if (oldentry[i] != jj_expentry[i]) {
+              continue jj_entries_loop;
+            }
+          }
+          jj_expentries.add(jj_expentry);
+          break jj_entries_loop;
+        }
+      }
+      if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;
+    }
+  }
+
+  /** Generate ParseException. */
+  public ParseException generateParseException() {
+    jj_expentries.clear();
+    boolean[] la1tokens = new boolean[133];
+    if (jj_kind >= 0) {
+      la1tokens[jj_kind] = true;
+      jj_kind = -1;
+    }
+    for (int i = 0; i < 175; i++) {
+      if (jj_la1[i] == jj_gen) {
+        for (int j = 0; j < 32; j++) {
+          if ((jj_la1_0[i] & (1<<j)) != 0) {
+            la1tokens[j] = true;
+          }
+          if ((jj_la1_1[i] & (1<<j)) != 0) {
+            la1tokens[32+j] = true;
+          }
+          if ((jj_la1_2[i] & (1<<j)) != 0) {
+            la1tokens[64+j] = true;
+          }
+          if ((jj_la1_3[i] & (1<<j)) != 0) {
+            la1tokens[96+j] = true;
+          }
+          if ((jj_la1_4[i] & (1<<j)) != 0) {
+            la1tokens[128+j] = true;
+          }
+        }
+      }
+    }
+    for (int i = 0; i < 133; i++) {
+      if (la1tokens[i]) {
+        jj_expentry = new int[1];
+        jj_expentry[0] = i;
+        jj_expentries.add(jj_expentry);
+      }
+    }
+    jj_endpos = 0;
+    jj_rescan_token();
+    jj_add_error_token(0, 0);
+    int[][] exptokseq = new int[jj_expentries.size()][];
+    for (int i = 0; i < jj_expentries.size(); i++) {
+      exptokseq[i] = jj_expentries.get(i);
+    }
+    return new ParseException(token, exptokseq, tokenImage);
+  }
+
+  /** Enable tracing. */
+  final public void enable_tracing() {
+  }
+
+  /** Disable tracing. */
+  final public void disable_tracing() {
+  }
+
+  private void jj_rescan_token() {
+    jj_rescan = true;
+    for (int i = 0; i < 47; i++) {
+    try {
+      JJCalls p = jj_2_rtns[i];
+      do {
+        if (p.gen > jj_gen) {
+          jj_la = p.arg; jj_lastpos = jj_scanpos = p.first;
+          switch (i) {
+            case 0: jj_3_1(); break;
+            case 1: jj_3_2(); break;
+            case 2: jj_3_3(); break;
+            case 3: jj_3_4(); break;
+            case 4: jj_3_5(); break;
+            case 5: jj_3_6(); break;
+            case 6: jj_3_7(); break;
+            case 7: jj_3_8(); break;
+            case 8: jj_3_9(); break;
+            case 9: jj_3_10(); break;
+            case 10: jj_3_11(); break;
+            case 11: jj_3_12(); break;
+            case 12: jj_3_13(); break;
+            case 13: jj_3_14(); break;
+            case 14: jj_3_15(); break;
+            case 15: jj_3_16(); break;
+            case 16: jj_3_17(); break;
+            case 17: jj_3_18(); break;
+            case 18: jj_3_19(); break;
+            case 19: jj_3_20(); break;
+            case 20: jj_3_21(); break;
+            case 21: jj_3_22(); break;
+            case 22: jj_3_23(); break;
+            case 23: jj_3_24(); break;
+            case 24: jj_3_25(); break;
+            case 25: jj_3_26(); break;
+            case 26: jj_3_27(); break;
+            case 27: jj_3_28(); break;
+            case 28: jj_3_29(); break;
+            case 29: jj_3_30(); break;
+            case 30: jj_3_31(); break;
+            case 31: jj_3_32(); break;
+            case 32: jj_3_33(); break;
+            case 33: jj_3_34(); break;
+            case 34: jj_3_35(); break;
+            case 35: jj_3_36(); break;
+            case 36: jj_3_37(); break;
+            case 37: jj_3_38(); break;
+            case 38: jj_3_39(); break;
+            case 39: jj_3_40(); break;
+            case 40: jj_3_41(); break;
+            case 41: jj_3_42(); break;
+            case 42: jj_3_43(); break;
+            case 43: jj_3_44(); break;
+            case 44: jj_3_45(); break;
+            case 45: jj_3_46(); break;
+            case 46: jj_3_47(); break;
+          }
+        }
+        p = p.next;
+      } while (p != null);
+      } catch(LookaheadSuccess ls) { }
+    }
+    jj_rescan = false;
+  }
+
+  private void jj_save(int index, int xla) {
+    JJCalls p = jj_2_rtns[index];
+    while (p.gen > jj_gen) {
+      if (p.next == null) { p = p.next = new JJCalls(); break; }
+      p = p.next;
+    }
+    p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla;
+  }
+
+  static final class JJCalls {
+    int gen;
+    Token first;
+    int arg;
+    JJCalls next;
+  }
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParserConstants.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParserConstants.java
index 2a961fb562..3692dfc71e 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParserConstants.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParserConstants.java
@@ -20,649 +20,395 @@
  */
 public interface ASTParserConstants {
 
-    /**
-     * End of File.
-     */
-    int EOF = 0;
-    /**
-     * RegularExpression Id.
-     */
-    int SINGLE_LINE_COMMENT = 6;
-    /**
-     * RegularExpression Id.
-     */
-    int JAVA_DOC_COMMENT = 9;
-    /**
-     * RegularExpression Id.
-     */
-    int MULTI_LINE_COMMENT = 10;
-    /**
-     * RegularExpression Id.
-     */
-    int ABSTRACT = 12;
-    /**
-     * RegularExpression Id.
-     */
-    int ASSERT = 13;
-    /**
-     * RegularExpression Id.
-     */
-    int BOOLEAN = 14;
-    /**
-     * RegularExpression Id.
-     */
-    int BREAK = 15;
-    /**
-     * RegularExpression Id.
-     */
-    int BYTE = 16;
-    /**
-     * RegularExpression Id.
-     */
-    int CASE = 17;
-    /**
-     * RegularExpression Id.
-     */
-    int CATCH = 18;
-    /**
-     * RegularExpression Id.
-     */
-    int CHAR = 19;
-    /**
-     * RegularExpression Id.
-     */
-    int CLASS = 20;
-    /**
-     * RegularExpression Id.
-     */
-    int CONST = 21;
-    /**
-     * RegularExpression Id.
-     */
-    int CONTINUE = 22;
-    /**
-     * RegularExpression Id.
-     */
-    int _DEFAULT = 23;
-    /**
-     * RegularExpression Id.
-     */
-    int DO = 24;
-    /**
-     * RegularExpression Id.
-     */
-    int DOUBLE = 25;
-    /**
-     * RegularExpression Id.
-     */
-    int ELSE = 26;
-    /**
-     * RegularExpression Id.
-     */
-    int ENUM = 27;
-    /**
-     * RegularExpression Id.
-     */
-    int EXTENDS = 28;
-    /**
-     * RegularExpression Id.
-     */
-    int FALSE = 29;
-    /**
-     * RegularExpression Id.
-     */
-    int FINAL = 30;
-    /**
-     * RegularExpression Id.
-     */
-    int FINALLY = 31;
-    /**
-     * RegularExpression Id.
-     */
-    int FLOAT = 32;
-    /**
-     * RegularExpression Id.
-     */
-    int FOR = 33;
-    /**
-     * RegularExpression Id.
-     */
-    int GOTO = 34;
-    /**
-     * RegularExpression Id.
-     */
-    int IF = 35;
-    /**
-     * RegularExpression Id.
-     */
-    int IMPLEMENTS = 36;
-    /**
-     * RegularExpression Id.
-     */
-    int IMPORT = 37;
-    /**
-     * RegularExpression Id.
-     */
-    int INSTANCEOF = 38;
-    /**
-     * RegularExpression Id.
-     */
-    int INT = 39;
-    /**
-     * RegularExpression Id.
-     */
-    int INTERFACE = 40;
-    /**
-     * RegularExpression Id.
-     */
-    int LONG = 41;
-    /**
-     * RegularExpression Id.
-     */
-    int NATIVE = 42;
-    /**
-     * RegularExpression Id.
-     */
-    int NEW = 43;
-    /**
-     * RegularExpression Id.
-     */
-    int NULL = 44;
-    /**
-     * RegularExpression Id.
-     */
-    int PACKAGE = 45;
-    /**
-     * RegularExpression Id.
-     */
-    int PRIVATE = 46;
-    /**
-     * RegularExpression Id.
-     */
-    int PROTECTED = 47;
-    /**
-     * RegularExpression Id.
-     */
-    int PUBLIC = 48;
-    /**
-     * RegularExpression Id.
-     */
-    int RETURN = 49;
-    /**
-     * RegularExpression Id.
-     */
-    int SHORT = 50;
-    /**
-     * RegularExpression Id.
-     */
-    int STATIC = 51;
-    /**
-     * RegularExpression Id.
-     */
-    int STRICTFP = 52;
-    /**
-     * RegularExpression Id.
-     */
-    int SUPER = 53;
-    /**
-     * RegularExpression Id.
-     */
-    int SWITCH = 54;
-    /**
-     * RegularExpression Id.
-     */
-    int SYNCHRONIZED = 55;
-    /**
-     * RegularExpression Id.
-     */
-    int THIS = 56;
-    /**
-     * RegularExpression Id.
-     */
-    int THROW = 57;
-    /**
-     * RegularExpression Id.
-     */
-    int THROWS = 58;
-    /**
-     * RegularExpression Id.
-     */
-    int TRANSIENT = 59;
-    /**
-     * RegularExpression Id.
-     */
-    int TRUE = 60;
-    /**
-     * RegularExpression Id.
-     */
-    int TRY = 61;
-    /**
-     * RegularExpression Id.
-     */
-    int VOID = 62;
-    /**
-     * RegularExpression Id.
-     */
-    int VOLATILE = 63;
-    /**
-     * RegularExpression Id.
-     */
-    int WHILE = 64;
-    /**
-     * RegularExpression Id.
-     */
-    int LONG_LITERAL = 65;
-    /**
-     * RegularExpression Id.
-     */
-    int INTEGER_LITERAL = 66;
-    /**
-     * RegularExpression Id.
-     */
-    int DECIMAL_LITERAL = 67;
-    /**
-     * RegularExpression Id.
-     */
-    int HEX_LITERAL = 68;
-    /**
-     * RegularExpression Id.
-     */
-    int OCTAL_LITERAL = 69;
-    /**
-     * RegularExpression Id.
-     */
-    int BINARY_LITERAL = 70;
-    /**
-     * RegularExpression Id.
-     */
-    int FLOATING_POINT_LITERAL = 71;
-    /**
-     * RegularExpression Id.
-     */
-    int DECIMAL_FLOATING_POINT_LITERAL = 72;
-    /**
-     * RegularExpression Id.
-     */
-    int DECIMAL_EXPONENT = 73;
-    /**
-     * RegularExpression Id.
-     */
-    int HEXADECIMAL_FLOATING_POINT_LITERAL = 74;
-    /**
-     * RegularExpression Id.
-     */
-    int HEXADECIMAL_EXPONENT = 75;
-    /**
-     * RegularExpression Id.
-     */
-    int CHARACTER_LITERAL = 76;
-    /**
-     * RegularExpression Id.
-     */
-    int STRING_LITERAL = 77;
-    /**
-     * RegularExpression Id.
-     */
-    int IDENTIFIER = 78;
-    /**
-     * RegularExpression Id.
-     */
-    int LETTER = 79;
-    /**
-     * RegularExpression Id.
-     */
-    int PART_LETTER = 80;
-    /**
-     * RegularExpression Id.
-     */
-    int LPAREN = 81;
-    /**
-     * RegularExpression Id.
-     */
-    int RPAREN = 82;
-    /**
-     * RegularExpression Id.
-     */
-    int LBRACE = 83;
-    /**
-     * RegularExpression Id.
-     */
-    int RBRACE = 84;
-    /**
-     * RegularExpression Id.
-     */
-    int LBRACKET = 85;
-    /**
-     * RegularExpression Id.
-     */
-    int RBRACKET = 86;
-    /**
-     * RegularExpression Id.
-     */
-    int SEMICOLON = 87;
-    /**
-     * RegularExpression Id.
-     */
-    int COMMA = 88;
-    /**
-     * RegularExpression Id.
-     */
-    int DOT = 89;
-    /**
-     * RegularExpression Id.
-     */
-    int AT = 90;
-    /**
-     * RegularExpression Id.
-     */
-    int ASSIGN = 91;
-    /**
-     * RegularExpression Id.
-     */
-    int LT = 92;
-    /**
-     * RegularExpression Id.
-     */
-    int BANG = 93;
-    /**
-     * RegularExpression Id.
-     */
-    int TILDE = 94;
-    /**
-     * RegularExpression Id.
-     */
-    int HOOK = 95;
-    /**
-     * RegularExpression Id.
-     */
-    int COLON = 96;
-    /**
-     * RegularExpression Id.
-     */
-    int EQ = 97;
-    /**
-     * RegularExpression Id.
-     */
-    int LE = 98;
-    /**
-     * RegularExpression Id.
-     */
-    int GE = 99;
-    /**
-     * RegularExpression Id.
-     */
-    int NE = 100;
-    /**
-     * RegularExpression Id.
-     */
-    int SC_OR = 101;
-    /**
-     * RegularExpression Id.
-     */
-    int SC_AND = 102;
-    /**
-     * RegularExpression Id.
-     */
-    int INCR = 103;
-    /**
-     * RegularExpression Id.
-     */
-    int DECR = 104;
-    /**
-     * RegularExpression Id.
-     */
-    int PLUS = 105;
-    /**
-     * RegularExpression Id.
-     */
-    int MINUS = 106;
-    /**
-     * RegularExpression Id.
-     */
-    int STAR = 107;
-    /**
-     * RegularExpression Id.
-     */
-    int SLASH = 108;
-    /**
-     * RegularExpression Id.
-     */
-    int BIT_AND = 109;
-    /**
-     * RegularExpression Id.
-     */
-    int BIT_OR = 110;
-    /**
-     * RegularExpression Id.
-     */
-    int XOR = 111;
-    /**
-     * RegularExpression Id.
-     */
-    int REM = 112;
-    /**
-     * RegularExpression Id.
-     */
-    int LSHIFT = 113;
-    /**
-     * RegularExpression Id.
-     */
-    int PLUSASSIGN = 114;
-    /**
-     * RegularExpression Id.
-     */
-    int MINUSASSIGN = 115;
-    /**
-     * RegularExpression Id.
-     */
-    int STARASSIGN = 116;
-    /**
-     * RegularExpression Id.
-     */
-    int SLASHASSIGN = 117;
-    /**
-     * RegularExpression Id.
-     */
-    int ANDASSIGN = 118;
-    /**
-     * RegularExpression Id.
-     */
-    int ORASSIGN = 119;
-    /**
-     * RegularExpression Id.
-     */
-    int XORASSIGN = 120;
-    /**
-     * RegularExpression Id.
-     */
-    int REMASSIGN = 121;
-    /**
-     * RegularExpression Id.
-     */
-    int LSHIFTASSIGN = 122;
-    /**
-     * RegularExpression Id.
-     */
-    int RSIGNEDSHIFTASSIGN = 123;
-    /**
-     * RegularExpression Id.
-     */
-    int RUNSIGNEDSHIFTASSIGN = 124;
-    /**
-     * RegularExpression Id.
-     */
-    int ELLIPSIS = 125;
-    /**
-     * RegularExpression Id.
-     */
-    int ARROW = 126;
-    /**
-     * RegularExpression Id.
-     */
-    int DOUBLECOLON = 127;
-    /**
-     * RegularExpression Id.
-     */
-    int RUNSIGNEDSHIFT = 128;
-    /**
-     * RegularExpression Id.
-     */
-    int RSIGNEDSHIFT = 129;
-    /**
-     * RegularExpression Id.
-     */
-    int GT = 130;
+  /** End of File. */
+  int EOF = 0;
+  /** RegularExpression Id. */
+  int SINGLE_LINE_COMMENT = 6;
+  /** RegularExpression Id. */
+  int JAVA_DOC_COMMENT = 9;
+  /** RegularExpression Id. */
+  int MULTI_LINE_COMMENT = 10;
+  /** RegularExpression Id. */
+  int ABSTRACT = 12;
+  /** RegularExpression Id. */
+  int ASSERT = 13;
+  /** RegularExpression Id. */
+  int BOOLEAN = 14;
+  /** RegularExpression Id. */
+  int BREAK = 15;
+  /** RegularExpression Id. */
+  int BYTE = 16;
+  /** RegularExpression Id. */
+  int CASE = 17;
+  /** RegularExpression Id. */
+  int CATCH = 18;
+  /** RegularExpression Id. */
+  int CHAR = 19;
+  /** RegularExpression Id. */
+  int CLASS = 20;
+  /** RegularExpression Id. */
+  int CONST = 21;
+  /** RegularExpression Id. */
+  int CONTINUE = 22;
+  /** RegularExpression Id. */
+  int _DEFAULT = 23;
+  /** RegularExpression Id. */
+  int DO = 24;
+  /** RegularExpression Id. */
+  int DOUBLE = 25;
+  /** RegularExpression Id. */
+  int ELSE = 26;
+  /** RegularExpression Id. */
+  int ENUM = 27;
+  /** RegularExpression Id. */
+  int EXTENDS = 28;
+  /** RegularExpression Id. */
+  int FALSE = 29;
+  /** RegularExpression Id. */
+  int FINAL = 30;
+  /** RegularExpression Id. */
+  int FINALLY = 31;
+  /** RegularExpression Id. */
+  int FLOAT = 32;
+  /** RegularExpression Id. */
+  int FOR = 33;
+  /** RegularExpression Id. */
+  int GOTO = 34;
+  /** RegularExpression Id. */
+  int IF = 35;
+  /** RegularExpression Id. */
+  int IMPLEMENTS = 36;
+  /** RegularExpression Id. */
+  int IMPORT = 37;
+  /** RegularExpression Id. */
+  int INSTANCEOF = 38;
+  /** RegularExpression Id. */
+  int INT = 39;
+  /** RegularExpression Id. */
+  int INTERFACE = 40;
+  /** RegularExpression Id. */
+  int LONG = 41;
+  /** RegularExpression Id. */
+  int NATIVE = 42;
+  /** RegularExpression Id. */
+  int NEW = 43;
+  /** RegularExpression Id. */
+  int NULL = 44;
+  /** RegularExpression Id. */
+  int PACKAGE = 45;
+  /** RegularExpression Id. */
+  int PRIVATE = 46;
+  /** RegularExpression Id. */
+  int PROTECTED = 47;
+  /** RegularExpression Id. */
+  int PUBLIC = 48;
+  /** RegularExpression Id. */
+  int RETURN = 49;
+  /** RegularExpression Id. */
+  int SHORT = 50;
+  /** RegularExpression Id. */
+  int STATIC = 51;
+  /** RegularExpression Id. */
+  int STRICTFP = 52;
+  /** RegularExpression Id. */
+  int SUPER = 53;
+  /** RegularExpression Id. */
+  int SWITCH = 54;
+  /** RegularExpression Id. */
+  int SYNCHRONIZED = 55;
+  /** RegularExpression Id. */
+  int THIS = 56;
+  /** RegularExpression Id. */
+  int THROW = 57;
+  /** RegularExpression Id. */
+  int THROWS = 58;
+  /** RegularExpression Id. */
+  int TRANSIENT = 59;
+  /** RegularExpression Id. */
+  int TRUE = 60;
+  /** RegularExpression Id. */
+  int TRY = 61;
+  /** RegularExpression Id. */
+  int VOID = 62;
+  /** RegularExpression Id. */
+  int VOLATILE = 63;
+  /** RegularExpression Id. */
+  int WHILE = 64;
+  /** RegularExpression Id. */
+  int LONG_LITERAL = 65;
+  /** RegularExpression Id. */
+  int INTEGER_LITERAL = 66;
+  /** RegularExpression Id. */
+  int DECIMAL_LITERAL = 67;
+  /** RegularExpression Id. */
+  int HEX_LITERAL = 68;
+  /** RegularExpression Id. */
+  int OCTAL_LITERAL = 69;
+  /** RegularExpression Id. */
+  int BINARY_LITERAL = 70;
+  /** RegularExpression Id. */
+  int FLOATING_POINT_LITERAL = 71;
+  /** RegularExpression Id. */
+  int DECIMAL_FLOATING_POINT_LITERAL = 72;
+  /** RegularExpression Id. */
+  int DECIMAL_EXPONENT = 73;
+  /** RegularExpression Id. */
+  int HEXADECIMAL_FLOATING_POINT_LITERAL = 74;
+  /** RegularExpression Id. */
+  int HEXADECIMAL_EXPONENT = 75;
+  /** RegularExpression Id. */
+  int CHARACTER_LITERAL = 76;
+  /** RegularExpression Id. */
+  int STRING_LITERAL = 77;
+  /** RegularExpression Id. */
+  int IDENTIFIER = 78;
+  /** RegularExpression Id. */
+  int LETTER = 79;
+  /** RegularExpression Id. */
+  int PART_LETTER = 80;
+  /** RegularExpression Id. */
+  int LPAREN = 81;
+  /** RegularExpression Id. */
+  int RPAREN = 82;
+  /** RegularExpression Id. */
+  int LBRACE = 83;
+  /** RegularExpression Id. */
+  int RBRACE = 84;
+  /** RegularExpression Id. */
+  int LBRACKET = 85;
+  /** RegularExpression Id. */
+  int RBRACKET = 86;
+  /** RegularExpression Id. */
+  int SEMICOLON = 87;
+  /** RegularExpression Id. */
+  int COMMA = 88;
+  /** RegularExpression Id. */
+  int DOT = 89;
+  /** RegularExpression Id. */
+  int AT = 90;
+  /** RegularExpression Id. */
+  int ASSIGN = 91;
+  /** RegularExpression Id. */
+  int LT = 92;
+  /** RegularExpression Id. */
+  int BANG = 93;
+  /** RegularExpression Id. */
+  int TILDE = 94;
+  /** RegularExpression Id. */
+  int HOOK = 95;
+  /** RegularExpression Id. */
+  int COLON = 96;
+  /** RegularExpression Id. */
+  int EQ = 97;
+  /** RegularExpression Id. */
+  int LE = 98;
+  /** RegularExpression Id. */
+  int GE = 99;
+  /** RegularExpression Id. */
+  int NE = 100;
+  /** RegularExpression Id. */
+  int SC_OR = 101;
+  /** RegularExpression Id. */
+  int SC_AND = 102;
+  /** RegularExpression Id. */
+  int INCR = 103;
+  /** RegularExpression Id. */
+  int DECR = 104;
+  /** RegularExpression Id. */
+  int PLUS = 105;
+  /** RegularExpression Id. */
+  int MINUS = 106;
+  /** RegularExpression Id. */
+  int STAR = 107;
+  /** RegularExpression Id. */
+  int SLASH = 108;
+  /** RegularExpression Id. */
+  int BIT_AND = 109;
+  /** RegularExpression Id. */
+  int BIT_OR = 110;
+  /** RegularExpression Id. */
+  int XOR = 111;
+  /** RegularExpression Id. */
+  int REM = 112;
+  /** RegularExpression Id. */
+  int LSHIFT = 113;
+  /** RegularExpression Id. */
+  int PLUSASSIGN = 114;
+  /** RegularExpression Id. */
+  int MINUSASSIGN = 115;
+  /** RegularExpression Id. */
+  int STARASSIGN = 116;
+  /** RegularExpression Id. */
+  int SLASHASSIGN = 117;
+  /** RegularExpression Id. */
+  int ANDASSIGN = 118;
+  /** RegularExpression Id. */
+  int ORASSIGN = 119;
+  /** RegularExpression Id. */
+  int XORASSIGN = 120;
+  /** RegularExpression Id. */
+  int REMASSIGN = 121;
+  /** RegularExpression Id. */
+  int LSHIFTASSIGN = 122;
+  /** RegularExpression Id. */
+  int RSIGNEDSHIFTASSIGN = 123;
+  /** RegularExpression Id. */
+  int RUNSIGNEDSHIFTASSIGN = 124;
+  /** RegularExpression Id. */
+  int ELLIPSIS = 125;
+  /** RegularExpression Id. */
+  int ARROW = 126;
+  /** RegularExpression Id. */
+  int DOUBLECOLON = 127;
+  /** RegularExpression Id. */
+  int RUNSIGNEDSHIFT = 128;
+  /** RegularExpression Id. */
+  int RSIGNEDSHIFT = 129;
+  /** RegularExpression Id. */
+  int GT = 130;
 
-    /**
-     * Lexical state.
-     */
-    int DEFAULT = 0;
-    /**
-     * Lexical state.
-     */
-    int IN_JAVA_DOC_COMMENT = 1;
-    /**
-     * Lexical state.
-     */
-    int IN_MULTI_LINE_COMMENT = 2;
+  /** Lexical state. */
+  int DEFAULT = 0;
+  /** Lexical state. */
+  int IN_JAVA_DOC_COMMENT = 1;
+  /** Lexical state. */
+  int IN_MULTI_LINE_COMMENT = 2;
 
-    /**
-     * Literal token values.
-     */
-    String[] tokenImage = {
-            "<EOF>",
-            "\" \"",
-            "\"\\t\"",
-            "\"\\n\"",
-            "\"\\r\"",
-            "\"\\f\"",
-            "<SINGLE_LINE_COMMENT>",
-            "<token of kind 7>",
-            "\"/*\"",
-            "\"*/\"",
-            "\"*/\"",
-            "<token of kind 11>",
-            "\"abstract\"",
-            "\"assert\"",
-            "\"boolean\"",
-            "\"break\"",
-            "\"byte\"",
-            "\"case\"",
-            "\"catch\"",
-            "\"char\"",
-            "\"class\"",
-            "\"const\"",
-            "\"continue\"",
-            "\"default\"",
-            "\"do\"",
-            "\"double\"",
-            "\"else\"",
-            "\"enum\"",
-            "\"extends\"",
-            "\"false\"",
-            "\"final\"",
-            "\"finally\"",
-            "\"float\"",
-            "\"for\"",
-            "\"goto\"",
-            "\"if\"",
-            "\"implements\"",
-            "\"import\"",
-            "\"instanceof\"",
-            "\"int\"",
-            "\"interface\"",
-            "\"long\"",
-            "\"native\"",
-            "\"new\"",
-            "\"null\"",
-            "\"package\"",
-            "\"private\"",
-            "\"protected\"",
-            "\"public\"",
-            "\"return\"",
-            "\"short\"",
-            "\"static\"",
-            "\"strictfp\"",
-            "\"super\"",
-            "\"switch\"",
-            "\"synchronized\"",
-            "\"this\"",
-            "\"throw\"",
-            "\"throws\"",
-            "\"transient\"",
-            "\"true\"",
-            "\"try\"",
-            "\"void\"",
-            "\"volatile\"",
-            "\"while\"",
-            "<LONG_LITERAL>",
-            "<INTEGER_LITERAL>",
-            "<DECIMAL_LITERAL>",
-            "<HEX_LITERAL>",
-            "<OCTAL_LITERAL>",
-            "<BINARY_LITERAL>",
-            "<FLOATING_POINT_LITERAL>",
-            "<DECIMAL_FLOATING_POINT_LITERAL>",
-            "<DECIMAL_EXPONENT>",
-            "<HEXADECIMAL_FLOATING_POINT_LITERAL>",
-            "<HEXADECIMAL_EXPONENT>",
-            "<CHARACTER_LITERAL>",
-            "<STRING_LITERAL>",
-            "<IDENTIFIER>",
-            "<LETTER>",
-            "<PART_LETTER>",
-            "\"(\"",
-            "\")\"",
-            "\"{\"",
-            "\"}\"",
-            "\"[\"",
-            "\"]\"",
-            "\";\"",
-            "\",\"",
-            "\".\"",
-            "\"@\"",
-            "\"=\"",
-            "\"<\"",
-            "\"!\"",
-            "\"~\"",
-            "\"?\"",
-            "\":\"",
-            "\"==\"",
-            "\"<=\"",
-            "\">=\"",
-            "\"!=\"",
-            "\"||\"",
-            "\"&&\"",
-            "\"++\"",
-            "\"--\"",
-            "\"+\"",
-            "\"-\"",
-            "\"*\"",
-            "\"/\"",
-            "\"&\"",
-            "\"|\"",
-            "\"^\"",
-            "\"%\"",
-            "\"<<\"",
-            "\"+=\"",
-            "\"-=\"",
-            "\"*=\"",
-            "\"/=\"",
-            "\"&=\"",
-            "\"|=\"",
-            "\"^=\"",
-            "\"%=\"",
-            "\"<<=\"",
-            "\">>=\"",
-            "\">>>=\"",
-            "\"...\"",
-            "\"->\"",
-            "\"::\"",
-            "\">>>\"",
-            "\">>\"",
-            "\">\"",
-            "\"\\u001a\"",
-            "\"<>\"",
-    };
+  /** Literal token values. */
+  String[] tokenImage = {
+    "<EOF>",
+    "\" \"",
+    "\"\\t\"",
+    "\"\\n\"",
+    "\"\\r\"",
+    "\"\\f\"",
+    "<SINGLE_LINE_COMMENT>",
+    "<token of kind 7>",
+    "\"/*\"",
+    "\"*/\"",
+    "\"*/\"",
+    "<token of kind 11>",
+    "\"abstract\"",
+    "\"assert\"",
+    "\"boolean\"",
+    "\"break\"",
+    "\"byte\"",
+    "\"case\"",
+    "\"catch\"",
+    "\"char\"",
+    "\"class\"",
+    "\"const\"",
+    "\"continue\"",
+    "\"default\"",
+    "\"do\"",
+    "\"double\"",
+    "\"else\"",
+    "\"enum\"",
+    "\"extends\"",
+    "\"false\"",
+    "\"final\"",
+    "\"finally\"",
+    "\"float\"",
+    "\"for\"",
+    "\"goto\"",
+    "\"if\"",
+    "\"implements\"",
+    "\"import\"",
+    "\"instanceof\"",
+    "\"int\"",
+    "\"interface\"",
+    "\"long\"",
+    "\"native\"",
+    "\"new\"",
+    "\"null\"",
+    "\"package\"",
+    "\"private\"",
+    "\"protected\"",
+    "\"public\"",
+    "\"return\"",
+    "\"short\"",
+    "\"static\"",
+    "\"strictfp\"",
+    "\"super\"",
+    "\"switch\"",
+    "\"synchronized\"",
+    "\"this\"",
+    "\"throw\"",
+    "\"throws\"",
+    "\"transient\"",
+    "\"true\"",
+    "\"try\"",
+    "\"void\"",
+    "\"volatile\"",
+    "\"while\"",
+    "<LONG_LITERAL>",
+    "<INTEGER_LITERAL>",
+    "<DECIMAL_LITERAL>",
+    "<HEX_LITERAL>",
+    "<OCTAL_LITERAL>",
+    "<BINARY_LITERAL>",
+    "<FLOATING_POINT_LITERAL>",
+    "<DECIMAL_FLOATING_POINT_LITERAL>",
+    "<DECIMAL_EXPONENT>",
+    "<HEXADECIMAL_FLOATING_POINT_LITERAL>",
+    "<HEXADECIMAL_EXPONENT>",
+    "<CHARACTER_LITERAL>",
+    "<STRING_LITERAL>",
+    "<IDENTIFIER>",
+    "<LETTER>",
+    "<PART_LETTER>",
+    "\"(\"",
+    "\")\"",
+    "\"{\"",
+    "\"}\"",
+    "\"[\"",
+    "\"]\"",
+    "\";\"",
+    "\",\"",
+    "\".\"",
+    "\"@\"",
+    "\"=\"",
+    "\"<\"",
+    "\"!\"",
+    "\"~\"",
+    "\"?\"",
+    "\":\"",
+    "\"==\"",
+    "\"<=\"",
+    "\">=\"",
+    "\"!=\"",
+    "\"||\"",
+    "\"&&\"",
+    "\"++\"",
+    "\"--\"",
+    "\"+\"",
+    "\"-\"",
+    "\"*\"",
+    "\"/\"",
+    "\"&\"",
+    "\"|\"",
+    "\"^\"",
+    "\"%\"",
+    "\"<<\"",
+    "\"+=\"",
+    "\"-=\"",
+    "\"*=\"",
+    "\"/=\"",
+    "\"&=\"",
+    "\"|=\"",
+    "\"^=\"",
+    "\"%=\"",
+    "\"<<=\"",
+    "\">>=\"",
+    "\">>>=\"",
+    "\"...\"",
+    "\"->\"",
+    "\"::\"",
+    "\">>>\"",
+    "\">>\"",
+    "\">\"",
+    "\"\\u001a\"",
+    "\"<>\"",
+  };
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParserTokenManager.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParserTokenManager.java
index 7f8b3e6fb9..8c157641c1 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParserTokenManager.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ASTParserTokenManager.java
@@ -12,10 +12,8 @@
  * along with Java 1.8 parser and Abstract Syntax Tree.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.github.javaparser;
-
 import java.io.*;
 import java.util.*;
-
 import com.github.javaparser.ast.*;
 import com.github.javaparser.ast.body.*;
 import com.github.javaparser.ast.comments.*;
@@ -23,2507 +21,2539 @@
 import com.github.javaparser.ast.stmt.*;
 import com.github.javaparser.ast.type.*;
 
-/**
- * Token Manager.
- */
-public class ASTParserTokenManager implements ASTParserConstants {
-
-    /**
-     * Debug output.
-     */
-    public java.io.PrintStream debugStream = System.out;
-
-    /**
-     * Set debug output.
-     */
-    public void setDebugStream(java.io.PrintStream ds) {
-        debugStream = ds;
-    }
-
-    private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1, long active2) {
-        switch (pos) {
-            case 0:
-                if ((active0 & 0xfffffffffffff000L) != 0L || (active1 & 0x1L) != 0L) {
-                    jjmatchedKind = 78;
-                    return 43;
-                }
-                if ((active0 & 0x100L) != 0L || (active1 & 0x20100000000000L) != 0L)
-                    return 45;
-                if ((active1 & 0x2000000002000000L) != 0L)
-                    return 1;
-                return -1;
-            case 1:
-                if ((active0 & 0x803000000L) != 0L)
-                    return 43;
-                if ((active0 & 0xfffffff7fcfff000L) != 0L || (active1 & 0x1L) != 0L) {
-                    if (jjmatchedPos != 1) {
-                        jjmatchedKind = 78;
-                        jjmatchedPos = 1;
-                    }
-                    return 43;
-                }
-                if ((active0 & 0x100L) != 0L)
-                    return 50;
-                return -1;
-            case 2:
-                if ((active0 & 0x2000098200000000L) != 0L)
-                    return 43;
-                if ((active0 & 0xdffff675fefff000L) != 0L || (active1 & 0x1L) != 0L) {
-                    if (jjmatchedPos != 2) {
-                        jjmatchedKind = 78;
-                        jjmatchedPos = 2;
-                    }
-                    return 43;
-                }
-                return -1;
-            case 3:
-                if ((active0 & 0x8effe571f2f4f000L) != 0L || (active1 & 0x1L) != 0L) {
-                    jjmatchedKind = 78;
-                    jjmatchedPos = 3;
-                    return 43;
-                }
-                if ((active0 & 0x510012040c0b0000L) != 0L)
-                    return 43;
-                return -1;
-            case 4:
-                if ((active0 & 0x88dbe57012c07000L) != 0L) {
-                    if (jjmatchedPos != 4) {
-                        jjmatchedKind = 78;
-                        jjmatchedPos = 4;
-                    }
-                    return 43;
-                }
-                if ((active0 & 0x6240001e0348000L) != 0L || (active1 & 0x1L) != 0L)
-                    return 43;
-                return -1;
-            case 5:
-                if ((active0 & 0x44b042002002000L) != 0L)
-                    return 43;
-                if ((active0 & 0x8890e15090c05000L) != 0L) {
-                    jjmatchedKind = 78;
-                    jjmatchedPos = 5;
-                    return 43;
-                }
-                return -1;
-            case 6:
-                if ((active0 & 0x600090804000L) != 0L)
-                    return 43;
-                if ((active0 & 0x8890815000401000L) != 0L) {
-                    jjmatchedKind = 78;
-                    jjmatchedPos = 6;
-                    return 43;
-                }
-                return -1;
-            case 7:
-                if ((active0 & 0x880815000000000L) != 0L) {
-                    jjmatchedKind = 78;
-                    jjmatchedPos = 7;
-                    return 43;
-                }
-                if ((active0 & 0x8010000000401000L) != 0L)
-                    return 43;
-                return -1;
-            case 8:
-                if ((active0 & 0x800810000000000L) != 0L)
-                    return 43;
-                if ((active0 & 0x80005000000000L) != 0L) {
-                    jjmatchedKind = 78;
-                    jjmatchedPos = 8;
-                    return 43;
-                }
-                return -1;
-            case 9:
-                if ((active0 & 0x5000000000L) != 0L)
-                    return 43;
-                if ((active0 & 0x80000000000000L) != 0L) {
-                    jjmatchedKind = 78;
-                    jjmatchedPos = 9;
-                    return 43;
-                }
-                return -1;
-            case 10:
-                if ((active0 & 0x80000000000000L) != 0L) {
-                    jjmatchedKind = 78;
-                    jjmatchedPos = 10;
-                    return 43;
-                }
-                return -1;
-            default:
-                return -1;
-        }
-    }
-
-    private final int jjStartNfa_0(int pos, long active0, long active1, long active2) {
-        return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1, active2), pos + 1);
-    }
-
-    private int jjStopAtPos(int pos, int kind) {
-        jjmatchedKind = kind;
-        jjmatchedPos = pos;
-        return pos + 1;
-    }
+/** Token Manager. */
+public class ASTParserTokenManager implements ASTParserConstants
+{
 
-    private int jjMoveStringLiteralDfa0_0() {
-        switch (curChar) {
-            case 26:
-                return jjStopAtPos(0, 131);
-            case 33:
-                jjmatchedKind = 93;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x1000000000L, 0x0L);
-            case 37:
-                jjmatchedKind = 112;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000000000L, 0x0L);
-            case 38:
-                jjmatchedKind = 109;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x40004000000000L, 0x0L);
-            case 40:
-                return jjStopAtPos(0, 81);
-            case 41:
-                return jjStopAtPos(0, 82);
-            case 42:
-                jjmatchedKind = 107;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x10000000000000L, 0x0L);
-            case 43:
-                jjmatchedKind = 105;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x4008000000000L, 0x0L);
-            case 44:
-                return jjStopAtPos(0, 88);
-            case 45:
-                jjmatchedKind = 106;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x4008010000000000L, 0x0L);
-            case 46:
-                jjmatchedKind = 89;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000000000000L, 0x0L);
-            case 47:
-                jjmatchedKind = 108;
-                return jjMoveStringLiteralDfa1_0(0x100L, 0x20000000000000L, 0x0L);
-            case 58:
-                jjmatchedKind = 96;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x8000000000000000L, 0x0L);
-            case 59:
-                return jjStopAtPos(0, 87);
-            case 60:
-                jjmatchedKind = 92;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x402000400000000L, 0x10L);
-            case 61:
-                jjmatchedKind = 91;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000L, 0x0L);
-            case 62:
-                jjmatchedKind = 130;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x1800000800000000L, 0x3L);
-            case 63:
-                return jjStopAtPos(0, 95);
-            case 64:
-                return jjStopAtPos(0, 90);
-            case 91:
-                return jjStopAtPos(0, 85);
-            case 93:
-                return jjStopAtPos(0, 86);
-            case 94:
-                jjmatchedKind = 111;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x100000000000000L, 0x0L);
-            case 97:
-                return jjMoveStringLiteralDfa1_0(0x3000L, 0x0L, 0x0L);
-            case 98:
-                return jjMoveStringLiteralDfa1_0(0x1c000L, 0x0L, 0x0L);
-            case 99:
-                return jjMoveStringLiteralDfa1_0(0x7e0000L, 0x0L, 0x0L);
-            case 100:
-                return jjMoveStringLiteralDfa1_0(0x3800000L, 0x0L, 0x0L);
-            case 101:
-                return jjMoveStringLiteralDfa1_0(0x1c000000L, 0x0L, 0x0L);
-            case 102:
-                return jjMoveStringLiteralDfa1_0(0x3e0000000L, 0x0L, 0x0L);
-            case 103:
-                return jjMoveStringLiteralDfa1_0(0x400000000L, 0x0L, 0x0L);
-            case 105:
-                return jjMoveStringLiteralDfa1_0(0x1f800000000L, 0x0L, 0x0L);
-            case 108:
-                return jjMoveStringLiteralDfa1_0(0x20000000000L, 0x0L, 0x0L);
-            case 110:
-                return jjMoveStringLiteralDfa1_0(0x1c0000000000L, 0x0L, 0x0L);
-            case 112:
-                return jjMoveStringLiteralDfa1_0(0x1e00000000000L, 0x0L, 0x0L);
-            case 114:
-                return jjMoveStringLiteralDfa1_0(0x2000000000000L, 0x0L, 0x0L);
-            case 115:
-                return jjMoveStringLiteralDfa1_0(0xfc000000000000L, 0x0L, 0x0L);
-            case 116:
-                return jjMoveStringLiteralDfa1_0(0x3f00000000000000L, 0x0L, 0x0L);
-            case 118:
-                return jjMoveStringLiteralDfa1_0(0xc000000000000000L, 0x0L, 0x0L);
-            case 119:
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x1L, 0x0L);
-            case 123:
-                return jjStopAtPos(0, 83);
-            case 124:
-                jjmatchedKind = 110;
-                return jjMoveStringLiteralDfa1_0(0x0L, 0x80002000000000L, 0x0L);
-            case 125:
-                return jjStopAtPos(0, 84);
-            case 126:
-                return jjStopAtPos(0, 94);
-            default:
-                return jjMoveNfa_0(0, 0);
-        }
-    }
-
-    private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2) {
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(0, active0, active1, active2);
+  /** Debug output. */
+  public  java.io.PrintStream debugStream = System.out;
+  /** Set debug output. */
+  public  void setDebugStream(java.io.PrintStream ds) { debugStream = ds; }
+private final int jjStopStringLiteralDfa_0(int pos, long active0, long active1, long active2)
+{
+   switch (pos)
+   {
+      case 0:
+         if ((active0 & 0xfffffffffffff000L) != 0L || (active1 & 0x1L) != 0L)
+         {
+            jjmatchedKind = 78;
+            return 43;
+         }
+         if ((active0 & 0x100L) != 0L || (active1 & 0x20100000000000L) != 0L)
+            return 45;
+         if ((active1 & 0x2000000002000000L) != 0L)
             return 1;
-        }
-        switch (curChar) {
-            case 38:
-                if ((active1 & 0x4000000000L) != 0L)
-                    return jjStopAtPos(1, 102);
-                break;
-            case 42:
-                if ((active0 & 0x100L) != 0L)
-                    return jjStartNfaWithStates_0(1, 8, 50);
-                break;
-            case 43:
-                if ((active1 & 0x8000000000L) != 0L)
-                    return jjStopAtPos(1, 103);
-                break;
-            case 45:
-                if ((active1 & 0x10000000000L) != 0L)
-                    return jjStopAtPos(1, 104);
-                break;
-            case 46:
-                return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000000000L, active2, 0L);
-            case 58:
-                if ((active1 & 0x8000000000000000L) != 0L)
-                    return jjStopAtPos(1, 127);
-                break;
-            case 60:
-                if ((active1 & 0x2000000000000L) != 0L) {
-                    jjmatchedKind = 113;
-                    jjmatchedPos = 1;
-                }
-                return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400000000000000L, active2, 0L);
-            case 61:
-                if ((active1 & 0x200000000L) != 0L)
-                    return jjStopAtPos(1, 97);
-                else if ((active1 & 0x400000000L) != 0L)
-                    return jjStopAtPos(1, 98);
-                else if ((active1 & 0x800000000L) != 0L)
-                    return jjStopAtPos(1, 99);
-                else if ((active1 & 0x1000000000L) != 0L)
-                    return jjStopAtPos(1, 100);
-                else if ((active1 & 0x4000000000000L) != 0L)
-                    return jjStopAtPos(1, 114);
-                else if ((active1 & 0x8000000000000L) != 0L)
-                    return jjStopAtPos(1, 115);
-                else if ((active1 & 0x10000000000000L) != 0L)
-                    return jjStopAtPos(1, 116);
-                else if ((active1 & 0x20000000000000L) != 0L)
-                    return jjStopAtPos(1, 117);
-                else if ((active1 & 0x40000000000000L) != 0L)
-                    return jjStopAtPos(1, 118);
-                else if ((active1 & 0x80000000000000L) != 0L)
-                    return jjStopAtPos(1, 119);
-                else if ((active1 & 0x100000000000000L) != 0L)
-                    return jjStopAtPos(1, 120);
-                else if ((active1 & 0x200000000000000L) != 0L)
-                    return jjStopAtPos(1, 121);
-                break;
-            case 62:
-                if ((active1 & 0x4000000000000000L) != 0L)
-                    return jjStopAtPos(1, 126);
-                else if ((active2 & 0x2L) != 0L) {
-                    jjmatchedKind = 129;
-                    jjmatchedPos = 1;
-                } else if ((active2 & 0x10L) != 0L)
-                    return jjStopAtPos(1, 132);
-                return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1800000000000000L, active2, 0x1L);
-            case 97:
-                return jjMoveStringLiteralDfa2_0(active0, 0x240020060000L, active1, 0L, active2, 0L);
-            case 98:
-                return jjMoveStringLiteralDfa2_0(active0, 0x1000L, active1, 0L, active2, 0L);
-            case 101:
-                return jjMoveStringLiteralDfa2_0(active0, 0x2080000800000L, active1, 0L, active2, 0L);
-            case 102:
-                if ((active0 & 0x800000000L) != 0L)
-                    return jjStartNfaWithStates_0(1, 35, 43);
-                break;
-            case 104:
-                return jjMoveStringLiteralDfa2_0(active0, 0x704000000080000L, active1, 0x1L, active2, 0L);
-            case 105:
-                return jjMoveStringLiteralDfa2_0(active0, 0xc0000000L, active1, 0L, active2, 0L);
-            case 108:
-                return jjMoveStringLiteralDfa2_0(active0, 0x104100000L, active1, 0L, active2, 0L);
-            case 109:
-                return jjMoveStringLiteralDfa2_0(active0, 0x3000000000L, active1, 0L, active2, 0L);
-            case 110:
-                return jjMoveStringLiteralDfa2_0(active0, 0x1c008000000L, active1, 0L, active2, 0L);
-            case 111:
-                if ((active0 & 0x1000000L) != 0L) {
-                    jjmatchedKind = 24;
-                    jjmatchedPos = 1;
-                }
-                return jjMoveStringLiteralDfa2_0(active0, 0xc000020602604000L, active1, 0L, active2, 0L);
-            case 114:
-                return jjMoveStringLiteralDfa2_0(active0, 0x3800c00000008000L, active1, 0L, active2, 0L);
-            case 115:
-                return jjMoveStringLiteralDfa2_0(active0, 0x2000L, active1, 0L, active2, 0L);
-            case 116:
-                return jjMoveStringLiteralDfa2_0(active0, 0x18000000000000L, active1, 0L, active2, 0L);
-            case 117:
-                return jjMoveStringLiteralDfa2_0(active0, 0x21100000000000L, active1, 0L, active2, 0L);
-            case 119:
-                return jjMoveStringLiteralDfa2_0(active0, 0x40000000000000L, active1, 0L, active2, 0L);
-            case 120:
-                return jjMoveStringLiteralDfa2_0(active0, 0x10000000L, active1, 0L, active2, 0L);
-            case 121:
-                return jjMoveStringLiteralDfa2_0(active0, 0x80000000010000L, active1, 0L, active2, 0L);
-            case 124:
-                if ((active1 & 0x2000000000L) != 0L)
-                    return jjStopAtPos(1, 101);
-                break;
-            default:
-                break;
-        }
-        return jjStartNfa_0(0, active0, active1, active2);
-    }
-
-    private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1, long old2, long active2) {
-        if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
-            return jjStartNfa_0(0, old0, old1, old2);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(1, active0, active1, active2);
-            return 2;
-        }
-        switch (curChar) {
-            case 46:
-                if ((active1 & 0x2000000000000000L) != 0L)
-                    return jjStopAtPos(2, 125);
-                break;
-            case 61:
-                if ((active1 & 0x400000000000000L) != 0L)
-                    return jjStopAtPos(2, 122);
-                else if ((active1 & 0x800000000000000L) != 0L)
-                    return jjStopAtPos(2, 123);
-                break;
-            case 62:
-                if ((active2 & 0x1L) != 0L) {
-                    jjmatchedKind = 128;
-                    jjmatchedPos = 2;
-                }
-                return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1000000000000000L, active2, 0L);
-            case 97:
-                return jjMoveStringLiteralDfa3_0(active0, 0x808000000180000L, active1, 0L, active2, 0L);
-            case 98:
-                return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L, active1, 0L, active2, 0L);
-            case 99:
-                return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 0L, active2, 0L);
-            case 101:
-                return jjMoveStringLiteralDfa3_0(active0, 0x8000L, active1, 0L, active2, 0L);
-            case 102:
-                return jjMoveStringLiteralDfa3_0(active0, 0x800000L, active1, 0L, active2, 0L);
-            case 105:
-                return jjMoveStringLiteralDfa3_0(active0, 0x4140400000000000L, active1, 0x1L, active2, 0L);
-            case 108:
-                return jjMoveStringLiteralDfa3_0(active0, 0x8000100020000000L, active1, 0L, active2, 0L);
-            case 110:
-                return jjMoveStringLiteralDfa3_0(active0, 0x800200c0600000L, active1, 0L, active2, 0L);
-            case 111:
-                return jjMoveStringLiteralDfa3_0(active0, 0x4800100004000L, active1, 0L, active2, 0L);
-            case 112:
-                return jjMoveStringLiteralDfa3_0(active0, 0x20003000000000L, active1, 0L, active2, 0L);
-            case 114:
-                if ((active0 & 0x200000000L) != 0L)
-                    return jjStartNfaWithStates_0(2, 33, 43);
-                return jjMoveStringLiteralDfa3_0(active0, 0x610000000000000L, active1, 0L, active2, 0L);
-            case 115:
-                return jjMoveStringLiteralDfa3_0(active0, 0x4004023000L, active1, 0L, active2, 0L);
-            case 116:
-                if ((active0 & 0x8000000000L) != 0L) {
-                    jjmatchedKind = 39;
-                    jjmatchedPos = 2;
-                }
-                return jjMoveStringLiteralDfa3_0(active0, 0x2050410050000L, active1, 0L, active2, 0L);
-            case 117:
-                return jjMoveStringLiteralDfa3_0(active0, 0x100000000a000000L, active1, 0L, active2, 0L);
-            case 119:
-                if ((active0 & 0x80000000000L) != 0L)
-                    return jjStartNfaWithStates_0(2, 43, 43);
-                break;
-            case 121:
-                if ((active0 & 0x2000000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(2, 61, 43);
-                break;
-            default:
-                break;
-        }
-        return jjStartNfa_0(1, active0, active1, active2);
-    }
-
-    private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1, long old2, long active2) {
-        if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
-            return jjStartNfa_0(1, old0, old1, old2);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(2, active0, active1, 0L);
-            return 3;
-        }
-        switch (curChar) {
-            case 61:
-                if ((active1 & 0x1000000000000000L) != 0L)
-                    return jjStopAtPos(3, 124);
-                break;
-            case 97:
-                return jjMoveStringLiteralDfa4_0(active0, 0x80000001c0808000L, active1, 0L);
-            case 98:
-                return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0L);
-            case 99:
-                return jjMoveStringLiteralDfa4_0(active0, 0x80000000040000L, active1, 0L);
-            case 100:
-                if ((active0 & 0x4000000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 62, 43);
-                break;
-            case 101:
-                if ((active0 & 0x10000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 16, 43);
-                else if ((active0 & 0x20000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 17, 43);
-                else if ((active0 & 0x4000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 26, 43);
-                else if ((active0 & 0x1000000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 60, 43);
-                return jjMoveStringLiteralDfa4_0(active0, 0x20010010002000L, active1, 0L);
-            case 103:
-                if ((active0 & 0x20000000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 41, 43);
-                break;
-            case 105:
-                return jjMoveStringLiteralDfa4_0(active0, 0x10040000000000L, active1, 0L);
-            case 107:
-                return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L);
-            case 108:
-                if ((active0 & 0x100000000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 44, 43);
-                return jjMoveStringLiteralDfa4_0(active0, 0x1001000004000L, active1, 0x1L);
-            case 109:
-                if ((active0 & 0x8000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 27, 43);
-                break;
-            case 110:
-                return jjMoveStringLiteralDfa4_0(active0, 0x800000000000000L, active1, 0L);
-            case 111:
-                if ((active0 & 0x400000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 34, 43);
-                return jjMoveStringLiteralDfa4_0(active0, 0x600002000000000L, active1, 0L);
-            case 114:
-                if ((active0 & 0x80000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 19, 43);
-                return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0L);
-            case 115:
-                if ((active0 & 0x100000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(3, 56, 43);
-                return jjMoveStringLiteralDfa4_0(active0, 0x20300000L, active1, 0L);
-            case 116:
-                return jjMoveStringLiteralDfa4_0(active0, 0x48804000401000L, active1, 0L);
-            case 117:
-                return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000L, active1, 0L);
-            case 118:
-                return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L, active1, 0L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(2, active0, active1, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1) {
-        if (((active0 &= old0) | (active1 &= old1)) == 0L)
-            return jjStartNfa_0(2, old0, old1, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(3, active0, active1, 0L);
-            return 4;
-        }
-        switch (curChar) {
-            case 97:
-                return jjMoveStringLiteralDfa5_0(active0, 0x604000000000L, active1, 0L);
-            case 99:
-                return jjMoveStringLiteralDfa5_0(active0, 0x50000000000000L, active1, 0L);
-            case 101:
-                if ((active0 & 0x20000000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 29, 43);
-                else if ((active1 & 0x1L) != 0L)
-                    return jjStartNfaWithStates_0(4, 64, 43);
-                return jjMoveStringLiteralDfa5_0(active0, 0x801000004000L, active1, 0L);
-            case 104:
-                if ((active0 & 0x40000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 18, 43);
-                return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L, active1, 0L);
-            case 105:
-                return jjMoveStringLiteralDfa5_0(active0, 0x9000000400000L, active1, 0L);
-            case 107:
-                if ((active0 & 0x8000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 15, 43);
-                break;
-            case 108:
-                if ((active0 & 0x40000000L) != 0L) {
-                    jjmatchedKind = 30;
-                    jjmatchedPos = 4;
-                }
-                return jjMoveStringLiteralDfa5_0(active0, 0x82000000L, active1, 0L);
-            case 110:
-                return jjMoveStringLiteralDfa5_0(active0, 0x10000000L, active1, 0L);
-            case 114:
-                if ((active0 & 0x20000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 53, 43);
-                return jjMoveStringLiteralDfa5_0(active0, 0x2012000003000L, active1, 0L);
-            case 115:
-                if ((active0 & 0x100000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 20, 43);
-                return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L, active1, 0L);
-            case 116:
-                if ((active0 & 0x200000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 21, 43);
-                else if ((active0 & 0x100000000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 32, 43);
-                else if ((active0 & 0x4000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(4, 50, 43);
-                return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0L);
-            case 117:
-                return jjMoveStringLiteralDfa5_0(active0, 0x800000L, active1, 0L);
-            case 118:
-                return jjMoveStringLiteralDfa5_0(active0, 0x40000000000L, active1, 0L);
-            case 119:
-                if ((active0 & 0x200000000000000L) != 0L) {
-                    jjmatchedKind = 57;
-                    jjmatchedPos = 4;
-                }
-                return jjMoveStringLiteralDfa5_0(active0, 0x400000000000000L, active1, 0L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(3, active0, active1, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long active1) {
-        if (((active0 &= old0) | (active1 &= old1)) == 0L)
-            return jjStartNfa_0(3, old0, old1, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(4, active0, 0L, 0L);
-            return 5;
-        }
-        switch (curChar) {
-            case 97:
-                return jjMoveStringLiteralDfa6_0(active0, 0x5000L);
-            case 99:
-                if ((active0 & 0x1000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 48, 43);
-                else if ((active0 & 0x8000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 51, 43);
-                return jjMoveStringLiteralDfa6_0(active0, 0x800000000000L);
-            case 100:
-                return jjMoveStringLiteralDfa6_0(active0, 0x10000000L);
-            case 101:
-                if ((active0 & 0x2000000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 25, 43);
-                else if ((active0 & 0x40000000000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 42, 43);
-                break;
-            case 102:
-                return jjMoveStringLiteralDfa6_0(active0, 0x10000000000L);
-            case 103:
-                return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L);
-            case 104:
-                if ((active0 & 0x40000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 54, 43);
-                break;
-            case 105:
-                return jjMoveStringLiteralDfa6_0(active0, 0x8800000000000000L);
-            case 108:
-                return jjMoveStringLiteralDfa6_0(active0, 0x80800000L);
-            case 109:
-                return jjMoveStringLiteralDfa6_0(active0, 0x1000000000L);
-            case 110:
-                if ((active0 & 0x2000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 49, 43);
-                return jjMoveStringLiteralDfa6_0(active0, 0x4000400000L);
-            case 114:
-                return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L);
-            case 115:
-                if ((active0 & 0x400000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 58, 43);
-                break;
-            case 116:
-                if ((active0 & 0x2000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 13, 43);
-                else if ((active0 & 0x2000000000L) != 0L)
-                    return jjStartNfaWithStates_0(5, 37, 43);
-                return jjMoveStringLiteralDfa6_0(active0, 0x10400000000000L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(4, active0, 0L, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa6_0(long old0, long active0) {
-        if (((active0 &= old0)) == 0L)
-            return jjStartNfa_0(4, old0, 0L, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(5, active0, 0L, 0L);
-            return 6;
-        }
-        switch (curChar) {
-            case 97:
-                return jjMoveStringLiteralDfa7_0(active0, 0x10000000000L);
-            case 99:
-                return jjMoveStringLiteralDfa7_0(active0, 0x4000001000L);
-            case 101:
-                if ((active0 & 0x200000000000L) != 0L)
-                    return jjStartNfaWithStates_0(6, 45, 43);
-                else if ((active0 & 0x400000000000L) != 0L)
-                    return jjStartNfaWithStates_0(6, 46, 43);
-                return jjMoveStringLiteralDfa7_0(active0, 0x800001000000000L);
-            case 102:
-                return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L);
-            case 108:
-                return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000000L);
-            case 110:
-                if ((active0 & 0x4000L) != 0L)
-                    return jjStartNfaWithStates_0(6, 14, 43);
-                break;
-            case 111:
-                return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L);
-            case 115:
-                if ((active0 & 0x10000000L) != 0L)
-                    return jjStartNfaWithStates_0(6, 28, 43);
-                break;
-            case 116:
-                if ((active0 & 0x800000L) != 0L)
-                    return jjStartNfaWithStates_0(6, 23, 43);
-                return jjMoveStringLiteralDfa7_0(active0, 0x800000000000L);
-            case 117:
-                return jjMoveStringLiteralDfa7_0(active0, 0x400000L);
-            case 121:
-                if ((active0 & 0x80000000L) != 0L)
-                    return jjStartNfaWithStates_0(6, 31, 43);
-                break;
-            default:
-                break;
-        }
-        return jjStartNfa_0(5, active0, 0L, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa7_0(long old0, long active0) {
-        if (((active0 &= old0)) == 0L)
-            return jjStartNfa_0(5, old0, 0L, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(6, active0, 0L, 0L);
-            return 7;
-        }
-        switch (curChar) {
-            case 99:
-                return jjMoveStringLiteralDfa8_0(active0, 0x10000000000L);
-            case 101:
-                if ((active0 & 0x400000L) != 0L)
-                    return jjStartNfaWithStates_0(7, 22, 43);
-                else if ((active0 & 0x8000000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(7, 63, 43);
-                return jjMoveStringLiteralDfa8_0(active0, 0x804000000000L);
-            case 110:
-                return jjMoveStringLiteralDfa8_0(active0, 0x880001000000000L);
-            case 112:
-                if ((active0 & 0x10000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(7, 52, 43);
-                break;
-            case 116:
-                if ((active0 & 0x1000L) != 0L)
-                    return jjStartNfaWithStates_0(7, 12, 43);
-                break;
-            default:
-                break;
-        }
-        return jjStartNfa_0(6, active0, 0L, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa8_0(long old0, long active0) {
-        if (((active0 &= old0)) == 0L)
-            return jjStartNfa_0(6, old0, 0L, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(7, active0, 0L, 0L);
-            return 8;
-        }
-        switch (curChar) {
-            case 100:
-                if ((active0 & 0x800000000000L) != 0L)
-                    return jjStartNfaWithStates_0(8, 47, 43);
-                break;
-            case 101:
-                if ((active0 & 0x10000000000L) != 0L)
-                    return jjStartNfaWithStates_0(8, 40, 43);
-                break;
-            case 105:
-                return jjMoveStringLiteralDfa9_0(active0, 0x80000000000000L);
-            case 111:
-                return jjMoveStringLiteralDfa9_0(active0, 0x4000000000L);
-            case 116:
-                if ((active0 & 0x800000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(8, 59, 43);
-                return jjMoveStringLiteralDfa9_0(active0, 0x1000000000L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(7, active0, 0L, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa9_0(long old0, long active0) {
-        if (((active0 &= old0)) == 0L)
-            return jjStartNfa_0(7, old0, 0L, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(8, active0, 0L, 0L);
-            return 9;
-        }
-        switch (curChar) {
-            case 102:
-                if ((active0 & 0x4000000000L) != 0L)
-                    return jjStartNfaWithStates_0(9, 38, 43);
-                break;
-            case 115:
-                if ((active0 & 0x1000000000L) != 0L)
-                    return jjStartNfaWithStates_0(9, 36, 43);
-                break;
-            case 122:
-                return jjMoveStringLiteralDfa10_0(active0, 0x80000000000000L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(8, active0, 0L, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa10_0(long old0, long active0) {
-        if (((active0 &= old0)) == 0L)
-            return jjStartNfa_0(8, old0, 0L, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(9, active0, 0L, 0L);
-            return 10;
-        }
-        switch (curChar) {
-            case 101:
-                return jjMoveStringLiteralDfa11_0(active0, 0x80000000000000L);
-            default:
-                break;
-        }
-        return jjStartNfa_0(9, active0, 0L, 0L);
-    }
-
-    private int jjMoveStringLiteralDfa11_0(long old0, long active0) {
-        if (((active0 &= old0)) == 0L)
-            return jjStartNfa_0(9, old0, 0L, 0L);
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            jjStopStringLiteralDfa_0(10, active0, 0L, 0L);
-            return 11;
-        }
-        switch (curChar) {
-            case 100:
-                if ((active0 & 0x80000000000000L) != 0L)
-                    return jjStartNfaWithStates_0(11, 55, 43);
-                break;
-            default:
-                break;
-        }
-        return jjStartNfa_0(10, active0, 0L, 0L);
-    }
-
-    private int jjStartNfaWithStates_0(int pos, int kind, int state) {
-        jjmatchedKind = kind;
-        jjmatchedPos = pos;
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            return pos + 1;
-        }
-        return jjMoveNfa_0(state, pos + 1);
-    }
-
-    static final long[] jjbitVec0 = {
-            0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
-    };
-    static final long[] jjbitVec2 = {
-            0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
-    };
-    static final long[] jjbitVec3 = {
-            0xfff0000000200002L, 0xffffffffffffdfffL, 0xfffff00f7fffffffL, 0x12000000007fffffL
-    };
-    static final long[] jjbitVec4 = {
-            0x0L, 0x0L, 0x420043c00000000L, 0xff7fffffff7fffffL
-    };
-    static final long[] jjbitVec5 = {
-            0x7fffffffffffffL, 0xffffffffffff0000L, 0xffffffffffffffffL, 0x401f0003ffc3L
-    };
-    static final long[] jjbitVec6 = {
-            0x0L, 0x400000000000000L, 0xfffffffbffffd740L, 0xfbfffffffff7fffL
-    };
-    static final long[] jjbitVec7 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffffffc03L, 0x33fffffffff7fffL
-    };
-    static final long[] jjbitVec8 = {
-            0xfffe00000000ffffL, 0xfffffffe027fffffL, 0xffL, 0x707ffffff0000L
-    };
-    static final long[] jjbitVec9 = {
-            0x7fffffe00000000L, 0xfffec000000007ffL, 0xffffffffffffffffL, 0x9c00c060002fffffL
-    };
-    static final long[] jjbitVec10 = {
-            0xfffffffd0000L, 0xe000L, 0x2003fffffffffL, 0x0L
-    };
-    static final long[] jjbitVec11 = {
-            0x23fffffffffffff0L, 0x3ff010000L, 0x23c5fdfffff99fe0L, 0xf0003b0000000L
-    };
-    static final long[] jjbitVec12 = {
-            0x36dfdfffff987e0L, 0x1c00005e000000L, 0x23edfdfffffbbfe0L, 0x2000300010000L
-    };
-    static final long[] jjbitVec13 = {
-            0x23edfdfffff99fe0L, 0x20003b0000000L, 0x3bfc718d63dc7e8L, 0x200000000000000L
-    };
-    static final long[] jjbitVec14 = {
-            0x3effdfffffddfe0L, 0x300000000L, 0x23effdfffffddfe0L, 0x340000000L
-    };
-    static final long[] jjbitVec15 = {
-            0x3fffdfffffddfe0L, 0x300000000L, 0x2ffbfffffc7fffe0L, 0x7fL
-    };
-    static final long[] jjbitVec16 = {
-            0x800dfffffffffffeL, 0x7fL, 0x200decaefef02596L, 0x3000005fL
-    };
-    static final long[] jjbitVec17 = {
-            0x1L, 0x7fffffffeffL, 0xf00L, 0x0L
-    };
-    static final long[] jjbitVec18 = {
-            0x6fbffffffffL, 0x3f0000L, 0xffffffff00000000L, 0x1ffffffffff003fL
-    };
-    static final long[] jjbitVec19 = {
-            0xffffffffffffffffL, 0xffffffff83ffffffL, 0xffffff07ffffffffL, 0x3ffffffffffffffL
-    };
-    static final long[] jjbitVec20 = {
-            0xffffffffffffff7fL, 0xffffffff3d7f3d7fL, 0x7f3d7fffffff3d7fL, 0xffff7fffff7f7f3dL
-    };
-    static final long[] jjbitVec21 = {
-            0xffffffff7f3d7fffL, 0x7ffff7fL, 0xffffffff00000000L, 0x1fffffffffffffL
-    };
-    static final long[] jjbitVec22 = {
-            0xffffffffffffffffL, 0x7f9fffffffffffL, 0xffffffff07fffffeL, 0x1c7ffffffffffL
-    };
-    static final long[] jjbitVec23 = {
-            0x3ffff0003dfffL, 0x1dfff0003ffffL, 0xfffffffffffffL, 0x18800000L
-    };
-    static final long[] jjbitVec24 = {
-            0xffffffff00000000L, 0xffffffffffffffL, 0x1ffffffffffL, 0x0L
-    };
-    static final long[] jjbitVec25 = {
-            0x1fffffffL, 0x1f3fffffff0000L, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec26 = {
-            0xffffffffffffffffL, 0xfffffffffffL, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec27 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffff0fffffffL, 0x3ffffffffffffffL
-    };
-    static final long[] jjbitVec28 = {
-            0xffffffff3f3fffffL, 0x3fffffffaaff3f3fL, 0x5fdfffffffffffffL, 0x1fdc1fff0fcf1fdcL
-    };
-    static final long[] jjbitVec29 = {
-            0x8000000000000000L, 0x8002000000100001L, 0x3ffff00000000L, 0x0L
-    };
-    static final long[] jjbitVec30 = {
-            0xe3fbbd503e2ffc84L, 0xffffffff000003e0L, 0xfL, 0x0L
-    };
-    static final long[] jjbitVec31 = {
-            0x1f3e03fe000000e0L, 0xfffffffffffffffeL, 0xfffffffee07fffffL, 0xffffffffffffffffL
-    };
-    static final long[] jjbitVec32 = {
-            0xfffe1fffffffffe0L, 0xffffffffffffffffL, 0xffffff00007fffL, 0xffff000000000000L
-    };
-    static final long[] jjbitVec33 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0x3fffffffffffffL, 0x0L
-    };
-    static final long[] jjbitVec34 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0x3fffffffffL, 0x0L
-    };
-    static final long[] jjbitVec35 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0x1fffL, 0x0L
-    };
-    static final long[] jjbitVec36 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffL, 0x0L
-    };
-    static final long[] jjbitVec37 = {
-            0x6L, 0x0L, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec38 = {
-            0xffff3fffffffffffL, 0x7ffffffffffL, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec39 = {
-            0x5f7ffdffa0f8007fL, 0xffffffffffffffdbL, 0x3ffffffffffffL, 0xfffffffffff80000L
-    };
-    static final long[] jjbitVec40 = {
-            0x3fffffffffffffffL, 0xffffffffffff0000L, 0xfffffffffffcffffL, 0x1fff0000000000ffL
-    };
-    static final long[] jjbitVec41 = {
-            0x18000000000000L, 0xffdf02000000e000L, 0xffffffffffffffffL, 0x1fffffffffffffffL
-    };
-    static final long[] jjbitVec42 = {
-            0x87fffffe00000010L, 0xffffffe007fffffeL, 0x7fffffffffffffffL, 0x631cfcfcfcL
-    };
-    static final long[] jjbitVec43 = {
-            0x0L, 0x0L, 0x420243cffffffffL, 0xff7fffffff7fffffL
-    };
-    static final long[] jjbitVec44 = {
-            0xffffffffffffffffL, 0x400ffffe0ffffffL, 0xfffffffbffffd740L, 0xfbfffffffff7fffL
-    };
-    static final long[] jjbitVec45 = {
-            0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffffffc7bL, 0x33fffffffff7fffL
-    };
-    static final long[] jjbitVec46 = {
-            0xfffe00000000ffffL, 0xfffffffe027fffffL, 0xbbfffffbfffe00ffL, 0x707ffffff0016L
-    };
-    static final long[] jjbitVec47 = {
-            0x7fffffe003f000fL, 0xffffc3ff01ffffffL, 0xffffffffffffffffL, 0x9ffffdffbfefffffL
-    };
-    static final long[] jjbitVec48 = {
-            0xffffffffffff8000L, 0xe7ffL, 0x3ffffffffffffL, 0x0L
-    };
-    static final long[] jjbitVec49 = {
-            0xf3fffffffffffffeL, 0xffcfff1f3fffL, 0xf3c5fdfffff99feeL, 0xfffcfb080399fL
-    };
-    static final long[] jjbitVec50 = {
-            0xd36dfdfffff987eeL, 0x1fffc05e003987L, 0xf3edfdfffffbbfeeL, 0x2ffcf00013bbfL
-    };
-    static final long[] jjbitVec51 = {
-            0xf3edfdfffff99feeL, 0x2ffc3b0c0398fL, 0xc3bfc718d63dc7ecL, 0x200ff8000803dc7L
-    };
-    static final long[] jjbitVec52 = {
-            0xc3effdfffffddfeeL, 0xffc300603ddfL, 0xf3effdfffffddfecL, 0xffc340603ddfL
-    };
-    static final long[] jjbitVec53 = {
-            0xc3fffdfffffddfecL, 0xffc300803dcfL, 0x2ffbfffffc7fffecL, 0xc0000ff5f847fL
-    };
-    static final long[] jjbitVec54 = {
-            0x87fffffffffffffeL, 0x3ff7fffL, 0x3bffecaefef02596L, 0x33ff3f5fL
-    };
-    static final long[] jjbitVec55 = {
-            0xc2a003ff03000001L, 0xfffe07fffffffeffL, 0x1ffffffffeff0fdfL, 0x40L
-    };
-    static final long[] jjbitVec56 = {
-            0x3c7f6fbffffffffL, 0x3ff03ffL, 0xffffffff00000000L, 0x1ffffffffff003fL
-    };
-    static final long[] jjbitVec57 = {
-            0xffffffff7f3d7fffL, 0x3fe0007ffff7fL, 0xffffffff00000000L, 0x1fffffffffffffL
-    };
-    static final long[] jjbitVec58 = {
-            0x1fffff001fdfffL, 0xddfff000fffffL, 0xffffffffffffffffL, 0x3ff388fffffL
-    };
-    static final long[] jjbitVec59 = {
-            0xffffffff03ff3800L, 0xffffffffffffffL, 0x3ffffffffffL, 0x0L
-    };
-    static final long[] jjbitVec60 = {
-            0xfff0fff1fffffffL, 0x1f3fffffffffc0L, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec61 = {
-            0x80007c000000f000L, 0x8002fc0f00100001L, 0x3ffff00000000L, 0x7e21fff0000L
-    };
-    static final long[] jjbitVec62 = {
-            0x1f3efffe000000e0L, 0xfffffffffffffffeL, 0xfffffffee67fffffL, 0xffffffffffffffffL
-    };
-    static final long[] jjbitVec63 = {
-            0x10000000000006L, 0x0L, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec64 = {
-            0x3L, 0x0L, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec65 = {
-            0x0L, 0x800000000000000L, 0x0L, 0x0L
-    };
-    static final long[] jjbitVec66 = {
-            0x5f7ffdffe0f8007fL, 0xffffffffffffffdbL, 0x3ffffffffffffL, 0xfffffffffff80000L
-    };
-    static final long[] jjbitVec67 = {
-            0x18000f0000ffffL, 0xffdf02000000e000L, 0xffffffffffffffffL, 0x9fffffffffffffffL
-    };
-    static final long[] jjbitVec68 = {
-            0x87fffffe03ff0010L, 0xffffffe007fffffeL, 0x7fffffffffffffffL, 0xe0000631cfcfcfcL
-    };
-
-    private int jjMoveNfa_0(int startState, int curPos) {
-        int startsAt = 0;
-        jjnewStateCnt = 130;
-        int i = 1;
-        jjstateSet[0] = startState;
-        int kind = 0x7fffffff;
-        for (; ; ) {
-            if (++jjround == 0x7fffffff)
-                ReInitRounds();
-            if (curChar < 64) {
-                long l = 1L << curChar;
-                do {
-                    switch (jjstateSet[--i]) {
-                        case 45:
-                            if (curChar == 42)
-                                jjstateSet[jjnewStateCnt++] = 50;
-                            else if (curChar == 47) {
-                                if (kind > 6)
-                                    kind = 6;
-                                jjCheckNAddStates(0, 2);
-                            }
-                            break;
-                        case 0:
-                            if ((0x3ff000000000000L & l) != 0L) {
-                                if (kind > 66)
-                                    kind = 66;
-                                jjCheckNAddStates(3, 17);
-                            } else if (curChar == 47)
-                                jjAddStates(18, 19);
-                            else if (curChar == 36) {
-                                if (kind > 78)
-                                    kind = 78;
-                                jjCheckNAdd(43);
-                            } else if (curChar == 34)
-                                jjCheckNAddStates(20, 23);
-                            else if (curChar == 39)
-                                jjAddStates(24, 26);
-                            else if (curChar == 46)
-                                jjCheckNAdd(1);
-                            if (curChar == 48)
-                                jjAddStates(27, 34);
-                            break;
-                        case 1:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(35, 38);
-                            break;
-                        case 2:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(2, 3);
-                            break;
-                        case 3:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(39, 41);
-                            break;
-                        case 5:
-                            if ((0x280000000000L & l) != 0L)
-                                jjCheckNAdd(6);
-                            break;
-                        case 6:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(42, 44);
-                            break;
-                        case 7:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(7, 8);
-                            break;
-                        case 8:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddTwoStates(6, 9);
-                            break;
-                        case 10:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(45, 48);
-                            break;
-                        case 11:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(49, 53);
-                            break;
-                        case 12:
-                            if (curChar == 39)
-                                jjAddStates(24, 26);
-                            break;
-                        case 13:
-                            if ((0xffffff7fffffdbffL & l) != 0L)
-                                jjCheckNAdd(14);
-                            break;
-                        case 14:
-                            if (curChar == 39 && kind > 76)
-                                kind = 76;
-                            break;
-                        case 16:
-                            if ((0x8400000000L & l) != 0L)
-                                jjCheckNAdd(14);
-                            break;
-                        case 17:
-                            if ((0xff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(18, 14);
-                            break;
-                        case 18:
-                            if ((0xff000000000000L & l) != 0L)
-                                jjCheckNAdd(14);
-                            break;
-                        case 19:
-                            if ((0xf000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 20;
-                            break;
-                        case 20:
-                            if ((0xff000000000000L & l) != 0L)
-                                jjCheckNAdd(18);
-                            break;
-                        case 22:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 23;
-                            break;
-                        case 23:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 24;
-                            break;
-                        case 24:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 25;
-                            break;
-                        case 25:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAdd(14);
-                            break;
-                        case 27:
-                            if (curChar == 34)
-                                jjCheckNAddStates(20, 23);
-                            break;
-                        case 28:
-                            if ((0xfffffffbffffdbffL & l) != 0L)
-                                jjCheckNAddStates(20, 23);
-                            break;
-                        case 30:
-                            if ((0x8400000000L & l) != 0L)
-                                jjCheckNAddStates(20, 23);
-                            break;
-                        case 32:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 33;
-                            break;
-                        case 33:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 34;
-                            break;
-                        case 34:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 35;
-                            break;
-                        case 35:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddStates(20, 23);
-                            break;
-                        case 37:
-                            if (curChar == 34 && kind > 77)
-                                kind = 77;
-                            break;
-                        case 38:
-                            if ((0xff000000000000L & l) != 0L)
-                                jjCheckNAddStates(54, 58);
-                            break;
-                        case 39:
-                            if ((0xff000000000000L & l) != 0L)
-                                jjCheckNAddStates(20, 23);
-                            break;
-                        case 40:
-                            if ((0xf000000000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 41;
-                            break;
-                        case 41:
-                            if ((0xff000000000000L & l) != 0L)
-                                jjCheckNAdd(39);
-                            break;
-                        case 42:
-                            if (curChar != 36)
-                                break;
-                            if (kind > 78)
-                                kind = 78;
-                            jjCheckNAdd(43);
-                            break;
-                        case 43:
-                            if ((0x3ff00100fffc1ffL & l) == 0L)
-                                break;
-                            if (kind > 78)
-                                kind = 78;
-                            jjCheckNAdd(43);
-                            break;
-                        case 44:
-                            if (curChar == 47)
-                                jjAddStates(18, 19);
-                            break;
-                        case 46:
-                            if ((0xffffffffffffdbffL & l) == 0L)
-                                break;
-                            if (kind > 6)
-                                kind = 6;
-                            jjCheckNAddStates(0, 2);
-                            break;
-                        case 47:
-                            if ((0x2400L & l) != 0L && kind > 6)
-                                kind = 6;
-                            break;
-                        case 48:
-                            if (curChar == 10 && kind > 6)
-                                kind = 6;
-                            break;
-                        case 49:
-                            if (curChar == 13)
-                                jjstateSet[jjnewStateCnt++] = 48;
-                            break;
-                        case 50:
-                            if (curChar == 42)
-                                jjstateSet[jjnewStateCnt++] = 51;
-                            break;
-                        case 51:
-                            if ((0xffff7fffffffffffL & l) != 0L && kind > 7)
-                                kind = 7;
-                            break;
-                        case 52:
-                            if (curChar == 42)
-                                jjstateSet[jjnewStateCnt++] = 50;
-                            break;
-                        case 53:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 66)
-                                kind = 66;
-                            jjCheckNAddStates(3, 17);
-                            break;
-                        case 54:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(54, 55);
-                            break;
-                        case 55:
-                        case 98:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAdd(56);
-                            break;
-                        case 57:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(57, 58);
-                            break;
-                        case 58:
-                        case 109:
-                            if ((0x3ff000000000000L & l) != 0L && kind > 66)
-                                kind = 66;
-                            break;
-                        case 59:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(59, 60);
-                            break;
-                        case 60:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddStates(59, 61);
-                            break;
-                        case 61:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddStates(62, 65);
-                            break;
-                        case 63:
-                            if ((0x280000000000L & l) != 0L)
-                                jjCheckNAdd(64);
-                            break;
-                        case 64:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddStates(66, 68);
-                            break;
-                        case 65:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(65, 66);
-                            break;
-                        case 66:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(64, 9);
-                            break;
-                        case 67:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddStates(69, 72);
-                            break;
-                        case 68:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddStates(73, 77);
-                            break;
-                        case 69:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(69, 70);
-                            break;
-                        case 70:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(71, 72);
-                            break;
-                        case 71:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddStates(78, 80);
-                            break;
-                        case 73:
-                            if ((0x280000000000L & l) != 0L)
-                                jjCheckNAdd(74);
-                            break;
-                        case 74:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(81, 83);
-                            break;
-                        case 75:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(75, 76);
-                            break;
-                        case 76:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddTwoStates(74, 9);
-                            break;
-                        case 77:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(84, 87);
-                            break;
-                        case 78:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddStates(88, 91);
-                            break;
-                        case 79:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(79, 80);
-                            break;
-                        case 80:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(81, 82);
-                            break;
-                        case 81:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddStates(92, 94);
-                            break;
-                        case 82:
-                            if (curChar != 46)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(95, 97);
-                            break;
-                        case 83:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(98, 101);
-                            break;
-                        case 84:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(84, 85);
-                            break;
-                        case 85:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(95, 97);
-                            break;
-                        case 87:
-                            if ((0x280000000000L & l) != 0L)
-                                jjCheckNAdd(88);
-                            break;
-                        case 88:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(102, 104);
-                            break;
-                        case 89:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(89, 90);
-                            break;
-                        case 90:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddTwoStates(88, 9);
-                            break;
-                        case 91:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(105, 108);
-                            break;
-                        case 92:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddStates(109, 113);
-                            break;
-                        case 93:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddStates(114, 117);
-                            break;
-                        case 94:
-                            if (curChar == 48)
-                                jjAddStates(27, 34);
-                            break;
-                        case 96:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddStates(118, 120);
-                            break;
-                        case 97:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(97, 98);
-                            break;
-                        case 99:
-                            if ((0xff000000000000L & l) != 0L)
-                                jjCheckNAddStates(121, 123);
-                            break;
-                        case 100:
-                            if ((0xff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(100, 101);
-                            break;
-                        case 101:
-                            if ((0xff000000000000L & l) != 0L)
-                                jjCheckNAdd(56);
-                            break;
-                        case 103:
-                            if ((0x3000000000000L & l) != 0L)
-                                jjCheckNAddStates(124, 126);
-                            break;
-                        case 104:
-                            if ((0x3000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(104, 105);
-                            break;
-                        case 105:
-                            if ((0x3000000000000L & l) != 0L)
-                                jjCheckNAdd(56);
-                            break;
-                        case 107:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 66)
-                                kind = 66;
-                            jjCheckNAddTwoStates(108, 109);
-                            break;
-                        case 108:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(108, 109);
-                            break;
-                        case 110:
-                            if ((0xff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 66)
-                                kind = 66;
-                            jjCheckNAddTwoStates(111, 112);
-                            break;
-                        case 111:
-                            if ((0xff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(111, 112);
-                            break;
-                        case 112:
-                            if ((0xff000000000000L & l) != 0L && kind > 66)
-                                kind = 66;
-                            break;
-                        case 114:
-                            if ((0x3000000000000L & l) == 0L)
-                                break;
-                            if (kind > 66)
-                                kind = 66;
-                            jjCheckNAddTwoStates(115, 116);
-                            break;
-                        case 115:
-                            if ((0x3000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(115, 116);
-                            break;
-                        case 116:
-                            if ((0x3000000000000L & l) != 0L && kind > 66)
-                                kind = 66;
-                            break;
-                        case 118:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjAddStates(127, 128);
-                            break;
-                        case 119:
-                            if (curChar == 46)
-                                jjCheckNAdd(120);
-                            break;
-                        case 120:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddTwoStates(120, 121);
-                            break;
-                        case 122:
-                            if ((0x280000000000L & l) != 0L)
-                                jjCheckNAdd(123);
-                            break;
-                        case 123:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddTwoStates(123, 9);
-                            break;
-                        case 125:
-                            if ((0x3ff000000000000L & l) != 0L)
-                                jjCheckNAddStates(129, 131);
-                            break;
-                        case 126:
-                            if (curChar == 46)
-                                jjCheckNAdd(127);
-                            break;
-                        case 128:
-                            if ((0x280000000000L & l) != 0L)
-                                jjCheckNAdd(129);
-                            break;
-                        case 129:
-                            if ((0x3ff000000000000L & l) == 0L)
-                                break;
-                            if (kind > 71)
-                                kind = 71;
-                            jjCheckNAddTwoStates(129, 9);
-                            break;
-                        default:
-                            break;
-                    }
-                } while (i != startsAt);
-            } else if (curChar < 128) {
-                long l = 1L << (curChar & 077);
-                do {
-                    switch (jjstateSet[--i]) {
-                        case 0:
-                            if ((0x7fffffe87fffffeL & l) == 0L)
-                                break;
-                            if (kind > 78)
-                                kind = 78;
-                            jjCheckNAdd(43);
-                            break;
-                        case 2:
-                            if (curChar == 95)
-                                jjAddStates(132, 133);
-                            break;
-                        case 4:
-                            if ((0x2000000020L & l) != 0L)
-                                jjAddStates(134, 135);
-                            break;
-                        case 7:
-                            if (curChar == 95)
-                                jjAddStates(136, 137);
-                            break;
-                        case 9:
-                            if ((0x5000000050L & l) != 0L && kind > 71)
-                                kind = 71;
-                            break;
-                        case 13:
-                            if ((0xffffffffefffffffL & l) != 0L)
-                                jjCheckNAdd(14);
-                            break;
-                        case 15:
-                            if (curChar == 92)
-                                jjAddStates(138, 140);
-                            break;
-                        case 16:
-                            if ((0x14404410000000L & l) != 0L)
-                                jjCheckNAdd(14);
-                            break;
-                        case 21:
-                            if (curChar == 117)
-                                jjstateSet[jjnewStateCnt++] = 22;
-                            break;
-                        case 22:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 23;
-                            break;
-                        case 23:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 24;
-                            break;
-                        case 24:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 25;
-                            break;
-                        case 25:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjCheckNAdd(14);
-                            break;
-                        case 26:
-                            if (curChar == 92)
-                                jjstateSet[jjnewStateCnt++] = 21;
-                            break;
-                        case 28:
-                            if ((0xffffffffefffffffL & l) != 0L)
-                                jjCheckNAddStates(20, 23);
-                            break;
-                        case 29:
-                            if (curChar == 92)
-                                jjAddStates(141, 143);
-                            break;
-                        case 30:
-                            if ((0x14404410000000L & l) != 0L)
-                                jjCheckNAddStates(20, 23);
-                            break;
-                        case 31:
-                            if (curChar == 117)
-                                jjstateSet[jjnewStateCnt++] = 32;
-                            break;
-                        case 32:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 33;
-                            break;
-                        case 33:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 34;
-                            break;
-                        case 34:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 35;
-                            break;
-                        case 35:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjCheckNAddStates(20, 23);
-                            break;
-                        case 36:
-                            if (curChar == 92)
-                                jjstateSet[jjnewStateCnt++] = 31;
-                            break;
-                        case 43:
-                            if ((0x87fffffe87fffffeL & l) == 0L)
-                                break;
-                            if (kind > 78)
-                                kind = 78;
-                            jjCheckNAdd(43);
-                            break;
-                        case 46:
-                            if (kind > 6)
-                                kind = 6;
-                            jjAddStates(0, 2);
-                            break;
-                        case 51:
-                            if (kind > 7)
-                                kind = 7;
-                            break;
-                        case 54:
-                            if (curChar == 95)
-                                jjAddStates(144, 145);
-                            break;
-                        case 56:
-                            if ((0x100000001000L & l) != 0L && kind > 65)
-                                kind = 65;
-                            break;
-                        case 57:
-                            if (curChar == 95)
-                                jjAddStates(146, 147);
-                            break;
-                        case 59:
-                            if (curChar == 95)
-                                jjAddStates(148, 149);
-                            break;
-                        case 62:
-                            if ((0x2000000020L & l) != 0L)
-                                jjAddStates(150, 151);
-                            break;
-                        case 65:
-                            if (curChar == 95)
-                                jjAddStates(152, 153);
-                            break;
-                        case 69:
-                            if (curChar == 95)
-                                jjAddStates(154, 155);
-                            break;
-                        case 72:
-                            if ((0x2000000020L & l) != 0L)
-                                jjAddStates(156, 157);
-                            break;
-                        case 75:
-                            if (curChar == 95)
-                                jjAddStates(158, 159);
-                            break;
-                        case 79:
-                            if (curChar == 95)
-                                jjAddStates(160, 161);
-                            break;
-                        case 84:
-                            if (curChar == 95)
-                                jjAddStates(162, 163);
-                            break;
-                        case 86:
-                            if ((0x2000000020L & l) != 0L)
-                                jjAddStates(164, 165);
-                            break;
-                        case 89:
-                            if (curChar == 95)
-                                jjAddStates(166, 167);
-                            break;
-                        case 95:
-                            if ((0x100000001000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 96;
-                            break;
-                        case 96:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjCheckNAddStates(118, 120);
-                            break;
-                        case 97:
-                            if ((0x7e8000007eL & l) != 0L)
-                                jjCheckNAddTwoStates(97, 98);
-                            break;
-                        case 98:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjCheckNAdd(56);
-                            break;
-                        case 100:
-                            if (curChar == 95)
-                                jjAddStates(168, 169);
-                            break;
-                        case 102:
-                            if ((0x400000004L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 103;
-                            break;
-                        case 104:
-                            if (curChar == 95)
-                                jjAddStates(170, 171);
-                            break;
-                        case 106:
-                            if ((0x100000001000000L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 107;
-                            break;
-                        case 107:
-                            if ((0x7e0000007eL & l) == 0L)
-                                break;
-                            if (kind > 66)
-                                kind = 66;
-                            jjCheckNAddTwoStates(108, 109);
-                            break;
-                        case 108:
-                            if ((0x7e8000007eL & l) != 0L)
-                                jjCheckNAddTwoStates(108, 109);
-                            break;
-                        case 109:
-                            if ((0x7e0000007eL & l) != 0L && kind > 66)
-                                kind = 66;
-                            break;
-                        case 111:
-                            if (curChar == 95)
-                                jjAddStates(172, 173);
-                            break;
-                        case 113:
-                            if ((0x400000004L & l) != 0L)
-                                jjstateSet[jjnewStateCnt++] = 114;
-                            break;
-                        case 115:
-                            if (curChar == 95)
-                                jjAddStates(174, 175);
-                            break;
-                        case 117:
-                            if ((0x100000001000000L & l) != 0L)
-                                jjCheckNAddTwoStates(118, 119);
-                            break;
-                        case 118:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjCheckNAddTwoStates(118, 119);
-                            break;
-                        case 120:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjAddStates(176, 177);
-                            break;
-                        case 121:
-                            if ((0x1000000010000L & l) != 0L)
-                                jjAddStates(178, 179);
-                            break;
-                        case 124:
-                            if ((0x100000001000000L & l) != 0L)
-                                jjCheckNAdd(125);
-                            break;
-                        case 125:
-                            if ((0x7e0000007eL & l) != 0L)
-                                jjCheckNAddStates(129, 131);
-                            break;
-                        case 127:
-                            if ((0x1000000010000L & l) != 0L)
-                                jjAddStates(180, 181);
-                            break;
-                        default:
-                            break;
-                    }
-                } while (i != startsAt);
-            } else {
-                int hiByte = (int) (curChar >> 8);
-                int i1 = hiByte >> 6;
-                long l1 = 1L << (hiByte & 077);
-                int i2 = (curChar & 0xff) >> 6;
-                long l2 = 1L << (curChar & 077);
-                do {
-                    switch (jjstateSet[--i]) {
-                        case 0:
-                            if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
-                                break;
-                            if (kind > 78)
-                                kind = 78;
-                            jjCheckNAdd(43);
-                            break;
-                        case 13:
-                            if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                                jjstateSet[jjnewStateCnt++] = 14;
-                            break;
-                        case 28:
-                            if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                                jjAddStates(20, 23);
-                            break;
-                        case 43:
-                            if (!jjCanMove_2(hiByte, i1, i2, l1, l2))
-                                break;
-                            if (kind > 78)
-                                kind = 78;
-                            jjCheckNAdd(43);
-                            break;
-                        case 46:
-                            if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
-                                break;
-                            if (kind > 6)
-                                kind = 6;
-                            jjAddStates(0, 2);
-                            break;
-                        case 51:
-                            if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 7)
-                                kind = 7;
-                            break;
-                        default:
-                            break;
-                    }
-                } while (i != startsAt);
+         return -1;
+      case 1:
+         if ((active0 & 0x803000000L) != 0L)
+            return 43;
+         if ((active0 & 0xfffffff7fcfff000L) != 0L || (active1 & 0x1L) != 0L)
+         {
+            if (jjmatchedPos != 1)
+            {
+               jjmatchedKind = 78;
+               jjmatchedPos = 1;
             }
-            if (kind != 0x7fffffff) {
-                jjmatchedKind = kind;
-                jjmatchedPos = curPos;
-                kind = 0x7fffffff;
+            return 43;
+         }
+         if ((active0 & 0x100L) != 0L)
+            return 50;
+         return -1;
+      case 2:
+         if ((active0 & 0x2000098200000000L) != 0L)
+            return 43;
+         if ((active0 & 0xdffff675fefff000L) != 0L || (active1 & 0x1L) != 0L)
+         {
+            if (jjmatchedPos != 2)
+            {
+               jjmatchedKind = 78;
+               jjmatchedPos = 2;
             }
-            ++curPos;
-            if ((i = jjnewStateCnt) == (startsAt = 130 - (jjnewStateCnt = startsAt)))
-                return curPos;
-            try {
-                curChar = input_stream.readChar();
-            } catch (java.io.IOException e) {
-                return curPos;
+            return 43;
+         }
+         return -1;
+      case 3:
+         if ((active0 & 0x8effe571f2f4f000L) != 0L || (active1 & 0x1L) != 0L)
+         {
+            jjmatchedKind = 78;
+            jjmatchedPos = 3;
+            return 43;
+         }
+         if ((active0 & 0x510012040c0b0000L) != 0L)
+            return 43;
+         return -1;
+      case 4:
+         if ((active0 & 0x88dbe57012c07000L) != 0L)
+         {
+            if (jjmatchedPos != 4)
+            {
+               jjmatchedKind = 78;
+               jjmatchedPos = 4;
             }
-        }
-    }
-
-    private int jjMoveStringLiteralDfa0_2() {
-        switch (curChar) {
-            case 42:
-                return jjMoveStringLiteralDfa1_2(0x400L);
-            default:
-                return 1;
-        }
-    }
-
-    private int jjMoveStringLiteralDfa1_2(long active0) {
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            return 1;
-        }
-        switch (curChar) {
-            case 47:
-                if ((active0 & 0x400L) != 0L)
-                    return jjStopAtPos(1, 10);
-                break;
-            default:
-                return 2;
-        }
-        return 2;
-    }
-
-    private int jjMoveStringLiteralDfa0_1() {
-        switch (curChar) {
-            case 42:
-                return jjMoveStringLiteralDfa1_1(0x200L);
-            default:
-                return 1;
-        }
-    }
-
-    private int jjMoveStringLiteralDfa1_1(long active0) {
-        try {
-            curChar = input_stream.readChar();
-        } catch (java.io.IOException e) {
-            return 1;
-        }
-        switch (curChar) {
-            case 47:
-                if ((active0 & 0x200L) != 0L)
-                    return jjStopAtPos(1, 9);
-                break;
-            default:
-                return 2;
-        }
-        return 2;
-    }
-
-    static final int[] jjnextStates = {
-            46, 47, 49, 54, 55, 56, 57, 58, 59, 62, 9, 69, 72, 79, 82, 93,
-            78, 68, 45, 52, 28, 29, 36, 37, 13, 15, 26, 95, 99, 102, 106, 110,
-            113, 117, 124, 2, 4, 9, 11, 1, 4, 9, 7, 9, 10, 6, 7, 9,
-            10, 1, 2, 4, 9, 11, 28, 29, 39, 36, 37, 61, 62, 9, 59, 62,
-            9, 68, 65, 9, 67, 64, 65, 9, 67, 61, 59, 62, 9, 68, 69, 72,
-            78, 75, 9, 77, 74, 75, 9, 77, 71, 69, 72, 78, 79, 82, 93, 83,
-            86, 9, 84, 86, 9, 92, 89, 9, 91, 88, 89, 9, 91, 83, 84, 86,
-            9, 92, 81, 79, 82, 93, 97, 98, 56, 100, 101, 56, 104, 105, 56, 118,
-            119, 125, 126, 127, 2, 3, 5, 6, 7, 8, 16, 17, 19, 30, 38, 40,
-            54, 55, 57, 58, 59, 60, 63, 64, 65, 66, 69, 70, 73, 74, 75, 76,
-            79, 80, 84, 85, 87, 88, 89, 90, 100, 101, 104, 105, 111, 112, 115, 116,
-            120, 121, 122, 123, 128, 129,
-    };
-
-    private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2) {
-        switch (hiByte) {
-            case 0:
-                return ((jjbitVec2[i2] & l2) != 0L);
-            default:
-                if ((jjbitVec0[i1] & l1) != 0L)
-                    return true;
-                return false;
-        }
-    }
-
-    private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2) {
-        switch (hiByte) {
-            case 0:
-                return ((jjbitVec4[i2] & l2) != 0L);
-            case 2:
-                return ((jjbitVec5[i2] & l2) != 0L);
-            case 3:
-                return ((jjbitVec6[i2] & l2) != 0L);
-            case 4:
-                return ((jjbitVec7[i2] & l2) != 0L);
-            case 5:
-                return ((jjbitVec8[i2] & l2) != 0L);
-            case 6:
-                return ((jjbitVec9[i2] & l2) != 0L);
-            case 7:
-                return ((jjbitVec10[i2] & l2) != 0L);
-            case 9:
-                return ((jjbitVec11[i2] & l2) != 0L);
-            case 10:
-                return ((jjbitVec12[i2] & l2) != 0L);
-            case 11:
-                return ((jjbitVec13[i2] & l2) != 0L);
-            case 12:
-                return ((jjbitVec14[i2] & l2) != 0L);
-            case 13:
-                return ((jjbitVec15[i2] & l2) != 0L);
-            case 14:
-                return ((jjbitVec16[i2] & l2) != 0L);
-            case 15:
-                return ((jjbitVec17[i2] & l2) != 0L);
-            case 16:
-                return ((jjbitVec18[i2] & l2) != 0L);
-            case 17:
-                return ((jjbitVec19[i2] & l2) != 0L);
-            case 18:
-                return ((jjbitVec20[i2] & l2) != 0L);
-            case 19:
-                return ((jjbitVec21[i2] & l2) != 0L);
-            case 20:
-                return ((jjbitVec0[i2] & l2) != 0L);
-            case 22:
-                return ((jjbitVec22[i2] & l2) != 0L);
-            case 23:
-                return ((jjbitVec23[i2] & l2) != 0L);
-            case 24:
-                return ((jjbitVec24[i2] & l2) != 0L);
-            case 25:
-                return ((jjbitVec25[i2] & l2) != 0L);
-            case 29:
-                return ((jjbitVec26[i2] & l2) != 0L);
-            case 30:
-                return ((jjbitVec27[i2] & l2) != 0L);
-            case 31:
-                return ((jjbitVec28[i2] & l2) != 0L);
-            case 32:
-                return ((jjbitVec29[i2] & l2) != 0L);
-            case 33:
-                return ((jjbitVec30[i2] & l2) != 0L);
-            case 48:
-                return ((jjbitVec31[i2] & l2) != 0L);
-            case 49:
-                return ((jjbitVec32[i2] & l2) != 0L);
-            case 77:
-                return ((jjbitVec33[i2] & l2) != 0L);
-            case 159:
-                return ((jjbitVec34[i2] & l2) != 0L);
-            case 164:
-                return ((jjbitVec35[i2] & l2) != 0L);
-            case 215:
-                return ((jjbitVec36[i2] & l2) != 0L);
-            case 216:
-                return ((jjbitVec37[i2] & l2) != 0L);
-            case 250:
-                return ((jjbitVec38[i2] & l2) != 0L);
-            case 251:
-                return ((jjbitVec39[i2] & l2) != 0L);
-            case 253:
-                return ((jjbitVec40[i2] & l2) != 0L);
-            case 254:
-                return ((jjbitVec41[i2] & l2) != 0L);
-            case 255:
-                return ((jjbitVec42[i2] & l2) != 0L);
-            default:
-                if ((jjbitVec3[i1] & l1) != 0L)
-                    return true;
-                return false;
-        }
-    }
-
-    private static final boolean jjCanMove_2(int hiByte, int i1, int i2, long l1, long l2) {
-        switch (hiByte) {
-            case 0:
-                return ((jjbitVec43[i2] & l2) != 0L);
-            case 2:
-                return ((jjbitVec5[i2] & l2) != 0L);
-            case 3:
-                return ((jjbitVec44[i2] & l2) != 0L);
-            case 4:
-                return ((jjbitVec45[i2] & l2) != 0L);
-            case 5:
-                return ((jjbitVec46[i2] & l2) != 0L);
-            case 6:
-                return ((jjbitVec47[i2] & l2) != 0L);
-            case 7:
-                return ((jjbitVec48[i2] & l2) != 0L);
-            case 9:
-                return ((jjbitVec49[i2] & l2) != 0L);
-            case 10:
-                return ((jjbitVec50[i2] & l2) != 0L);
-            case 11:
-                return ((jjbitVec51[i2] & l2) != 0L);
-            case 12:
-                return ((jjbitVec52[i2] & l2) != 0L);
-            case 13:
-                return ((jjbitVec53[i2] & l2) != 0L);
-            case 14:
-                return ((jjbitVec54[i2] & l2) != 0L);
-            case 15:
-                return ((jjbitVec55[i2] & l2) != 0L);
-            case 16:
-                return ((jjbitVec56[i2] & l2) != 0L);
-            case 17:
-                return ((jjbitVec19[i2] & l2) != 0L);
-            case 18:
-                return ((jjbitVec20[i2] & l2) != 0L);
-            case 19:
-                return ((jjbitVec57[i2] & l2) != 0L);
-            case 20:
-                return ((jjbitVec0[i2] & l2) != 0L);
-            case 22:
-                return ((jjbitVec22[i2] & l2) != 0L);
-            case 23:
-                return ((jjbitVec58[i2] & l2) != 0L);
-            case 24:
-                return ((jjbitVec59[i2] & l2) != 0L);
-            case 25:
-                return ((jjbitVec60[i2] & l2) != 0L);
-            case 29:
-                return ((jjbitVec26[i2] & l2) != 0L);
-            case 30:
-                return ((jjbitVec27[i2] & l2) != 0L);
-            case 31:
-                return ((jjbitVec28[i2] & l2) != 0L);
-            case 32:
-                return ((jjbitVec61[i2] & l2) != 0L);
-            case 33:
-                return ((jjbitVec30[i2] & l2) != 0L);
-            case 48:
-                return ((jjbitVec62[i2] & l2) != 0L);
-            case 49:
-                return ((jjbitVec32[i2] & l2) != 0L);
-            case 77:
-                return ((jjbitVec33[i2] & l2) != 0L);
-            case 159:
-                return ((jjbitVec34[i2] & l2) != 0L);
-            case 164:
-                return ((jjbitVec35[i2] & l2) != 0L);
-            case 215:
-                return ((jjbitVec36[i2] & l2) != 0L);
-            case 216:
-                return ((jjbitVec63[i2] & l2) != 0L);
-            case 220:
-                return ((jjbitVec64[i2] & l2) != 0L);
-            case 221:
-                return ((jjbitVec65[i2] & l2) != 0L);
-            case 250:
-                return ((jjbitVec38[i2] & l2) != 0L);
-            case 251:
-                return ((jjbitVec66[i2] & l2) != 0L);
-            case 253:
-                return ((jjbitVec40[i2] & l2) != 0L);
-            case 254:
-                return ((jjbitVec67[i2] & l2) != 0L);
-            case 255:
-                return ((jjbitVec68[i2] & l2) != 0L);
-            default:
-                if ((jjbitVec3[i1] & l1) != 0L)
-                    return true;
-                return false;
-        }
-    }
-
-    /**
-     * Token literal values.
-     */
-    public static final String[] jjstrLiteralImages = {
-            "", null, null, null, null, null, null, null, null, null, null, null,
-            "\141\142\163\164\162\141\143\164", "\141\163\163\145\162\164", "\142\157\157\154\145\141\156",
-            "\142\162\145\141\153", "\142\171\164\145", "\143\141\163\145", "\143\141\164\143\150",
-            "\143\150\141\162", "\143\154\141\163\163", "\143\157\156\163\164",
-            "\143\157\156\164\151\156\165\145", "\144\145\146\141\165\154\164", "\144\157", "\144\157\165\142\154\145",
-            "\145\154\163\145", "\145\156\165\155", "\145\170\164\145\156\144\163", "\146\141\154\163\145",
-            "\146\151\156\141\154", "\146\151\156\141\154\154\171", "\146\154\157\141\164", "\146\157\162",
-            "\147\157\164\157", "\151\146", "\151\155\160\154\145\155\145\156\164\163",
-            "\151\155\160\157\162\164", "\151\156\163\164\141\156\143\145\157\146", "\151\156\164",
-            "\151\156\164\145\162\146\141\143\145", "\154\157\156\147", "\156\141\164\151\166\145", "\156\145\167",
-            "\156\165\154\154", "\160\141\143\153\141\147\145", "\160\162\151\166\141\164\145",
-            "\160\162\157\164\145\143\164\145\144", "\160\165\142\154\151\143", "\162\145\164\165\162\156",
-            "\163\150\157\162\164", "\163\164\141\164\151\143", "\163\164\162\151\143\164\146\160",
-            "\163\165\160\145\162", "\163\167\151\164\143\150",
-            "\163\171\156\143\150\162\157\156\151\172\145\144", "\164\150\151\163", "\164\150\162\157\167", "\164\150\162\157\167\163",
-            "\164\162\141\156\163\151\145\156\164", "\164\162\165\145", "\164\162\171", "\166\157\151\144",
-            "\166\157\154\141\164\151\154\145", "\167\150\151\154\145", null, null, null, null, null, null, null, null, null,
-            null, null, null, null, null, null, null, "\50", "\51", "\173", "\175", "\133",
-            "\135", "\73", "\54", "\56", "\100", "\75", "\74", "\41", "\176", "\77", "\72",
-            "\75\75", "\74\75", "\76\75", "\41\75", "\174\174", "\46\46", "\53\53", "\55\55", "\53",
-            "\55", "\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\53\75", "\55\75",
-            "\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\45\75", "\74\74\75", "\76\76\75",
-            "\76\76\76\75", "\56\56\56", "\55\76", "\72\72", "\76\76\76", "\76\76", "\76", "\32",
-            "\74\76",};
-
-    /**
-     * Lexer state names.
-     */
-    public static final String[] lexStateNames = {
-            "DEFAULT",
-            "IN_JAVA_DOC_COMMENT",
-            "IN_MULTI_LINE_COMMENT",
-    };
-
-    /**
-     * Lex State array.
-     */
-    public static final int[] jjnewLexState = {
-            -1, -1, -1, -1, -1, -1, -1, 1, 2, 0, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-            -1, -1, -1, -1, -1, -1, -1, -1,
-    };
-    static final long[] jjtoToken = {
-            0xfffffffffffff001L, 0xfffffffffffe7087L, 0x1fL,
-    };
-    static final long[] jjtoSkip = {
-            0x67eL, 0x0L, 0x0L,
-    };
-    static final long[] jjtoSpecial = {
-            0x640L, 0x0L, 0x0L,
-    };
-    static final long[] jjtoMore = {
-            0x980L, 0x0L, 0x0L,
-    };
-    protected JavaCharStream input_stream;
-    private final int[] jjrounds = new int[130];
-    private final int[] jjstateSet = new int[260];
-    private final StringBuilder jjimage = new StringBuilder();
-    private StringBuilder image = jjimage;
-    private int jjimageLen;
-    private int lengthOfMatch;
-    protected char curChar;
+            return 43;
+         }
+         if ((active0 & 0x6240001e0348000L) != 0L || (active1 & 0x1L) != 0L)
+            return 43;
+         return -1;
+      case 5:
+         if ((active0 & 0x44b042002002000L) != 0L)
+            return 43;
+         if ((active0 & 0x8890e15090c05000L) != 0L)
+         {
+            jjmatchedKind = 78;
+            jjmatchedPos = 5;
+            return 43;
+         }
+         return -1;
+      case 6:
+         if ((active0 & 0x600090804000L) != 0L)
+            return 43;
+         if ((active0 & 0x8890815000401000L) != 0L)
+         {
+            jjmatchedKind = 78;
+            jjmatchedPos = 6;
+            return 43;
+         }
+         return -1;
+      case 7:
+         if ((active0 & 0x880815000000000L) != 0L)
+         {
+            jjmatchedKind = 78;
+            jjmatchedPos = 7;
+            return 43;
+         }
+         if ((active0 & 0x8010000000401000L) != 0L)
+            return 43;
+         return -1;
+      case 8:
+         if ((active0 & 0x800810000000000L) != 0L)
+            return 43;
+         if ((active0 & 0x80005000000000L) != 0L)
+         {
+            jjmatchedKind = 78;
+            jjmatchedPos = 8;
+            return 43;
+         }
+         return -1;
+      case 9:
+         if ((active0 & 0x5000000000L) != 0L)
+            return 43;
+         if ((active0 & 0x80000000000000L) != 0L)
+         {
+            jjmatchedKind = 78;
+            jjmatchedPos = 9;
+            return 43;
+         }
+         return -1;
+      case 10:
+         if ((active0 & 0x80000000000000L) != 0L)
+         {
+            jjmatchedKind = 78;
+            jjmatchedPos = 10;
+            return 43;
+         }
+         return -1;
+      default :
+         return -1;
+   }
+}
+private final int jjStartNfa_0(int pos, long active0, long active1, long active2)
+{
+   return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0, active1, active2), pos + 1);
+}
+private int jjStopAtPos(int pos, int kind)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   return pos + 1;
+}
+private int jjMoveStringLiteralDfa0_0()
+{
+   switch(curChar)
+   {
+      case 26:
+         return jjStopAtPos(0, 131);
+      case 33:
+         jjmatchedKind = 93;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x1000000000L, 0x0L);
+      case 37:
+         jjmatchedKind = 112;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000000000L, 0x0L);
+      case 38:
+         jjmatchedKind = 109;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x40004000000000L, 0x0L);
+      case 40:
+         return jjStopAtPos(0, 81);
+      case 41:
+         return jjStopAtPos(0, 82);
+      case 42:
+         jjmatchedKind = 107;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x10000000000000L, 0x0L);
+      case 43:
+         jjmatchedKind = 105;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x4008000000000L, 0x0L);
+      case 44:
+         return jjStopAtPos(0, 88);
+      case 45:
+         jjmatchedKind = 106;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x4008010000000000L, 0x0L);
+      case 46:
+         jjmatchedKind = 89;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x2000000000000000L, 0x0L);
+      case 47:
+         jjmatchedKind = 108;
+         return jjMoveStringLiteralDfa1_0(0x100L, 0x20000000000000L, 0x0L);
+      case 58:
+         jjmatchedKind = 96;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x8000000000000000L, 0x0L);
+      case 59:
+         return jjStopAtPos(0, 87);
+      case 60:
+         jjmatchedKind = 92;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x402000400000000L, 0x10L);
+      case 61:
+         jjmatchedKind = 91;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x200000000L, 0x0L);
+      case 62:
+         jjmatchedKind = 130;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x1800000800000000L, 0x3L);
+      case 63:
+         return jjStopAtPos(0, 95);
+      case 64:
+         return jjStopAtPos(0, 90);
+      case 91:
+         return jjStopAtPos(0, 85);
+      case 93:
+         return jjStopAtPos(0, 86);
+      case 94:
+         jjmatchedKind = 111;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x100000000000000L, 0x0L);
+      case 97:
+         return jjMoveStringLiteralDfa1_0(0x3000L, 0x0L, 0x0L);
+      case 98:
+         return jjMoveStringLiteralDfa1_0(0x1c000L, 0x0L, 0x0L);
+      case 99:
+         return jjMoveStringLiteralDfa1_0(0x7e0000L, 0x0L, 0x0L);
+      case 100:
+         return jjMoveStringLiteralDfa1_0(0x3800000L, 0x0L, 0x0L);
+      case 101:
+         return jjMoveStringLiteralDfa1_0(0x1c000000L, 0x0L, 0x0L);
+      case 102:
+         return jjMoveStringLiteralDfa1_0(0x3e0000000L, 0x0L, 0x0L);
+      case 103:
+         return jjMoveStringLiteralDfa1_0(0x400000000L, 0x0L, 0x0L);
+      case 105:
+         return jjMoveStringLiteralDfa1_0(0x1f800000000L, 0x0L, 0x0L);
+      case 108:
+         return jjMoveStringLiteralDfa1_0(0x20000000000L, 0x0L, 0x0L);
+      case 110:
+         return jjMoveStringLiteralDfa1_0(0x1c0000000000L, 0x0L, 0x0L);
+      case 112:
+         return jjMoveStringLiteralDfa1_0(0x1e00000000000L, 0x0L, 0x0L);
+      case 114:
+         return jjMoveStringLiteralDfa1_0(0x2000000000000L, 0x0L, 0x0L);
+      case 115:
+         return jjMoveStringLiteralDfa1_0(0xfc000000000000L, 0x0L, 0x0L);
+      case 116:
+         return jjMoveStringLiteralDfa1_0(0x3f00000000000000L, 0x0L, 0x0L);
+      case 118:
+         return jjMoveStringLiteralDfa1_0(0xc000000000000000L, 0x0L, 0x0L);
+      case 119:
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x1L, 0x0L);
+      case 123:
+         return jjStopAtPos(0, 83);
+      case 124:
+         jjmatchedKind = 110;
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x80002000000000L, 0x0L);
+      case 125:
+         return jjStopAtPos(0, 84);
+      case 126:
+         return jjStopAtPos(0, 94);
+      default :
+         return jjMoveNfa_0(0, 0);
+   }
+}
+private int jjMoveStringLiteralDfa1_0(long active0, long active1, long active2)
+{
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(0, active0, active1, active2);
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 38:
+         if ((active1 & 0x4000000000L) != 0L)
+            return jjStopAtPos(1, 102);
+         break;
+      case 42:
+         if ((active0 & 0x100L) != 0L)
+            return jjStartNfaWithStates_0(1, 8, 50);
+         break;
+      case 43:
+         if ((active1 & 0x8000000000L) != 0L)
+            return jjStopAtPos(1, 103);
+         break;
+      case 45:
+         if ((active1 & 0x10000000000L) != 0L)
+            return jjStopAtPos(1, 104);
+         break;
+      case 46:
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000000000L, active2, 0L);
+      case 58:
+         if ((active1 & 0x8000000000000000L) != 0L)
+            return jjStopAtPos(1, 127);
+         break;
+      case 60:
+         if ((active1 & 0x2000000000000L) != 0L)
+         {
+            jjmatchedKind = 113;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x400000000000000L, active2, 0L);
+      case 61:
+         if ((active1 & 0x200000000L) != 0L)
+            return jjStopAtPos(1, 97);
+         else if ((active1 & 0x400000000L) != 0L)
+            return jjStopAtPos(1, 98);
+         else if ((active1 & 0x800000000L) != 0L)
+            return jjStopAtPos(1, 99);
+         else if ((active1 & 0x1000000000L) != 0L)
+            return jjStopAtPos(1, 100);
+         else if ((active1 & 0x4000000000000L) != 0L)
+            return jjStopAtPos(1, 114);
+         else if ((active1 & 0x8000000000000L) != 0L)
+            return jjStopAtPos(1, 115);
+         else if ((active1 & 0x10000000000000L) != 0L)
+            return jjStopAtPos(1, 116);
+         else if ((active1 & 0x20000000000000L) != 0L)
+            return jjStopAtPos(1, 117);
+         else if ((active1 & 0x40000000000000L) != 0L)
+            return jjStopAtPos(1, 118);
+         else if ((active1 & 0x80000000000000L) != 0L)
+            return jjStopAtPos(1, 119);
+         else if ((active1 & 0x100000000000000L) != 0L)
+            return jjStopAtPos(1, 120);
+         else if ((active1 & 0x200000000000000L) != 0L)
+            return jjStopAtPos(1, 121);
+         break;
+      case 62:
+         if ((active1 & 0x4000000000000000L) != 0L)
+            return jjStopAtPos(1, 126);
+         else if ((active2 & 0x2L) != 0L)
+         {
+            jjmatchedKind = 129;
+            jjmatchedPos = 1;
+         }
+         else if ((active2 & 0x10L) != 0L)
+            return jjStopAtPos(1, 132);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1800000000000000L, active2, 0x1L);
+      case 97:
+         return jjMoveStringLiteralDfa2_0(active0, 0x240020060000L, active1, 0L, active2, 0L);
+      case 98:
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000L, active1, 0L, active2, 0L);
+      case 101:
+         return jjMoveStringLiteralDfa2_0(active0, 0x2080000800000L, active1, 0L, active2, 0L);
+      case 102:
+         if ((active0 & 0x800000000L) != 0L)
+            return jjStartNfaWithStates_0(1, 35, 43);
+         break;
+      case 104:
+         return jjMoveStringLiteralDfa2_0(active0, 0x704000000080000L, active1, 0x1L, active2, 0L);
+      case 105:
+         return jjMoveStringLiteralDfa2_0(active0, 0xc0000000L, active1, 0L, active2, 0L);
+      case 108:
+         return jjMoveStringLiteralDfa2_0(active0, 0x104100000L, active1, 0L, active2, 0L);
+      case 109:
+         return jjMoveStringLiteralDfa2_0(active0, 0x3000000000L, active1, 0L, active2, 0L);
+      case 110:
+         return jjMoveStringLiteralDfa2_0(active0, 0x1c008000000L, active1, 0L, active2, 0L);
+      case 111:
+         if ((active0 & 0x1000000L) != 0L)
+         {
+            jjmatchedKind = 24;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_0(active0, 0xc000020602604000L, active1, 0L, active2, 0L);
+      case 114:
+         return jjMoveStringLiteralDfa2_0(active0, 0x3800c00000008000L, active1, 0L, active2, 0L);
+      case 115:
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000L, active1, 0L, active2, 0L);
+      case 116:
+         return jjMoveStringLiteralDfa2_0(active0, 0x18000000000000L, active1, 0L, active2, 0L);
+      case 117:
+         return jjMoveStringLiteralDfa2_0(active0, 0x21100000000000L, active1, 0L, active2, 0L);
+      case 119:
+         return jjMoveStringLiteralDfa2_0(active0, 0x40000000000000L, active1, 0L, active2, 0L);
+      case 120:
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000000L, active1, 0L, active2, 0L);
+      case 121:
+         return jjMoveStringLiteralDfa2_0(active0, 0x80000000010000L, active1, 0L, active2, 0L);
+      case 124:
+         if ((active1 & 0x2000000000L) != 0L)
+            return jjStopAtPos(1, 101);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(0, active0, active1, active2);
+}
+private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1, long old2, long active2)
+{
+   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+      return jjStartNfa_0(0, old0, old1, old2);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(1, active0, active1, active2);
+      return 2;
+   }
+   switch(curChar)
+   {
+      case 46:
+         if ((active1 & 0x2000000000000000L) != 0L)
+            return jjStopAtPos(2, 125);
+         break;
+      case 61:
+         if ((active1 & 0x400000000000000L) != 0L)
+            return jjStopAtPos(2, 122);
+         else if ((active1 & 0x800000000000000L) != 0L)
+            return jjStopAtPos(2, 123);
+         break;
+      case 62:
+         if ((active2 & 0x1L) != 0L)
+         {
+            jjmatchedKind = 128;
+            jjmatchedPos = 2;
+         }
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1000000000000000L, active2, 0L);
+      case 97:
+         return jjMoveStringLiteralDfa3_0(active0, 0x808000000180000L, active1, 0L, active2, 0L);
+      case 98:
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000L, active1, 0L, active2, 0L);
+      case 99:
+         return jjMoveStringLiteralDfa3_0(active0, 0x200000000000L, active1, 0L, active2, 0L);
+      case 101:
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000L, active1, 0L, active2, 0L);
+      case 102:
+         return jjMoveStringLiteralDfa3_0(active0, 0x800000L, active1, 0L, active2, 0L);
+      case 105:
+         return jjMoveStringLiteralDfa3_0(active0, 0x4140400000000000L, active1, 0x1L, active2, 0L);
+      case 108:
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000100020000000L, active1, 0L, active2, 0L);
+      case 110:
+         return jjMoveStringLiteralDfa3_0(active0, 0x800200c0600000L, active1, 0L, active2, 0L);
+      case 111:
+         return jjMoveStringLiteralDfa3_0(active0, 0x4800100004000L, active1, 0L, active2, 0L);
+      case 112:
+         return jjMoveStringLiteralDfa3_0(active0, 0x20003000000000L, active1, 0L, active2, 0L);
+      case 114:
+         if ((active0 & 0x200000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 33, 43);
+         return jjMoveStringLiteralDfa3_0(active0, 0x610000000000000L, active1, 0L, active2, 0L);
+      case 115:
+         return jjMoveStringLiteralDfa3_0(active0, 0x4004023000L, active1, 0L, active2, 0L);
+      case 116:
+         if ((active0 & 0x8000000000L) != 0L)
+         {
+            jjmatchedKind = 39;
+            jjmatchedPos = 2;
+         }
+         return jjMoveStringLiteralDfa3_0(active0, 0x2050410050000L, active1, 0L, active2, 0L);
+      case 117:
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000a000000L, active1, 0L, active2, 0L);
+      case 119:
+         if ((active0 & 0x80000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 43, 43);
+         break;
+      case 121:
+         if ((active0 & 0x2000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(2, 61, 43);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(1, active0, active1, active2);
+}
+private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1, long old2, long active2)
+{
+   if (((active0 &= old0) | (active1 &= old1) | (active2 &= old2)) == 0L)
+      return jjStartNfa_0(1, old0, old1, old2);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(2, active0, active1, 0L);
+      return 3;
+   }
+   switch(curChar)
+   {
+      case 61:
+         if ((active1 & 0x1000000000000000L) != 0L)
+            return jjStopAtPos(3, 124);
+         break;
+      case 97:
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000001c0808000L, active1, 0L);
+      case 98:
+         return jjMoveStringLiteralDfa4_0(active0, 0x2000000L, active1, 0L);
+      case 99:
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000040000L, active1, 0L);
+      case 100:
+         if ((active0 & 0x4000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 62, 43);
+         break;
+      case 101:
+         if ((active0 & 0x10000L) != 0L)
+            return jjStartNfaWithStates_0(3, 16, 43);
+         else if ((active0 & 0x20000L) != 0L)
+            return jjStartNfaWithStates_0(3, 17, 43);
+         else if ((active0 & 0x4000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 26, 43);
+         else if ((active0 & 0x1000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 60, 43);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20010010002000L, active1, 0L);
+      case 103:
+         if ((active0 & 0x20000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 41, 43);
+         break;
+      case 105:
+         return jjMoveStringLiteralDfa4_0(active0, 0x10040000000000L, active1, 0L);
+      case 107:
+         return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L);
+      case 108:
+         if ((active0 & 0x100000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 44, 43);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1001000004000L, active1, 0x1L);
+      case 109:
+         if ((active0 & 0x8000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 27, 43);
+         break;
+      case 110:
+         return jjMoveStringLiteralDfa4_0(active0, 0x800000000000000L, active1, 0L);
+      case 111:
+         if ((active0 & 0x400000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 34, 43);
+         return jjMoveStringLiteralDfa4_0(active0, 0x600002000000000L, active1, 0L);
+      case 114:
+         if ((active0 & 0x80000L) != 0L)
+            return jjStartNfaWithStates_0(3, 19, 43);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000000000000L, active1, 0L);
+      case 115:
+         if ((active0 & 0x100000000000000L) != 0L)
+            return jjStartNfaWithStates_0(3, 56, 43);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20300000L, active1, 0L);
+      case 116:
+         return jjMoveStringLiteralDfa4_0(active0, 0x48804000401000L, active1, 0L);
+      case 117:
+         return jjMoveStringLiteralDfa4_0(active0, 0x2000000000000L, active1, 0L);
+      case 118:
+         return jjMoveStringLiteralDfa4_0(active0, 0x400000000000L, active1, 0L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(2, active0, active1, 0L);
+}
+private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1)
+{
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_0(2, old0, old1, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(3, active0, active1, 0L);
+      return 4;
+   }
+   switch(curChar)
+   {
+      case 97:
+         return jjMoveStringLiteralDfa5_0(active0, 0x604000000000L, active1, 0L);
+      case 99:
+         return jjMoveStringLiteralDfa5_0(active0, 0x50000000000000L, active1, 0L);
+      case 101:
+         if ((active0 & 0x20000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 29, 43);
+         else if ((active1 & 0x1L) != 0L)
+            return jjStartNfaWithStates_0(4, 64, 43);
+         return jjMoveStringLiteralDfa5_0(active0, 0x801000004000L, active1, 0L);
+      case 104:
+         if ((active0 & 0x40000L) != 0L)
+            return jjStartNfaWithStates_0(4, 18, 43);
+         return jjMoveStringLiteralDfa5_0(active0, 0x80000000000000L, active1, 0L);
+      case 105:
+         return jjMoveStringLiteralDfa5_0(active0, 0x9000000400000L, active1, 0L);
+      case 107:
+         if ((active0 & 0x8000L) != 0L)
+            return jjStartNfaWithStates_0(4, 15, 43);
+         break;
+      case 108:
+         if ((active0 & 0x40000000L) != 0L)
+         {
+            jjmatchedKind = 30;
+            jjmatchedPos = 4;
+         }
+         return jjMoveStringLiteralDfa5_0(active0, 0x82000000L, active1, 0L);
+      case 110:
+         return jjMoveStringLiteralDfa5_0(active0, 0x10000000L, active1, 0L);
+      case 114:
+         if ((active0 & 0x20000000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 53, 43);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2012000003000L, active1, 0L);
+      case 115:
+         if ((active0 & 0x100000L) != 0L)
+            return jjStartNfaWithStates_0(4, 20, 43);
+         return jjMoveStringLiteralDfa5_0(active0, 0x800000000000000L, active1, 0L);
+      case 116:
+         if ((active0 & 0x200000L) != 0L)
+            return jjStartNfaWithStates_0(4, 21, 43);
+         else if ((active0 & 0x100000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 32, 43);
+         else if ((active0 & 0x4000000000000L) != 0L)
+            return jjStartNfaWithStates_0(4, 50, 43);
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000000000000000L, active1, 0L);
+      case 117:
+         return jjMoveStringLiteralDfa5_0(active0, 0x800000L, active1, 0L);
+      case 118:
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000000000L, active1, 0L);
+      case 119:
+         if ((active0 & 0x200000000000000L) != 0L)
+         {
+            jjmatchedKind = 57;
+            jjmatchedPos = 4;
+         }
+         return jjMoveStringLiteralDfa5_0(active0, 0x400000000000000L, active1, 0L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(3, active0, active1, 0L);
+}
+private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long active1)
+{
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjStartNfa_0(3, old0, old1, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(4, active0, 0L, 0L);
+      return 5;
+   }
+   switch(curChar)
+   {
+      case 97:
+         return jjMoveStringLiteralDfa6_0(active0, 0x5000L);
+      case 99:
+         if ((active0 & 0x1000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 48, 43);
+         else if ((active0 & 0x8000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 51, 43);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000000000L);
+      case 100:
+         return jjMoveStringLiteralDfa6_0(active0, 0x10000000L);
+      case 101:
+         if ((active0 & 0x2000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 25, 43);
+         else if ((active0 & 0x40000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 42, 43);
+         break;
+      case 102:
+         return jjMoveStringLiteralDfa6_0(active0, 0x10000000000L);
+      case 103:
+         return jjMoveStringLiteralDfa6_0(active0, 0x200000000000L);
+      case 104:
+         if ((active0 & 0x40000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 54, 43);
+         break;
+      case 105:
+         return jjMoveStringLiteralDfa6_0(active0, 0x8800000000000000L);
+      case 108:
+         return jjMoveStringLiteralDfa6_0(active0, 0x80800000L);
+      case 109:
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000000L);
+      case 110:
+         if ((active0 & 0x2000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 49, 43);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000400000L);
+      case 114:
+         return jjMoveStringLiteralDfa6_0(active0, 0x80000000000000L);
+      case 115:
+         if ((active0 & 0x400000000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 58, 43);
+         break;
+      case 116:
+         if ((active0 & 0x2000L) != 0L)
+            return jjStartNfaWithStates_0(5, 13, 43);
+         else if ((active0 & 0x2000000000L) != 0L)
+            return jjStartNfaWithStates_0(5, 37, 43);
+         return jjMoveStringLiteralDfa6_0(active0, 0x10400000000000L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(4, active0, 0L, 0L);
+}
+private int jjMoveStringLiteralDfa6_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(4, old0, 0L, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(5, active0, 0L, 0L);
+      return 6;
+   }
+   switch(curChar)
+   {
+      case 97:
+         return jjMoveStringLiteralDfa7_0(active0, 0x10000000000L);
+      case 99:
+         return jjMoveStringLiteralDfa7_0(active0, 0x4000001000L);
+      case 101:
+         if ((active0 & 0x200000000000L) != 0L)
+            return jjStartNfaWithStates_0(6, 45, 43);
+         else if ((active0 & 0x400000000000L) != 0L)
+            return jjStartNfaWithStates_0(6, 46, 43);
+         return jjMoveStringLiteralDfa7_0(active0, 0x800001000000000L);
+      case 102:
+         return jjMoveStringLiteralDfa7_0(active0, 0x10000000000000L);
+      case 108:
+         return jjMoveStringLiteralDfa7_0(active0, 0x8000000000000000L);
+      case 110:
+         if ((active0 & 0x4000L) != 0L)
+            return jjStartNfaWithStates_0(6, 14, 43);
+         break;
+      case 111:
+         return jjMoveStringLiteralDfa7_0(active0, 0x80000000000000L);
+      case 115:
+         if ((active0 & 0x10000000L) != 0L)
+            return jjStartNfaWithStates_0(6, 28, 43);
+         break;
+      case 116:
+         if ((active0 & 0x800000L) != 0L)
+            return jjStartNfaWithStates_0(6, 23, 43);
+         return jjMoveStringLiteralDfa7_0(active0, 0x800000000000L);
+      case 117:
+         return jjMoveStringLiteralDfa7_0(active0, 0x400000L);
+      case 121:
+         if ((active0 & 0x80000000L) != 0L)
+            return jjStartNfaWithStates_0(6, 31, 43);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(5, active0, 0L, 0L);
+}
+private int jjMoveStringLiteralDfa7_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(5, old0, 0L, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(6, active0, 0L, 0L);
+      return 7;
+   }
+   switch(curChar)
+   {
+      case 99:
+         return jjMoveStringLiteralDfa8_0(active0, 0x10000000000L);
+      case 101:
+         if ((active0 & 0x400000L) != 0L)
+            return jjStartNfaWithStates_0(7, 22, 43);
+         else if ((active0 & 0x8000000000000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 63, 43);
+         return jjMoveStringLiteralDfa8_0(active0, 0x804000000000L);
+      case 110:
+         return jjMoveStringLiteralDfa8_0(active0, 0x880001000000000L);
+      case 112:
+         if ((active0 & 0x10000000000000L) != 0L)
+            return jjStartNfaWithStates_0(7, 52, 43);
+         break;
+      case 116:
+         if ((active0 & 0x1000L) != 0L)
+            return jjStartNfaWithStates_0(7, 12, 43);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(6, active0, 0L, 0L);
+}
+private int jjMoveStringLiteralDfa8_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(6, old0, 0L, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(7, active0, 0L, 0L);
+      return 8;
+   }
+   switch(curChar)
+   {
+      case 100:
+         if ((active0 & 0x800000000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 47, 43);
+         break;
+      case 101:
+         if ((active0 & 0x10000000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 40, 43);
+         break;
+      case 105:
+         return jjMoveStringLiteralDfa9_0(active0, 0x80000000000000L);
+      case 111:
+         return jjMoveStringLiteralDfa9_0(active0, 0x4000000000L);
+      case 116:
+         if ((active0 & 0x800000000000000L) != 0L)
+            return jjStartNfaWithStates_0(8, 59, 43);
+         return jjMoveStringLiteralDfa9_0(active0, 0x1000000000L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(7, active0, 0L, 0L);
+}
+private int jjMoveStringLiteralDfa9_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(7, old0, 0L, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(8, active0, 0L, 0L);
+      return 9;
+   }
+   switch(curChar)
+   {
+      case 102:
+         if ((active0 & 0x4000000000L) != 0L)
+            return jjStartNfaWithStates_0(9, 38, 43);
+         break;
+      case 115:
+         if ((active0 & 0x1000000000L) != 0L)
+            return jjStartNfaWithStates_0(9, 36, 43);
+         break;
+      case 122:
+         return jjMoveStringLiteralDfa10_0(active0, 0x80000000000000L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(8, active0, 0L, 0L);
+}
+private int jjMoveStringLiteralDfa10_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(8, old0, 0L, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(9, active0, 0L, 0L);
+      return 10;
+   }
+   switch(curChar)
+   {
+      case 101:
+         return jjMoveStringLiteralDfa11_0(active0, 0x80000000000000L);
+      default :
+         break;
+   }
+   return jjStartNfa_0(9, active0, 0L, 0L);
+}
+private int jjMoveStringLiteralDfa11_0(long old0, long active0)
+{
+   if (((active0 &= old0)) == 0L)
+      return jjStartNfa_0(9, old0, 0L, 0L);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      jjStopStringLiteralDfa_0(10, active0, 0L, 0L);
+      return 11;
+   }
+   switch(curChar)
+   {
+      case 100:
+         if ((active0 & 0x80000000000000L) != 0L)
+            return jjStartNfaWithStates_0(11, 55, 43);
+         break;
+      default :
+         break;
+   }
+   return jjStartNfa_0(10, active0, 0L, 0L);
+}
+private int jjStartNfaWithStates_0(int pos, int kind, int state)
+{
+   jjmatchedKind = kind;
+   jjmatchedPos = pos;
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) { return pos + 1; }
+   return jjMoveNfa_0(state, pos + 1);
+}
+static final long[] jjbitVec0 = {
+   0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
+};
+static final long[] jjbitVec2 = {
+   0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL
+};
+static final long[] jjbitVec3 = {
+   0xfff0000000200002L, 0xffffffffffffdfffL, 0xfffff00f7fffffffL, 0x12000000007fffffL
+};
+static final long[] jjbitVec4 = {
+   0x0L, 0x0L, 0x420043c00000000L, 0xff7fffffff7fffffL
+};
+static final long[] jjbitVec5 = {
+   0x7fffffffffffffL, 0xffffffffffff0000L, 0xffffffffffffffffL, 0x401f0003ffc3L
+};
+static final long[] jjbitVec6 = {
+   0x0L, 0x400000000000000L, 0xfffffffbffffd740L, 0xfbfffffffff7fffL
+};
+static final long[] jjbitVec7 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffffffc03L, 0x33fffffffff7fffL
+};
+static final long[] jjbitVec8 = {
+   0xfffe00000000ffffL, 0xfffffffe027fffffL, 0xffL, 0x707ffffff0000L
+};
+static final long[] jjbitVec9 = {
+   0x7fffffe00000000L, 0xfffec000000007ffL, 0xffffffffffffffffL, 0x9c00c060002fffffL
+};
+static final long[] jjbitVec10 = {
+   0xfffffffd0000L, 0xe000L, 0x2003fffffffffL, 0x0L
+};
+static final long[] jjbitVec11 = {
+   0x23fffffffffffff0L, 0x3ff010000L, 0x23c5fdfffff99fe0L, 0xf0003b0000000L
+};
+static final long[] jjbitVec12 = {
+   0x36dfdfffff987e0L, 0x1c00005e000000L, 0x23edfdfffffbbfe0L, 0x2000300010000L
+};
+static final long[] jjbitVec13 = {
+   0x23edfdfffff99fe0L, 0x20003b0000000L, 0x3bfc718d63dc7e8L, 0x200000000000000L
+};
+static final long[] jjbitVec14 = {
+   0x3effdfffffddfe0L, 0x300000000L, 0x23effdfffffddfe0L, 0x340000000L
+};
+static final long[] jjbitVec15 = {
+   0x3fffdfffffddfe0L, 0x300000000L, 0x2ffbfffffc7fffe0L, 0x7fL
+};
+static final long[] jjbitVec16 = {
+   0x800dfffffffffffeL, 0x7fL, 0x200decaefef02596L, 0x3000005fL
+};
+static final long[] jjbitVec17 = {
+   0x1L, 0x7fffffffeffL, 0xf00L, 0x0L
+};
+static final long[] jjbitVec18 = {
+   0x6fbffffffffL, 0x3f0000L, 0xffffffff00000000L, 0x1ffffffffff003fL
+};
+static final long[] jjbitVec19 = {
+   0xffffffffffffffffL, 0xffffffff83ffffffL, 0xffffff07ffffffffL, 0x3ffffffffffffffL
+};
+static final long[] jjbitVec20 = {
+   0xffffffffffffff7fL, 0xffffffff3d7f3d7fL, 0x7f3d7fffffff3d7fL, 0xffff7fffff7f7f3dL
+};
+static final long[] jjbitVec21 = {
+   0xffffffff7f3d7fffL, 0x7ffff7fL, 0xffffffff00000000L, 0x1fffffffffffffL
+};
+static final long[] jjbitVec22 = {
+   0xffffffffffffffffL, 0x7f9fffffffffffL, 0xffffffff07fffffeL, 0x1c7ffffffffffL
+};
+static final long[] jjbitVec23 = {
+   0x3ffff0003dfffL, 0x1dfff0003ffffL, 0xfffffffffffffL, 0x18800000L
+};
+static final long[] jjbitVec24 = {
+   0xffffffff00000000L, 0xffffffffffffffL, 0x1ffffffffffL, 0x0L
+};
+static final long[] jjbitVec25 = {
+   0x1fffffffL, 0x1f3fffffff0000L, 0x0L, 0x0L
+};
+static final long[] jjbitVec26 = {
+   0xffffffffffffffffL, 0xfffffffffffL, 0x0L, 0x0L
+};
+static final long[] jjbitVec27 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffff0fffffffL, 0x3ffffffffffffffL
+};
+static final long[] jjbitVec28 = {
+   0xffffffff3f3fffffL, 0x3fffffffaaff3f3fL, 0x5fdfffffffffffffL, 0x1fdc1fff0fcf1fdcL
+};
+static final long[] jjbitVec29 = {
+   0x8000000000000000L, 0x8002000000100001L, 0x3ffff00000000L, 0x0L
+};
+static final long[] jjbitVec30 = {
+   0xe3fbbd503e2ffc84L, 0xffffffff000003e0L, 0xfL, 0x0L
+};
+static final long[] jjbitVec31 = {
+   0x1f3e03fe000000e0L, 0xfffffffffffffffeL, 0xfffffffee07fffffL, 0xffffffffffffffffL
+};
+static final long[] jjbitVec32 = {
+   0xfffe1fffffffffe0L, 0xffffffffffffffffL, 0xffffff00007fffL, 0xffff000000000000L
+};
+static final long[] jjbitVec33 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0x3fffffffffffffL, 0x0L
+};
+static final long[] jjbitVec34 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0x3fffffffffL, 0x0L
+};
+static final long[] jjbitVec35 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0x1fffL, 0x0L
+};
+static final long[] jjbitVec36 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffL, 0x0L
+};
+static final long[] jjbitVec37 = {
+   0x6L, 0x0L, 0x0L, 0x0L
+};
+static final long[] jjbitVec38 = {
+   0xffff3fffffffffffL, 0x7ffffffffffL, 0x0L, 0x0L
+};
+static final long[] jjbitVec39 = {
+   0x5f7ffdffa0f8007fL, 0xffffffffffffffdbL, 0x3ffffffffffffL, 0xfffffffffff80000L
+};
+static final long[] jjbitVec40 = {
+   0x3fffffffffffffffL, 0xffffffffffff0000L, 0xfffffffffffcffffL, 0x1fff0000000000ffL
+};
+static final long[] jjbitVec41 = {
+   0x18000000000000L, 0xffdf02000000e000L, 0xffffffffffffffffL, 0x1fffffffffffffffL
+};
+static final long[] jjbitVec42 = {
+   0x87fffffe00000010L, 0xffffffe007fffffeL, 0x7fffffffffffffffL, 0x631cfcfcfcL
+};
+static final long[] jjbitVec43 = {
+   0x0L, 0x0L, 0x420243cffffffffL, 0xff7fffffff7fffffL
+};
+static final long[] jjbitVec44 = {
+   0xffffffffffffffffL, 0x400ffffe0ffffffL, 0xfffffffbffffd740L, 0xfbfffffffff7fffL
+};
+static final long[] jjbitVec45 = {
+   0xffffffffffffffffL, 0xffffffffffffffffL, 0xfffffffffffffc7bL, 0x33fffffffff7fffL
+};
+static final long[] jjbitVec46 = {
+   0xfffe00000000ffffL, 0xfffffffe027fffffL, 0xbbfffffbfffe00ffL, 0x707ffffff0016L
+};
+static final long[] jjbitVec47 = {
+   0x7fffffe003f000fL, 0xffffc3ff01ffffffL, 0xffffffffffffffffL, 0x9ffffdffbfefffffL
+};
+static final long[] jjbitVec48 = {
+   0xffffffffffff8000L, 0xe7ffL, 0x3ffffffffffffL, 0x0L
+};
+static final long[] jjbitVec49 = {
+   0xf3fffffffffffffeL, 0xffcfff1f3fffL, 0xf3c5fdfffff99feeL, 0xfffcfb080399fL
+};
+static final long[] jjbitVec50 = {
+   0xd36dfdfffff987eeL, 0x1fffc05e003987L, 0xf3edfdfffffbbfeeL, 0x2ffcf00013bbfL
+};
+static final long[] jjbitVec51 = {
+   0xf3edfdfffff99feeL, 0x2ffc3b0c0398fL, 0xc3bfc718d63dc7ecL, 0x200ff8000803dc7L
+};
+static final long[] jjbitVec52 = {
+   0xc3effdfffffddfeeL, 0xffc300603ddfL, 0xf3effdfffffddfecL, 0xffc340603ddfL
+};
+static final long[] jjbitVec53 = {
+   0xc3fffdfffffddfecL, 0xffc300803dcfL, 0x2ffbfffffc7fffecL, 0xc0000ff5f847fL
+};
+static final long[] jjbitVec54 = {
+   0x87fffffffffffffeL, 0x3ff7fffL, 0x3bffecaefef02596L, 0x33ff3f5fL
+};
+static final long[] jjbitVec55 = {
+   0xc2a003ff03000001L, 0xfffe07fffffffeffL, 0x1ffffffffeff0fdfL, 0x40L
+};
+static final long[] jjbitVec56 = {
+   0x3c7f6fbffffffffL, 0x3ff03ffL, 0xffffffff00000000L, 0x1ffffffffff003fL
+};
+static final long[] jjbitVec57 = {
+   0xffffffff7f3d7fffL, 0x3fe0007ffff7fL, 0xffffffff00000000L, 0x1fffffffffffffL
+};
+static final long[] jjbitVec58 = {
+   0x1fffff001fdfffL, 0xddfff000fffffL, 0xffffffffffffffffL, 0x3ff388fffffL
+};
+static final long[] jjbitVec59 = {
+   0xffffffff03ff3800L, 0xffffffffffffffL, 0x3ffffffffffL, 0x0L
+};
+static final long[] jjbitVec60 = {
+   0xfff0fff1fffffffL, 0x1f3fffffffffc0L, 0x0L, 0x0L
+};
+static final long[] jjbitVec61 = {
+   0x80007c000000f000L, 0x8002fc0f00100001L, 0x3ffff00000000L, 0x7e21fff0000L
+};
+static final long[] jjbitVec62 = {
+   0x1f3efffe000000e0L, 0xfffffffffffffffeL, 0xfffffffee67fffffL, 0xffffffffffffffffL
+};
+static final long[] jjbitVec63 = {
+   0x10000000000006L, 0x0L, 0x0L, 0x0L
+};
+static final long[] jjbitVec64 = {
+   0x3L, 0x0L, 0x0L, 0x0L
+};
+static final long[] jjbitVec65 = {
+   0x0L, 0x800000000000000L, 0x0L, 0x0L
+};
+static final long[] jjbitVec66 = {
+   0x5f7ffdffe0f8007fL, 0xffffffffffffffdbL, 0x3ffffffffffffL, 0xfffffffffff80000L
+};
+static final long[] jjbitVec67 = {
+   0x18000f0000ffffL, 0xffdf02000000e000L, 0xffffffffffffffffL, 0x9fffffffffffffffL
+};
+static final long[] jjbitVec68 = {
+   0x87fffffe03ff0010L, 0xffffffe007fffffeL, 0x7fffffffffffffffL, 0xe0000631cfcfcfcL
+};
+private int jjMoveNfa_0(int startState, int curPos)
+{
+   int startsAt = 0;
+   jjnewStateCnt = 130;
+   int i = 1;
+   jjstateSet[0] = startState;
+   int kind = 0x7fffffff;
+   for (;;)
+   {
+      if (++jjround == 0x7fffffff)
+         ReInitRounds();
+      if (curChar < 64)
+      {
+         long l = 1L << curChar;
+         do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 45:
+                  if (curChar == 42)
+                     jjstateSet[jjnewStateCnt++] = 50;
+                  else if (curChar == 47)
+                  {
+                     if (kind > 6)
+                        kind = 6;
+                     jjCheckNAddStates(0, 2);
+                  }
+                  break;
+               case 0:
+                  if ((0x3ff000000000000L & l) != 0L)
+                  {
+                     if (kind > 66)
+                        kind = 66;
+                     jjCheckNAddStates(3, 17);
+                  }
+                  else if (curChar == 47)
+                     jjAddStates(18, 19);
+                  else if (curChar == 36)
+                  {
+                     if (kind > 78)
+                        kind = 78;
+                     jjCheckNAdd(43);
+                  }
+                  else if (curChar == 34)
+                     jjCheckNAddStates(20, 23);
+                  else if (curChar == 39)
+                     jjAddStates(24, 26);
+                  else if (curChar == 46)
+                     jjCheckNAdd(1);
+                  if (curChar == 48)
+                     jjAddStates(27, 34);
+                  break;
+               case 1:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(35, 38);
+                  break;
+               case 2:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(2, 3);
+                  break;
+               case 3:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(39, 41);
+                  break;
+               case 5:
+                  if ((0x280000000000L & l) != 0L)
+                     jjCheckNAdd(6);
+                  break;
+               case 6:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(42, 44);
+                  break;
+               case 7:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(7, 8);
+                  break;
+               case 8:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddTwoStates(6, 9);
+                  break;
+               case 10:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(45, 48);
+                  break;
+               case 11:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(49, 53);
+                  break;
+               case 12:
+                  if (curChar == 39)
+                     jjAddStates(24, 26);
+                  break;
+               case 13:
+                  if ((0xffffff7fffffdbffL & l) != 0L)
+                     jjCheckNAdd(14);
+                  break;
+               case 14:
+                  if (curChar == 39 && kind > 76)
+                     kind = 76;
+                  break;
+               case 16:
+                  if ((0x8400000000L & l) != 0L)
+                     jjCheckNAdd(14);
+                  break;
+               case 17:
+                  if ((0xff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(18, 14);
+                  break;
+               case 18:
+                  if ((0xff000000000000L & l) != 0L)
+                     jjCheckNAdd(14);
+                  break;
+               case 19:
+                  if ((0xf000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 20;
+                  break;
+               case 20:
+                  if ((0xff000000000000L & l) != 0L)
+                     jjCheckNAdd(18);
+                  break;
+               case 22:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 23;
+                  break;
+               case 23:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 24;
+                  break;
+               case 24:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 25;
+                  break;
+               case 25:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAdd(14);
+                  break;
+               case 27:
+                  if (curChar == 34)
+                     jjCheckNAddStates(20, 23);
+                  break;
+               case 28:
+                  if ((0xfffffffbffffdbffL & l) != 0L)
+                     jjCheckNAddStates(20, 23);
+                  break;
+               case 30:
+                  if ((0x8400000000L & l) != 0L)
+                     jjCheckNAddStates(20, 23);
+                  break;
+               case 32:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 33;
+                  break;
+               case 33:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 34;
+                  break;
+               case 34:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 35;
+                  break;
+               case 35:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddStates(20, 23);
+                  break;
+               case 37:
+                  if (curChar == 34 && kind > 77)
+                     kind = 77;
+                  break;
+               case 38:
+                  if ((0xff000000000000L & l) != 0L)
+                     jjCheckNAddStates(54, 58);
+                  break;
+               case 39:
+                  if ((0xff000000000000L & l) != 0L)
+                     jjCheckNAddStates(20, 23);
+                  break;
+               case 40:
+                  if ((0xf000000000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 41;
+                  break;
+               case 41:
+                  if ((0xff000000000000L & l) != 0L)
+                     jjCheckNAdd(39);
+                  break;
+               case 42:
+                  if (curChar != 36)
+                     break;
+                  if (kind > 78)
+                     kind = 78;
+                  jjCheckNAdd(43);
+                  break;
+               case 43:
+                  if ((0x3ff00100fffc1ffL & l) == 0L)
+                     break;
+                  if (kind > 78)
+                     kind = 78;
+                  jjCheckNAdd(43);
+                  break;
+               case 44:
+                  if (curChar == 47)
+                     jjAddStates(18, 19);
+                  break;
+               case 46:
+                  if ((0xffffffffffffdbffL & l) == 0L)
+                     break;
+                  if (kind > 6)
+                     kind = 6;
+                  jjCheckNAddStates(0, 2);
+                  break;
+               case 47:
+                  if ((0x2400L & l) != 0L && kind > 6)
+                     kind = 6;
+                  break;
+               case 48:
+                  if (curChar == 10 && kind > 6)
+                     kind = 6;
+                  break;
+               case 49:
+                  if (curChar == 13)
+                     jjstateSet[jjnewStateCnt++] = 48;
+                  break;
+               case 50:
+                  if (curChar == 42)
+                     jjstateSet[jjnewStateCnt++] = 51;
+                  break;
+               case 51:
+                  if ((0xffff7fffffffffffL & l) != 0L && kind > 7)
+                     kind = 7;
+                  break;
+               case 52:
+                  if (curChar == 42)
+                     jjstateSet[jjnewStateCnt++] = 50;
+                  break;
+               case 53:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 66)
+                     kind = 66;
+                  jjCheckNAddStates(3, 17);
+                  break;
+               case 54:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(54, 55);
+                  break;
+               case 55:
+               case 98:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAdd(56);
+                  break;
+               case 57:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(57, 58);
+                  break;
+               case 58:
+               case 109:
+                  if ((0x3ff000000000000L & l) != 0L && kind > 66)
+                     kind = 66;
+                  break;
+               case 59:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(59, 60);
+                  break;
+               case 60:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddStates(59, 61);
+                  break;
+               case 61:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddStates(62, 65);
+                  break;
+               case 63:
+                  if ((0x280000000000L & l) != 0L)
+                     jjCheckNAdd(64);
+                  break;
+               case 64:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddStates(66, 68);
+                  break;
+               case 65:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(65, 66);
+                  break;
+               case 66:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(64, 9);
+                  break;
+               case 67:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddStates(69, 72);
+                  break;
+               case 68:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddStates(73, 77);
+                  break;
+               case 69:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(69, 70);
+                  break;
+               case 70:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(71, 72);
+                  break;
+               case 71:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddStates(78, 80);
+                  break;
+               case 73:
+                  if ((0x280000000000L & l) != 0L)
+                     jjCheckNAdd(74);
+                  break;
+               case 74:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(81, 83);
+                  break;
+               case 75:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(75, 76);
+                  break;
+               case 76:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddTwoStates(74, 9);
+                  break;
+               case 77:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(84, 87);
+                  break;
+               case 78:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddStates(88, 91);
+                  break;
+               case 79:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(79, 80);
+                  break;
+               case 80:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(81, 82);
+                  break;
+               case 81:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddStates(92, 94);
+                  break;
+               case 82:
+                  if (curChar != 46)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(95, 97);
+                  break;
+               case 83:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(98, 101);
+                  break;
+               case 84:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(84, 85);
+                  break;
+               case 85:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(95, 97);
+                  break;
+               case 87:
+                  if ((0x280000000000L & l) != 0L)
+                     jjCheckNAdd(88);
+                  break;
+               case 88:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(102, 104);
+                  break;
+               case 89:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(89, 90);
+                  break;
+               case 90:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddTwoStates(88, 9);
+                  break;
+               case 91:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(105, 108);
+                  break;
+               case 92:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddStates(109, 113);
+                  break;
+               case 93:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddStates(114, 117);
+                  break;
+               case 94:
+                  if (curChar == 48)
+                     jjAddStates(27, 34);
+                  break;
+               case 96:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddStates(118, 120);
+                  break;
+               case 97:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(97, 98);
+                  break;
+               case 99:
+                  if ((0xff000000000000L & l) != 0L)
+                     jjCheckNAddStates(121, 123);
+                  break;
+               case 100:
+                  if ((0xff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(100, 101);
+                  break;
+               case 101:
+                  if ((0xff000000000000L & l) != 0L)
+                     jjCheckNAdd(56);
+                  break;
+               case 103:
+                  if ((0x3000000000000L & l) != 0L)
+                     jjCheckNAddStates(124, 126);
+                  break;
+               case 104:
+                  if ((0x3000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(104, 105);
+                  break;
+               case 105:
+                  if ((0x3000000000000L & l) != 0L)
+                     jjCheckNAdd(56);
+                  break;
+               case 107:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 66)
+                     kind = 66;
+                  jjCheckNAddTwoStates(108, 109);
+                  break;
+               case 108:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(108, 109);
+                  break;
+               case 110:
+                  if ((0xff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 66)
+                     kind = 66;
+                  jjCheckNAddTwoStates(111, 112);
+                  break;
+               case 111:
+                  if ((0xff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(111, 112);
+                  break;
+               case 112:
+                  if ((0xff000000000000L & l) != 0L && kind > 66)
+                     kind = 66;
+                  break;
+               case 114:
+                  if ((0x3000000000000L & l) == 0L)
+                     break;
+                  if (kind > 66)
+                     kind = 66;
+                  jjCheckNAddTwoStates(115, 116);
+                  break;
+               case 115:
+                  if ((0x3000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(115, 116);
+                  break;
+               case 116:
+                  if ((0x3000000000000L & l) != 0L && kind > 66)
+                     kind = 66;
+                  break;
+               case 118:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjAddStates(127, 128);
+                  break;
+               case 119:
+                  if (curChar == 46)
+                     jjCheckNAdd(120);
+                  break;
+               case 120:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddTwoStates(120, 121);
+                  break;
+               case 122:
+                  if ((0x280000000000L & l) != 0L)
+                     jjCheckNAdd(123);
+                  break;
+               case 123:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddTwoStates(123, 9);
+                  break;
+               case 125:
+                  if ((0x3ff000000000000L & l) != 0L)
+                     jjCheckNAddStates(129, 131);
+                  break;
+               case 126:
+                  if (curChar == 46)
+                     jjCheckNAdd(127);
+                  break;
+               case 128:
+                  if ((0x280000000000L & l) != 0L)
+                     jjCheckNAdd(129);
+                  break;
+               case 129:
+                  if ((0x3ff000000000000L & l) == 0L)
+                     break;
+                  if (kind > 71)
+                     kind = 71;
+                  jjCheckNAddTwoStates(129, 9);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else if (curChar < 128)
+      {
+         long l = 1L << (curChar & 077);
+         do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if ((0x7fffffe87fffffeL & l) == 0L)
+                     break;
+                  if (kind > 78)
+                     kind = 78;
+                  jjCheckNAdd(43);
+                  break;
+               case 2:
+                  if (curChar == 95)
+                     jjAddStates(132, 133);
+                  break;
+               case 4:
+                  if ((0x2000000020L & l) != 0L)
+                     jjAddStates(134, 135);
+                  break;
+               case 7:
+                  if (curChar == 95)
+                     jjAddStates(136, 137);
+                  break;
+               case 9:
+                  if ((0x5000000050L & l) != 0L && kind > 71)
+                     kind = 71;
+                  break;
+               case 13:
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     jjCheckNAdd(14);
+                  break;
+               case 15:
+                  if (curChar == 92)
+                     jjAddStates(138, 140);
+                  break;
+               case 16:
+                  if ((0x14404410000000L & l) != 0L)
+                     jjCheckNAdd(14);
+                  break;
+               case 21:
+                  if (curChar == 117)
+                     jjstateSet[jjnewStateCnt++] = 22;
+                  break;
+               case 22:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 23;
+                  break;
+               case 23:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 24;
+                  break;
+               case 24:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 25;
+                  break;
+               case 25:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjCheckNAdd(14);
+                  break;
+               case 26:
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 21;
+                  break;
+               case 28:
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     jjCheckNAddStates(20, 23);
+                  break;
+               case 29:
+                  if (curChar == 92)
+                     jjAddStates(141, 143);
+                  break;
+               case 30:
+                  if ((0x14404410000000L & l) != 0L)
+                     jjCheckNAddStates(20, 23);
+                  break;
+               case 31:
+                  if (curChar == 117)
+                     jjstateSet[jjnewStateCnt++] = 32;
+                  break;
+               case 32:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 33;
+                  break;
+               case 33:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 34;
+                  break;
+               case 34:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 35;
+                  break;
+               case 35:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjCheckNAddStates(20, 23);
+                  break;
+               case 36:
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 31;
+                  break;
+               case 43:
+                  if ((0x87fffffe87fffffeL & l) == 0L)
+                     break;
+                  if (kind > 78)
+                     kind = 78;
+                  jjCheckNAdd(43);
+                  break;
+               case 46:
+                  if (kind > 6)
+                     kind = 6;
+                  jjAddStates(0, 2);
+                  break;
+               case 51:
+                  if (kind > 7)
+                     kind = 7;
+                  break;
+               case 54:
+                  if (curChar == 95)
+                     jjAddStates(144, 145);
+                  break;
+               case 56:
+                  if ((0x100000001000L & l) != 0L && kind > 65)
+                     kind = 65;
+                  break;
+               case 57:
+                  if (curChar == 95)
+                     jjAddStates(146, 147);
+                  break;
+               case 59:
+                  if (curChar == 95)
+                     jjAddStates(148, 149);
+                  break;
+               case 62:
+                  if ((0x2000000020L & l) != 0L)
+                     jjAddStates(150, 151);
+                  break;
+               case 65:
+                  if (curChar == 95)
+                     jjAddStates(152, 153);
+                  break;
+               case 69:
+                  if (curChar == 95)
+                     jjAddStates(154, 155);
+                  break;
+               case 72:
+                  if ((0x2000000020L & l) != 0L)
+                     jjAddStates(156, 157);
+                  break;
+               case 75:
+                  if (curChar == 95)
+                     jjAddStates(158, 159);
+                  break;
+               case 79:
+                  if (curChar == 95)
+                     jjAddStates(160, 161);
+                  break;
+               case 84:
+                  if (curChar == 95)
+                     jjAddStates(162, 163);
+                  break;
+               case 86:
+                  if ((0x2000000020L & l) != 0L)
+                     jjAddStates(164, 165);
+                  break;
+               case 89:
+                  if (curChar == 95)
+                     jjAddStates(166, 167);
+                  break;
+               case 95:
+                  if ((0x100000001000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 96;
+                  break;
+               case 96:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjCheckNAddStates(118, 120);
+                  break;
+               case 97:
+                  if ((0x7e8000007eL & l) != 0L)
+                     jjCheckNAddTwoStates(97, 98);
+                  break;
+               case 98:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjCheckNAdd(56);
+                  break;
+               case 100:
+                  if (curChar == 95)
+                     jjAddStates(168, 169);
+                  break;
+               case 102:
+                  if ((0x400000004L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 103;
+                  break;
+               case 104:
+                  if (curChar == 95)
+                     jjAddStates(170, 171);
+                  break;
+               case 106:
+                  if ((0x100000001000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 107;
+                  break;
+               case 107:
+                  if ((0x7e0000007eL & l) == 0L)
+                     break;
+                  if (kind > 66)
+                     kind = 66;
+                  jjCheckNAddTwoStates(108, 109);
+                  break;
+               case 108:
+                  if ((0x7e8000007eL & l) != 0L)
+                     jjCheckNAddTwoStates(108, 109);
+                  break;
+               case 109:
+                  if ((0x7e0000007eL & l) != 0L && kind > 66)
+                     kind = 66;
+                  break;
+               case 111:
+                  if (curChar == 95)
+                     jjAddStates(172, 173);
+                  break;
+               case 113:
+                  if ((0x400000004L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 114;
+                  break;
+               case 115:
+                  if (curChar == 95)
+                     jjAddStates(174, 175);
+                  break;
+               case 117:
+                  if ((0x100000001000000L & l) != 0L)
+                     jjCheckNAddTwoStates(118, 119);
+                  break;
+               case 118:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjCheckNAddTwoStates(118, 119);
+                  break;
+               case 120:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjAddStates(176, 177);
+                  break;
+               case 121:
+                  if ((0x1000000010000L & l) != 0L)
+                     jjAddStates(178, 179);
+                  break;
+               case 124:
+                  if ((0x100000001000000L & l) != 0L)
+                     jjCheckNAdd(125);
+                  break;
+               case 125:
+                  if ((0x7e0000007eL & l) != 0L)
+                     jjCheckNAddStates(129, 131);
+                  break;
+               case 127:
+                  if ((0x1000000010000L & l) != 0L)
+                     jjAddStates(180, 181);
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      else
+      {
+         int hiByte = (int)(curChar >> 8);
+         int i1 = hiByte >> 6;
+         long l1 = 1L << (hiByte & 077);
+         int i2 = (curChar & 0xff) >> 6;
+         long l2 = 1L << (curChar & 077);
+         do
+         {
+            switch(jjstateSet[--i])
+            {
+               case 0:
+                  if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
+                     break;
+                  if (kind > 78)
+                     kind = 78;
+                  jjCheckNAdd(43);
+                  break;
+               case 13:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     jjstateSet[jjnewStateCnt++] = 14;
+                  break;
+               case 28:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     jjAddStates(20, 23);
+                  break;
+               case 43:
+                  if (!jjCanMove_2(hiByte, i1, i2, l1, l2))
+                     break;
+                  if (kind > 78)
+                     kind = 78;
+                  jjCheckNAdd(43);
+                  break;
+               case 46:
+                  if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     break;
+                  if (kind > 6)
+                     kind = 6;
+                  jjAddStates(0, 2);
+                  break;
+               case 51:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2) && kind > 7)
+                     kind = 7;
+                  break;
+               default : break;
+            }
+         } while(i != startsAt);
+      }
+      if (kind != 0x7fffffff)
+      {
+         jjmatchedKind = kind;
+         jjmatchedPos = curPos;
+         kind = 0x7fffffff;
+      }
+      ++curPos;
+      if ((i = jjnewStateCnt) == (startsAt = 130 - (jjnewStateCnt = startsAt)))
+         return curPos;
+      try { curChar = input_stream.readChar(); }
+      catch(java.io.IOException e) { return curPos; }
+   }
+}
+private int jjMoveStringLiteralDfa0_2()
+{
+   switch(curChar)
+   {
+      case 42:
+         return jjMoveStringLiteralDfa1_2(0x400L);
+      default :
+         return 1;
+   }
+}
+private int jjMoveStringLiteralDfa1_2(long active0)
+{
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 47:
+         if ((active0 & 0x400L) != 0L)
+            return jjStopAtPos(1, 10);
+         break;
+      default :
+         return 2;
+   }
+   return 2;
+}
+private int jjMoveStringLiteralDfa0_1()
+{
+   switch(curChar)
+   {
+      case 42:
+         return jjMoveStringLiteralDfa1_1(0x200L);
+      default :
+         return 1;
+   }
+}
+private int jjMoveStringLiteralDfa1_1(long active0)
+{
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+      return 1;
+   }
+   switch(curChar)
+   {
+      case 47:
+         if ((active0 & 0x200L) != 0L)
+            return jjStopAtPos(1, 9);
+         break;
+      default :
+         return 2;
+   }
+   return 2;
+}
+static final int[] jjnextStates = {
+   46, 47, 49, 54, 55, 56, 57, 58, 59, 62, 9, 69, 72, 79, 82, 93, 
+   78, 68, 45, 52, 28, 29, 36, 37, 13, 15, 26, 95, 99, 102, 106, 110, 
+   113, 117, 124, 2, 4, 9, 11, 1, 4, 9, 7, 9, 10, 6, 7, 9, 
+   10, 1, 2, 4, 9, 11, 28, 29, 39, 36, 37, 61, 62, 9, 59, 62, 
+   9, 68, 65, 9, 67, 64, 65, 9, 67, 61, 59, 62, 9, 68, 69, 72, 
+   78, 75, 9, 77, 74, 75, 9, 77, 71, 69, 72, 78, 79, 82, 93, 83, 
+   86, 9, 84, 86, 9, 92, 89, 9, 91, 88, 89, 9, 91, 83, 84, 86, 
+   9, 92, 81, 79, 82, 93, 97, 98, 56, 100, 101, 56, 104, 105, 56, 118, 
+   119, 125, 126, 127, 2, 3, 5, 6, 7, 8, 16, 17, 19, 30, 38, 40, 
+   54, 55, 57, 58, 59, 60, 63, 64, 65, 66, 69, 70, 73, 74, 75, 76, 
+   79, 80, 84, 85, 87, 88, 89, 90, 100, 101, 104, 105, 111, 112, 115, 116, 
+   120, 121, 122, 123, 128, 129, 
+};
+private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
+{
+   switch(hiByte)
+   {
+      case 0:
+         return ((jjbitVec2[i2] & l2) != 0L);
+      default :
+         if ((jjbitVec0[i1] & l1) != 0L)
+            return true;
+         return false;
+   }
+}
+private static final boolean jjCanMove_1(int hiByte, int i1, int i2, long l1, long l2)
+{
+   switch(hiByte)
+   {
+      case 0:
+         return ((jjbitVec4[i2] & l2) != 0L);
+      case 2:
+         return ((jjbitVec5[i2] & l2) != 0L);
+      case 3:
+         return ((jjbitVec6[i2] & l2) != 0L);
+      case 4:
+         return ((jjbitVec7[i2] & l2) != 0L);
+      case 5:
+         return ((jjbitVec8[i2] & l2) != 0L);
+      case 6:
+         return ((jjbitVec9[i2] & l2) != 0L);
+      case 7:
+         return ((jjbitVec10[i2] & l2) != 0L);
+      case 9:
+         return ((jjbitVec11[i2] & l2) != 0L);
+      case 10:
+         return ((jjbitVec12[i2] & l2) != 0L);
+      case 11:
+         return ((jjbitVec13[i2] & l2) != 0L);
+      case 12:
+         return ((jjbitVec14[i2] & l2) != 0L);
+      case 13:
+         return ((jjbitVec15[i2] & l2) != 0L);
+      case 14:
+         return ((jjbitVec16[i2] & l2) != 0L);
+      case 15:
+         return ((jjbitVec17[i2] & l2) != 0L);
+      case 16:
+         return ((jjbitVec18[i2] & l2) != 0L);
+      case 17:
+         return ((jjbitVec19[i2] & l2) != 0L);
+      case 18:
+         return ((jjbitVec20[i2] & l2) != 0L);
+      case 19:
+         return ((jjbitVec21[i2] & l2) != 0L);
+      case 20:
+         return ((jjbitVec0[i2] & l2) != 0L);
+      case 22:
+         return ((jjbitVec22[i2] & l2) != 0L);
+      case 23:
+         return ((jjbitVec23[i2] & l2) != 0L);
+      case 24:
+         return ((jjbitVec24[i2] & l2) != 0L);
+      case 25:
+         return ((jjbitVec25[i2] & l2) != 0L);
+      case 29:
+         return ((jjbitVec26[i2] & l2) != 0L);
+      case 30:
+         return ((jjbitVec27[i2] & l2) != 0L);
+      case 31:
+         return ((jjbitVec28[i2] & l2) != 0L);
+      case 32:
+         return ((jjbitVec29[i2] & l2) != 0L);
+      case 33:
+         return ((jjbitVec30[i2] & l2) != 0L);
+      case 48:
+         return ((jjbitVec31[i2] & l2) != 0L);
+      case 49:
+         return ((jjbitVec32[i2] & l2) != 0L);
+      case 77:
+         return ((jjbitVec33[i2] & l2) != 0L);
+      case 159:
+         return ((jjbitVec34[i2] & l2) != 0L);
+      case 164:
+         return ((jjbitVec35[i2] & l2) != 0L);
+      case 215:
+         return ((jjbitVec36[i2] & l2) != 0L);
+      case 216:
+         return ((jjbitVec37[i2] & l2) != 0L);
+      case 250:
+         return ((jjbitVec38[i2] & l2) != 0L);
+      case 251:
+         return ((jjbitVec39[i2] & l2) != 0L);
+      case 253:
+         return ((jjbitVec40[i2] & l2) != 0L);
+      case 254:
+         return ((jjbitVec41[i2] & l2) != 0L);
+      case 255:
+         return ((jjbitVec42[i2] & l2) != 0L);
+      default :
+         if ((jjbitVec3[i1] & l1) != 0L)
+            return true;
+         return false;
+   }
+}
+private static final boolean jjCanMove_2(int hiByte, int i1, int i2, long l1, long l2)
+{
+   switch(hiByte)
+   {
+      case 0:
+         return ((jjbitVec43[i2] & l2) != 0L);
+      case 2:
+         return ((jjbitVec5[i2] & l2) != 0L);
+      case 3:
+         return ((jjbitVec44[i2] & l2) != 0L);
+      case 4:
+         return ((jjbitVec45[i2] & l2) != 0L);
+      case 5:
+         return ((jjbitVec46[i2] & l2) != 0L);
+      case 6:
+         return ((jjbitVec47[i2] & l2) != 0L);
+      case 7:
+         return ((jjbitVec48[i2] & l2) != 0L);
+      case 9:
+         return ((jjbitVec49[i2] & l2) != 0L);
+      case 10:
+         return ((jjbitVec50[i2] & l2) != 0L);
+      case 11:
+         return ((jjbitVec51[i2] & l2) != 0L);
+      case 12:
+         return ((jjbitVec52[i2] & l2) != 0L);
+      case 13:
+         return ((jjbitVec53[i2] & l2) != 0L);
+      case 14:
+         return ((jjbitVec54[i2] & l2) != 0L);
+      case 15:
+         return ((jjbitVec55[i2] & l2) != 0L);
+      case 16:
+         return ((jjbitVec56[i2] & l2) != 0L);
+      case 17:
+         return ((jjbitVec19[i2] & l2) != 0L);
+      case 18:
+         return ((jjbitVec20[i2] & l2) != 0L);
+      case 19:
+         return ((jjbitVec57[i2] & l2) != 0L);
+      case 20:
+         return ((jjbitVec0[i2] & l2) != 0L);
+      case 22:
+         return ((jjbitVec22[i2] & l2) != 0L);
+      case 23:
+         return ((jjbitVec58[i2] & l2) != 0L);
+      case 24:
+         return ((jjbitVec59[i2] & l2) != 0L);
+      case 25:
+         return ((jjbitVec60[i2] & l2) != 0L);
+      case 29:
+         return ((jjbitVec26[i2] & l2) != 0L);
+      case 30:
+         return ((jjbitVec27[i2] & l2) != 0L);
+      case 31:
+         return ((jjbitVec28[i2] & l2) != 0L);
+      case 32:
+         return ((jjbitVec61[i2] & l2) != 0L);
+      case 33:
+         return ((jjbitVec30[i2] & l2) != 0L);
+      case 48:
+         return ((jjbitVec62[i2] & l2) != 0L);
+      case 49:
+         return ((jjbitVec32[i2] & l2) != 0L);
+      case 77:
+         return ((jjbitVec33[i2] & l2) != 0L);
+      case 159:
+         return ((jjbitVec34[i2] & l2) != 0L);
+      case 164:
+         return ((jjbitVec35[i2] & l2) != 0L);
+      case 215:
+         return ((jjbitVec36[i2] & l2) != 0L);
+      case 216:
+         return ((jjbitVec63[i2] & l2) != 0L);
+      case 220:
+         return ((jjbitVec64[i2] & l2) != 0L);
+      case 221:
+         return ((jjbitVec65[i2] & l2) != 0L);
+      case 250:
+         return ((jjbitVec38[i2] & l2) != 0L);
+      case 251:
+         return ((jjbitVec66[i2] & l2) != 0L);
+      case 253:
+         return ((jjbitVec40[i2] & l2) != 0L);
+      case 254:
+         return ((jjbitVec67[i2] & l2) != 0L);
+      case 255:
+         return ((jjbitVec68[i2] & l2) != 0L);
+      default :
+         if ((jjbitVec3[i1] & l1) != 0L)
+            return true;
+         return false;
+   }
+}
 
-    /**
-     * Constructor.
-     */
-    public ASTParserTokenManager(JavaCharStream stream) {
-        if (JavaCharStream.staticFlag)
-            throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
-        input_stream = stream;
-    }
+/** Token literal values. */
+public static final String[] jjstrLiteralImages = {
+"", null, null, null, null, null, null, null, null, null, null, null, 
+"\141\142\163\164\162\141\143\164", "\141\163\163\145\162\164", "\142\157\157\154\145\141\156", 
+"\142\162\145\141\153", "\142\171\164\145", "\143\141\163\145", "\143\141\164\143\150", 
+"\143\150\141\162", "\143\154\141\163\163", "\143\157\156\163\164", 
+"\143\157\156\164\151\156\165\145", "\144\145\146\141\165\154\164", "\144\157", "\144\157\165\142\154\145", 
+"\145\154\163\145", "\145\156\165\155", "\145\170\164\145\156\144\163", "\146\141\154\163\145", 
+"\146\151\156\141\154", "\146\151\156\141\154\154\171", "\146\154\157\141\164", "\146\157\162", 
+"\147\157\164\157", "\151\146", "\151\155\160\154\145\155\145\156\164\163", 
+"\151\155\160\157\162\164", "\151\156\163\164\141\156\143\145\157\146", "\151\156\164", 
+"\151\156\164\145\162\146\141\143\145", "\154\157\156\147", "\156\141\164\151\166\145", "\156\145\167", 
+"\156\165\154\154", "\160\141\143\153\141\147\145", "\160\162\151\166\141\164\145", 
+"\160\162\157\164\145\143\164\145\144", "\160\165\142\154\151\143", "\162\145\164\165\162\156", 
+"\163\150\157\162\164", "\163\164\141\164\151\143", "\163\164\162\151\143\164\146\160", 
+"\163\165\160\145\162", "\163\167\151\164\143\150", 
+"\163\171\156\143\150\162\157\156\151\172\145\144", "\164\150\151\163", "\164\150\162\157\167", "\164\150\162\157\167\163", 
+"\164\162\141\156\163\151\145\156\164", "\164\162\165\145", "\164\162\171", "\166\157\151\144", 
+"\166\157\154\141\164\151\154\145", "\167\150\151\154\145", null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, null, "\50", "\51", "\173", "\175", "\133", 
+"\135", "\73", "\54", "\56", "\100", "\75", "\74", "\41", "\176", "\77", "\72", 
+"\75\75", "\74\75", "\76\75", "\41\75", "\174\174", "\46\46", "\53\53", "\55\55", "\53", 
+"\55", "\52", "\57", "\46", "\174", "\136", "\45", "\74\74", "\53\75", "\55\75", 
+"\52\75", "\57\75", "\46\75", "\174\75", "\136\75", "\45\75", "\74\74\75", "\76\76\75", 
+"\76\76\76\75", "\56\56\56", "\55\76", "\72\72", "\76\76\76", "\76\76", "\76", "\32", 
+"\74\76", };
 
-    /**
-     * Constructor.
-     */
-    public ASTParserTokenManager(JavaCharStream stream, int lexState) {
-        this(stream);
-        SwitchTo(lexState);
-    }
+/** Lexer state names. */
+public static final String[] lexStateNames = {
+   "DEFAULT",
+   "IN_JAVA_DOC_COMMENT",
+   "IN_MULTI_LINE_COMMENT",
+};
 
-    /**
-     * Reinitialise parser.
-     */
-    public void ReInit(JavaCharStream stream) {
-        jjmatchedPos = jjnewStateCnt = 0;
-        curLexState = defaultLexState;
-        input_stream = stream;
-        ReInitRounds();
-    }
+/** Lex State array. */
+public static final int[] jjnewLexState = {
+   -1, -1, -1, -1, -1, -1, -1, 1, 2, 0, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, 
+};
+static final long[] jjtoToken = {
+   0xfffffffffffff001L, 0xfffffffffffe7087L, 0x1fL, 
+};
+static final long[] jjtoSkip = {
+   0x67eL, 0x0L, 0x0L, 
+};
+static final long[] jjtoSpecial = {
+   0x640L, 0x0L, 0x0L, 
+};
+static final long[] jjtoMore = {
+   0x980L, 0x0L, 0x0L, 
+};
+protected JavaCharStream input_stream;
+private final int[] jjrounds = new int[130];
+private final int[] jjstateSet = new int[260];
+private final StringBuilder jjimage = new StringBuilder();
+private StringBuilder image = jjimage;
+private int jjimageLen;
+private int lengthOfMatch;
+protected char curChar;
+/** Constructor. */
+public ASTParserTokenManager(JavaCharStream stream){
+   if (JavaCharStream.staticFlag)
+      throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+   input_stream = stream;
+}
 
-    private void ReInitRounds() {
-        int i;
-        jjround = 0x80000001;
-        for (i = 130; i-- > 0; )
-            jjrounds[i] = 0x80000000;
-    }
+/** Constructor. */
+public ASTParserTokenManager(JavaCharStream stream, int lexState){
+   this(stream);
+   SwitchTo(lexState);
+}
 
-    /**
-     * Reinitialise parser.
-     */
-    public void ReInit(JavaCharStream stream, int lexState) {
-        ReInit(stream);
-        SwitchTo(lexState);
-    }
+/** Reinitialise parser. */
+public void ReInit(JavaCharStream stream)
+{
+   jjmatchedPos = jjnewStateCnt = 0;
+   curLexState = defaultLexState;
+   input_stream = stream;
+   ReInitRounds();
+}
+private void ReInitRounds()
+{
+   int i;
+   jjround = 0x80000001;
+   for (i = 130; i-- > 0;)
+      jjrounds[i] = 0x80000000;
+}
 
-    /**
-     * Switch to specified lex state.
-     */
-    public void SwitchTo(int lexState) {
-        if (lexState >= 3 || lexState < 0)
-            throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
-        else
-            curLexState = lexState;
-    }
+/** Reinitialise parser. */
+public void ReInit(JavaCharStream stream, int lexState)
+{
+   ReInit(stream);
+   SwitchTo(lexState);
+}
 
-    protected Token jjFillToken() {
-        final Token t;
-        final String curTokenImage;
-        final int beginLine;
-        final int endLine;
-        final int beginColumn;
-        final int endColumn;
-        String im = jjstrLiteralImages[jjmatchedKind];
-        curTokenImage = (im == null) ? input_stream.GetImage() : im;
-        beginLine = input_stream.getBeginLine();
-        beginColumn = input_stream.getBeginColumn();
-        endLine = input_stream.getEndLine();
-        endColumn = input_stream.getEndColumn();
-        t = ASTParser.GTToken.newToken(jjmatchedKind, curTokenImage);
+/** Switch to specified lex state. */
+public void SwitchTo(int lexState)
+{
+   if (lexState >= 3 || lexState < 0)
+      throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+   else
+      curLexState = lexState;
+}
 
-        t.beginLine = beginLine;
-        t.endLine = endLine;
-        t.beginColumn = beginColumn;
-        t.endColumn = endColumn;
+protected Token jjFillToken()
+{
+   final Token t;
+   final String curTokenImage;
+   final int beginLine;
+   final int endLine;
+   final int beginColumn;
+   final int endColumn;
+   String im = jjstrLiteralImages[jjmatchedKind];
+   curTokenImage = (im == null) ? input_stream.GetImage() : im;
+   beginLine = input_stream.getBeginLine();
+   beginColumn = input_stream.getBeginColumn();
+   endLine = input_stream.getEndLine();
+   endColumn = input_stream.getEndColumn();
+   t = ASTParser.GTToken.newToken(jjmatchedKind, curTokenImage);
 
-        return t;
-    }
+   t.beginLine = beginLine;
+   t.endLine = endLine;
+   t.beginColumn = beginColumn;
+   t.endColumn = endColumn;
 
-    int curLexState = 0;
-    int defaultLexState = 0;
-    int jjnewStateCnt;
-    int jjround;
-    int jjmatchedPos;
-    int jjmatchedKind;
+   return t;
+}
 
-    /**
-     * Get the next Token.
-     */
-    public Token getNextToken() {
-        Token specialToken = null;
-        Token matchedToken;
-        int curPos = 0;
+int curLexState = 0;
+int defaultLexState = 0;
+int jjnewStateCnt;
+int jjround;
+int jjmatchedPos;
+int jjmatchedKind;
 
-        EOFLoop:
-        for (; ; ) {
-            try {
-                curChar = input_stream.BeginToken();
-            } catch (java.io.IOException e) {
-                jjmatchedKind = 0;
-                matchedToken = jjFillToken();
-                matchedToken.specialToken = specialToken;
-                return matchedToken;
-            }
-            image = jjimage;
-            image.setLength(0);
-            jjimageLen = 0;
+/** Get the next Token. */
+public Token getNextToken() 
+{
+  Token specialToken = null;
+  Token matchedToken;
+  int curPos = 0;
 
-            for (; ; ) {
-                switch (curLexState) {
-                    case 0:
-                        try {
-                            input_stream.backup(0);
-                            while (curChar <= 32 && (0x100003600L & (1L << curChar)) != 0L)
-                                curChar = input_stream.BeginToken();
-                        } catch (java.io.IOException e1) {
-                            continue EOFLoop;
-                        }
-                        jjmatchedKind = 0x7fffffff;
-                        jjmatchedPos = 0;
-                        curPos = jjMoveStringLiteralDfa0_0();
-                        break;
-                    case 1:
-                        jjmatchedKind = 0x7fffffff;
-                        jjmatchedPos = 0;
-                        curPos = jjMoveStringLiteralDfa0_1();
-                        if (jjmatchedPos == 0 && jjmatchedKind > 11) {
-                            jjmatchedKind = 11;
-                        }
-                        break;
-                    case 2:
-                        jjmatchedKind = 0x7fffffff;
-                        jjmatchedPos = 0;
-                        curPos = jjMoveStringLiteralDfa0_2();
-                        if (jjmatchedPos == 0 && jjmatchedKind > 11) {
-                            jjmatchedKind = 11;
-                        }
-                        break;
-                }
-                if (jjmatchedKind != 0x7fffffff) {
-                    if (jjmatchedPos + 1 < curPos)
-                        input_stream.backup(curPos - jjmatchedPos - 1);
-                    if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) {
-                        matchedToken = jjFillToken();
-                        matchedToken.specialToken = specialToken;
-                        TokenLexicalActions(matchedToken);
-                        if (jjnewLexState[jjmatchedKind] != -1)
-                            curLexState = jjnewLexState[jjmatchedKind];
-                        return matchedToken;
-                    } else if ((jjtoSkip[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) {
-                        if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L) {
-                            matchedToken = jjFillToken();
-                            if (specialToken == null)
-                                specialToken = matchedToken;
-                            else {
-                                matchedToken.specialToken = specialToken;
-                                specialToken = (specialToken.next = matchedToken);
-                            }
-                            SkipLexicalActions(matchedToken);
-                        } else
-                            SkipLexicalActions(null);
-                        if (jjnewLexState[jjmatchedKind] != -1)
-                            curLexState = jjnewLexState[jjmatchedKind];
-                        continue EOFLoop;
-                    }
-                    MoreLexicalActions();
-                    if (jjnewLexState[jjmatchedKind] != -1)
-                        curLexState = jjnewLexState[jjmatchedKind];
-                    curPos = 0;
-                    jjmatchedKind = 0x7fffffff;
-                    try {
-                        curChar = input_stream.readChar();
-                        continue;
-                    } catch (java.io.IOException e1) {
-                    }
-                }
-                int error_line = input_stream.getEndLine();
-                int error_column = input_stream.getEndColumn();
-                String error_after = null;
-                boolean EOFSeen = false;
-                try {
-                    input_stream.readChar();
-                    input_stream.backup(1);
-                } catch (java.io.IOException e1) {
-                    EOFSeen = true;
-                    error_after = curPos <= 1 ? "" : input_stream.GetImage();
-                    if (curChar == '\n' || curChar == '\r') {
-                        error_line++;
-                        error_column = 0;
-                    } else
-                        error_column++;
-                }
-                if (!EOFSeen) {
-                    input_stream.backup(1);
-                    error_after = curPos <= 1 ? "" : input_stream.GetImage();
-                }
-                throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
-            }
-        }
-    }
+  EOFLoop :
+  for (;;)
+  {
+   try
+   {
+      curChar = input_stream.BeginToken();
+   }
+   catch(java.io.IOException e)
+   {
+      jjmatchedKind = 0;
+      matchedToken = jjFillToken();
+      matchedToken.specialToken = specialToken;
+      return matchedToken;
+   }
+   image = jjimage;
+   image.setLength(0);
+   jjimageLen = 0;
 
-    void SkipLexicalActions(Token matchedToken) {
-        switch (jjmatchedKind) {
-            default:
-                break;
+   for (;;)
+   {
+     switch(curLexState)
+     {
+       case 0:
+         try { input_stream.backup(0);
+            while (curChar <= 32 && (0x100003600L & (1L << curChar)) != 0L)
+               curChar = input_stream.BeginToken();
+         }
+         catch (java.io.IOException e1) { continue EOFLoop; }
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_0();
+         break;
+       case 1:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_1();
+         if (jjmatchedPos == 0 && jjmatchedKind > 11)
+         {
+            jjmatchedKind = 11;
+         }
+         break;
+       case 2:
+         jjmatchedKind = 0x7fffffff;
+         jjmatchedPos = 0;
+         curPos = jjMoveStringLiteralDfa0_2();
+         if (jjmatchedPos == 0 && jjmatchedKind > 11)
+         {
+            jjmatchedKind = 11;
+         }
+         break;
+     }
+     if (jjmatchedKind != 0x7fffffff)
+     {
+        if (jjmatchedPos + 1 < curPos)
+           input_stream.backup(curPos - jjmatchedPos - 1);
+        if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+        {
+           matchedToken = jjFillToken();
+           matchedToken.specialToken = specialToken;
+           TokenLexicalActions(matchedToken);
+       if (jjnewLexState[jjmatchedKind] != -1)
+         curLexState = jjnewLexState[jjmatchedKind];
+           return matchedToken;
         }
-    }
-
-    void MoreLexicalActions() {
-        jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
-        switch (jjmatchedKind) {
-            case 7:
-                image.append(input_stream.GetSuffix(jjimageLen));
-                jjimageLen = 0;
-                input_stream.backup(1);
-                break;
-            default:
-                break;
+        else if ((jjtoSkip[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+        {
+           if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
+           {
+              matchedToken = jjFillToken();
+              if (specialToken == null)
+                 specialToken = matchedToken;
+              else
+              {
+                 matchedToken.specialToken = specialToken;
+                 specialToken = (specialToken.next = matchedToken);
+              }
+              SkipLexicalActions(matchedToken);
+           }
+           else
+              SkipLexicalActions(null);
+         if (jjnewLexState[jjmatchedKind] != -1)
+           curLexState = jjnewLexState[jjmatchedKind];
+           continue EOFLoop;
         }
-    }
-
-    void TokenLexicalActions(Token matchedToken) {
-        switch (jjmatchedKind) {
-            case 128:
-                image.append(jjstrLiteralImages[128]);
-                lengthOfMatch = jjstrLiteralImages[128].length();
-                matchedToken.kind = GT;
-                ((ASTParser.GTToken) matchedToken).realKind = RUNSIGNEDSHIFT;
-                input_stream.backup(2);
-                break;
-            case 129:
-                image.append(jjstrLiteralImages[129]);
-                lengthOfMatch = jjstrLiteralImages[129].length();
-                matchedToken.kind = GT;
-                ((ASTParser.GTToken) matchedToken).realKind = RSIGNEDSHIFT;
-                input_stream.backup(1);
-                break;
-            default:
-                break;
+        MoreLexicalActions();
+      if (jjnewLexState[jjmatchedKind] != -1)
+        curLexState = jjnewLexState[jjmatchedKind];
+        curPos = 0;
+        jjmatchedKind = 0x7fffffff;
+        try {
+           curChar = input_stream.readChar();
+           continue;
         }
-    }
-
-    private void jjCheckNAdd(int state) {
-        if (jjrounds[state] != jjround) {
-            jjstateSet[jjnewStateCnt++] = state;
-            jjrounds[state] = jjround;
+        catch (java.io.IOException e1) { }
+     }
+     int error_line = input_stream.getEndLine();
+     int error_column = input_stream.getEndColumn();
+     String error_after = null;
+     boolean EOFSeen = false;
+     try { input_stream.readChar(); input_stream.backup(1); }
+     catch (java.io.IOException e1) {
+        EOFSeen = true;
+        error_after = curPos <= 1 ? "" : input_stream.GetImage();
+        if (curChar == '\n' || curChar == '\r') {
+           error_line++;
+           error_column = 0;
         }
-    }
-
-    private void jjAddStates(int start, int end) {
-        do {
-            jjstateSet[jjnewStateCnt++] = jjnextStates[start];
-        } while (start++ != end);
-    }
+        else
+           error_column++;
+     }
+     if (!EOFSeen) {
+        input_stream.backup(1);
+        error_after = curPos <= 1 ? "" : input_stream.GetImage();
+     }
+     throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
+   }
+  }
+}
 
-    private void jjCheckNAddTwoStates(int state1, int state2) {
-        jjCheckNAdd(state1);
-        jjCheckNAdd(state2);
-    }
+void SkipLexicalActions(Token matchedToken)
+{
+   switch(jjmatchedKind)
+   {
+      default :
+         break;
+   }
+}
+void MoreLexicalActions()
+{
+   jjimageLen += (lengthOfMatch = jjmatchedPos + 1);
+   switch(jjmatchedKind)
+   {
+      case 7 :
+         image.append(input_stream.GetSuffix(jjimageLen));
+         jjimageLen = 0;
+                   input_stream.backup(1);
+         break;
+      default :
+         break;
+   }
+}
+void TokenLexicalActions(Token matchedToken)
+{
+   switch(jjmatchedKind)
+   {
+      case 128 :
+        image.append(jjstrLiteralImages[128]);
+        lengthOfMatch = jjstrLiteralImages[128].length();
+     matchedToken.kind = GT;
+     ((ASTParser.GTToken)matchedToken).realKind = RUNSIGNEDSHIFT;
+     input_stream.backup(2);
+         break;
+      case 129 :
+        image.append(jjstrLiteralImages[129]);
+        lengthOfMatch = jjstrLiteralImages[129].length();
+     matchedToken.kind = GT;
+     ((ASTParser.GTToken)matchedToken).realKind = RSIGNEDSHIFT;
+     input_stream.backup(1);
+         break;
+      default :
+         break;
+   }
+}
+private void jjCheckNAdd(int state)
+{
+   if (jjrounds[state] != jjround)
+   {
+      jjstateSet[jjnewStateCnt++] = state;
+      jjrounds[state] = jjround;
+   }
+}
+private void jjAddStates(int start, int end)
+{
+   do {
+      jjstateSet[jjnewStateCnt++] = jjnextStates[start];
+   } while (start++ != end);
+}
+private void jjCheckNAddTwoStates(int state1, int state2)
+{
+   jjCheckNAdd(state1);
+   jjCheckNAdd(state2);
+}
 
-    private void jjCheckNAddStates(int start, int end) {
-        do {
-            jjCheckNAdd(jjnextStates[start]);
-        } while (start++ != end);
-    }
+private void jjCheckNAddStates(int start, int end)
+{
+   do {
+      jjCheckNAdd(jjnextStates[start]);
+   } while (start++ != end);
+}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/JavaCharStream.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/JavaCharStream.java
index 9a03beec9d..62a6544b3a 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/JavaCharStream.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/JavaCharStream.java
@@ -20,605 +20,610 @@
  */
 
 public
-class JavaCharStream {
-    /**
-     * Whether parser is static.
-     */
-    public static final boolean staticFlag = false;
-
-    static final int hexval(char c) throws java.io.IOException {
-        switch (c) {
-            case '0':
-                return 0;
-            case '1':
-                return 1;
-            case '2':
-                return 2;
-            case '3':
-                return 3;
-            case '4':
-                return 4;
-            case '5':
-                return 5;
-            case '6':
-                return 6;
-            case '7':
-                return 7;
-            case '8':
-                return 8;
-            case '9':
-                return 9;
-
-            case 'a':
-            case 'A':
-                return 10;
-            case 'b':
-            case 'B':
-                return 11;
-            case 'c':
-            case 'C':
-                return 12;
-            case 'd':
-            case 'D':
-                return 13;
-            case 'e':
-            case 'E':
-                return 14;
-            case 'f':
-            case 'F':
-                return 15;
-        }
-
-        throw new java.io.IOException(); // Should never come here
-    }
-
-    /**
-     * Position in buffer.
-     */
-    public int bufpos = -1;
-    int bufsize;
-    int available;
-    int tokenBegin;
-    protected int bufline[];
-    protected int bufcolumn[];
-
-    protected int column = 0;
-    protected int line = 1;
-
-    protected boolean prevCharIsCR = false;
-    protected boolean prevCharIsLF = false;
-
-    protected java.io.Reader inputStream;
-
-    protected char[] nextCharBuf;
-    protected char[] buffer;
-    protected int maxNextCharInd = 0;
-    protected int nextCharInd = -1;
-    protected int inBuf = 0;
-    protected int tabSize = 8;
-
-    protected void setTabSize(int i) {
-        tabSize = i;
-    }
-
-    protected int getTabSize(int i) {
-        return tabSize;
-    }
-
-    protected void ExpandBuff(boolean wrapAround) {
-        char[] newbuffer = new char[bufsize + 2048];
-        int newbufline[] = new int[bufsize + 2048];
-        int newbufcolumn[] = new int[bufsize + 2048];
-
-        try {
-            if (wrapAround) {
-                System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-                System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
-                buffer = newbuffer;
-
-                System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-                System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
-                bufline = newbufline;
-
-                System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-                System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
-                bufcolumn = newbufcolumn;
-
-                bufpos += (bufsize - tokenBegin);
-            } else {
-                System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
-                buffer = newbuffer;
-
-                System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
-                bufline = newbufline;
-
-                System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
-                bufcolumn = newbufcolumn;
-
-                bufpos -= tokenBegin;
-            }
-        } catch (Throwable t) {
-            throw new Error(t.getMessage());
-        }
-
-        available = (bufsize += 2048);
-        tokenBegin = 0;
-    }
-
-    protected void FillBuff() throws java.io.IOException {
-        int i;
-        if (maxNextCharInd == 4096)
-            maxNextCharInd = nextCharInd = 0;
-
-        try {
-            if ((i = inputStream.read(nextCharBuf, maxNextCharInd,
-                    4096 - maxNextCharInd)) == -1) {
-                inputStream.close();
-                throw new java.io.IOException();
-            } else
-                maxNextCharInd += i;
-            return;
-        } catch (java.io.IOException e) {
-            if (bufpos != 0) {
-                --bufpos;
-                backup(0);
-            } else {
-                bufline[bufpos] = line;
-                bufcolumn[bufpos] = column;
-            }
-            throw e;
-        }
-    }
-
-    protected char ReadByte() throws java.io.IOException {
-        if (++nextCharInd >= maxNextCharInd)
-            FillBuff();
-
-        return nextCharBuf[nextCharInd];
-    }
-
-    /**
-     * @return starting character for token.
-     */
-    public char BeginToken() throws java.io.IOException {
-        if (inBuf > 0) {
-            --inBuf;
-
-            if (++bufpos == bufsize)
-                bufpos = 0;
-
-            tokenBegin = bufpos;
-            return buffer[bufpos];
-        }
-
-        tokenBegin = 0;
-        bufpos = -1;
-
-        return readChar();
-    }
-
-    protected void AdjustBuffSize() {
-        if (available == bufsize) {
-            if (tokenBegin > 2048) {
-                bufpos = 0;
-                available = tokenBegin;
-            } else
-                ExpandBuff(false);
-        } else if (available > tokenBegin)
-            available = bufsize;
-        else if ((tokenBegin - available) < 2048)
-            ExpandBuff(true);
-        else
-            available = tokenBegin;
-    }
-
-    protected void UpdateLineColumn(char c) {
-        column++;
-
-        if (prevCharIsLF) {
-            prevCharIsLF = false;
-            line += (column = 1);
-        } else if (prevCharIsCR) {
-            prevCharIsCR = false;
-            if (c == '\n') {
-                prevCharIsLF = true;
-            } else
-                line += (column = 1);
-        }
-
-        switch (c) {
-            case '\r':
-                prevCharIsCR = true;
-                break;
-            case '\n':
-                prevCharIsLF = true;
-                break;
-            case '\t':
-                column--;
-                column += (tabSize - (column % tabSize));
-                break;
-            default:
-                break;
-        }
-
+class JavaCharStream
+{
+  /** Whether parser is static. */
+  public static final boolean staticFlag = false;
+
+  static final int hexval(char c) throws java.io.IOException {
+    switch(c)
+    {
+       case '0' :
+          return 0;
+       case '1' :
+          return 1;
+       case '2' :
+          return 2;
+       case '3' :
+          return 3;
+       case '4' :
+          return 4;
+       case '5' :
+          return 5;
+       case '6' :
+          return 6;
+       case '7' :
+          return 7;
+       case '8' :
+          return 8;
+       case '9' :
+          return 9;
+
+       case 'a' :
+       case 'A' :
+          return 10;
+       case 'b' :
+       case 'B' :
+          return 11;
+       case 'c' :
+       case 'C' :
+          return 12;
+       case 'd' :
+       case 'D' :
+          return 13;
+       case 'e' :
+       case 'E' :
+          return 14;
+       case 'f' :
+       case 'F' :
+          return 15;
+    }
+
+    throw new java.io.IOException(); // Should never come here
+  }
+
+/** Position in buffer. */
+  public int bufpos = -1;
+  int bufsize;
+  int available;
+  int tokenBegin;
+  protected int bufline[];
+  protected int bufcolumn[];
+
+  protected int column = 0;
+  protected int line = 1;
+
+  protected boolean prevCharIsCR = false;
+  protected boolean prevCharIsLF = false;
+
+  protected java.io.Reader inputStream;
+
+  protected char[] nextCharBuf;
+  protected char[] buffer;
+  protected int maxNextCharInd = 0;
+  protected int nextCharInd = -1;
+  protected int inBuf = 0;
+  protected int tabSize = 8;
+
+  protected void setTabSize(int i) { tabSize = i; }
+  protected int getTabSize(int i) { return tabSize; }
+
+  protected void ExpandBuff(boolean wrapAround)
+  {
+    char[] newbuffer = new char[bufsize + 2048];
+    int newbufline[] = new int[bufsize + 2048];
+    int newbufcolumn[] = new int[bufsize + 2048];
+
+    try
+    {
+      if (wrapAround)
+      {
+        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+        System.arraycopy(buffer, 0, newbuffer, bufsize - tokenBegin, bufpos);
+        buffer = newbuffer;
+
+        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+        System.arraycopy(bufline, 0, newbufline, bufsize - tokenBegin, bufpos);
+        bufline = newbufline;
+
+        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+        System.arraycopy(bufcolumn, 0, newbufcolumn, bufsize - tokenBegin, bufpos);
+        bufcolumn = newbufcolumn;
+
+        bufpos += (bufsize - tokenBegin);
+    }
+    else
+    {
+        System.arraycopy(buffer, tokenBegin, newbuffer, 0, bufsize - tokenBegin);
+        buffer = newbuffer;
+
+        System.arraycopy(bufline, tokenBegin, newbufline, 0, bufsize - tokenBegin);
+        bufline = newbufline;
+
+        System.arraycopy(bufcolumn, tokenBegin, newbufcolumn, 0, bufsize - tokenBegin);
+        bufcolumn = newbufcolumn;
+
+        bufpos -= tokenBegin;
+      }
+    }
+    catch (Throwable t)
+    {
+      throw new Error(t.getMessage());
+    }
+
+    available = (bufsize += 2048);
+    tokenBegin = 0;
+  }
+
+  protected void FillBuff() throws java.io.IOException
+  {
+    int i;
+    if (maxNextCharInd == 4096)
+      maxNextCharInd = nextCharInd = 0;
+
+    try {
+      if ((i = inputStream.read(nextCharBuf, maxNextCharInd,
+                                          4096 - maxNextCharInd)) == -1)
+      {
+        inputStream.close();
+        throw new java.io.IOException();
+      }
+      else
+         maxNextCharInd += i;
+      return;
+    }
+    catch(java.io.IOException e) {
+      if (bufpos != 0)
+      {
+        --bufpos;
+        backup(0);
+      }
+      else
+      {
         bufline[bufpos] = line;
         bufcolumn[bufpos] = column;
-    }
-
-    /**
-     * Read a character.
-     */
-    public char readChar() throws java.io.IOException {
-        if (inBuf > 0) {
-            --inBuf;
-
-            if (++bufpos == bufsize)
-                bufpos = 0;
-
-            return buffer[bufpos];
-        }
-
-        char c;
-
+      }
+      throw e;
+    }
+  }
+
+  protected char ReadByte() throws java.io.IOException
+  {
+    if (++nextCharInd >= maxNextCharInd)
+      FillBuff();
+
+    return nextCharBuf[nextCharInd];
+  }
+
+/** @return starting character for token. */
+  public char BeginToken() throws java.io.IOException
+  {
+    if (inBuf > 0)
+    {
+      --inBuf;
+
+      if (++bufpos == bufsize)
+        bufpos = 0;
+
+      tokenBegin = bufpos;
+      return buffer[bufpos];
+    }
+
+    tokenBegin = 0;
+    bufpos = -1;
+
+    return readChar();
+  }
+
+  protected void AdjustBuffSize()
+  {
+    if (available == bufsize)
+    {
+      if (tokenBegin > 2048)
+      {
+        bufpos = 0;
+        available = tokenBegin;
+      }
+      else
+        ExpandBuff(false);
+    }
+    else if (available > tokenBegin)
+      available = bufsize;
+    else if ((tokenBegin - available) < 2048)
+      ExpandBuff(true);
+    else
+      available = tokenBegin;
+  }
+
+  protected void UpdateLineColumn(char c)
+  {
+    column++;
+
+    if (prevCharIsLF)
+    {
+      prevCharIsLF = false;
+      line += (column = 1);
+    }
+    else if (prevCharIsCR)
+    {
+      prevCharIsCR = false;
+      if (c == '\n')
+      {
+        prevCharIsLF = true;
+      }
+      else
+        line += (column = 1);
+    }
+
+    switch (c)
+    {
+      case '\r' :
+        prevCharIsCR = true;
+        break;
+      case '\n' :
+        prevCharIsLF = true;
+        break;
+      case '\t' :
+        column--;
+        column += (tabSize - (column % tabSize));
+        break;
+      default :
+        break;
+    }
+
+    bufline[bufpos] = line;
+    bufcolumn[bufpos] = column;
+  }
+
+/** Read a character. */
+  public char readChar() throws java.io.IOException
+  {
+    if (inBuf > 0)
+    {
+      --inBuf;
+
+      if (++bufpos == bufsize)
+        bufpos = 0;
+
+      return buffer[bufpos];
+    }
+
+    char c;
+
+    if (++bufpos == available)
+      AdjustBuffSize();
+
+    if ((buffer[bufpos] = c = ReadByte()) == '\\')
+    {
+      UpdateLineColumn(c);
+
+      int backSlashCnt = 1;
+
+      for (;;) // Read all the backslashes
+      {
         if (++bufpos == available)
-            AdjustBuffSize();
+          AdjustBuffSize();
 
-        if ((buffer[bufpos] = c = ReadByte()) == '\\') {
+        try
+        {
+          if ((buffer[bufpos] = c = ReadByte()) != '\\')
+          {
             UpdateLineColumn(c);
-
-            int backSlashCnt = 1;
-
-            for (; ; ) // Read all the backslashes
+            // found a non-backslash char.
+            if ((c == 'u') && ((backSlashCnt & 1) == 1))
             {
-                if (++bufpos == available)
-                    AdjustBuffSize();
-
-                try {
-                    if ((buffer[bufpos] = c = ReadByte()) != '\\') {
-                        UpdateLineColumn(c);
-                        // found a non-backslash char.
-                        if ((c == 'u') && ((backSlashCnt & 1) == 1)) {
-                            if (--bufpos < 0)
-                                bufpos = bufsize - 1;
-
-                            break;
-                        }
-
-                        backup(backSlashCnt);
-                        return '\\';
-                    }
-                } catch (java.io.IOException e) {
-                    // We are returning one backslash so we should only backup (count-1)
-                    if (backSlashCnt > 1)
-                        backup(backSlashCnt - 1);
-
-                    return '\\';
-                }
-
-                UpdateLineColumn(c);
-                backSlashCnt++;
-            }
-
-            // Here, we have seen an odd number of backslash's followed by a 'u'
-            try {
-                while ((c = ReadByte()) == 'u')
-                    ++column;
+              if (--bufpos < 0)
+                bufpos = bufsize - 1;
 
-                buffer[bufpos] = c = (char) (hexval(c) << 12 |
-                        hexval(ReadByte()) << 8 |
-                        hexval(ReadByte()) << 4 |
-                        hexval(ReadByte()));
-
-                column += 4;
-            } catch (java.io.IOException e) {
-                throw new Error("Invalid escape character at line " + line +
-                        " column " + column + ".");
+              break;
             }
 
-            if (backSlashCnt == 1)
-                return c;
-            else {
-                backup(backSlashCnt - 1);
-                return '\\';
-            }
-        } else {
-            UpdateLineColumn(c);
-            return c;
+            backup(backSlashCnt);
+            return '\\';
+          }
         }
-    }
-
-    @Deprecated
-    /**
-     * @deprecated
-     * @see #getEndColumn
-     */
-    public int getColumn() {
-        return bufcolumn[bufpos];
-    }
-
-    @Deprecated
-    /**
-     * @deprecated
-     * @see #getEndLine
-     */
-    public int getLine() {
-        return bufline[bufpos];
-    }
-
-    /**
-     * Get end column.
-     */
-    public int getEndColumn() {
-        return bufcolumn[bufpos];
-    }
-
-    /**
-     * Get end line.
-     */
-    public int getEndLine() {
-        return bufline[bufpos];
-    }
-
-    /**
-     * @return column of token start
-     */
-    public int getBeginColumn() {
-        return bufcolumn[tokenBegin];
-    }
-
-    /**
-     * @return line number of token start
-     */
-    public int getBeginLine() {
-        return bufline[tokenBegin];
-    }
-
-    /**
-     * Retreat.
-     */
-    public void backup(int amount) {
-
-        inBuf += amount;
-        if ((bufpos -= amount) < 0)
-            bufpos += bufsize;
-    }
-
-    /**
-     * Constructor.
-     */
-    public JavaCharStream(java.io.Reader dstream,
-                          int startline, int startcolumn, int buffersize) {
-        inputStream = dstream;
-        line = startline;
-        column = startcolumn - 1;
-
-        available = bufsize = buffersize;
-        buffer = new char[buffersize];
-        bufline = new int[buffersize];
-        bufcolumn = new int[buffersize];
-        nextCharBuf = new char[4096];
-    }
-
-    /**
-     * Constructor.
-     */
-    public JavaCharStream(java.io.Reader dstream,
-                          int startline, int startcolumn) {
-        this(dstream, startline, startcolumn, 4096);
-    }
-
-    /**
-     * Constructor.
-     */
-    public JavaCharStream(java.io.Reader dstream) {
-        this(dstream, 1, 1, 4096);
-    }
+        catch(java.io.IOException e)
+        {
+	  // We are returning one backslash so we should only backup (count-1)
+          if (backSlashCnt > 1)
+            backup(backSlashCnt-1);
 
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(java.io.Reader dstream,
-                       int startline, int startcolumn, int buffersize) {
-        inputStream = dstream;
-        line = startline;
-        column = startcolumn - 1;
-
-        if (buffer == null || buffersize != buffer.length) {
-            available = bufsize = buffersize;
-            buffer = new char[buffersize];
-            bufline = new int[buffersize];
-            bufcolumn = new int[buffersize];
-            nextCharBuf = new char[4096];
+          return '\\';
         }
-        prevCharIsLF = prevCharIsCR = false;
-        tokenBegin = inBuf = maxNextCharInd = 0;
-        nextCharInd = bufpos = -1;
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(java.io.Reader dstream,
-                       int startline, int startcolumn) {
-        ReInit(dstream, startline, startcolumn, 4096);
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(java.io.Reader dstream) {
-        ReInit(dstream, 1, 1, 4096);
-    }
-
-    /**
-     * Constructor.
-     */
-    public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
-                          int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException {
-        this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
-    }
-
-    /**
-     * Constructor.
-     */
-    public JavaCharStream(java.io.InputStream dstream, int startline,
-                          int startcolumn, int buffersize) {
-        this(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
-    }
-
-    /**
-     * Constructor.
-     */
-    public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
-                          int startcolumn) throws java.io.UnsupportedEncodingException {
-        this(dstream, encoding, startline, startcolumn, 4096);
-    }
-
-    /**
-     * Constructor.
-     */
-    public JavaCharStream(java.io.InputStream dstream, int startline,
-                          int startcolumn) {
-        this(dstream, startline, startcolumn, 4096);
-    }
-
-    /**
-     * Constructor.
-     */
-    public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException {
-        this(dstream, encoding, 1, 1, 4096);
-    }
 
-    /**
-     * Constructor.
-     */
-    public JavaCharStream(java.io.InputStream dstream) {
-        this(dstream, 1, 1, 4096);
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(java.io.InputStream dstream, String encoding, int startline,
-                       int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException {
-        ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(java.io.InputStream dstream, int startline,
-                       int startcolumn, int buffersize) {
-        ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(java.io.InputStream dstream, String encoding, int startline,
-                       int startcolumn) throws java.io.UnsupportedEncodingException {
-        ReInit(dstream, encoding, startline, startcolumn, 4096);
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(java.io.InputStream dstream, int startline,
-                       int startcolumn) {
-        ReInit(dstream, startline, startcolumn, 4096);
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException {
-        ReInit(dstream, encoding, 1, 1, 4096);
-    }
-
-    /**
-     * Reinitialise.
-     */
-    public void ReInit(java.io.InputStream dstream) {
-        ReInit(dstream, 1, 1, 4096);
-    }
-
-    /**
-     * @return token image as String
-     */
-    public String GetImage() {
-        if (bufpos >= tokenBegin)
-            return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
+        UpdateLineColumn(c);
+        backSlashCnt++;
+      }
+
+      // Here, we have seen an odd number of backslash's followed by a 'u'
+      try
+      {
+        while ((c = ReadByte()) == 'u')
+          ++column;
+
+        buffer[bufpos] = c = (char)(hexval(c) << 12 |
+                                    hexval(ReadByte()) << 8 |
+                                    hexval(ReadByte()) << 4 |
+                                    hexval(ReadByte()));
+
+        column += 4;
+      }
+      catch(java.io.IOException e)
+      {
+        throw new Error("Invalid escape character at line " + line +
+                                         " column " + column + ".");
+      }
+
+      if (backSlashCnt == 1)
+        return c;
+      else
+      {
+        backup(backSlashCnt - 1);
+        return '\\';
+      }
+    }
+    else
+    {
+      UpdateLineColumn(c);
+      return c;
+    }
+  }
+
+  @Deprecated
+  /**
+   * @deprecated
+   * @see #getEndColumn
+   */
+  public int getColumn() {
+    return bufcolumn[bufpos];
+  }
+
+  @Deprecated
+  /**
+   * @deprecated
+   * @see #getEndLine
+   */
+  public int getLine() {
+    return bufline[bufpos];
+  }
+
+/** Get end column. */
+  public int getEndColumn() {
+    return bufcolumn[bufpos];
+  }
+
+/** Get end line. */
+  public int getEndLine() {
+    return bufline[bufpos];
+  }
+
+/** @return column of token start */
+  public int getBeginColumn() {
+    return bufcolumn[tokenBegin];
+  }
+
+/** @return line number of token start */
+  public int getBeginLine() {
+    return bufline[tokenBegin];
+  }
+
+/** Retreat. */
+  public void backup(int amount) {
+
+    inBuf += amount;
+    if ((bufpos -= amount) < 0)
+      bufpos += bufsize;
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.Reader dstream,
+                 int startline, int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    available = bufsize = buffersize;
+    buffer = new char[buffersize];
+    bufline = new int[buffersize];
+    bufcolumn = new int[buffersize];
+    nextCharBuf = new char[4096];
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.Reader dstream,
+                                        int startline, int startcolumn)
+  {
+    this(dstream, startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.Reader dstream)
+  {
+    this(dstream, 1, 1, 4096);
+  }
+/** Reinitialise. */
+  public void ReInit(java.io.Reader dstream,
+                 int startline, int startcolumn, int buffersize)
+  {
+    inputStream = dstream;
+    line = startline;
+    column = startcolumn - 1;
+
+    if (buffer == null || buffersize != buffer.length)
+    {
+      available = bufsize = buffersize;
+      buffer = new char[buffersize];
+      bufline = new int[buffersize];
+      bufcolumn = new int[buffersize];
+      nextCharBuf = new char[4096];
+    }
+    prevCharIsLF = prevCharIsCR = false;
+    tokenBegin = inBuf = maxNextCharInd = 0;
+    nextCharInd = bufpos = -1;
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.Reader dstream,
+                                        int startline, int startcolumn)
+  {
+    ReInit(dstream, startline, startcolumn, 4096);
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.Reader dstream)
+  {
+    ReInit(dstream, 1, 1, 4096);
+  }
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
+  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+  {
+    this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+    this(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, String encoding, int startline,
+                        int startcolumn) throws java.io.UnsupportedEncodingException
+  {
+    this(dstream, encoding, startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, int startline,
+                        int startcolumn)
+  {
+    this(dstream, startline, startcolumn, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+  {
+    this(dstream, encoding, 1, 1, 4096);
+  }
+
+/** Constructor. */
+  public JavaCharStream(java.io.InputStream dstream)
+  {
+    this(dstream, 1, 1, 4096);
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+  int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+  {
+    ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, int startline,
+  int startcolumn, int buffersize)
+  {
+    ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+  }
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+                     int startcolumn) throws java.io.UnsupportedEncodingException
+  {
+    ReInit(dstream, encoding, startline, startcolumn, 4096);
+  }
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, int startline,
+                     int startcolumn)
+  {
+    ReInit(dstream, startline, startcolumn, 4096);
+  }
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+  {
+    ReInit(dstream, encoding, 1, 1, 4096);
+  }
+
+/** Reinitialise. */
+  public void ReInit(java.io.InputStream dstream)
+  {
+    ReInit(dstream, 1, 1, 4096);
+  }
+
+  /** @return token image as String */
+  public String GetImage()
+  {
+    if (bufpos >= tokenBegin)
+      return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
+    else
+      return new String(buffer, tokenBegin, bufsize - tokenBegin) +
+                              new String(buffer, 0, bufpos + 1);
+  }
+
+  /** @return suffix */
+  public char[] GetSuffix(int len)
+  {
+    char[] ret = new char[len];
+
+    if ((bufpos + 1) >= len)
+      System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
+    else
+    {
+      System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
+                                                        len - bufpos - 1);
+      System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
+    }
+
+    return ret;
+  }
+
+  /** Set buffers back to null when finished. */
+  public void Done()
+  {
+    nextCharBuf = null;
+    buffer = null;
+    bufline = null;
+    bufcolumn = null;
+  }
+
+  /**
+   * Method to adjust line and column numbers for the start of a token.
+   */
+  public void adjustBeginLineColumn(int newLine, int newCol)
+  {
+    int start = tokenBegin;
+    int len;
+
+    if (bufpos >= tokenBegin)
+    {
+      len = bufpos - tokenBegin + inBuf + 1;
+    }
+    else
+    {
+      len = bufsize - tokenBegin + bufpos + 1 + inBuf;
+    }
+
+    int i = 0, j = 0, k = 0;
+    int nextColDiff = 0, columnDiff = 0;
+
+    while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize])
+    {
+      bufline[j] = newLine;
+      nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
+      bufcolumn[j] = newCol + columnDiff;
+      columnDiff = nextColDiff;
+      i++;
+    }
+
+    if (i < len)
+    {
+      bufline[j] = newLine++;
+      bufcolumn[j] = newCol + columnDiff;
+
+      while (i++ < len)
+      {
+        if (bufline[j = start % bufsize] != bufline[++start % bufsize])
+          bufline[j] = newLine++;
         else
-            return new String(buffer, tokenBegin, bufsize - tokenBegin) +
-                    new String(buffer, 0, bufpos + 1);
-    }
-
-    /**
-     * @return suffix
-     */
-    public char[] GetSuffix(int len) {
-        char[] ret = new char[len];
-
-        if ((bufpos + 1) >= len)
-            System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
-        else {
-            System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
-                    len - bufpos - 1);
-            System.arraycopy(buffer, 0, ret, len - bufpos - 1, bufpos + 1);
-        }
-
-        return ret;
-    }
-
-    /**
-     * Set buffers back to null when finished.
-     */
-    public void Done() {
-        nextCharBuf = null;
-        buffer = null;
-        bufline = null;
-        bufcolumn = null;
+          bufline[j] = newLine;
+      }
     }
 
-    /**
-     * Method to adjust line and column numbers for the start of a token.
-     */
-    public void adjustBeginLineColumn(int newLine, int newCol) {
-        int start = tokenBegin;
-        int len;
-
-        if (bufpos >= tokenBegin) {
-            len = bufpos - tokenBegin + inBuf + 1;
-        } else {
-            len = bufsize - tokenBegin + bufpos + 1 + inBuf;
-        }
-
-        int i = 0, j = 0, k = 0;
-        int nextColDiff = 0, columnDiff = 0;
-
-        while (i < len && bufline[j = start % bufsize] == bufline[k = ++start % bufsize]) {
-            bufline[j] = newLine;
-            nextColDiff = columnDiff + bufcolumn[k] - bufcolumn[j];
-            bufcolumn[j] = newCol + columnDiff;
-            columnDiff = nextColDiff;
-            i++;
-        }
-
-        if (i < len) {
-            bufline[j] = newLine++;
-            bufcolumn[j] = newCol + columnDiff;
-
-            while (i++ < len) {
-                if (bufline[j = start % bufsize] != bufline[++start % bufsize])
-                    bufline[j] = newLine++;
-                else
-                    bufline[j] = newLine;
-            }
-        }
-
-        line = bufline[j];
-        column = bufcolumn[j];
-    }
+    line = bufline[j];
+    column = bufcolumn[j];
+  }
 
 }
 /* JavaCC - OriginalChecksum=5111a95355f2f1cc405246f828703097 (do not edit this line) */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ParseException.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ParseException.java
index 932d2be89b..31d07cd515 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ParseException.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/ParseException.java
@@ -19,181 +19,181 @@
  * You can explicitly create objects of this exception type by
  * calling the method generateParseException in the generated
  * parser.
- * <p>
+ *
  * You can modify this class to customize your error reporting
  * mechanisms so long as you retain the public fields.
  */
 public class ParseException extends Exception {
 
-    /**
-     * The version identifier for this Serializable class.
-     * Increment only if the <i>serialized</i> form of the
-     * class changes.
-     */
-    private static final long serialVersionUID = 1L;
+  /**
+   * The version identifier for this Serializable class.
+   * Increment only if the <i>serialized</i> form of the
+   * class changes.
+   */
+  private static final long serialVersionUID = 1L;
 
-    /**
-     * This constructor is used by the method "generateParseException"
-     * in the generated parser.  Calling this constructor generates
-     * a new object of this type with the fields "currentToken",
-     * "expectedTokenSequences", and "tokenImage" set.
-     */
-    public ParseException(Token currentTokenVal,
-                          int[][] expectedTokenSequencesVal,
-                          String[] tokenImageVal
-    ) {
-        super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal));
-        currentToken = currentTokenVal;
-        expectedTokenSequences = expectedTokenSequencesVal;
-        tokenImage = tokenImageVal;
-    }
+  /**
+   * This constructor is used by the method "generateParseException"
+   * in the generated parser.  Calling this constructor generates
+   * a new object of this type with the fields "currentToken",
+   * "expectedTokenSequences", and "tokenImage" set.
+   */
+  public ParseException(Token currentTokenVal,
+                        int[][] expectedTokenSequencesVal,
+                        String[] tokenImageVal
+                       )
+  {
+    super(initialise(currentTokenVal, expectedTokenSequencesVal, tokenImageVal));
+    currentToken = currentTokenVal;
+    expectedTokenSequences = expectedTokenSequencesVal;
+    tokenImage = tokenImageVal;
+  }
 
-    /**
-     * The following constructors are for use by you for whatever
-     * purpose you can think of.  Constructing the exception in this
-     * manner makes the exception behave in the normal way - i.e., as
-     * documented in the class "Throwable".  The fields "errorToken",
-     * "expectedTokenSequences", and "tokenImage" do not contain
-     * relevant information.  The JavaCC generated code does not use
-     * these constructors.
-     */
+  /**
+   * The following constructors are for use by you for whatever
+   * purpose you can think of.  Constructing the exception in this
+   * manner makes the exception behave in the normal way - i.e., as
+   * documented in the class "Throwable".  The fields "errorToken",
+   * "expectedTokenSequences", and "tokenImage" do not contain
+   * relevant information.  The JavaCC generated code does not use
+   * these constructors.
+   */
 
-    public ParseException() {
-        super();
-    }
+  public ParseException() {
+    super();
+  }
 
-    /**
-     * Constructor with message.
-     */
-    public ParseException(String message) {
-        super(message);
-    }
+  /** Constructor with message. */
+  public ParseException(String message) {
+    super(message);
+  }
 
 
-    /**
-     * This is the last token that has been consumed successfully.  If
-     * this object has been created due to a parse error, the token
-     * followng this token will (therefore) be the first error token.
-     */
-    public Token currentToken;
+  /**
+   * This is the last token that has been consumed successfully.  If
+   * this object has been created due to a parse error, the token
+   * followng this token will (therefore) be the first error token.
+   */
+  public Token currentToken;
 
-    /**
-     * Each entry in this array is an array of integers.  Each array
-     * of integers represents a sequence of tokens (by their ordinal
-     * values) that is expected at this point of the parse.
-     */
-    public int[][] expectedTokenSequences;
+  /**
+   * Each entry in this array is an array of integers.  Each array
+   * of integers represents a sequence of tokens (by their ordinal
+   * values) that is expected at this point of the parse.
+   */
+  public int[][] expectedTokenSequences;
 
-    /**
-     * This is a reference to the "tokenImage" array of the generated
-     * parser within which the parse error occurred.  This array is
-     * defined in the generated ...Constants interface.
-     */
-    public String[] tokenImage;
+  /**
+   * This is a reference to the "tokenImage" array of the generated
+   * parser within which the parse error occurred.  This array is
+   * defined in the generated ...Constants interface.
+   */
+  public String[] tokenImage;
 
-    /**
-     * It uses "currentToken" and "expectedTokenSequences" to generate a parse
-     * error message and returns it.  If this object has been created
-     * due to a parse error, and you do not catch it (it gets thrown
-     * from the parser) the correct error message
-     * gets displayed.
-     */
-    private static String initialise(Token currentToken,
-                                     int[][] expectedTokenSequences,
-                                     String[] tokenImage) {
-        String eol = System.getProperty("line.separator", "\n");
-        StringBuffer expected = new StringBuffer();
-        int maxSize = 0;
-        for (int i = 0; i < expectedTokenSequences.length; i++) {
-            if (maxSize < expectedTokenSequences[i].length) {
-                maxSize = expectedTokenSequences[i].length;
-            }
-            for (int j = 0; j < expectedTokenSequences[i].length; j++) {
-                expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
-            }
-            if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
-                expected.append("...");
-            }
-            expected.append(eol).append("    ");
-        }
-        String retval = "Encountered \"";
-        Token tok = currentToken.next;
-        for (int i = 0; i < maxSize; i++) {
-            if (i != 0) retval += " ";
-            if (tok.kind == 0) {
-                retval += tokenImage[0];
-                break;
-            }
-            retval += " " + tokenImage[tok.kind];
-            retval += " \"";
-            retval += add_escapes(tok.image);
-            retval += " \"";
-            tok = tok.next;
-        }
-        retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
-        retval += "." + eol;
-        if (expectedTokenSequences.length == 1) {
-            retval += "Was expecting:" + eol + "    ";
-        } else {
-            retval += "Was expecting one of:" + eol + "    ";
-        }
-        retval += expected.toString();
-        return retval;
+  /**
+   * It uses "currentToken" and "expectedTokenSequences" to generate a parse
+   * error message and returns it.  If this object has been created
+   * due to a parse error, and you do not catch it (it gets thrown
+   * from the parser) the correct error message
+   * gets displayed.
+   */
+  private static String initialise(Token currentToken,
+                           int[][] expectedTokenSequences,
+                           String[] tokenImage) {
+    String eol = System.getProperty("line.separator", "\n");
+    StringBuffer expected = new StringBuffer();
+    int maxSize = 0;
+    for (int i = 0; i < expectedTokenSequences.length; i++) {
+      if (maxSize < expectedTokenSequences[i].length) {
+        maxSize = expectedTokenSequences[i].length;
+      }
+      for (int j = 0; j < expectedTokenSequences[i].length; j++) {
+        expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
+      }
+      if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
+        expected.append("...");
+      }
+      expected.append(eol).append("    ");
+    }
+    String retval = "Encountered \"";
+    Token tok = currentToken.next;
+    for (int i = 0; i < maxSize; i++) {
+      if (i != 0) retval += " ";
+      if (tok.kind == 0) {
+        retval += tokenImage[0];
+        break;
+      }
+      retval += " " + tokenImage[tok.kind];
+      retval += " \"";
+      retval += add_escapes(tok.image);
+      retval += " \"";
+      tok = tok.next;
     }
+    retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+    retval += "." + eol;
+    if (expectedTokenSequences.length == 1) {
+      retval += "Was expecting:" + eol + "    ";
+    } else {
+      retval += "Was expecting one of:" + eol + "    ";
+    }
+    retval += expected.toString();
+    return retval;
+  }
 
-    /**
-     * The end of line string for this machine.
-     */
-    protected String eol = System.getProperty("line.separator", "\n");
+  /**
+   * The end of line string for this machine.
+   */
+  protected String eol = System.getProperty("line.separator", "\n");
 
-    /**
-     * Used to convert raw characters to their escaped version
-     * when these raw version cannot be used as part of an ASCII
-     * string literal.
-     */
-    static String add_escapes(String str) {
-        StringBuffer retval = new StringBuffer();
-        char ch;
-        for (int i = 0; i < str.length(); i++) {
-            switch (str.charAt(i)) {
-                case 0:
-                    continue;
-                case '\b':
-                    retval.append("\\b");
-                    continue;
-                case '\t':
-                    retval.append("\\t");
-                    continue;
-                case '\n':
-                    retval.append("\\n");
-                    continue;
-                case '\f':
-                    retval.append("\\f");
-                    continue;
-                case '\r':
-                    retval.append("\\r");
-                    continue;
-                case '\"':
-                    retval.append("\\\"");
-                    continue;
-                case '\'':
-                    retval.append("\\\'");
-                    continue;
-                case '\\':
-                    retval.append("\\\\");
-                    continue;
-                default:
-                    if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                        String s = "0000" + Integer.toString(ch, 16);
-                        retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-                    } else {
-                        retval.append(ch);
-                    }
-                    continue;
-            }
+  /**
+   * Used to convert raw characters to their escaped version
+   * when these raw version cannot be used as part of an ASCII
+   * string literal.
+   */
+  static String add_escapes(String str) {
+      StringBuffer retval = new StringBuffer();
+      char ch;
+      for (int i = 0; i < str.length(); i++) {
+        switch (str.charAt(i))
+        {
+           case 0 :
+              continue;
+           case '\b':
+              retval.append("\\b");
+              continue;
+           case '\t':
+              retval.append("\\t");
+              continue;
+           case '\n':
+              retval.append("\\n");
+              continue;
+           case '\f':
+              retval.append("\\f");
+              continue;
+           case '\r':
+              retval.append("\\r");
+              continue;
+           case '\"':
+              retval.append("\\\"");
+              continue;
+           case '\'':
+              retval.append("\\\'");
+              continue;
+           case '\\':
+              retval.append("\\\\");
+              continue;
+           default:
+              if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+                 String s = "0000" + Integer.toString(ch, 16);
+                 retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+              } else {
+                 retval.append(ch);
+              }
+              continue;
         }
-        return retval.toString();
-    }
+      }
+      return retval.toString();
+   }
 
 }
 /* JavaCC - OriginalChecksum=62ba72b2159703420d5ce7232a0226fb (do not edit this line) */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/Token.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/Token.java
index a4ebfd3a41..8aa85f4dd8 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/Token.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/Token.java
@@ -20,128 +20,124 @@
 
 public class Token implements java.io.Serializable {
 
-    /**
-     * The version identifier for this Serializable class.
-     * Increment only if the <i>serialized</i> form of the
-     * class changes.
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * An integer that describes the kind of this token.  This numbering
-     * system is determined by JavaCCParser, and a table of these numbers is
-     * stored in the file ...Constants.java.
-     */
-    public int kind;
-
-    /**
-     * The line number of the first character of this Token.
-     */
-    public int beginLine;
-    /**
-     * The column number of the first character of this Token.
-     */
-    public int beginColumn;
-    /**
-     * The line number of the last character of this Token.
-     */
-    public int endLine;
-    /**
-     * The column number of the last character of this Token.
-     */
-    public int endColumn;
-
-    /**
-     * The string image of the token.
-     */
-    public String image;
-
-    /**
-     * A reference to the next regular (non-special) token from the input
-     * stream.  If this is the last token from the input stream, or if the
-     * token manager has not read tokens beyond this one, this field is
-     * set to null.  This is true only if this token is also a regular
-     * token.  Otherwise, see below for a description of the contents of
-     * this field.
-     */
-    public Token next;
-
-    /**
-     * This field is used to access special tokens that occur prior to this
-     * token, but after the immediately preceding regular (non-special) token.
-     * If there are no such special tokens, this field is set to null.
-     * When there are more than one such special token, this field refers
-     * to the last of these special tokens, which in turn refers to the next
-     * previous special token through its specialToken field, and so on
-     * until the first special token (whose specialToken field is null).
-     * The next fields of special tokens refer to other special tokens that
-     * immediately follow it (without an intervening regular token).  If there
-     * is no such token, this field is null.
-     */
-    public Token specialToken;
-
-    /**
-     * An optional attribute value of the Token.
-     * Tokens which are not used as syntactic sugar will often contain
-     * meaningful values that will be used later on by the compiler or
-     * interpreter. This attribute value is often different from the image.
-     * Any subclass of Token that actually wants to return a non-null value can
-     * override this method as appropriate.
-     */
-    public Object getValue() {
-        return null;
+  /**
+   * The version identifier for this Serializable class.
+   * Increment only if the <i>serialized</i> form of the
+   * class changes.
+   */
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * An integer that describes the kind of this token.  This numbering
+   * system is determined by JavaCCParser, and a table of these numbers is
+   * stored in the file ...Constants.java.
+   */
+  public int kind;
+
+  /** The line number of the first character of this Token. */
+  public int beginLine;
+  /** The column number of the first character of this Token. */
+  public int beginColumn;
+  /** The line number of the last character of this Token. */
+  public int endLine;
+  /** The column number of the last character of this Token. */
+  public int endColumn;
+
+  /**
+   * The string image of the token.
+   */
+  public String image;
+
+  /**
+   * A reference to the next regular (non-special) token from the input
+   * stream.  If this is the last token from the input stream, or if the
+   * token manager has not read tokens beyond this one, this field is
+   * set to null.  This is true only if this token is also a regular
+   * token.  Otherwise, see below for a description of the contents of
+   * this field.
+   */
+  public Token next;
+
+  /**
+   * This field is used to access special tokens that occur prior to this
+   * token, but after the immediately preceding regular (non-special) token.
+   * If there are no such special tokens, this field is set to null.
+   * When there are more than one such special token, this field refers
+   * to the last of these special tokens, which in turn refers to the next
+   * previous special token through its specialToken field, and so on
+   * until the first special token (whose specialToken field is null).
+   * The next fields of special tokens refer to other special tokens that
+   * immediately follow it (without an intervening regular token).  If there
+   * is no such token, this field is null.
+   */
+  public Token specialToken;
+
+  /**
+   * An optional attribute value of the Token.
+   * Tokens which are not used as syntactic sugar will often contain
+   * meaningful values that will be used later on by the compiler or
+   * interpreter. This attribute value is often different from the image.
+   * Any subclass of Token that actually wants to return a non-null value can
+   * override this method as appropriate.
+   */
+  public Object getValue() {
+    return null;
+  }
+
+  /**
+   * No-argument constructor
+   */
+  public Token() {}
+
+  /**
+   * Constructs a new token for the specified Image.
+   */
+  public Token(int kind)
+  {
+    this(kind, null);
+  }
+
+  /**
+   * Constructs a new token for the specified Image and Kind.
+   */
+  public Token(int kind, String image)
+  {
+    this.kind = kind;
+    this.image = image;
+  }
+
+  /**
+   * Returns the image.
+   */
+  public String toString()
+  {
+    return image;
+  }
+
+  /**
+   * Returns a new Token object, by default. However, if you want, you
+   * can create and return subclass objects based on the value of ofKind.
+   * Simply add the cases to the switch for all those special cases.
+   * For example, if you have a subclass of Token called IDToken that
+   * you want to create if ofKind is ID, simply add something like :
+   *
+   *    case MyParserConstants.ID : return new IDToken(ofKind, image);
+   *
+   * to the following switch statement. Then you can cast matchedToken
+   * variable to the appropriate type and use sit in your lexical actions.
+   */
+  public static Token newToken(int ofKind, String image)
+  {
+    switch(ofKind)
+    {
+      default : return new Token(ofKind, image);
     }
+  }
 
-    /**
-     * No-argument constructor
-     */
-    public Token() {
-    }
-
-    /**
-     * Constructs a new token for the specified Image.
-     */
-    public Token(int kind) {
-        this(kind, null);
-    }
-
-    /**
-     * Constructs a new token for the specified Image and Kind.
-     */
-    public Token(int kind, String image) {
-        this.kind = kind;
-        this.image = image;
-    }
-
-    /**
-     * Returns the image.
-     */
-    public String toString() {
-        return image;
-    }
-
-    /**
-     * Returns a new Token object, by default. However, if you want, you
-     * can create and return subclass objects based on the value of ofKind.
-     * Simply add the cases to the switch for all those special cases.
-     * For example, if you have a subclass of Token called IDToken that
-     * you want to create if ofKind is ID, simply add something like :
-     * <p>
-     * case MyParserConstants.ID : return new IDToken(ofKind, image);
-     * <p>
-     * to the following switch statement. Then you can cast matchedToken
-     * variable to the appropriate type and use sit in your lexical actions.
-     */
-    public static Token newToken(int ofKind, String image) {
-        switch (ofKind) {
-            default:
-                return new Token(ofKind, image);
-        }
-    }
-
-    public static Token newToken(int ofKind) {
-        return newToken(ofKind, null);
-    }
+  public static Token newToken(int ofKind)
+  {
+    return newToken(ofKind, null);
+  }
 
 }
 /* JavaCC - OriginalChecksum=a2058282d76ebf324ed236272a3341cb (do not edit this line) */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/TokenMgrError.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/TokenMgrError.java
index 02afe0d7f9..09197e805c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/TokenMgrError.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/generated/com/github/javaparser/TokenMgrError.java
@@ -14,152 +14,146 @@
  */
 package com.github.javaparser;
 
-/**
- * Token Manager Error.
- */
-public class TokenMgrError extends Error {
+/** Token Manager Error. */
+public class TokenMgrError extends Error
+{
 
-    /**
-     * The version identifier for this Serializable class.
-     * Increment only if the <i>serialized</i> form of the
-     * class changes.
-     */
-    private static final long serialVersionUID = 1L;
+  /**
+   * The version identifier for this Serializable class.
+   * Increment only if the <i>serialized</i> form of the
+   * class changes.
+   */
+  private static final long serialVersionUID = 1L;
 
-    /*
-     * Ordinals for various reasons why an Error of this type can be thrown.
-     */
+  /*
+   * Ordinals for various reasons why an Error of this type can be thrown.
+   */
 
-    /**
-     * Lexical error occurred.
-     */
-    static final int LEXICAL_ERROR = 0;
+  /**
+   * Lexical error occurred.
+   */
+  static final int LEXICAL_ERROR = 0;
 
-    /**
-     * An attempt was made to create a second instance of a static token manager.
-     */
-    static final int STATIC_LEXER_ERROR = 1;
+  /**
+   * An attempt was made to create a second instance of a static token manager.
+   */
+  static final int STATIC_LEXER_ERROR = 1;
 
-    /**
-     * Tried to change to an invalid lexical state.
-     */
-    static final int INVALID_LEXICAL_STATE = 2;
+  /**
+   * Tried to change to an invalid lexical state.
+   */
+  static final int INVALID_LEXICAL_STATE = 2;
 
-    /**
-     * Detected (and bailed out of) an infinite loop in the token manager.
-     */
-    static final int LOOP_DETECTED = 3;
+  /**
+   * Detected (and bailed out of) an infinite loop in the token manager.
+   */
+  static final int LOOP_DETECTED = 3;
 
-    /**
-     * Indicates the reason why the exception is thrown. It will have
-     * one of the above 4 values.
-     */
-    int errorCode;
+  /**
+   * Indicates the reason why the exception is thrown. It will have
+   * one of the above 4 values.
+   */
+  int errorCode;
 
-    /**
-     * Replaces unprintable characters by their escaped (or unicode escaped)
-     * equivalents in the given string
-     */
-    protected static final String addEscapes(String str) {
-        StringBuffer retval = new StringBuffer();
-        char ch;
-        for (int i = 0; i < str.length(); i++) {
-            switch (str.charAt(i)) {
-                case 0:
-                    continue;
-                case '\b':
-                    retval.append("\\b");
-                    continue;
-                case '\t':
-                    retval.append("\\t");
-                    continue;
-                case '\n':
-                    retval.append("\\n");
-                    continue;
-                case '\f':
-                    retval.append("\\f");
-                    continue;
-                case '\r':
-                    retval.append("\\r");
-                    continue;
-                case '\"':
-                    retval.append("\\\"");
-                    continue;
-                case '\'':
-                    retval.append("\\\'");
-                    continue;
-                case '\\':
-                    retval.append("\\\\");
-                    continue;
-                default:
-                    if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
-                        String s = "0000" + Integer.toString(ch, 16);
-                        retval.append("\\u" + s.substring(s.length() - 4, s.length()));
-                    } else {
-                        retval.append(ch);
-                    }
-                    continue;
-            }
-        }
-        return retval.toString();
+  /**
+   * Replaces unprintable characters by their escaped (or unicode escaped)
+   * equivalents in the given string
+   */
+  protected static final String addEscapes(String str) {
+    StringBuffer retval = new StringBuffer();
+    char ch;
+    for (int i = 0; i < str.length(); i++) {
+      switch (str.charAt(i))
+      {
+        case 0 :
+          continue;
+        case '\b':
+          retval.append("\\b");
+          continue;
+        case '\t':
+          retval.append("\\t");
+          continue;
+        case '\n':
+          retval.append("\\n");
+          continue;
+        case '\f':
+          retval.append("\\f");
+          continue;
+        case '\r':
+          retval.append("\\r");
+          continue;
+        case '\"':
+          retval.append("\\\"");
+          continue;
+        case '\'':
+          retval.append("\\\'");
+          continue;
+        case '\\':
+          retval.append("\\\\");
+          continue;
+        default:
+          if ((ch = str.charAt(i)) < 0x20 || ch > 0x7e) {
+            String s = "0000" + Integer.toString(ch, 16);
+            retval.append("\\u" + s.substring(s.length() - 4, s.length()));
+          } else {
+            retval.append(ch);
+          }
+          continue;
+      }
     }
+    return retval.toString();
+  }
 
-    /**
-     * Returns a detailed message for the Error when it is thrown by the
-     * token manager to indicate a lexical error.
-     * Parameters :
-     * EOFSeen     : indicates if EOF caused the lexical error
-     * curLexState : lexical state in which this error occurred
-     * errorLine   : line number when the error occurred
-     * errorColumn : column number when the error occurred
-     * errorAfter  : prefix that was seen before this error occurred
-     * curchar     : the offending character
-     * Note: You can customize the lexical error message by modifying this method.
-     */
-    protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
-        return ("Lexical error at line " +
-                errorLine + ", column " +
-                errorColumn + ".  Encountered: " +
-                (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int) curChar + "), ") +
-                "after : \"" + addEscapes(errorAfter) + "\"");
-    }
+  /**
+   * Returns a detailed message for the Error when it is thrown by the
+   * token manager to indicate a lexical error.
+   * Parameters :
+   *    EOFSeen     : indicates if EOF caused the lexical error
+   *    curLexState : lexical state in which this error occurred
+   *    errorLine   : line number when the error occurred
+   *    errorColumn : column number when the error occurred
+   *    errorAfter  : prefix that was seen before this error occurred
+   *    curchar     : the offending character
+   * Note: You can customize the lexical error message by modifying this method.
+   */
+  protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) {
+    return("Lexical error at line " +
+          errorLine + ", column " +
+          errorColumn + ".  Encountered: " +
+          (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") +
+          "after : \"" + addEscapes(errorAfter) + "\"");
+  }
 
-    /**
-     * You can also modify the body of this method to customize your error messages.
-     * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
-     * of end-users concern, so you can return something like :
-     * <p>
-     * "Internal Error : Please file a bug report .... "
-     * <p>
-     * from this method for such cases in the release version of your parser.
-     */
-    public String getMessage() {
-        return super.getMessage();
-    }
+  /**
+   * You can also modify the body of this method to customize your error messages.
+   * For example, cases like LOOP_DETECTED and INVALID_LEXICAL_STATE are not
+   * of end-users concern, so you can return something like :
+   *
+   *     "Internal Error : Please file a bug report .... "
+   *
+   * from this method for such cases in the release version of your parser.
+   */
+  public String getMessage() {
+    return super.getMessage();
+  }
 
-    /*
-     * Constructors of various flavors follow.
-     */
+  /*
+   * Constructors of various flavors follow.
+   */
 
-    /**
-     * No arg constructor.
-     */
-    public TokenMgrError() {
-    }
+  /** No arg constructor. */
+  public TokenMgrError() {
+  }
 
-    /**
-     * Constructor with message and reason.
-     */
-    public TokenMgrError(String message, int reason) {
-        super(message);
-        errorCode = reason;
-    }
+  /** Constructor with message and reason. */
+  public TokenMgrError(String message, int reason) {
+    super(message);
+    errorCode = reason;
+  }
 
-    /**
-     * Full Constructor.
-     */
-    public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
-        this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
-    }
+  /** Full Constructor. */
+  public TokenMgrError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar, int reason) {
+    this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason);
+  }
 }
 /* JavaCC - OriginalChecksum=f06c7e964b5c13a732337c2f3fb4f836 (do not edit this line) */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ASTHelper.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ASTHelper.java
index c3d7fbe993..7e706cd644 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ASTHelper.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ASTHelper.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser;
 
 import com.github.javaparser.ast.CompilationUnit;
@@ -50,7 +50,7 @@
 
 /**
  * This class helps to construct new nodes.
- *
+ * 
  * @author Júlio Vilmar Gesser
  */
 public final class ASTHelper {
@@ -80,8 +80,9 @@ private ASTHelper() {
     /**
      * Creates a new {@link NameExpr} from a qualified name.<br>
      * The qualified name can contains "." (dot) characters.
-     *
-     * @param qualifiedName qualified name
+     * 
+     * @param qualifiedName
+     *            qualified name
      * @return instanceof {@link NameExpr}
      */
     public static NameExpr createNameExpr(String qualifiedName) {
@@ -95,9 +96,11 @@ public static NameExpr createNameExpr(String qualifiedName) {
 
     /**
      * Creates a new {@link Parameter}.
-     *
-     * @param type type of the parameter
-     * @param name name of the parameter
+     * 
+     * @param type
+     *            type of the parameter
+     * @param name
+     *            name of the parameter
      * @return instance of {@link Parameter}
      */
     public static Parameter createParameter(Type type, String name) {
@@ -106,10 +109,13 @@ public static Parameter createParameter(Type type, String name) {
 
     /**
      * Creates a {@link FieldDeclaration}.
-     *
-     * @param modifiers modifiers
-     * @param type      type
-     * @param variable  variable declarator
+     * 
+     * @param modifiers
+     *            modifiers
+     * @param type
+     *            type
+     * @param variable
+     *            variable declarator
      * @return instance of {@link FieldDeclaration}
      */
     public static FieldDeclaration createFieldDeclaration(int modifiers, Type type, VariableDeclarator variable) {
@@ -121,10 +127,13 @@ public static FieldDeclaration createFieldDeclaration(int modifiers, Type type,
 
     /**
      * Creates a {@link FieldDeclaration}.
-     *
-     * @param modifiers modifiers
-     * @param type      type
-     * @param name      field name
+     * 
+     * @param modifiers
+     *            modifiers
+     * @param type
+     *            type
+     * @param name
+     *            field name
      * @return instance of {@link FieldDeclaration}
      */
     public static FieldDeclaration createFieldDeclaration(int modifiers, Type type, String name) {
@@ -135,9 +144,11 @@ public static FieldDeclaration createFieldDeclaration(int modifiers, Type type,
 
     /**
      * Creates a {@link VariableDeclarationExpr}.
-     *
-     * @param type type
-     * @param name name
+     * 
+     * @param type
+     *            type
+     * @param name
+     *            name
      * @return instance of {@link VariableDeclarationExpr}
      */
     public static VariableDeclarationExpr createVariableDeclarationExpr(Type type, String name) {
@@ -149,9 +160,11 @@ public static VariableDeclarationExpr createVariableDeclarationExpr(Type type, S
     /**
      * Adds the given parameter to the method. The list of parameters will be
      * initialized if it is <code>null</code>.
-     *
-     * @param method    method
-     * @param parameter parameter
+     * 
+     * @param method
+     *            method
+     * @param parameter
+     *            parameter
      */
     public static void addParameter(MethodDeclaration method, Parameter parameter) {
         List<Parameter> parameters = method.getParameters();
@@ -165,9 +178,11 @@ public static void addParameter(MethodDeclaration method, Parameter parameter) {
     /**
      * Adds the given argument to the method call. The list of arguments will be
      * initialized if it is <code>null</code>.
-     *
-     * @param call method call
-     * @param arg  argument value
+     * 
+     * @param call
+     *            method call
+     * @param arg
+     *            argument value
      */
     public static void addArgument(MethodCallExpr call, Expression arg) {
         List<Expression> args = call.getArgs();
@@ -181,9 +196,11 @@ public static void addArgument(MethodCallExpr call, Expression arg) {
     /**
      * Adds the given type declaration to the compilation unit. The list of
      * types will be initialized if it is <code>null</code>.
-     *
-     * @param cu   compilation unit
-     * @param type type declaration
+     * 
+     * @param cu
+     *            compilation unit
+     * @param type
+     *            type declaration
      */
     public static void addTypeDeclaration(CompilationUnit cu, TypeDeclaration type) {
         List<TypeDeclaration> types = cu.getTypes();
@@ -197,9 +214,11 @@ public static void addTypeDeclaration(CompilationUnit cu, TypeDeclaration type)
 
     /**
      * Creates a new {@link ReferenceType} for a class or interface.
-     *
-     * @param name       name of the class or interface
-     * @param arrayCount number of arrays or <code>0</code> if is not a array.
+     * 
+     * @param name
+     *            name of the class or interface
+     * @param arrayCount
+     *            number of arrays or <code>0</code> if is not a array.
      * @return instanceof {@link ReferenceType}
      */
     public static ReferenceType createReferenceType(String name, int arrayCount) {
@@ -208,9 +227,11 @@ public static ReferenceType createReferenceType(String name, int arrayCount) {
 
     /**
      * Creates a new {@link ReferenceType} for the given primitive type.
-     *
-     * @param type       primitive type
-     * @param arrayCount number of arrays or <code>0</code> if is not a array.
+     * 
+     * @param type
+     *            primitive type
+     * @param arrayCount
+     *            number of arrays or <code>0</code> if is not a array.
      * @return instanceof {@link ReferenceType}
      */
     public static ReferenceType createReferenceType(PrimitiveType type, int arrayCount) {
@@ -220,9 +241,9 @@ public static ReferenceType createReferenceType(PrimitiveType type, int arrayCou
     /**
      * Adds the given statement to the specified block. The list of statements
      * will be initialized if it is <code>null</code>.
-     *
+     * 
      * @param block to have expression added to
-     * @param stmt  to be added
+     * @param stmt to be added
      */
     public static void addStmt(BlockStmt block, Statement stmt) {
         List<Statement> stmts = block.getStmts();
@@ -236,9 +257,9 @@ public static void addStmt(BlockStmt block, Statement stmt) {
     /**
      * Adds the given expression to the specified block. The list of statements
      * will be initialized if it is <code>null</code>.
-     *
+     * 
      * @param block to have expression added to
-     * @param expr  to be added
+     * @param expr to be added
      */
     public static void addStmt(BlockStmt block, Expression expr) {
         addStmt(block, new ExpressionStmt(expr));
@@ -247,9 +268,11 @@ public static void addStmt(BlockStmt block, Expression expr) {
     /**
      * Adds the given declaration to the specified type. The list of members
      * will be initialized if it is <code>null</code>.
-     *
-     * @param type type declaration
-     * @param decl member declaration
+     * 
+     * @param type
+     *            type declaration
+     * @param decl
+     *            member declaration
      */
     public static void addMember(TypeDeclaration type, BodyDeclaration decl) {
         List<BodyDeclaration> members = type.getMembers();
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/JavaParser.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/JavaParser.java
index 812875321f..431255051c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/JavaParser.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/JavaParser.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser;
 
 import static com.github.javaparser.PositionUtils.areInOrder;
@@ -50,7 +50,6 @@
 import java.util.List;
 
 // FIXME this file does not seem to be generated by javacc. Is the doc wrong, or the javacc config?
-
 /**
  * <p>
  * This class was generated automatically by javacc, do not edit.
@@ -70,7 +69,8 @@ private JavaParser() {
 
     private static boolean _doNotConsiderAnnotationsAsNodeStartForCodeAttribution = false;
 
-    public static boolean getDoNotConsiderAnnotationsAsNodeStartForCodeAttribution() {
+    public static boolean getDoNotConsiderAnnotationsAsNodeStartForCodeAttribution()
+    {
         return _doNotConsiderAnnotationsAsNodeStartForCodeAttribution;
     }
 
@@ -78,27 +78,32 @@ public static void setDoNotConsiderAnnotationsAsNodeStartForCodeAttribution(bool
         _doNotConsiderAnnotationsAsNodeStartForCodeAttribution = doNotConsiderAnnotationsAsNodeStartForCodeAttribution;
     }
 
-    public static boolean getDoNotAssignCommentsPreceedingEmptyLines() {
+    public static boolean getDoNotAssignCommentsPreceedingEmptyLines()
+    {
         return _doNotAssignCommentsPreceedingEmptyLines;
     }
 
-    public static void setDoNotAssignCommentsPreceedingEmptyLines(boolean doNotAssignCommentsPreceedingEmptyLines) {
+    public static void setDoNotAssignCommentsPreceedingEmptyLines(boolean doNotAssignCommentsPreceedingEmptyLines)
+    {
         _doNotAssignCommentsPreceedingEmptyLines = doNotAssignCommentsPreceedingEmptyLines;
     }
 
     public static CompilationUnit parse(final InputStream in,
                                         final String encoding) {
-        return parse(in, encoding, true);
+        return parse(in,encoding,true);
     }
 
     /**
      * Parses the Java code contained in the {@link InputStream} and returns a
      * {@link CompilationUnit} that represents it.
      *
-     * @param in       {@link InputStream} containing Java source code
-     * @param encoding encoding of the source code
+     * @param in
+     *            {@link InputStream} containing Java source code
+     * @param encoding
+     *            encoding of the source code
      * @return CompilationUnit representing the Java source code
-     * @throws ParseException if the source code has parser errors
+     * @throws ParseException
+     *             if the source code has parser errors
      */
     public static CompilationUnit parse(final InputStream in,
                                         final String encoding, boolean considerComments) {
@@ -106,11 +111,11 @@ public static CompilationUnit parse(final InputStream in,
             String code = SourcesHelper.streamToString(in, encoding);
             InputStream in1 = SourcesHelper.stringToStream(code, encoding);
             CompilationUnit cu = new ASTParser(in1, encoding).CompilationUnit();
-            if (considerComments) {
-                insertComments(cu, code);
+            if (considerComments){
+                insertComments(cu,code);
             }
             return cu;
-        } catch (IOException ioe) {
+        } catch (IOException ioe){
             throw new ParseException(ioe.getMessage());
         }
     }
@@ -119,27 +124,33 @@ public static CompilationUnit parse(final InputStream in,
      * Parses the Java code contained in the {@link InputStream} and returns a
      * {@link CompilationUnit} that represents it.
      *
-     * @param in {@link InputStream} containing Java source code
+     * @param in
+     *            {@link InputStream} containing Java source code
      * @return CompilationUnit representing the Java source code
-     * @throws ParseException if the source code has parser errors
+     * @throws ParseException
+     *             if the source code has parser errors
      */
-    public static CompilationUnit parse(final InputStream in) {
-        return parse(in, null, true);
+    public static CompilationUnit parse(final InputStream in)
+            {
+        return parse(in, null,true);
     }
 
     public static CompilationUnit parse(final File file, final String encoding)
             throws ParseException, IOException {
-        return parse(file, encoding, true);
+        return parse(file,encoding,true);
     }
 
     /**
      * Parses the Java code contained in a {@link File} and returns a
      * {@link CompilationUnit} that represents it.
      *
-     * @param file     {@link File} containing Java source code
-     * @param encoding encoding of the source code
+     * @param file
+     *            {@link File} containing Java source code
+     * @param encoding
+     *            encoding of the source code
      * @return CompilationUnit representing the Java source code
-     * @throws ParseException if the source code has parser errors
+     * @throws ParseException
+     *             if the source code has parser errors
      * @throws IOException
      */
     public static CompilationUnit parse(final File file, final String encoding, boolean considerComments)
@@ -156,26 +167,29 @@ public static CompilationUnit parse(final File file, final String encoding, bool
      * Parses the Java code contained in a {@link File} and returns a
      * {@link CompilationUnit} that represents it.
      *
-     * @param file {@link File} containing Java source code
+     * @param file
+     *            {@link File} containing Java source code
      * @return CompilationUnit representing the Java source code
-     * @throws ParseException if the source code has parser errors
+     * @throws ParseException
+     *             if the source code has parser errors
      * @throws IOException
      */
     public static CompilationUnit parse(final File file) throws ParseException,
             IOException {
-        return parse(file, null, true);
+        return parse(file, null,true);
     }
 
-    public static CompilationUnit parse(final Reader reader, boolean considerComments) {
+    public static CompilationUnit parse(final Reader reader, boolean considerComments)
+            {
         try {
             String code = SourcesHelper.readerToString(reader);
             Reader reader1 = SourcesHelper.stringToReader(code);
             CompilationUnit cu = new ASTParser(reader1).CompilationUnit();
-            if (considerComments) {
-                insertComments(cu, code);
+            if (considerComments){
+                insertComments(cu,code);
             }
             return cu;
-        } catch (IOException ioe) {
+        } catch (IOException ioe){
             throw new ParseException(ioe.getMessage());
         }
     }
@@ -184,11 +198,14 @@ public static CompilationUnit parse(final Reader reader, boolean considerComment
      * Parses the Java block contained in a {@link String} and returns a
      * {@link BlockStmt} that represents it.
      *
-     * @param blockStatement {@link String} containing Java block code
+     * @param blockStatement
+     *            {@link String} containing Java block code
      * @return BlockStmt representing the Java block
-     * @throws ParseException if the source code has parser errors
+     * @throws ParseException
+     *             if the source code has parser errors
      */
-    public static BlockStmt parseBlock(final String blockStatement) {
+    public static BlockStmt parseBlock(final String blockStatement)
+            {
         StringReader sr = new StringReader(blockStatement);
         BlockStmt result = new ASTParser(sr).Block();
         sr.close();
@@ -199,9 +216,11 @@ public static BlockStmt parseBlock(final String blockStatement) {
      * Parses the Java statement contained in a {@link String} and returns a
      * {@link Statement} that represents it.
      *
-     * @param statement {@link String} containing Java statement code
+     * @param statement
+     *            {@link String} containing Java statement code
      * @return Statement representing the Java statement
-     * @throws ParseException if the source code has parser errors
+     * @throws ParseException
+     *             if the source code has parser errors
      */
     public static Statement parseStatement(final String statement) {
         StringReader sr = new StringReader(statement);
@@ -214,9 +233,11 @@ public static Statement parseStatement(final String statement) {
      * Parses the Java import contained in a {@link String} and returns a
      * {@link ImportDeclaration} that represents it.
      *
-     * @param importDeclaration {@link String} containing Java import code
+     * @param importDeclaration
+     *            {@link String} containing Java import code
      * @return ImportDeclaration representing the Java import declaration
-     * @throws ParseException if the source code has parser errors
+     * @throws ParseException
+     *             if the source code has parser errors
      */
     public static ImportDeclaration parseImport(final String importDeclaration) {
         StringReader sr = new StringReader(importDeclaration);
@@ -229,9 +250,11 @@ public static ImportDeclaration parseImport(final String importDeclaration) {
      * Parses the Java expression contained in a {@link String} and returns a
      * {@link Expression} that represents it.
      *
-     * @param expression {@link String} containing Java expression
+     * @param expression
+     *            {@link String} containing Java expression
      * @return Expression representing the Java expression
-     * @throws ParseException if the source code has parser errors
+     * @throws ParseException
+     *             if the source code has parser errors
      */
     public static Expression parseExpression(final String expression) {
         StringReader sr = new StringReader(expression);
@@ -244,9 +267,11 @@ public static Expression parseExpression(final String expression) {
      * Parses the Java annotation contained in a {@link String} and returns a
      * {@link AnnotationExpr} that represents it.
      *
-     * @param annotation {@link String} containing Java annotation
+     * @param annotation
+     *            {@link String} containing Java annotation
      * @return AnnotationExpr representing the Java annotation
-     * @throws ParseException if the source code has parser errors
+     * @throws ParseException
+     *             if the source code has parser errors
      */
     public static AnnotationExpr parseAnnotation(final String annotation) {
         StringReader sr = new StringReader(annotation);
@@ -259,9 +284,11 @@ public static AnnotationExpr parseAnnotation(final String annotation) {
      * Parses the Java body declaration(e.g fields or methods) contained in a
      * {@link String} and returns a {@link BodyDeclaration} that represents it.
      *
-     * @param body {@link String} containing Java body declaration
+     * @param body
+     *            {@link String} containing Java body declaration
      * @return BodyDeclaration representing the Java annotation
-     * @throws ParseException if the source code has parser errors
+     * @throws ParseException
+     *             if the source code has parser errors
      */
     public static BodyDeclaration parseBodyDeclaration(final String body) {
         StringReader sr = new StringReader(body);
@@ -274,8 +301,8 @@ public static BodyDeclaration parseBodyDeclaration(final String body) {
      * Comments are attributed to the thing the comment and are removed from
      * allComments.
      */
-    private static void insertCommentsInCu(CompilationUnit cu, CommentsCollection commentsCollection) {
-        if (commentsCollection.size() == 0) return;
+    private static void insertCommentsInCu(CompilationUnit cu, CommentsCollection commentsCollection){
+        if (commentsCollection.size()==0) return;
 
         // I should sort all the direct children and the comments, if a comment is the first thing then it
         // a comment to the CompilationUnit
@@ -287,18 +314,20 @@ private static void insertCommentsInCu(CompilationUnit cu, CommentsCollection co
         List<Node> children = cu.getChildrenNodes();
         PositionUtils.sortByBeginPosition(children);
 
-        if (cu.getPackage() != null && (children.size() == 0 || PositionUtils.areInOrder(comments.get(0), children.get(0)))) {
+        if (cu.getPackage()!=null && (children.size()==0 || PositionUtils.areInOrder(comments.get(0), children.get(0)))){
             cu.setComment(comments.get(0));
             comments.remove(0);
         }
 
-        insertCommentsInNode(cu, comments);
+        insertCommentsInNode(cu,comments);
     }
 
-    private static boolean attributeLineCommentToNodeOrChild(Node node, LineComment lineComment) {
+    private static boolean attributeLineCommentToNodeOrChild(Node node, LineComment lineComment)
+    {
         // The node start and end at the same line as the comment,
         // let's give to it the comment
-        if (node.getBeginLine() == lineComment.getBeginLine() && !node.hasComment()) {
+        if (node.getBeginLine()==lineComment.getBeginLine() && !node.hasComment())
+        {
             node.setComment(lineComment);
             return true;
         } else {
@@ -309,8 +338,10 @@ private static boolean attributeLineCommentToNodeOrChild(Node node, LineComment
             PositionUtils.sortByBeginPosition(children);
             Collections.reverse(children);
 
-            for (Node child : children) {
-                if (attributeLineCommentToNodeOrChild(child, lineComment)) {
+            for (Node child : children)
+            {
+                if (attributeLineCommentToNodeOrChild(child, lineComment))
+                {
                     return true;
                 }
             }
@@ -323,8 +354,8 @@ private static boolean attributeLineCommentToNodeOrChild(Node node, LineComment
      * This method try to attributes the nodes received to child of the node.
      * It returns the node that were not attributed.
      */
-    private static void insertCommentsInNode(Node node, List<Comment> commentsToAttribute) {
-        if (commentsToAttribute.size() == 0) return;
+    private static void insertCommentsInNode(Node node, List<Comment> commentsToAttribute){
+        if (commentsToAttribute.size()==0) return;
 
         // the comments can:
         // 1) Inside one of the child, then it is the child that have to associate them
@@ -334,25 +365,30 @@ private static void insertCommentsInNode(Node node, List<Comment> commentsToAttr
         List<Node> children = node.getChildrenNodes();
         PositionUtils.sortByBeginPosition(children);
 
-        for (Node child : children) {
+        for (Node child : children){
             List<Comment> commentsInsideChild = new LinkedList<Comment>();
-            for (Comment c : commentsToAttribute) {
-                if (PositionUtils.nodeContains(child, c, _doNotConsiderAnnotationsAsNodeStartForCodeAttribution)) {
+            for (Comment c : commentsToAttribute){
+                if (PositionUtils.nodeContains(child, c, _doNotConsiderAnnotationsAsNodeStartForCodeAttribution)){
                     commentsInsideChild.add(c);
                 }
             }
             commentsToAttribute.removeAll(commentsInsideChild);
-            insertCommentsInNode(child, commentsInsideChild);
+            insertCommentsInNode(child,commentsInsideChild);
         }
 
         // I can attribute in line comments to elements preceeding them, if there
         // is something contained in their line
         List<Comment> attributedComments = new LinkedList<Comment>();
-        for (Comment comment : commentsToAttribute) {
-            if (comment.isLineComment()) {
-                for (Node child : children) {
-                    if (child.getEndLine() == comment.getBeginLine()) {
-                        if (attributeLineCommentToNodeOrChild(child, comment.asLineComment())) {
+        for (Comment comment : commentsToAttribute)
+        {
+            if (comment.isLineComment())
+            {
+                for (Node child : children)
+                {
+                    if (child.getEndLine()==comment.getBeginLine())
+                    {
+                        if (attributeLineCommentToNodeOrChild(child, comment.asLineComment()))
+                        {
                             attributedComments.add(comment);
                         }
                     }
@@ -368,14 +404,15 @@ private static void insertCommentsInNode(Node node, List<Comment> commentsToAttr
         childrenAndComments.addAll(commentsToAttribute);
         PositionUtils.sortByBeginPosition(childrenAndComments, _doNotConsiderAnnotationsAsNodeStartForCodeAttribution);
 
-        for (Node thing : childrenAndComments) {
-            if (thing instanceof Comment) {
-                previousComment = (Comment) thing;
-                if (!previousComment.isOrphan()) {
+        for (Node thing : childrenAndComments){
+            if (thing instanceof Comment){
+                previousComment = (Comment)thing;
+                if (!previousComment.isOrphan())
+                {
                     previousComment = null;
                 }
             } else {
-                if (previousComment != null && !thing.hasComment()) {
+                if (previousComment != null && !thing.hasComment()){
                     if (!_doNotAssignCommentsPreceedingEmptyLines || !thereAreLinesBetween(previousComment, thing)) {
                         thing.setComment(previousComment);
                         attributedComments.add(previousComment);
@@ -388,26 +425,28 @@ private static void insertCommentsInNode(Node node, List<Comment> commentsToAttr
         commentsToAttribute.removeAll(attributedComments);
 
         // all the remaining are orphan nodes
-        for (Comment c : commentsToAttribute) {
+        for (Comment c : commentsToAttribute){
             if (c.isOrphan()) {
                 node.addOrphanComment(c);
             }
         }
     }
 
-    private static boolean thereAreLinesBetween(Node a, Node b) {
-        if (!PositionUtils.areInOrder(a, b)) {
+    private static boolean thereAreLinesBetween(Node a, Node b)
+    {
+        if (!PositionUtils.areInOrder(a, b))
+        {
             return thereAreLinesBetween(b, a);
         }
         int endOfA = a.getEndLine();
-        return b.getBeginLine() > (a.getEndLine() + 1);
+        return b.getBeginLine()>(a.getEndLine()+1);
     }
 
     private static void insertComments(CompilationUnit cu, String code) throws IOException {
         CommentsParser commentsParser = new CommentsParser();
         CommentsCollection allComments = commentsParser.parse(code);
 
-        insertCommentsInCu(cu, allComments);
+        insertCommentsInCu(cu,allComments);
     }
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/Position.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/Position.java
index 8970bb0831..522411c270 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/Position.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/Position.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser;
 
 import com.github.javaparser.ast.Node;
@@ -27,27 +27,27 @@ public class Position {
     private int line;
     private int column;
 
-    public static final Position ABSOLUTE_START = new Position(Node.ABSOLUTE_BEGIN_LINE, -1);
-    public static final Position ABSOLUTE_END = new Position(Node.ABSOLUTE_END_LINE, -1);
+    public static final Position ABSOLUTE_START = new Position(Node.ABSOLUTE_BEGIN_LINE,-1);
+    public static final Position ABSOLUTE_END = new Position(Node.ABSOLUTE_END_LINE,-1);
 
-    public static Position beginOf(Node node) {
-        return new Position(node.getBeginLine(), node.getBeginColumn());
+    public static Position beginOf(Node node){
+        return new Position(node.getBeginLine(),node.getBeginColumn());
     }
 
-    public static Position endOf(Node node) {
-        return new Position(node.getEndLine(), node.getEndColumn());
+    public static Position endOf(Node node){
+        return new Position(node.getEndLine(),node.getEndColumn());
     }
 
-    public Position(int line, int column) {
+    public Position(int line, int column){
         this.line = line;
         this.column = column;
     }
 
-    public int getLine() {
+    public int getLine(){
         return this.line;
     }
 
-    public int getColumn() {
+    public int getColumn(){
         return this.column;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/PositionUtils.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/PositionUtils.java
index 5be830908a..41df817107 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/PositionUtils.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/PositionUtils.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser;
 
 import com.github.javaparser.ast.Node;
@@ -42,11 +42,11 @@ private PositionUtils() {
         // prevent instantiation
     }
 
-    public static <T extends Node> void sortByBeginPosition(List<T> nodes) {
+    public static <T extends Node> void sortByBeginPosition(List<T> nodes){
         sortByBeginPosition(nodes, false);
     }
 
-    public static <T extends Node> void sortByBeginPosition(List<T> nodes, final boolean ignoringAnnotations) {
+    public static <T extends Node> void sortByBeginPosition(List<T> nodes, final boolean ignoringAnnotations){
         Collections.sort(nodes, new Comparator<Node>() {
             @Override
             public int compare(Node o1, Node o2) {
@@ -55,11 +55,11 @@ public int compare(Node o1, Node o2) {
         });
     }
 
-    public static boolean areInOrder(Node a, Node b) {
+    public static boolean areInOrder(Node a, Node b){
         return areInOrder(a, b, false);
     }
 
-    public static boolean areInOrder(Node a, Node b, boolean ignoringAnnotations) {
+    public static boolean areInOrder(Node a, Node b, boolean ignoringAnnotations){
         return compare(a, b, ignoringAnnotations) <= 0;
     }
 
@@ -73,7 +73,7 @@ private static int compare(Node a, Node b, boolean ignoringAnnotations) {
             }
         }
 
-        int signLine = signum(a.getBeginLine() - b.getBeginLine());
+        int signLine = signum( a.getBeginLine() - b.getBeginLine() );
         if (signLine == 0) {
             return signum(a.getBeginColumn() - b.getBeginColumn());
         } else {
@@ -82,14 +82,14 @@ private static int compare(Node a, Node b, boolean ignoringAnnotations) {
     }
 
     public static AnnotationExpr getLastAnnotation(Node node) {
-        if (node instanceof AnnotableNode) {
+        if (node instanceof AnnotableNode){
             List<AnnotationExpr> annotations = new LinkedList<AnnotationExpr>();
             annotations.addAll(((AnnotableNode) node).getAnnotations());
-            if (annotations.size() == 0) {
+            if (annotations.size()==0){
                 return null;
             }
             sortByBeginPosition(annotations);
-            return annotations.get(annotations.size() - 1);
+            return annotations.get(annotations.size()-1);
         } else {
             return null;
         }
@@ -114,28 +114,27 @@ private static Node beginNodeWithoutConsideringAnnotations(Node node) {
         } else if (node instanceof ClassOrInterfaceDeclaration) {
             ClassOrInterfaceDeclaration casted = (ClassOrInterfaceDeclaration) node;
             return casted.getNameExpr();
-        } else {
+        }  else {
             return node;
         }
     }
 
-    public static boolean nodeContains(Node container, Node contained, boolean ignoringAnnotations) {
-        if (!ignoringAnnotations || PositionUtils.getLastAnnotation(container) == null) {
+    public static boolean nodeContains(Node container, Node contained, boolean ignoringAnnotations){
+        if (!ignoringAnnotations || PositionUtils.getLastAnnotation(container)==null){
             return container.contains(contained);
         }
-        if (!container.contains(contained)) {
+        if (!container.contains(contained)){
             return false;
         }
         // if the node is contained, but it comes immediately after the annotations,
         // let's not consider it contained
-        if (container instanceof AnnotableNode) {
+        if (container instanceof AnnotableNode){
             int bl = beginLineWithoutConsideringAnnotation(container);
             int bc = beginColumnWithoutConsideringAnnotation(container);
-            if (bl > contained.getBeginLine()) return false;
-            if (bl == contained.getBeginLine() && bc > contained.getBeginColumn()) return false;
-            if (container.getEndLine() < contained.getEndLine()) return false;
-            if (container.getEndLine() == contained.getEndLine() && container.getEndColumn() < contained.getEndColumn())
-                return false;
+            if (bl>contained.getBeginLine()) return false;
+            if (bl==contained.getBeginLine() && bc>contained.getBeginColumn()) return false;
+            if (container.getEndLine()<contained.getEndLine()) return false;
+            if (container.getEndLine()==contained.getEndLine() && container.getEndColumn()<contained.getEndColumn()) return false;
             return true;
         }
         return true;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/SourcesHelper.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/SourcesHelper.java
index e482b74350..87f83f0da2 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/SourcesHelper.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/SourcesHelper.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,14 +18,14 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser;
 
 import java.io.*;
 
 public class SourcesHelper {
 
-    static String streamToString(InputStream in, String encoding) {
+    static String streamToString(InputStream in, String encoding){
         if (encoding == null) {
             return streamToString(in);
         } else {
@@ -34,7 +34,7 @@ static String streamToString(InputStream in, String encoding) {
         }
     }
 
-    static String streamToString(InputStream in) {
+    static String streamToString(InputStream in){
         java.util.Scanner s = new java.util.Scanner(in).useDelimiter("\\A");
         return s.hasNext() ? s.next() : "";
     }
@@ -45,7 +45,7 @@ static InputStream stringToStream(String s, String encoding) throws UnsupportedE
     }
 
     static String readerToString(Reader reader) throws IOException {
-        char[] arr = new char[8 * 1024]; // 8K at a time
+        char[] arr = new char[8*1024]; // 8K at a time
         StringBuilder buf = new StringBuilder();
         int numChars;
 
@@ -56,7 +56,7 @@ static String readerToString(Reader reader) throws IOException {
         return buf.toString();
     }
 
-    static Reader stringToReader(String s) {
+    static Reader stringToReader(String s){
         return new StringReader(s);
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/AccessSpecifier.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/AccessSpecifier.java
index fb5f039b63..5eafdac640 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/AccessSpecifier.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/AccessSpecifier.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast;
 
 /**
@@ -41,7 +41,7 @@ private AccessSpecifier(String codeRepresentation) {
         this.codeRepresenation = codeRepresentation;
     }
 
-    public String getCodeRepresenation() {
+    public String getCodeRepresenation(){
         return this.codeRepresenation;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/CompilationUnit.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/CompilationUnit.java
index 3107d4af4e..f3db30274c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/CompilationUnit.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/CompilationUnit.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast;
 
 import com.github.javaparser.ast.body.AnnotationDeclaration;
@@ -46,7 +46,6 @@
  *                      ( }{@link TypeDeclaration}{@code )*
  * }
  * </pre>
- *
  * @author Julio Vilmar Gesser
  */
 public final class CompilationUnit extends Node {
@@ -88,9 +87,9 @@ public <A> void accept(VoidVisitor<A> v, A arg) {
      * Including javadocs, line comments and block comments of all types,
      * inner-classes and other members.<br>
      * If there is no comment, <code>null</code> is returned.
-     *
+     * 
      * @return list with all comments of this compilation unit or
-     * <code>null</code>
+     *         <code>null</code>
      * @see JavadocComment
      * @see com.github.javaparser.ast.comments.LineComment
      * @see com.github.javaparser.ast.comments.BlockComment
@@ -102,7 +101,7 @@ public List<Comment> getComments() {
     /**
      * Retrieves the list of imports declared in this compilation unit or
      * <code>null</code> if there is no import.
-     *
+     * 
      * @return the list of imports or <code>null</code> if there is no import
      */
     public List<ImportDeclaration> getImports() {
@@ -113,7 +112,7 @@ public List<ImportDeclaration> getImports() {
      * Retrieves the package declaration of this compilation unit.<br>
      * If this compilation unit has no package declaration (default package),
      * <code>null</code> is returned.
-     *
+     * 
      * @return the package declaration or <code>null</code>
      */
     public PackageDeclaration getPackage() {
@@ -123,7 +122,7 @@ public PackageDeclaration getPackage() {
     /**
      * Return the list of types declared in this compilation unit.<br>
      * If there is no types declared, <code>null</code> is returned.
-     *
+     * 
      * @return the list of types or <code>null</code> null if there is no type
      * @see AnnotationDeclaration
      * @see ClassOrInterfaceDeclaration
@@ -136,8 +135,9 @@ public List<TypeDeclaration> getTypes() {
 
     /**
      * Sets the list of comments of this compilation unit.
-     *
-     * @param comments the list of comments
+     * 
+     * @param comments
+     *            the list of comments
      */
     public void setComments(List<Comment> comments) {
         throw new RuntimeException("Not implemented!");
@@ -146,32 +146,35 @@ public void setComments(List<Comment> comments) {
     /**
      * Sets the list of imports of this compilation unit. The list is initially
      * <code>null</code>.
-     *
-     * @param imports the list of imports
+     * 
+     * @param imports
+     *            the list of imports
      */
     public void setImports(List<ImportDeclaration> imports) {
         this.imports = imports;
-        setAsParentNodeOf(this.imports);
+		setAsParentNodeOf(this.imports);
     }
 
     /**
      * Sets or clear the package declarations of this compilation unit.
-     *
-     * @param pakage the pakage declaration to set or <code>null</code> to default
-     *               package
+     * 
+     * @param pakage
+     *            the pakage declaration to set or <code>null</code> to default
+     *            package
      */
     public void setPackage(PackageDeclaration pakage) {
         this.pakage = pakage;
-        setAsParentNodeOf(this.pakage);
+		setAsParentNodeOf(this.pakage);
     }
 
     /**
      * Sets the list of types declared in this compilation unit.
-     *
-     * @param types the lis of types
+     * 
+     * @param types
+     *            the lis of types
      */
     public void setTypes(List<TypeDeclaration> types) {
         this.types = types;
-        setAsParentNodeOf(this.types);
+		setAsParentNodeOf(this.types);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/DocumentableNode.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/DocumentableNode.java
index 74f70c5e41..0038831b8b 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/DocumentableNode.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/DocumentableNode.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast;
 
 import com.github.javaparser.ast.comments.JavadocComment;
@@ -29,6 +29,5 @@
 public interface DocumentableNode {
 
     public JavadocComment getJavaDoc();
-
     public void setJavaDoc(JavadocComment javadocComment);
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/ImportDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/ImportDeclaration.java
index 0d9da3d5b1..da249e20b4 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/ImportDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/ImportDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast;
 
 import com.github.javaparser.ast.expr.NameExpr;
@@ -36,7 +36,6 @@
  * ImportDeclaration ::= "import" ( "static" )? }{@link NameExpr}{@code ( "." "*" )? ";"
  * }
  * </pre>
- *
  * @author Julio Vilmar Gesser
  */
 public final class ImportDeclaration extends Node {
@@ -75,7 +74,7 @@ public <A> void accept(VoidVisitor<A> v, A arg) {
 
     /**
      * Retrieves the name of the import.
-     *
+     * 
      * @return the name of the import
      */
     public NameExpr getName() {
@@ -84,9 +83,9 @@ public NameExpr getName() {
 
     /**
      * Return if the import ends with "*".
-     *
+     * 
      * @return <code>true</code> if the import ends with "*", <code>false</code>
-     * otherwise
+     *         otherwise
      */
     public boolean isAsterisk() {
         return asterisk;
@@ -94,9 +93,9 @@ public boolean isAsterisk() {
 
     /**
      * Return if the import is static.
-     *
+     * 
      * @return <code>true</code> if the import is static, <code>false</code>
-     * otherwise
+     *         otherwise
      */
     public boolean isStatic() {
         return static_;
@@ -104,8 +103,9 @@ public boolean isStatic() {
 
     /**
      * Sets if this import is asterisk.
-     *
-     * @param asterisk <code>true</code> if this import is asterisk
+     * 
+     * @param asterisk
+     *            <code>true</code> if this import is asterisk
      */
     public void setAsterisk(boolean asterisk) {
         this.asterisk = asterisk;
@@ -113,8 +113,9 @@ public void setAsterisk(boolean asterisk) {
 
     /**
      * Sets the name this import.
-     *
-     * @param name the name to set
+     * 
+     * @param name
+     *            the name to set
      */
     public void setName(NameExpr name) {
         this.name = name;
@@ -123,8 +124,9 @@ public void setName(NameExpr name) {
 
     /**
      * Sets if this import is static.
-     *
-     * @param static_ <code>true</code> if this import is static
+     * 
+     * @param static_
+     *            <code>true</code> if this import is static
      */
     public void setStatic(boolean static_) {
         this.static_ = static_;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/NamedNode.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/NamedNode.java
index 873016a0b3..7885d71d2c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/NamedNode.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/NamedNode.java
@@ -23,10 +23,10 @@
 
 /**
  * A node having a name.
- * <p>
+ *  
  * The main reason for this interface is to permit users to manipulate homogeneously all nodes with a getName method.
- *
- * @since 2.0.1
+ * 
+ * @since 2.0.1 
  */
 public interface NamedNode {
     String getName();
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/Node.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/Node.java
index 583ebdd8bd..f5f9cb2387 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/Node.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/Node.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -30,11 +30,11 @@
 
 /**
  * Abstract class for all nodes of the AST.
- * <p>
+ *
  * Each Node can have one associated comment which describe it and
  * a number of "orphan comments" which it contains but are not specifically
  * associated to any element.
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public abstract class Node implements Cloneable {
@@ -71,27 +71,34 @@ public Node(final int beginLine, final int beginColumn, final int endLine, final
 
     /**
      * Accept method for visitor support.
-     *
-     * @param <R> the type the return value of the visitor
-     * @param <A> the type the argument passed to the visitor
-     * @param v   the visitor implementation
-     * @param arg the argument passed to the visitor
+     * 
+     * @param <R>
+     *            the type the return value of the visitor
+     * @param <A>
+     *            the type the argument passed to the visitor
+     * @param v
+     *            the visitor implementation
+     * @param arg
+     *            the argument passed to the visitor
      * @return the result of the visit
      */
     public abstract <R, A> R accept(GenericVisitor<R, A> v, A arg);
 
     /**
      * Accept method for visitor support.
-     *
-     * @param <A> the type the argument passed for the visitor
-     * @param v   the visitor implementation
-     * @param arg any value relevant for the visitor
+     * 
+     * @param <A>
+     *            the type the argument passed for the visitor
+     * @param v
+     *            the visitor implementation
+     * @param arg
+     *            any value relevant for the visitor
      */
     public abstract <A> void accept(VoidVisitor<A> v, A arg);
 
     /**
      * Return the begin column of this node.
-     *
+     * 
      * @return the begin column of this node
      */
     public final int getBeginColumn() {
@@ -100,7 +107,7 @@ public final int getBeginColumn() {
 
     /**
      * Return the begin line of this node.
-     *
+     * 
      * @return the begin line of this node
      */
     public final int getBeginLine() {
@@ -127,7 +134,7 @@ public final Object getData() {
 
     /**
      * Return the end column of this node.
-     *
+     * 
      * @return the end column of this node
      */
     public final int getEndColumn() {
@@ -136,7 +143,7 @@ public final int getEndColumn() {
 
     /**
      * Return the end line of this node.
-     *
+     * 
      * @return the end line of this node
      */
     public final int getEndLine() {
@@ -145,8 +152,9 @@ public final int getEndLine() {
 
     /**
      * Sets the begin column of this node.
-     *
-     * @param beginColumn the begin column of this node
+     * 
+     * @param beginColumn
+     *            the begin column of this node
      */
     public final void setBeginColumn(final int beginColumn) {
         this.beginColumn = beginColumn;
@@ -154,8 +162,9 @@ public final void setBeginColumn(final int beginColumn) {
 
     /**
      * Sets the begin line of this node.
-     *
-     * @param beginLine the begin line of this node
+     * 
+     * @param beginLine
+     *            the begin line of this node
      */
     public final void setBeginLine(final int beginLine) {
         this.beginLine = beginLine;
@@ -170,7 +179,8 @@ public final void setComment(final Comment comment) {
         if (comment != null && (this instanceof Comment)) {
             throw new RuntimeException("A comment can not be commented");
         }
-        if (this.comment != null) {
+        if (this.comment != null)
+        {
             this.comment.setCommentedNode(null);
         }
         this.comment = comment;
@@ -190,8 +200,9 @@ public final void setData(final Object data) {
 
     /**
      * Sets the end column of this node.
-     *
-     * @param endColumn the end column of this node
+     * 
+     * @param endColumn
+     *            the end column of this node
      */
     public final void setEndColumn(final int endColumn) {
         this.endColumn = endColumn;
@@ -199,8 +210,9 @@ public final void setEndColumn(final int endColumn) {
 
     /**
      * Sets the end line of this node.
-     *
-     * @param endLine the end line of this node
+     * 
+     * @param endLine
+     *            the end line of this node
      */
     public final void setEndLine(final int endLine) {
         this.endLine = endLine;
@@ -208,7 +220,7 @@ public final void setEndLine(final int endLine) {
 
     /**
      * Return the String representation of this node.
-     *
+     * 
      * @return the String representation of this node
      */
     @Override
@@ -266,13 +278,12 @@ public void addOrphanComment(Comment comment) {
     /**
      * This is a list of Comment which are inside the node and are not associated
      * with any meaningful AST Node.
-     * <p>
+     *
      * For example, comments at the end of methods (immediately before the parenthesis)
      * or at the end of CompilationUnit are orphan comments.
-     * <p>
+     *
      * When more than one comments preceed a statement, the one immediately preceeding it
      * it is associated with the statements, while the others are "orphan".
-     *
      * @return all comments that cannot be attributed to a concept
      */
     public List<Comment> getOrphanComments() {
@@ -283,7 +294,6 @@ public List<Comment> getOrphanComments() {
      * This is the list of Comment which are contained in the Node either because
      * they are properly associated to one of its children or because they are floating
      * around inside the Node
-     *
      * @return all Comments within the node as a list
      */
     public List<Comment> getAllContainedComments() {
@@ -359,7 +369,8 @@ public boolean isPositionedBefore(int line, int column) {
         }
     }
 
-    public boolean hasComment() {
+    public boolean hasComment()
+    {
         return comment != null;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/PackageDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/PackageDeclaration.java
index 451dafc008..d0aaf5b1e5 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/PackageDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/PackageDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast;
 
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -39,7 +39,6 @@
  * PackageDeclaration ::= ( }{@link AnnotationExpr}{@code )* "package" }{@link NameExpr}{@code ) ";"
  * }
  * </pre>
- *
  * @author Julio Vilmar Gesser
  */
 public final class PackageDeclaration extends Node {
@@ -79,7 +78,7 @@ public <A> void accept(VoidVisitor<A> v, A arg) {
     /**
      * Retrieves the list of annotations declared before the package
      * declaration. Return <code>null</code> if there are no annotations.
-     *
+     * 
      * @return list of annotations or <code>null</code>
      */
     public List<AnnotationExpr> getAnnotations() {
@@ -88,7 +87,7 @@ public List<AnnotationExpr> getAnnotations() {
 
     /**
      * Return the name of the package.
-     *
+     * 
      * @return the name of the package
      */
     public NameExpr getName() {
@@ -96,7 +95,8 @@ public NameExpr getName() {
     }
 
     /**
-     * @param annotations the annotations to set
+     * @param annotations
+     *            the annotations to set
      */
     public void setAnnotations(List<AnnotationExpr> annotations) {
         this.annotations = annotations;
@@ -105,8 +105,9 @@ public void setAnnotations(List<AnnotationExpr> annotations) {
 
     /**
      * Sets the name of this package declaration.
-     *
-     * @param name the name to set
+     * 
+     * @param name
+     *            the name to set
      */
     public void setName(NameExpr name) {
         this.name = name;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/TreeVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/TreeVisitor.java
index 060fafdc90..f3b2672d07 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/TreeVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/TreeVisitor.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,14 +18,14 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast;
 
 public abstract class TreeVisitor {
 
-    public void visitDepthFirst(Node node) {
+    public void visitDepthFirst(Node node){
         process(node);
-        for (Node child : node.getChildrenNodes()) {
+        for (Node child : node.getChildrenNodes()){
             visitDepthFirst(child);
         }
     }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/TypeParameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/TypeParameter.java
index 650e38d619..c43d3793d4 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/TypeParameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/TypeParameter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast;
 
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -38,31 +38,30 @@
  * TypeParameter ::= <IDENTIFIER> ( "extends" }{@link ClassOrInterfaceType}{@code ( "&" }{@link ClassOrInterfaceType}{@code )* )?
  * }
  * </pre>
- *
  * @author Julio Vilmar Gesser
  */
 public final class TypeParameter extends Node implements NamedNode {
 
-    private String name;
+	private String name;
 
     private List<AnnotationExpr> annotations;
 
-    private List<ClassOrInterfaceType> typeBound;
+	private List<ClassOrInterfaceType> typeBound;
 
-    public TypeParameter() {
-    }
+	public TypeParameter() {
+	}
 
-    public TypeParameter(final String name, final List<ClassOrInterfaceType> typeBound) {
-        setName(name);
-        setTypeBound(typeBound);
-    }
+	public TypeParameter(final String name, final List<ClassOrInterfaceType> typeBound) {
+		setName(name);
+		setTypeBound(typeBound);
+	}
 
-    public TypeParameter(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                         final String name, final List<ClassOrInterfaceType> typeBound) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setName(name);
-        setTypeBound(typeBound);
-    }
+	public TypeParameter(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final String name, final List<ClassOrInterfaceType> typeBound) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setName(name);
+		setTypeBound(typeBound);
+	}
 
     public TypeParameter(int beginLine, int beginColumn, int endLine,
                          int endColumn, String name, List<ClassOrInterfaceType> typeBound, List<AnnotationExpr> annotations) {
@@ -72,53 +71,53 @@ public TypeParameter(int beginLine, int beginColumn, int endLine,
         this.annotations = annotations;
     }
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    /**
-     * Return the name of the paramenter.
-     *
-     * @return the name of the paramenter
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Return the list of {@link ClassOrInterfaceType} that this parameter
-     * extends. Return <code>null</code> null if there are no type.
-     *
-     * @return list of types that this paramente extends or <code>null</code>
-     */
-    public List<ClassOrInterfaceType> getTypeBound() {
-        return typeBound;
-    }
-
-    /**
-     * Sets the name of this type parameter.
-     *
-     * @param name the name to set
-     */
-    public void setName(final String name) {
-        this.name = name;
-    }
-
-    /**
-     * Sets the list o types.
-     *
-     * @param typeBound the typeBound to set
-     */
-    public void setTypeBound(final List<ClassOrInterfaceType> typeBound) {
-        this.typeBound = typeBound;
-        setAsParentNodeOf(typeBound);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	/**
+	 * Return the name of the paramenter.
+	 * 
+	 * @return the name of the paramenter
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Return the list of {@link ClassOrInterfaceType} that this parameter
+	 * extends. Return <code>null</code> null if there are no type.
+	 * 
+	 * @return list of types that this paramente extends or <code>null</code>
+	 */
+	public List<ClassOrInterfaceType> getTypeBound() {
+		return typeBound;
+	}
+
+	/**
+	 * Sets the name of this type parameter.
+	 * 
+	 * @param name
+	 *            the name to set
+	 */
+	public void setName(final String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Sets the list o types.
+	 * 
+	 * @param typeBound
+	 *            the typeBound to set
+	 */
+	public void setTypeBound(final List<ClassOrInterfaceType> typeBound) {
+		this.typeBound = typeBound;
+		setAsParentNodeOf(typeBound);
+	}
 
     public List<AnnotationExpr> getAnnotations() {
         return annotations;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotableNode.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotableNode.java
index 47a4a8c59b..47c8c4fe8e 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotableNode.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotableNode.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.expr.AnnotationExpr;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationDeclaration.java
index 52c879b6ed..51f25617a8 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.DocumentableNode;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
index c4a494b4e8..a81e6cc712 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.DocumentableNode;
@@ -87,9 +87,9 @@ public Expression getDefaultValue() {
 
     /**
      * Return the modifiers of this member declaration.
-     *
-     * @return modifiers
+     * 
      * @see ModifierSet
+     * @return modifiers
      */
     public int getModifiers() {
         return modifiers;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/BaseParameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/BaseParameter.java
index c8365b4678..e14deb1772 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/BaseParameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/BaseParameter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.Node;
@@ -30,33 +30,33 @@ public abstract class BaseParameter extends Node {
     private int modifiers;
 
     private List<AnnotationExpr> annotations;
-
+    
     private VariableDeclaratorId id;
-
+    
     public BaseParameter() {
     }
-
+    
     public BaseParameter(VariableDeclaratorId id) {
         setId(id);
-    }
+	}
 
-    public BaseParameter(int modifiers, VariableDeclaratorId id) {
+	public BaseParameter(int modifiers, VariableDeclaratorId id) {
         setModifiers(modifiers);
         setId(id);
-    }
-
-    public BaseParameter(int modifiers, List<AnnotationExpr> annotations, VariableDeclaratorId id) {
+	}
+	
+	public BaseParameter(int modifiers, List<AnnotationExpr> annotations, VariableDeclaratorId id) {
         setModifiers(modifiers);
         setAnnotations(annotations);
         setId(id);
-    }
+	}
 
-    public BaseParameter(int beginLine, int beginColumn, int endLine, int endColumn, int modifiers, List<AnnotationExpr> annotations, VariableDeclaratorId id) {
-        super(beginLine, beginColumn, endLine, endColumn);
+	public BaseParameter(int beginLine, int beginColumn, int endLine, int endColumn, int modifiers, List<AnnotationExpr> annotations, VariableDeclaratorId id) {
+	    super(beginLine, beginColumn, endLine, endColumn);
         setModifiers(modifiers);
         setAnnotations(annotations);
         setId(id);
-    }
+	}
 
     public List<AnnotationExpr> getAnnotations() {
         return annotations;
@@ -68,9 +68,9 @@ public VariableDeclaratorId getId() {
 
     /**
      * Return the modifiers of this parameter declaration.
-     *
-     * @return modifiers
+     * 
      * @see ModifierSet
+     * @return modifiers
      */
     public int getModifiers() {
         return modifiers;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/BodyDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/BodyDeclaration.java
index a1824b3980..bbf138b775 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/BodyDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/BodyDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.Node;
@@ -38,16 +38,16 @@ public BodyDeclaration() {
     }
 
     public BodyDeclaration(List<AnnotationExpr> annotations) {
-        setAnnotations(annotations);
+    	setAnnotations(annotations);
     }
 
     public BodyDeclaration(int beginLine, int beginColumn, int endLine, int endColumn, List<AnnotationExpr> annotations) {
         super(beginLine, beginColumn, endLine, endColumn);
-        setAnnotations(annotations);
+    	setAnnotations(annotations);
     }
 
     public final List<AnnotationExpr> getAnnotations() {
-        if (annotations == null) {
+        if (annotations==null){
             annotations = new ArrayList<AnnotationExpr>();
         }
         return annotations;
@@ -55,6 +55,6 @@ public final List<AnnotationExpr> getAnnotations() {
 
     public final void setAnnotations(List<AnnotationExpr> annotations) {
         this.annotations = annotations;
-        setAsParentNodeOf(this.annotations);
+		setAsParentNodeOf(this.annotations);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
index 93aa901e4b..e098f6edbf 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.DocumentableNode;
@@ -36,90 +36,88 @@
  */
 public final class ClassOrInterfaceDeclaration extends TypeDeclaration implements DocumentableNode {
 
-    private boolean interface_;
-
-    private List<TypeParameter> typeParameters;
-
-    // Can contain more than one item if this is an interface
-    private List<ClassOrInterfaceType> extendsList;
-
-    private List<ClassOrInterfaceType> implementsList;
-
-    public ClassOrInterfaceDeclaration() {
-    }
-
-    public ClassOrInterfaceDeclaration(final int modifiers, final boolean isInterface, final String name) {
-        super(modifiers, name);
-        setInterface(isInterface);
-    }
-
-    public ClassOrInterfaceDeclaration(final int modifiers,
-                                       final List<AnnotationExpr> annotations, final boolean isInterface, final String name,
-                                       final List<TypeParameter> typeParameters, final List<ClassOrInterfaceType> extendsList,
-                                       final List<ClassOrInterfaceType> implementsList, final List<BodyDeclaration> members) {
-        super(annotations, modifiers, name, members);
-        setInterface(isInterface);
-        setTypeParameters(typeParameters);
-        setExtends(extendsList);
-        setImplements(implementsList);
-    }
-
-    public ClassOrInterfaceDeclaration(final int beginLine, final int beginColumn, final int endLine,
-                                       final int endColumn, final int modifiers,
-                                       final List<AnnotationExpr> annotations, final boolean isInterface, final String name,
-                                       final List<TypeParameter> typeParameters, final List<ClassOrInterfaceType> extendsList,
-                                       final List<ClassOrInterfaceType> implementsList, final List<BodyDeclaration> members) {
-        super(beginLine, beginColumn, endLine, endColumn, annotations, modifiers, name, members);
-        setInterface(isInterface);
-        setTypeParameters(typeParameters);
-        setExtends(extendsList);
-        setImplements(implementsList);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public List<ClassOrInterfaceType> getExtends() {
-        return extendsList;
-    }
-
-    public List<ClassOrInterfaceType> getImplements() {
-        return implementsList;
-    }
-
-    public List<TypeParameter> getTypeParameters() {
-        return typeParameters;
-    }
+	private boolean interface_;
+
+	private List<TypeParameter> typeParameters;
+
+	// Can contain more than one item if this is an interface
+	private List<ClassOrInterfaceType> extendsList;
+
+	private List<ClassOrInterfaceType> implementsList;
+
+	public ClassOrInterfaceDeclaration() {
+	}
+
+	public ClassOrInterfaceDeclaration(final int modifiers, final boolean isInterface, final String name) {
+		super(modifiers, name);
+		setInterface(isInterface);
+	}
+
+	public ClassOrInterfaceDeclaration(final int modifiers,
+			final List<AnnotationExpr> annotations, final boolean isInterface, final String name,
+			final List<TypeParameter> typeParameters, final List<ClassOrInterfaceType> extendsList,
+			final List<ClassOrInterfaceType> implementsList, final List<BodyDeclaration> members) {
+		super(annotations, modifiers, name, members);
+		setInterface(isInterface);
+		setTypeParameters(typeParameters);
+		setExtends(extendsList);
+		setImplements(implementsList);
+	}
+
+	public ClassOrInterfaceDeclaration(final int beginLine, final int beginColumn, final int endLine,
+			final int endColumn, final int modifiers,
+			final List<AnnotationExpr> annotations, final boolean isInterface, final String name,
+			final List<TypeParameter> typeParameters, final List<ClassOrInterfaceType> extendsList,
+			final List<ClassOrInterfaceType> implementsList, final List<BodyDeclaration> members) {
+		super(beginLine, beginColumn, endLine, endColumn, annotations, modifiers, name, members);
+		setInterface(isInterface);
+		setTypeParameters(typeParameters);
+		setExtends(extendsList);
+		setImplements(implementsList);
+	}
+
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public List<ClassOrInterfaceType> getExtends() {
+		return extendsList;
+	}
+
+	public List<ClassOrInterfaceType> getImplements() {
+		return implementsList;
+	}
+
+	public List<TypeParameter> getTypeParameters() {
+		return typeParameters;
+	}
 
     public boolean isInterface() {
-        return interface_;
-    }
-
-    public void setExtends(final List<ClassOrInterfaceType> extendsList) {
-        this.extendsList = extendsList;
-        setAsParentNodeOf(this.extendsList);
-    }
-
-    public void setImplements(final List<ClassOrInterfaceType> implementsList) {
-        this.implementsList = implementsList;
-        setAsParentNodeOf(this.implementsList);
-    }
-
-    public void setInterface(final boolean interface_) {
-        this.interface_ = interface_;
-    }
-
-    public void setTypeParameters(final List<TypeParameter> typeParameters) {
-        this.typeParameters = typeParameters;
-        setAsParentNodeOf(this.typeParameters);
-    }
+		return interface_;
+	}
+
+	public void setExtends(final List<ClassOrInterfaceType> extendsList) {
+		this.extendsList = extendsList;
+		setAsParentNodeOf(this.extendsList);
+	}
+
+	public void setImplements(final List<ClassOrInterfaceType> implementsList) {
+		this.implementsList = implementsList;
+		setAsParentNodeOf(this.implementsList);
+	}
+
+	public void setInterface(final boolean interface_) {
+		this.interface_ = interface_;
+	}
+
+	public void setTypeParameters(final List<TypeParameter> typeParameters) {
+		this.typeParameters = typeParameters;
+		setAsParentNodeOf(this.typeParameters);
+	}
 
     @Override
     public void setJavaDoc(JavadocComment javadocComment) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ConstructorDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ConstructorDeclaration.java
index ac30d0bbbe..892810c59f 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ConstructorDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ConstructorDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -100,9 +100,9 @@ public BlockStmt getBlock() {
 
     /**
      * Return the modifiers of this member declaration.
-     *
-     * @return modifiers
+     * 
      * @see ModifierSet
+     * @return modifiers
      */
     public int getModifiers() {
         return modifiers;
@@ -168,7 +168,7 @@ public void setTypeParameters(List<TypeParameter> typeParameters) {
 
     /**
      * The declaration returned has this schema:
-     * <p>
+     *
      * [accessSpecifier] className ([paramType [paramName]])
      * [throws exceptionsList]
      */
@@ -184,7 +184,8 @@ public String getDeclarationAsString(boolean includingModifiers, boolean includi
         sb.append(getName());
         sb.append("(");
         boolean firstParam = true;
-        for (Parameter param : getParameters()) {
+        for (Parameter param : getParameters())
+        {
             if (firstParam) {
                 firstParam = false;
             } else {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyMemberDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
index 6625f0e445..1c19d097fe 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyMemberDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.DocumentableNode;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyTypeDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
index d365169d73..59e8686004 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EmptyTypeDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.DocumentableNode;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumConstantDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumConstantDeclaration.java
index 8eacc5d202..d7c425cda5 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumConstantDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumConstantDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.DocumentableNode;
@@ -87,12 +87,12 @@ public String getName() {
 
     public void setArgs(List<Expression> args) {
         this.args = args;
-        setAsParentNodeOf(this.args);
+		setAsParentNodeOf(this.args);
     }
 
     public void setClassBody(List<BodyDeclaration> classBody) {
         this.classBody = classBody;
-        setAsParentNodeOf(this.classBody);
+		setAsParentNodeOf(this.classBody);
     }
 
     public void setName(String name) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumDeclaration.java
index 28d788ebf1..34b8ee4e54 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/EnumDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.DocumentableNode;
@@ -79,12 +79,12 @@ public List<ClassOrInterfaceType> getImplements() {
 
     public void setEntries(List<EnumConstantDeclaration> entries) {
         this.entries = entries;
-        setAsParentNodeOf(this.entries);
+		setAsParentNodeOf(this.entries);
     }
 
     public void setImplements(List<ClassOrInterfaceType> implementsList) {
         this.implementsList = implementsList;
-        setAsParentNodeOf(this.implementsList);
+		setAsParentNodeOf(this.implementsList);
     }
 
     @Override
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/FieldDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/FieldDeclaration.java
index f1e310e216..2f48ed8f50 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/FieldDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/FieldDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.DocumentableNode;
@@ -46,31 +46,31 @@ public FieldDeclaration() {
     }
 
     public FieldDeclaration(int modifiers, Type type, VariableDeclarator variable) {
-        setModifiers(modifiers);
-        setType(type);
-        List<VariableDeclarator> aux = new ArrayList<VariableDeclarator>();
-        aux.add(variable);
-        setVariables(aux);
+    	setModifiers(modifiers);
+    	setType(type);
+    	List<VariableDeclarator> aux = new ArrayList<VariableDeclarator>();
+    	aux.add(variable);
+    	setVariables(aux);
     }
 
     public FieldDeclaration(int modifiers, Type type, List<VariableDeclarator> variables) {
-        setModifiers(modifiers);
-        setType(type);
-        setVariables(variables);
+    	setModifiers(modifiers);
+    	setType(type);
+    	setVariables(variables);
     }
 
     public FieldDeclaration(int modifiers, List<AnnotationExpr> annotations, Type type, List<VariableDeclarator> variables) {
         super(annotations);
         setModifiers(modifiers);
-        setType(type);
-        setVariables(variables);
+    	setType(type);
+    	setVariables(variables);
     }
 
     public FieldDeclaration(int beginLine, int beginColumn, int endLine, int endColumn, int modifiers, List<AnnotationExpr> annotations, Type type, List<VariableDeclarator> variables) {
         super(beginLine, beginColumn, endLine, endColumn, annotations);
         setModifiers(modifiers);
-        setType(type);
-        setVariables(variables);
+    	setType(type);
+    	setVariables(variables);
     }
 
     @Override
@@ -85,9 +85,9 @@ public <A> void accept(VoidVisitor<A> v, A arg) {
 
     /**
      * Return the modifiers of this member declaration.
-     *
-     * @return modifiers
+     * 
      * @see ModifierSet
+     * @return modifiers
      */
     public int getModifiers() {
         return modifiers;
@@ -107,12 +107,12 @@ public void setModifiers(int modifiers) {
 
     public void setType(Type type) {
         this.type = type;
-        setAsParentNodeOf(this.type);
+		setAsParentNodeOf(this.type);
     }
 
     public void setVariables(List<VariableDeclarator> variables) {
         this.variables = variables;
-        setAsParentNodeOf(this.variables);
+		setAsParentNodeOf(this.variables);
     }
 
     @Override
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/InitializerDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/InitializerDeclaration.java
index 65ce6a9f36..ea1df9a987 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/InitializerDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/InitializerDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.DocumentableNode;
@@ -71,7 +71,7 @@ public boolean isStatic() {
 
     public void setBlock(BlockStmt block) {
         this.block = block;
-        setAsParentNodeOf(this.block);
+		setAsParentNodeOf(this.block);
     }
 
     public void setStatic(boolean isStatic) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/MethodDeclaration.java
index eecbea2404..7f9ca0b7df 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/MethodDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/MethodDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.AccessSpecifier;
@@ -41,168 +41,166 @@
  */
 public final class MethodDeclaration extends BodyDeclaration implements DocumentableNode, WithDeclaration, NamedNode {
 
-    private int modifiers;
+	private int modifiers;
 
-    private List<TypeParameter> typeParameters;
+	private List<TypeParameter> typeParameters;
 
-    private Type type;
+	private Type type;
 
-    private NameExpr name;
+	private NameExpr name;
 
-    private List<Parameter> parameters;
+	private List<Parameter> parameters;
 
-    private int arrayCount;
+	private int arrayCount;
 
-    private List<NameExpr> throws_;
+	private List<NameExpr> throws_;
 
-    private BlockStmt body;
+	private BlockStmt body;
 
     private boolean isDefault = false;
 
     public MethodDeclaration() {
-    }
-
-    public MethodDeclaration(final int modifiers, final Type type, final String name) {
-        setModifiers(modifiers);
-        setType(type);
-        setName(name);
-    }
-
-    public MethodDeclaration(final int modifiers, final Type type, final String name, final List<Parameter> parameters) {
-        setModifiers(modifiers);
-        setType(type);
-        setName(name);
-        setParameters(parameters);
-    }
-
-    public MethodDeclaration(final int modifiers, final List<AnnotationExpr> annotations,
-                             final List<TypeParameter> typeParameters, final Type type, final String name,
-                             final List<Parameter> parameters, final int arrayCount, final List<NameExpr> throws_, final BlockStmt block) {
-        super(annotations);
-        setModifiers(modifiers);
-        setTypeParameters(typeParameters);
-        setType(type);
-        setName(name);
-        setParameters(parameters);
-        setArrayCount(arrayCount);
-        setThrows(throws_);
-        setBody(block);
-    }
-
-    public MethodDeclaration(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                             final int modifiers, final List<AnnotationExpr> annotations,
-                             final List<TypeParameter> typeParameters, final Type type, final String name,
-                             final List<Parameter> parameters, final int arrayCount, final List<NameExpr> throws_, final BlockStmt block) {
-        super(beginLine, beginColumn, endLine, endColumn, annotations);
-        setModifiers(modifiers);
-        setTypeParameters(typeParameters);
-        setType(type);
-        setName(name);
-        setParameters(parameters);
-        setArrayCount(arrayCount);
-        setThrows(throws_);
-        setBody(block);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public int getArrayCount() {
-        return arrayCount;
-    }
-
-    // FIXME this is called "Block" in the constructor. Pick one.
-    public BlockStmt getBody() {
-        return body;
-    }
-
-    /**
-     * Return the modifiers of this member declaration.
-     *
-     * @return modifiers
-     * @see ModifierSet
-     */
-    public int getModifiers() {
-        return modifiers;
-    }
-
-    public String getName() {
-        return name.getName();
-    }
+	}
+
+	public MethodDeclaration(final int modifiers, final Type type, final String name) {
+		setModifiers(modifiers);
+		setType(type);
+		setName(name);
+	}
+
+	public MethodDeclaration(final int modifiers, final Type type, final String name, final List<Parameter> parameters) {
+		setModifiers(modifiers);
+		setType(type);
+		setName(name);
+		setParameters(parameters);
+	}
+
+	public MethodDeclaration(final int modifiers, final List<AnnotationExpr> annotations,
+			final List<TypeParameter> typeParameters, final Type type, final String name,
+			final List<Parameter> parameters, final int arrayCount, final List<NameExpr> throws_, final BlockStmt block) {
+		super(annotations);
+		setModifiers(modifiers);
+		setTypeParameters(typeParameters);
+		setType(type);
+		setName(name);
+		setParameters(parameters);
+		setArrayCount(arrayCount);
+		setThrows(throws_);
+		setBody(block);
+	}
+
+	public MethodDeclaration(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final int modifiers, final List<AnnotationExpr> annotations,
+			final List<TypeParameter> typeParameters, final Type type, final String name,
+			final List<Parameter> parameters, final int arrayCount, final List<NameExpr> throws_, final BlockStmt block) {
+		super(beginLine, beginColumn, endLine, endColumn, annotations);
+		setModifiers(modifiers);
+		setTypeParameters(typeParameters);
+		setType(type);
+		setName(name);
+		setParameters(parameters);
+		setArrayCount(arrayCount);
+		setThrows(throws_);
+		setBody(block);
+	}
+
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public int getArrayCount() {
+		return arrayCount;
+	}
+
+	// FIXME this is called "Block" in the constructor. Pick one.
+	public BlockStmt getBody() {
+		return body;
+	}
+
+	/**
+	 * Return the modifiers of this member declaration.
+	 * 
+	 * @see ModifierSet
+	 * @return modifiers
+	 */
+	public int getModifiers() {
+		return modifiers;
+	}
+
+	public String getName() {
+		return name.getName();
+	}
 
     public NameExpr getNameExpr() {
         return name;
     }
 
-    public List<Parameter> getParameters() {
+	public List<Parameter> getParameters() {
         if (parameters == null) {
             parameters = new ArrayList<Parameter>();
         }
-        return parameters;
-    }
+		return parameters;
+	}
 
-    public List<NameExpr> getThrows() {
+	public List<NameExpr> getThrows() {
         if (throws_ == null) {
             throws_ = new ArrayList<NameExpr>();
         }
-        return throws_;
-    }
+		return throws_;
+	}
 
-    public Type getType() {
-        return type;
-    }
+	public Type getType() {
+		return type;
+	}
 
-    public List<TypeParameter> getTypeParameters() {
-        return typeParameters;
-    }
+	public List<TypeParameter> getTypeParameters() {
+		return typeParameters;
+	}
 
-    public void setArrayCount(final int arrayCount) {
-        this.arrayCount = arrayCount;
-    }
+	public void setArrayCount(final int arrayCount) {
+		this.arrayCount = arrayCount;
+	}
 
-    public void setBody(final BlockStmt body) {
-        this.body = body;
-        setAsParentNodeOf(this.body);
-    }
+	public void setBody(final BlockStmt body) {
+		this.body = body;
+		setAsParentNodeOf(this.body);
+	}
 
-    public void setModifiers(final int modifiers) {
-        this.modifiers = modifiers;
-    }
+	public void setModifiers(final int modifiers) {
+		this.modifiers = modifiers;
+	}
 
-    public void setName(final String name) {
-        this.name = new NameExpr(name);
-    }
+	public void setName(final String name) {
+		this.name = new NameExpr(name);
+	}
 
     public void setNameExpr(final NameExpr name) {
         this.name = name;
     }
 
     public void setParameters(final List<Parameter> parameters) {
-        this.parameters = parameters;
-        setAsParentNodeOf(this.parameters);
-    }
+		this.parameters = parameters;
+		setAsParentNodeOf(this.parameters);
+	}
 
-    public void setThrows(final List<NameExpr> throws_) {
-        this.throws_ = throws_;
-        setAsParentNodeOf(this.throws_);
-    }
+	public void setThrows(final List<NameExpr> throws_) {
+		this.throws_ = throws_;
+		setAsParentNodeOf(this.throws_);
+	}
 
-    public void setType(final Type type) {
-        this.type = type;
-        setAsParentNodeOf(this.type);
-    }
+	public void setType(final Type type) {
+		this.type = type;
+		setAsParentNodeOf(this.type);
+	}
 
-    public void setTypeParameters(final List<TypeParameter> typeParameters) {
-        this.typeParameters = typeParameters;
-        setAsParentNodeOf(typeParameters);
-    }
+	public void setTypeParameters(final List<TypeParameter> typeParameters) {
+		this.typeParameters = typeParameters;
+		setAsParentNodeOf(typeParameters);
+	}
 
 
     public boolean isDefault() {
@@ -223,14 +221,13 @@ public String getDeclarationAsString() {
     public String getDeclarationAsString(boolean includingModifiers, boolean includingThrows) {
         return getDeclarationAsString(includingModifiers, includingThrows, true);
     }
-
+    
     /**
      * The declaration returned has this schema:
-     * <p>
+     *
      * [accessSpecifier] [static] [abstract] [final] [native]
      * [synchronized] returnType methodName ([paramType [paramName]])
      * [throws exceptionsList]
-     *
      * @return method declaration as String
      */
     @Override
@@ -240,19 +237,19 @@ public String getDeclarationAsString(boolean includingModifiers, boolean includi
             AccessSpecifier accessSpecifier = ModifierSet.getAccessSpecifier(getModifiers());
             sb.append(accessSpecifier.getCodeRepresenation());
             sb.append(accessSpecifier == AccessSpecifier.DEFAULT ? "" : " ");
-            if (ModifierSet.isStatic(getModifiers())) {
+            if (ModifierSet.isStatic(getModifiers())){
                 sb.append("static ");
             }
-            if (ModifierSet.isAbstract(getModifiers())) {
+            if (ModifierSet.isAbstract(getModifiers())){
                 sb.append("abstract ");
             }
-            if (ModifierSet.isFinal(getModifiers())) {
+            if (ModifierSet.isFinal(getModifiers())){
                 sb.append("final ");
             }
-            if (ModifierSet.isNative(getModifiers())) {
+            if (ModifierSet.isNative(getModifiers())){
                 sb.append("native ");
             }
-            if (ModifierSet.isSynchronized(getModifiers())) {
+            if (ModifierSet.isSynchronized(getModifiers())){
                 sb.append("synchronized ");
             }
         }
@@ -262,7 +259,8 @@ public String getDeclarationAsString(boolean includingModifiers, boolean includi
         sb.append(getName());
         sb.append("(");
         boolean firstParam = true;
-        for (Parameter param : getParameters()) {
+        for (Parameter param : getParameters())
+        {
             if (firstParam) {
                 firstParam = false;
             } else {
@@ -273,7 +271,7 @@ public String getDeclarationAsString(boolean includingModifiers, boolean includi
             } else {
                 sb.append(param.getType().toStringWithoutComments());
                 if (param.isVarArgs()) {
-                    sb.append("...");
+                	sb.append("...");
                 }
             }
         }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ModifierSet.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ModifierSet.java
index b67180a37c..6981ced303 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ModifierSet.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/ModifierSet.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.AccessSpecifier;
@@ -57,11 +57,11 @@ public final class ModifierSet {
     public static final int STRICTFP = Modifier.STRICT;
 
     public static AccessSpecifier getAccessSpecifier(int modifiers) {
-        if (isPublic(modifiers)) {
+        if (isPublic(modifiers)){
             return AccessSpecifier.PUBLIC;
-        } else if (isProtected(modifiers)) {
+        } else if (isProtected(modifiers)){
             return AccessSpecifier.PROTECTED;
-        } else if (isPrivate(modifiers)) {
+        } else if (isPrivate(modifiers)){
             return AccessSpecifier.PRIVATE;
         } else {
             return AccessSpecifier.DEFAULT;
@@ -100,7 +100,6 @@ public static boolean isProtected(int modifiers) {
      * Is the element accessible from within the package?
      * It is the level of access which is applied if no modifiers are chosen,
      * it is sometimes called "default".
-     *
      * @param modifiers indicator
      * @return true if modifier denotes package level access
      */
@@ -134,9 +133,8 @@ public static boolean isVolatile(int modifiers) {
 
     /**
      * Removes the given modifier.
-     *
      * @param modifiers existing modifiers
-     * @param mod       modifier to be removed
+     * @param mod modifier to be removed
      * @return result for removing modifier
      */
     public static int removeModifier(int modifiers, int mod) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/MultiTypeParameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/MultiTypeParameter.java
index 5ed92ae94b..6dad24c71f 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/MultiTypeParameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/MultiTypeParameter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -30,9 +30,8 @@
 
 public class MultiTypeParameter extends BaseParameter {
     private List<Type> types;
-
-    public MultiTypeParameter() {
-    }
+	
+    public MultiTypeParameter() {}
 
     public MultiTypeParameter(int modifiers, List<AnnotationExpr> annotations, List<Type> types, VariableDeclaratorId id) {
         super(modifiers, annotations, id);
@@ -42,13 +41,13 @@ public MultiTypeParameter(int modifiers, List<AnnotationExpr> annotations, List<
     public MultiTypeParameter(int beginLine, int beginColumn, int endLine, int endColumn, int modifiers, List<AnnotationExpr> annotations, List<Type> types, VariableDeclaratorId id) {
         super(beginLine, beginColumn, endLine, endColumn, modifiers, annotations, id);
         this.types = types;
-    }
+	}
 
     @Override
     public <R, A> R accept(GenericVisitor<R, A> v, A arg) {
         return v.visit(this, arg);
     }
-
+    
     @Override
     public <A> void accept(VoidVisitor<A> v, A arg) {
         v.visit(this, arg);
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/Parameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/Parameter.java
index c5cc20b827..6113d702a3 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/Parameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/Parameter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -40,12 +40,12 @@ public Parameter() {
     }
 
     public Parameter(Type type, VariableDeclaratorId id) {
-        super(id);
+    	super(id);
         setType(type);
     }
 
     public Parameter(int modifiers, Type type, VariableDeclaratorId id) {
-        super(modifiers, id);
+    	super(modifiers, id);
         setType(type);
     }
 
@@ -75,7 +75,7 @@ public boolean isVarArgs() {
 
     public void setType(Type type) {
         this.type = type;
-        setAsParentNodeOf(this.type);
+		setAsParentNodeOf(this.type);
     }
 
     public void setVarArgs(boolean isVarArgs) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/TypeDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/TypeDeclaration.java
index 7b120bc994..bd7c09327c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/TypeDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/TypeDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.NamedNode;
@@ -32,75 +32,75 @@
  */
 public abstract class TypeDeclaration extends BodyDeclaration implements NamedNode {
 
-    private NameExpr name;
-
-    private int modifiers;
-
-    private List<BodyDeclaration> members;
-
-    public TypeDeclaration() {
-    }
-
-    public TypeDeclaration(int modifiers, String name) {
-        setName(name);
-        setModifiers(modifiers);
-    }
-
-    public TypeDeclaration(List<AnnotationExpr> annotations,
-                           int modifiers, String name,
-                           List<BodyDeclaration> members) {
-        super(annotations);
-        setName(name);
-        setModifiers(modifiers);
-        setMembers(members);
-    }
-
-    public TypeDeclaration(int beginLine, int beginColumn, int endLine,
-                           int endColumn, List<AnnotationExpr> annotations,
-                           int modifiers, String name,
-                           List<BodyDeclaration> members) {
-        super(beginLine, beginColumn, endLine, endColumn, annotations);
-        setName(name);
-        setModifiers(modifiers);
-        setMembers(members);
-    }
-
-    public final List<BodyDeclaration> getMembers() {
-        return members;
-    }
-
-    /**
-     * Return the modifiers of this type declaration.
-     *
-     * @return modifiers
-     * @see ModifierSet
-     */
-    public final int getModifiers() {
-        return modifiers;
-    }
-
-    public final String getName() {
-        return name.getName();
-    }
-
-    public void setMembers(List<BodyDeclaration> members) {
-        this.members = members;
-        setAsParentNodeOf(this.members);
-    }
-
-    public final void setModifiers(int modifiers) {
-        this.modifiers = modifiers;
-    }
-
-    public final void setName(String name) {
-        this.name = new NameExpr(name);
-    }
+	private NameExpr name;
+
+	private int modifiers;
+
+	private List<BodyDeclaration> members;
+
+	public TypeDeclaration() {
+	}
+
+	public TypeDeclaration(int modifiers, String name) {
+		setName(name);
+		setModifiers(modifiers);
+	}
+
+	public TypeDeclaration(List<AnnotationExpr> annotations,
+			int modifiers, String name,
+			List<BodyDeclaration> members) {
+		super(annotations);
+		setName(name);
+		setModifiers(modifiers);
+		setMembers(members);
+	}
+
+	public TypeDeclaration(int beginLine, int beginColumn, int endLine,
+			int endColumn, List<AnnotationExpr> annotations,
+			int modifiers, String name,
+			List<BodyDeclaration> members) {
+		super(beginLine, beginColumn, endLine, endColumn, annotations);
+		setName(name);
+		setModifiers(modifiers);
+		setMembers(members);
+	}
+
+	public final List<BodyDeclaration> getMembers() {
+		return members;
+	}
+
+	/**
+	 * Return the modifiers of this type declaration.
+	 * 
+	 * @see ModifierSet
+	 * @return modifiers
+	 */
+	public final int getModifiers() {
+		return modifiers;
+	}
+
+	public final String getName() {
+		return name.getName();
+	}
+
+	public void setMembers(List<BodyDeclaration> members) {
+		this.members = members;
+		setAsParentNodeOf(this.members);
+	}
+
+	public final void setModifiers(int modifiers) {
+		this.modifiers = modifiers;
+	}
+
+	public final void setName(String name) {
+		this.name = new NameExpr(name);
+	}
 
     public final void setNameExpr(NameExpr nameExpr) {
-        this.name = nameExpr;
+      this.name = nameExpr;
     }
 
     public final NameExpr getNameExpr() {
-        return name;
+      return name;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclarator.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclarator.java
index 4e4d399393..50097b8630 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclarator.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclarator.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.Node;
@@ -43,8 +43,8 @@ public VariableDeclarator(VariableDeclaratorId id) {
     }
 
     public VariableDeclarator(VariableDeclaratorId id, Expression init) {
-        setId(id);
-        setInit(init);
+    	setId(id);
+    	setInit(init);
     }
 
     public VariableDeclarator(int beginLine, int beginColumn, int endLine, int endColumn, VariableDeclaratorId id, Expression init) {
@@ -73,11 +73,11 @@ public Expression getInit() {
 
     public void setId(VariableDeclaratorId id) {
         this.id = id;
-        setAsParentNodeOf(this.id);
+		setAsParentNodeOf(this.id);
     }
 
     public void setInit(Expression init) {
         this.init = init;
-        setAsParentNodeOf(this.init);
+		setAsParentNodeOf(this.init);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclaratorId.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclaratorId.java
index 500060568c..c56bd8e7f1 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclaratorId.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/VariableDeclaratorId.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 import com.github.javaparser.ast.NamedNode;
@@ -39,7 +39,7 @@ public VariableDeclaratorId() {
     }
 
     public VariableDeclaratorId(String name) {
-        setName(name);
+       setName(name);
     }
 
     public VariableDeclaratorId(int beginLine, int beginColumn, int endLine, int endColumn, String name, int arrayCount) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/WithDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/WithDeclaration.java
index 0b4d9df962..8f1725ce60 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/WithDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/body/WithDeclaration.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.body;
 
 /**
@@ -32,7 +32,6 @@ public interface WithDeclaration {
     /**
      * As {@link WithDeclaration#getDeclarationAsString(boolean, boolean, boolean)} including
      * the modifiers, the throws clause and the parameters with both type and name.
-     *
      * @return String representation of declaration
      */
     String getDeclarationAsString();
@@ -40,9 +39,8 @@ public interface WithDeclaration {
     /**
      * As {@link WithDeclaration#getDeclarationAsString(boolean, boolean, boolean)} including
      * the parameters with both type and name.
-     *
      * @param includingModifiers flag to include the modifiers (if present) in the string produced
-     * @param includingThrows    flag to include the throws clause (if present) in the string produced
+     * @param includingThrows flag to include the throws clause (if present) in the string produced
      * @return String representation of declaration based on parameter flags
      */
     String getDeclarationAsString(boolean includingModifiers, boolean includingThrows);
@@ -50,9 +48,8 @@ public interface WithDeclaration {
     /**
      * A simple representation of the element declaration.
      * It should fit one string.
-     *
-     * @param includingModifiers     flag to include the modifiers (if present) in the string produced
-     * @param includingThrows        flag to include the throws clause (if present) in the string produced
+     * @param includingModifiers flag to include the modifiers (if present) in the string produced
+     * @param includingThrows flag to include the throws clause (if present) in the string produced
      * @param includingParameterName flag to include the parameter name (while the parameter type is always included) in the string produced
      * @return String representation of declaration based on parameter flags
      */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/BlockComment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/BlockComment.java
index f6b8f15b37..6b2d039263 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/BlockComment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/BlockComment.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.comments;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -30,7 +30,7 @@
  * </p>
  * Block comments can have multi lines and are delimited by "/&#42;" and
  * "&#42;/".
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public final class BlockComment extends Comment {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/Comment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/Comment.java
index 4247b9277d..135972b928 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/Comment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/Comment.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,18 +18,18 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.comments;
 
 import com.github.javaparser.ast.Node;
 
 /**
  * Abstract class for all AST nodes that represent comments.
- *
- * @author Julio Vilmar Gesser
+ * 
  * @see BlockComment
  * @see LineComment
  * @see JavadocComment
+ * @author Julio Vilmar Gesser
  */
 public abstract class Comment extends Node {
 
@@ -50,7 +50,7 @@ public Comment(int beginLine, int beginColumn, int endLine, int endColumn, Strin
 
     /**
      * Return the text of the comment.
-     *
+     * 
      * @return text of the comment
      */
     public final String getContent() {
@@ -59,44 +59,54 @@ public final String getContent() {
 
     /**
      * Sets the text of the comment.
-     *
-     * @param content the text of the comment to set
+     * 
+     * @param content
+     *            the text of the comment to set
      */
     public void setContent(String content) {
         this.content = content;
     }
 
-    public boolean isLineComment() {
+    public boolean isLineComment()
+    {
         return false;
     }
 
-    public LineComment asLineComment() {
-        if (isLineComment()) {
+    public LineComment asLineComment()
+    {
+        if (isLineComment())
+        {
             return (LineComment) this;
         } else {
             throw new UnsupportedOperationException("Not a line comment");
         }
     }
 
-    public Node getCommentedNode() {
+    public Node getCommentedNode()
+    {
         return this.commentedNode;
     }
 
-    public void setCommentedNode(Node commentedNode) {
-        if (commentedNode == null) {
+    public void setCommentedNode(Node commentedNode)
+    {
+        if (commentedNode==null)
+        {
             this.commentedNode = commentedNode;
             return;
         }
-        if (commentedNode == this) {
+        if (commentedNode==this)
+        {
             throw new IllegalArgumentException();
         }
-        if (commentedNode instanceof Comment) {
+        if (commentedNode instanceof Comment)
+        {
             throw new IllegalArgumentException();
         }
         this.commentedNode = commentedNode;
     }
 
-    public boolean isOrphan() {
+    public boolean isOrphan()
+    {
         return this.commentedNode == null;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsCollection.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsCollection.java
index 5cfc5dbc08..ac94c61d5a 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsCollection.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsCollection.java
@@ -32,45 +32,45 @@ public class CommentsCollection {
     private List<BlockComment> blockComments = new LinkedList<BlockComment>();
     private List<JavadocComment> javadocComments = new LinkedList<JavadocComment>();
 
-    public List<LineComment> getLineComments() {
+    public List<LineComment> getLineComments(){
         return lineComments;
     }
 
-    public List<BlockComment> getBlockComments() {
+    public List<BlockComment> getBlockComments(){
         return blockComments;
     }
 
-    public List<JavadocComment> getJavadocComments() {
+    public List<JavadocComment> getJavadocComments(){
         return javadocComments;
     }
 
-    public void addComment(LineComment lineComment) {
+    public void addComment(LineComment lineComment){
         this.lineComments.add(lineComment);
     }
 
-    public void addComment(BlockComment blockComment) {
+    public void addComment(BlockComment blockComment){
         this.blockComments.add(blockComment);
     }
 
-    public void addComment(JavadocComment javadocComment) {
+    public void addComment(JavadocComment javadocComment){
         this.javadocComments.add(javadocComment);
     }
 
-    public boolean contains(Comment comment) {
-        for (Comment c : getAll()) {
+    public boolean contains(Comment comment){
+        for (Comment c : getAll()){
             // we tollerate a difference of one element in the end column:
             // it depends how \r and \n are calculated...
-            if (c.getBeginLine() == comment.getBeginLine() &&
-                    c.getBeginColumn() == comment.getBeginColumn() &&
-                    c.getEndLine() == comment.getEndLine() &&
-                    Math.abs(c.getEndColumn() - comment.getEndColumn()) < 2) {
+            if ( c.getBeginLine()==comment.getBeginLine() &&
+                 c.getBeginColumn()==comment.getBeginColumn() &&
+                 c.getEndLine()==comment.getEndLine() &&
+                 Math.abs(c.getEndColumn()-comment.getEndColumn())<2 ){
                 return true;
             }
         }
         return false;
     }
 
-    public List<Comment> getAll() {
+    public List<Comment> getAll(){
         List<Comment> comments = new LinkedList<Comment>();
         comments.addAll(lineComments);
         comments.addAll(blockComments);
@@ -78,24 +78,24 @@ public List<Comment> getAll() {
         return comments;
     }
 
-    public int size() {
-        return lineComments.size() + blockComments.size() + javadocComments.size();
+    public int size(){
+        return lineComments.size()+blockComments.size()+javadocComments.size();
     }
 
-    public CommentsCollection minus(CommentsCollection other) {
+    public CommentsCollection minus(CommentsCollection other){
         CommentsCollection result = new CommentsCollection();
-        for (LineComment comment : lineComments) {
-            if (!other.contains(comment)) {
+        for (LineComment comment : lineComments){
+            if (!other.contains(comment)){
                 result.lineComments.add(comment);
             }
         }
-        for (BlockComment comment : blockComments) {
-            if (!other.contains(comment)) {
+        for (BlockComment comment : blockComments){
+            if (!other.contains(comment)){
                 result.blockComments.add(comment);
             }
         }
-        for (JavadocComment comment : javadocComments) {
-            if (!other.contains(comment)) {
+        for (JavadocComment comment : javadocComments){
+            if (!other.contains(comment)){
                 result.javadocComments.add(comment);
             }
         }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsParser.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsParser.java
index 47857ec38e..3d3a59d45f 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsParser.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/CommentsParser.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.comments;
 
 import java.io.*;
@@ -51,7 +51,7 @@ public CommentsCollection parse(final InputStream in, final String charsetName)
         CommentsCollection comments = new CommentsCollection();
         int r;
 
-        Deque prevTwoChars = new LinkedList<Character>(Arrays.asList('z', 'z'));
+        Deque prevTwoChars = new LinkedList<Character>(Arrays.asList('z','z'));
 
         State state = State.CODE;
         LineComment currentLineComment = null;
@@ -59,17 +59,17 @@ public CommentsCollection parse(final InputStream in, final String charsetName)
         StringBuffer currentContent = null;
 
         int currLine = 1;
-        int currCol = 1;
+        int currCol  = 1;
 
-        while ((r = br.read()) != -1) {
-            char c = (char) r;
-            if (c == '\r') {
+        while ((r=br.read()) != -1){
+            char c = (char)r;
+            if (c=='\r'){
                 lastWasASlashR = true;
-            } else if (c == '\n' && lastWasASlashR) {
-                lastWasASlashR = false;
+            } else if (c=='\n'&&lastWasASlashR){
+                lastWasASlashR=false;
                 continue;
             } else {
-                lastWasASlashR = false;
+                lastWasASlashR=false;
             }
             switch (state) {
                 case CODE:
@@ -94,7 +94,7 @@ public CommentsCollection parse(final InputStream in, final String charsetName)
                     }
                     break;
                 case IN_LINE_COMMENT:
-                    if (c == '\n' || c == '\r') {
+                    if (c=='\n' || c=='\r'){
                         currentLineComment.setContent(currentContent.toString());
                         currentLineComment.setEndLine(currLine);
                         currentLineComment.setEndColumn(currCol);
@@ -105,28 +105,28 @@ public CommentsCollection parse(final InputStream in, final String charsetName)
                     }
                     break;
                 case IN_BLOCK_COMMENT:
-                    if (prevTwoChars.peekLast().equals('*') && c == '/' && !prevTwoChars.peekFirst().equals('/')) {
+                    if (prevTwoChars.peekLast().equals('*') && c=='/' && !prevTwoChars.peekFirst().equals('/')){
 
                         // delete last character
-                        String content = currentContent.deleteCharAt(currentContent.toString().length() - 1).toString();
+                        String content = currentContent.deleteCharAt(currentContent.toString().length()-1).toString();
 
-                        if (content.startsWith("*")) {
+                        if (content.startsWith("*")){
                             JavadocComment javadocComment = new JavadocComment();
                             javadocComment.setContent(content.substring(1));
                             javadocComment.setBeginLine(currentBlockComment.getBeginLine());
                             javadocComment.setBeginColumn(currentBlockComment.getBeginColumn());
                             javadocComment.setEndLine(currLine);
-                            javadocComment.setEndColumn(currCol + 1);
+                            javadocComment.setEndColumn(currCol+1);
                             comments.addComment(javadocComment);
                         } else {
                             currentBlockComment.setContent(content);
                             currentBlockComment.setEndLine(currLine);
-                            currentBlockComment.setEndColumn(currCol + 1);
+                            currentBlockComment.setEndColumn(currCol+1);
                             comments.addComment(currentBlockComment);
                         }
                         state = State.CODE;
                     } else {
-                        currentContent.append(c == '\r' ? '\n' : c);
+                        currentContent.append(c=='\r'?'\n':c);
                     }
                     break;
                 case IN_STRING:
@@ -142,23 +142,23 @@ public CommentsCollection parse(final InputStream in, final String charsetName)
                 default:
                     throw new RuntimeException("Unexpected");
             }
-            switch (c) {
+            switch (c){
                 case '\n':
                 case '\r':
-                    currLine += 1;
+                    currLine+=1;
                     currCol = 1;
                     break;
                 case '\t':
-                    currCol += COLUMNS_PER_TAB;
+                    currCol+=COLUMNS_PER_TAB;
                     break;
                 default:
-                    currCol += 1;
+                    currCol+=1;
             }
             prevTwoChars.remove();
             prevTwoChars.add(c);
         }
 
-        if (state == State.IN_LINE_COMMENT) {
+        if (state==State.IN_LINE_COMMENT){
             currentLineComment.setContent(currentContent.toString());
             currentLineComment.setEndLine(currLine);
             currentLineComment.setEndColumn(currCol);
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/JavadocComment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/JavadocComment.java
index 2176a1b984..a070321ffe 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/JavadocComment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/JavadocComment.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.comments;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/LineComment.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/LineComment.java
index 4e31c4f924..b3df1df0e8 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/LineComment.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/comments/LineComment.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.comments;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,7 +29,7 @@
  * AST node that represent line comments.
  * </p>
  * Line comments are started with "//" and finish at the end of the line ("\n").
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public final class LineComment extends Comment {
@@ -55,7 +55,8 @@ public <A> void accept(VoidVisitor<A> v, A arg) {
         v.visit(this, arg);
     }
 
-    public boolean isLineComment() {
+    public boolean isLineComment()
+    {
         return true;
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/AnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/AnnotationExpr.java
index e7e2d22b7f..8c65e926f7 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/AnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/AnnotationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 /**
@@ -26,22 +26,21 @@
  */
 public abstract class AnnotationExpr extends Expression {
 
-    protected NameExpr name;
+	protected NameExpr name;
 
-    public AnnotationExpr() {
-    }
+	public AnnotationExpr() {}
 
-    public AnnotationExpr(int beginLine, int beginColumn, int endLine,
-                          int endColumn) {
-        super(beginLine, beginColumn, endLine, endColumn);
-    }
+	public AnnotationExpr(int beginLine, int beginColumn, int endLine,
+			int endColumn) {
+		super(beginLine, beginColumn, endLine, endColumn);
+	}
 
-    public NameExpr getName() {
-        return name;
-    }
+	public NameExpr getName() {
+		return name;
+	}
 
-    public void setName(NameExpr name) {
-        this.name = name;
-        setAsParentNodeOf(name);
-    }
+	public void setName(NameExpr name) {
+		this.name = name;
+		setAsParentNodeOf(name);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayAccessExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayAccessExpr.java
index 7868eee564..7026d15eb5 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayAccessExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayAccessExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -67,11 +67,11 @@ public Expression getName() {
 
     public void setIndex(Expression index) {
         this.index = index;
-        setAsParentNodeOf(this.index);
+		setAsParentNodeOf(this.index);
     }
 
     public void setName(Expression name) {
         this.name = name;
-        setAsParentNodeOf(this.name);
+		setAsParentNodeOf(this.name);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayCreationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayCreationExpr.java
index 22054d2411..1ca425b510 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayCreationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayCreationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.type.Type;
@@ -107,17 +107,17 @@ public void setArrayCount(int arrayCount) {
 
     public void setDimensions(List<Expression> dimensions) {
         this.dimensions = dimensions;
-        setAsParentNodeOf(this.dimensions);
+		setAsParentNodeOf(this.dimensions);
     }
 
     public void setInitializer(ArrayInitializerExpr initializer) {
         this.initializer = initializer;
-        setAsParentNodeOf(this.initializer);
+		setAsParentNodeOf(this.initializer);
     }
 
     public void setType(Type type) {
         this.type = type;
-        setAsParentNodeOf(this.type);
+		setAsParentNodeOf(this.type);
     }
 
     public List<List<AnnotationExpr>> getArraysAnnotations() {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayInitializerExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
index 070872b008..f7fa424cff 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ArrayInitializerExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -37,7 +37,7 @@ public ArrayInitializerExpr() {
     }
 
     public ArrayInitializerExpr(List<Expression> values) {
-        setValues(values);
+       setValues(values);
     }
 
     public ArrayInitializerExpr(int beginLine, int beginColumn, int endLine, int endColumn, List<Expression> values) {
@@ -61,6 +61,6 @@ public List<Expression> getValues() {
 
     public void setValues(List<Expression> values) {
         this.values = values;
-        setAsParentNodeOf(this.values);
+		setAsParentNodeOf(this.values);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/AssignExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/AssignExpr.java
index bb6b35b8c6..b3d508fe97 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/AssignExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/AssignExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -94,11 +94,11 @@ public void setOperator(Operator op) {
 
     public void setTarget(Expression target) {
         this.target = target;
-        setAsParentNodeOf(this.target);
+		setAsParentNodeOf(this.target);
     }
 
     public void setValue(Expression value) {
         this.value = value;
-        setAsParentNodeOf(this.value);
+		setAsParentNodeOf(this.value);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/BinaryExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/BinaryExpr.java
index e86f1cf8ba..4ace4bec4d 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/BinaryExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/BinaryExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -61,16 +61,16 @@ public BinaryExpr() {
     }
 
     public BinaryExpr(Expression left, Expression right, Operator op) {
-        setLeft(left);
-        setRight(right);
-        setOperator(op);
+    	setLeft(left);
+    	setRight(right);
+    	setOperator(op);
     }
 
     public BinaryExpr(int beginLine, int beginColumn, int endLine, int endColumn, Expression left, Expression right, Operator op) {
         super(beginLine, beginColumn, endLine, endColumn);
-        setLeft(left);
-        setRight(right);
-        setOperator(op);
+    	setLeft(left);
+    	setRight(right);
+    	setOperator(op);
     }
 
     @Override
@@ -97,7 +97,7 @@ public Expression getRight() {
 
     public void setLeft(Expression left) {
         this.left = left;
-        setAsParentNodeOf(this.left);
+		setAsParentNodeOf(this.left);
     }
 
     public void setOperator(Operator op) {
@@ -106,6 +106,6 @@ public void setOperator(Operator op) {
 
     public void setRight(Expression right) {
         this.right = right;
-        setAsParentNodeOf(this.right);
+		setAsParentNodeOf(this.right);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/BooleanLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
index 93d6698c30..e92244a622 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/BooleanLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -35,7 +35,7 @@ public BooleanLiteralExpr() {
     }
 
     public BooleanLiteralExpr(boolean value) {
-        setValue(value);
+    	setValue(value);
     }
 
     public BooleanLiteralExpr(int beginLine, int beginColumn, int endLine, int endColumn, boolean value) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/CastExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/CastExpr.java
index e866a75a2b..843386968b 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/CastExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/CastExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.type.Type;
@@ -38,14 +38,14 @@ public CastExpr() {
     }
 
     public CastExpr(Type type, Expression expr) {
-        setType(type);
-        setExpr(expr);
+    	setType(type);
+    	setExpr(expr);
     }
 
     public CastExpr(int beginLine, int beginColumn, int endLine, int endColumn, Type type, Expression expr) {
         super(beginLine, beginColumn, endLine, endColumn);
         setType(type);
-        setExpr(expr);
+    	setExpr(expr);
     }
 
     @Override
@@ -68,11 +68,11 @@ public Type getType() {
 
     public void setExpr(Expression expr) {
         this.expr = expr;
-        setAsParentNodeOf(this.expr);
+		setAsParentNodeOf(this.expr);
     }
 
     public void setType(Type type) {
         this.type = type;
-        setAsParentNodeOf(this.type);
+		setAsParentNodeOf(this.type);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/CharLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/CharLiteralExpr.java
index 0152ecf6e0..061805d47f 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/CharLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/CharLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ClassExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ClassExpr.java
index 88e9d25a9f..bd33c6730a 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ClassExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ClassExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.type.Type;
@@ -36,7 +36,7 @@ public ClassExpr() {
     }
 
     public ClassExpr(Type type) {
-        setType(type);
+       setType(type);
     }
 
     public ClassExpr(int beginLine, int beginColumn, int endLine, int endColumn, Type type) {
@@ -60,6 +60,6 @@ public Type getType() {
 
     public void setType(Type type) {
         this.type = type;
-        setAsParentNodeOf(this.type);
+		setAsParentNodeOf(this.type);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ConditionalExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ConditionalExpr.java
index 0cc7fc204d..31db61cca2 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ConditionalExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ConditionalExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -75,16 +75,16 @@ public Expression getThenExpr() {
 
     public void setCondition(Expression condition) {
         this.condition = condition;
-        setAsParentNodeOf(this.condition);
+		setAsParentNodeOf(this.condition);
     }
 
     public void setElseExpr(Expression elseExpr) {
         this.elseExpr = elseExpr;
-        setAsParentNodeOf(this.elseExpr);
+		setAsParentNodeOf(this.elseExpr);
     }
 
     public void setThenExpr(Expression thenExpr) {
         this.thenExpr = thenExpr;
-        setAsParentNodeOf(this.thenExpr);
+		setAsParentNodeOf(this.thenExpr);
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/DoubleLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
index fe2a69d787..ce6962d7bf 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/DoubleLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,25 +29,23 @@
  */
 public final class DoubleLiteralExpr extends StringLiteralExpr {
 
-    public DoubleLiteralExpr() {
-    }
+	public DoubleLiteralExpr() {
+	}
 
-    public DoubleLiteralExpr(final String value) {
-        super(value);
-    }
+	public DoubleLiteralExpr(final String value) {
+		super(value);
+	}
 
-    public DoubleLiteralExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                             final String value) {
-        super(beginLine, beginColumn, endLine, endColumn, value);
-    }
+	public DoubleLiteralExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final String value) {
+		super(beginLine, beginColumn, endLine, endColumn, value);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/EnclosedExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/EnclosedExpr.java
index 297f4b98b6..72f9de2a19 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/EnclosedExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/EnclosedExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,37 +29,35 @@
  */
 public final class EnclosedExpr extends Expression {
 
-    private Expression inner;
+	private Expression inner;
 
-    public EnclosedExpr() {
-    }
+	public EnclosedExpr() {
+	}
 
-    public EnclosedExpr(final Expression inner) {
-        setInner(inner);
-    }
+	public EnclosedExpr(final Expression inner) {
+		setInner(inner);
+	}
 
-    public EnclosedExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                        final Expression inner) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setInner(inner);
-    }
+	public EnclosedExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression inner) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setInner(inner);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getInner() {
-        return inner;
-    }
+	public Expression getInner() {
+		return inner;
+	}
 
-    public void setInner(final Expression inner) {
-        this.inner = inner;
-        setAsParentNodeOf(this.inner);
-    }
+	public void setInner(final Expression inner) {
+		this.inner = inner;
+		setAsParentNodeOf(this.inner);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/Expression.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/Expression.java
index 0aa154de6a..8b36d6b1dd 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/Expression.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/Expression.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.Node;
@@ -28,11 +28,11 @@
  */
 public abstract class Expression extends Node {
 
-    public Expression() {
-    }
+	public Expression() {
+	}
 
-    public Expression(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
-        super(beginLine, beginColumn, endLine, endColumn);
-    }
+	public Expression(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
+		super(beginLine, beginColumn, endLine, endColumn);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/FieldAccessExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/FieldAccessExpr.java
index fd72b8ecb5..b57bf7fe07 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/FieldAccessExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/FieldAccessExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.type.Type;
@@ -32,69 +32,67 @@
  */
 public final class FieldAccessExpr extends Expression {
 
-    private Expression scope;
+	private Expression scope;
 
-    private List<Type> typeArgs;
+	private List<Type> typeArgs;
 
-    private NameExpr field;
+	private NameExpr field;
 
-    public FieldAccessExpr() {
-    }
+	public FieldAccessExpr() {
+	}
 
-    public FieldAccessExpr(final Expression scope, final String field) {
-        setScope(scope);
-        setField(field);
-    }
+	public FieldAccessExpr(final Expression scope, final String field) {
+		setScope(scope);
+		setField(field);
+	}
 
-    public FieldAccessExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                           final Expression scope, final List<Type> typeArgs, final String field) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setScope(scope);
-        setTypeArgs(typeArgs);
-        setField(field);
-    }
+	public FieldAccessExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression scope, final List<Type> typeArgs, final String field) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setScope(scope);
+		setTypeArgs(typeArgs);
+		setField(field);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public String getField() {
-        return field.getName();
-    }
+	public String getField() {
+		return field.getName();
+	}
 
-    public NameExpr getFieldExpr() {
-        return field;
-    }
+	public NameExpr getFieldExpr() {
+		return field;
+	}
 
-    public Expression getScope() {
-        return scope;
-    }
+	public Expression getScope() {
+		return scope;
+	}
 
-    public List<Type> getTypeArgs() {
-        return typeArgs;
-    }
+	public List<Type> getTypeArgs() {
+		return typeArgs;
+	}
 
-    public void setField(final String field) {
-        this.field = new NameExpr(field);
-    }
+	public void setField(final String field) {
+		this.field = new NameExpr(field);
+	}
 
-    public void setFieldExpr(NameExpr field) {
-        this.field = field;
-    }
+	public void setFieldExpr(NameExpr field) {
+		this.field = field;
+	}
 
-    public void setScope(final Expression scope) {
-        this.scope = scope;
-        setAsParentNodeOf(this.scope);
-    }
+	public void setScope(final Expression scope) {
+		this.scope = scope;
+		setAsParentNodeOf(this.scope);
+	}
 
-    public void setTypeArgs(final List<Type> typeArgs) {
-        this.typeArgs = typeArgs;
-        setAsParentNodeOf(this.typeArgs);
-    }
+	public void setTypeArgs(final List<Type> typeArgs) {
+		this.typeArgs = typeArgs;
+		setAsParentNodeOf(this.typeArgs);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/InstanceOfExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/InstanceOfExpr.java
index 99a618903b..9a9786512d 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/InstanceOfExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/InstanceOfExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.type.Type;
@@ -30,50 +30,48 @@
  */
 public final class InstanceOfExpr extends Expression {
 
-    private Expression expr;
+	private Expression expr;
 
-    private Type type;
+	private Type type;
 
-    public InstanceOfExpr() {
-    }
+	public InstanceOfExpr() {
+	}
 
-    public InstanceOfExpr(final Expression expr, final Type type) {
-        setExpr(expr);
-        setType(type);
-    }
+	public InstanceOfExpr(final Expression expr, final Type type) {
+		setExpr(expr);
+		setType(type);
+	}
 
-    public InstanceOfExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                          final Expression expr, final Type type) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setExpr(expr);
-        setType(type);
-    }
+	public InstanceOfExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression expr, final Type type) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setExpr(expr);
+		setType(type);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getExpr() {
-        return expr;
-    }
+	public Expression getExpr() {
+		return expr;
+	}
 
-    public Type getType() {
-        return type;
-    }
+	public Type getType() {
+		return type;
+	}
 
-    public void setExpr(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-    }
+	public void setExpr(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+	}
 
-    public void setType(final Type type) {
-        this.type = type;
-        setAsParentNodeOf(this.type);
-    }
+	public void setType(final Type type) {
+		this.type = type;
+		setAsParentNodeOf(this.type);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
index 14f8108432..b326c57700 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,35 +29,33 @@
  */
 public class IntegerLiteralExpr extends StringLiteralExpr {
 
-    private static final String UNSIGNED_MIN_VALUE = "2147483648";
+	private static final String UNSIGNED_MIN_VALUE = "2147483648";
 
-    protected static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE;
+	protected static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE;
 
-    public IntegerLiteralExpr() {
-    }
+	public IntegerLiteralExpr() {
+	}
 
-    public IntegerLiteralExpr(final String value) {
-        super(value);
-    }
+	public IntegerLiteralExpr(final String value) {
+		super(value);
+	}
 
-    public IntegerLiteralExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                              final String value) {
-        super(beginLine, beginColumn, endLine, endColumn, value);
-    }
+	public IntegerLiteralExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final String value) {
+		super(beginLine, beginColumn, endLine, endColumn, value);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public final boolean isMinValue() {
-        return value != null && //
-                value.length() == 10 && //
-                value.equals(UNSIGNED_MIN_VALUE);
-    }
+	public final boolean isMinValue() {
+		return value != null && //
+				value.length() == 10 && //
+				value.equals(UNSIGNED_MIN_VALUE);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
index 50de28d972..238b56431b 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/IntegerLiteralMinValueExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,22 +29,20 @@
  */
 public final class IntegerLiteralMinValueExpr extends IntegerLiteralExpr {
 
-    public IntegerLiteralMinValueExpr() {
-        super(MIN_VALUE);
-    }
+	public IntegerLiteralMinValueExpr() {
+		super(MIN_VALUE);
+	}
 
-    public IntegerLiteralMinValueExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
-        super(beginLine, beginColumn, endLine, endColumn, MIN_VALUE);
-    }
+	public IntegerLiteralMinValueExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
+		super(beginLine, beginColumn, endLine, endColumn, MIN_VALUE);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LambdaExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LambdaExpr.java
index 28589f1005..4e4e934442 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LambdaExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LambdaExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 
@@ -30,65 +30,65 @@
 import java.util.List;
 
 /**
- * Lambda expressions.
- *
+ * Lambda expressions. 
  * @author Raquel Pau
+ *
  */
 public class LambdaExpr extends Expression {
 
-    private List<Parameter> parameters;
+	private List<Parameter> parameters;
 
-    private boolean parametersEnclosed;
+	private boolean parametersEnclosed;
 
-    private Statement body;
+	private Statement body;
 
-    public LambdaExpr() {
-    }
+	public LambdaExpr() {
+	}
 
-    public LambdaExpr(int beginLine, int beginColumn, int endLine,
+	public LambdaExpr(int beginLine, int beginColumn, int endLine,
                       int endColumn, List<Parameter> parameters, Statement body,
                       boolean parametersEnclosed) {
 
-        super(beginLine, beginColumn, endLine, endColumn);
-        setParameters(parameters);
-        setBody(body);
+		super(beginLine, beginColumn, endLine, endColumn);
+		setParameters(parameters);
+		setBody(body);
         setParametersEnclosed(parametersEnclosed);
-    }
-
-    public List<Parameter> getParameters() {
-        return parameters;
-    }
-
-    public void setParameters(List<Parameter> parameters) {
-        this.parameters = parameters;
-        setAsParentNodeOf(this.parameters);
-    }
-
-    public Statement getBody() {
-        return body;
-    }
-
-    public void setBody(Statement body) {
-        this.body = body;
-        setAsParentNodeOf(this.body);
-    }
-
-    @Override
-    public <R, A> R accept(GenericVisitor<R, A> v, A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(VoidVisitor<A> v, A arg) {
-        v.visit(this, arg);
-    }
-
-    public boolean isParametersEnclosed() {
-        return parametersEnclosed;
-    }
-
-    public void setParametersEnclosed(boolean parametersEnclosed) {
-        this.parametersEnclosed = parametersEnclosed;
-    }
+	}
+
+	public List<Parameter> getParameters() {
+		return parameters;
+	}
+
+	public void setParameters(List<Parameter> parameters) {
+		this.parameters = parameters;
+		setAsParentNodeOf(this.parameters);
+	}
+
+	public Statement getBody() {
+		return body;
+	}
+
+	public void setBody(Statement body) {
+		this.body = body;
+		setAsParentNodeOf(this.body);
+	}
+
+	@Override
+	public <R, A> R accept(GenericVisitor<R, A> v, A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override
+	public <A> void accept(VoidVisitor<A> v, A arg) {
+		v.visit(this, arg);
+	}
+
+	public boolean isParametersEnclosed() {
+		return parametersEnclosed;
+	}
+
+	public void setParametersEnclosed(boolean parametersEnclosed) {
+		this.parametersEnclosed = parametersEnclosed;
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LiteralExpr.java
index 425c840e0d..7827f78664 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 /**
@@ -26,10 +26,10 @@
  */
 public abstract class LiteralExpr extends Expression {
 
-    public LiteralExpr() {
-    }
+	public LiteralExpr() {
+	}
 
-    public LiteralExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
-        super(beginLine, beginColumn, endLine, endColumn);
-    }
+	public LiteralExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
+		super(beginLine, beginColumn, endLine, endColumn);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralExpr.java
index e95d55e660..15ea255bac 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,36 +29,34 @@
  */
 public class LongLiteralExpr extends StringLiteralExpr {
 
-    private static final String UNSIGNED_MIN_VALUE = "9223372036854775808";
+	private static final String UNSIGNED_MIN_VALUE = "9223372036854775808";
 
-    protected static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE + "L";
+	protected static final String MIN_VALUE = "-" + UNSIGNED_MIN_VALUE + "L";
 
-    public LongLiteralExpr() {
-    }
+	public LongLiteralExpr() {
+	}
 
-    public LongLiteralExpr(final String value) {
-        super(value);
-    }
+	public LongLiteralExpr(final String value) {
+		super(value);
+	}
 
-    public LongLiteralExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                           final String value) {
-        super(beginLine, beginColumn, endLine, endColumn, value);
-    }
+	public LongLiteralExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final String value) {
+		super(beginLine, beginColumn, endLine, endColumn, value);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public final boolean isMinValue() {
-        return value != null && //
-                value.length() == 20 && //
-                value.startsWith(UNSIGNED_MIN_VALUE) && //
-                (value.charAt(19) == 'L' || value.charAt(19) == 'l');
-    }
+	public final boolean isMinValue() {
+		return value != null && //
+				value.length() == 20 && //
+				value.startsWith(UNSIGNED_MIN_VALUE) && //
+				(value.charAt(19) == 'L' || value.charAt(19) == 'l');
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
index 0d20854d75..f351f7a593 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/LongLiteralMinValueExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,22 +29,20 @@
  */
 public final class LongLiteralMinValueExpr extends LongLiteralExpr {
 
-    public LongLiteralMinValueExpr() {
-        super(MIN_VALUE);
-    }
+	public LongLiteralMinValueExpr() {
+		super(MIN_VALUE);
+	}
 
-    public LongLiteralMinValueExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
-        super(beginLine, beginColumn, endLine, endColumn, MIN_VALUE);
-    }
+	public LongLiteralMinValueExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
+		super(beginLine, beginColumn, endLine, endColumn, MIN_VALUE);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
index 90863a7375..c1a354530a 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MarkerAnnotationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,27 +29,25 @@
  */
 public final class MarkerAnnotationExpr extends AnnotationExpr {
 
-    public MarkerAnnotationExpr() {
-    }
+	public MarkerAnnotationExpr() {
+	}
 
-    public MarkerAnnotationExpr(final NameExpr name) {
-        setName(name);
-    }
+	public MarkerAnnotationExpr(final NameExpr name) {
+		setName(name);
+	}
 
-    public MarkerAnnotationExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                                final NameExpr name) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setName(name);
-    }
+	public MarkerAnnotationExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final NameExpr name) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setName(name);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MemberValuePair.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MemberValuePair.java
index bd851aa230..e0fa80c666 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MemberValuePair.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MemberValuePair.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.NamedNode;
@@ -31,49 +31,47 @@
  */
 public final class MemberValuePair extends Node implements NamedNode {
 
-    private String name;
+	private String name;
 
-    private Expression value;
+	private Expression value;
 
-    public MemberValuePair() {
-    }
+	public MemberValuePair() {
+	}
 
-    public MemberValuePair(final String name, final Expression value) {
-        setName(name);
-        setValue(value);
-    }
+	public MemberValuePair(final String name, final Expression value) {
+		setName(name);
+		setValue(value);
+	}
 
-    public MemberValuePair(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                           final String name, final Expression value) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setName(name);
-        setValue(value);
-    }
+	public MemberValuePair(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final String name, final Expression value) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setName(name);
+		setValue(value);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public String getName() {
-        return name;
-    }
+	public String getName() {
+		return name;
+	}
 
-    public Expression getValue() {
-        return value;
-    }
+	public Expression getValue() {
+		return value;
+	}
 
-    public void setName(final String name) {
-        this.name = name;
-    }
+	public void setName(final String name) {
+		this.name = name;
+	}
 
-    public void setValue(final Expression value) {
-        this.value = value;
-        setAsParentNodeOf(this.value);
-    }
+	public void setValue(final Expression value) {
+		this.value = value;
+		setAsParentNodeOf(this.value);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodCallExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodCallExpr.java
index 516e44790c..9d5d10f065 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodCallExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodCallExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.type.Type;
@@ -32,87 +32,85 @@
  */
 public final class MethodCallExpr extends Expression {
 
-    private Expression scope;
-
-    private List<Type> typeArgs;
-
-    private NameExpr name;
-
-    private List<Expression> args;
-
-    public MethodCallExpr() {
-    }
-
-    public MethodCallExpr(final Expression scope, final String name) {
-        setScope(scope);
-        setName(name);
-    }
-
-    public MethodCallExpr(final Expression scope, final String name, final List<Expression> args) {
-        setScope(scope);
-        setName(name);
-        setArgs(args);
-    }
-
-    public MethodCallExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                          final Expression scope, final List<Type> typeArgs, final String name, final List<Expression> args) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setScope(scope);
-        setTypeArgs(typeArgs);
-        setName(name);
-        setArgs(args);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public List<Expression> getArgs() {
-        return args;
-    }
-
-    public String getName() {
-        return name.getName();
-    }
-
-    public NameExpr getNameExpr() {
-        return name;
-    }
-
-    public Expression getScope() {
-        return scope;
-    }
-
-    public List<Type> getTypeArgs() {
-        return typeArgs;
-    }
-
-    public void setArgs(final List<Expression> args) {
-        this.args = args;
-        setAsParentNodeOf(this.args);
-    }
-
-    public void setName(final String name) {
-        this.name = new NameExpr(name);
-    }
-
-    public void setNameExpr(NameExpr name) {
-        this.name = name;
-    }
-
-    public void setScope(final Expression scope) {
-        this.scope = scope;
-        setAsParentNodeOf(this.scope);
-    }
-
-    public void setTypeArgs(final List<Type> typeArgs) {
-        this.typeArgs = typeArgs;
-        setAsParentNodeOf(this.typeArgs);
-    }
+	private Expression scope;
+
+	private List<Type> typeArgs;
+
+	private NameExpr name;
+
+	private List<Expression> args;
+
+	public MethodCallExpr() {
+	}
+
+	public MethodCallExpr(final Expression scope, final String name) {
+		setScope(scope);
+		setName(name);
+	}
+
+	public MethodCallExpr(final Expression scope, final String name, final List<Expression> args) {
+		setScope(scope);
+		setName(name);
+		setArgs(args);
+	}
+
+	public MethodCallExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression scope, final List<Type> typeArgs, final String name, final List<Expression> args) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setScope(scope);
+		setTypeArgs(typeArgs);
+		setName(name);
+		setArgs(args);
+	}
+
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public List<Expression> getArgs() {
+		return args;
+	}
+
+	public String getName() {
+		return name.getName();
+	}
+
+	public NameExpr getNameExpr() {
+		return name;
+	}
+
+	public Expression getScope() {
+		return scope;
+	}
+
+	public List<Type> getTypeArgs() {
+		return typeArgs;
+	}
+
+	public void setArgs(final List<Expression> args) {
+		this.args = args;
+		setAsParentNodeOf(this.args);
+	}
+
+	public void setName(final String name) {
+		this.name = new NameExpr(name);
+	}
+
+	public void setNameExpr(NameExpr name) {
+		this.name = name;
+	}
+
+	public void setScope(final Expression scope) {
+		this.scope = scope;
+		setAsParentNodeOf(this.scope);
+	}
+
+	public void setTypeArgs(final List<Type> typeArgs) {
+		this.typeArgs = typeArgs;
+		setAsParentNodeOf(this.typeArgs);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodReferenceExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodReferenceExpr.java
index 6c30e9848d..918ad3f2a5 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodReferenceExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/MethodReferenceExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.TypeParameter;
@@ -30,12 +30,12 @@
 /**
  * Method reference expressions introduced in Java 8 specifically designed to simplify lambda Expressions.
  * These are some examples:
- * <p>
- * System.out::println;
- * <p>
- * (test ? stream.map(String::trim) : stream)::toArray;
  *
+ * System.out::println; 
+ *
+ * (test ? stream.map(String::trim) : stream)::toArray; 
  * @author Raquel Pau
+ *
  */
 public class MethodReferenceExpr extends Expression {
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NameExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NameExpr.java
index 75665338ed..5cdbbbb6c4 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NameExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NameExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.NamedNode;
@@ -30,37 +30,35 @@
  */
 public class NameExpr extends Expression implements NamedNode {
 
-    private String name;
+	private String name;
 
-    public NameExpr() {
-    }
+	public NameExpr() {
+	}
 
-    public NameExpr(final String name) {
-        this.name = name;
-    }
+	public NameExpr(final String name) {
+		this.name = name;
+	}
 
-    public NameExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                    final String name) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        this.name = name;
-    }
+	public NameExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final String name) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		this.name = name;
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public final String getName() {
-        return name;
-    }
+	public final String getName() {
+		return name;
+	}
 
-    public final void setName(final String name) {
-        this.name = name;
-    }
+	public final void setName(final String name) {
+		this.name = name;
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NormalAnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
index 125d8bd0ee..2b2adfd72f 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NormalAnnotationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -31,39 +31,37 @@
  */
 public final class NormalAnnotationExpr extends AnnotationExpr {
 
-    private List<MemberValuePair> pairs;
+	private List<MemberValuePair> pairs;
 
-    public NormalAnnotationExpr() {
-    }
+	public NormalAnnotationExpr() {
+	}
 
-    public NormalAnnotationExpr(final NameExpr name, final List<MemberValuePair> pairs) {
-        setName(name);
-        setPairs(pairs);
-    }
+	public NormalAnnotationExpr(final NameExpr name, final List<MemberValuePair> pairs) {
+		setName(name);
+		setPairs(pairs);
+	}
 
-    public NormalAnnotationExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                                final NameExpr name, final List<MemberValuePair> pairs) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setName(name);
-        setPairs(pairs);
-    }
+	public NormalAnnotationExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final NameExpr name, final List<MemberValuePair> pairs) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setName(name);
+		setPairs(pairs);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public List<MemberValuePair> getPairs() {
-        return pairs;
-    }
+	public List<MemberValuePair> getPairs() {
+		return pairs;
+	}
 
-    public void setPairs(final List<MemberValuePair> pairs) {
-        this.pairs = pairs;
-        setAsParentNodeOf(this.pairs);
-    }
+	public void setPairs(final List<MemberValuePair> pairs) {
+		this.pairs = pairs;
+		setAsParentNodeOf(this.pairs);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NullLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NullLiteralExpr.java
index aae98c4eef..c7bc177d50 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NullLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/NullLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,20 +29,18 @@
  */
 public final class NullLiteralExpr extends LiteralExpr {
 
-    public NullLiteralExpr() {
-    }
+	public NullLiteralExpr() {
+	}
 
-    public NullLiteralExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
-        super(beginLine, beginColumn, endLine, endColumn);
-    }
+	public NullLiteralExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
+		super(beginLine, beginColumn, endLine, endColumn);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ObjectCreationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ObjectCreationExpr.java
index 51a8878e1a..228dabc2cd 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ObjectCreationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ObjectCreationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.body.BodyDeclaration;
@@ -34,88 +34,86 @@
  */
 public final class ObjectCreationExpr extends Expression {
 
-    private Expression scope;
-
-    private ClassOrInterfaceType type;
-
-    private List<Type> typeArgs;
-
-    private List<Expression> args;
-
-    private List<BodyDeclaration> anonymousClassBody;
-
-    public ObjectCreationExpr() {
-    }
-
-    public ObjectCreationExpr(final Expression scope, final ClassOrInterfaceType type, final List<Expression> args) {
-        setScope(scope);
-        setType(type);
-        setArgs(args);
-    }
-
-    public ObjectCreationExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                              final Expression scope, final ClassOrInterfaceType type, final List<Type> typeArgs,
-                              final List<Expression> args, final List<BodyDeclaration> anonymousBody) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setScope(scope);
-        setType(type);
-        setTypeArgs(typeArgs);
-        setArgs(args);
-        setAnonymousClassBody(anonymousBody);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public List<BodyDeclaration> getAnonymousClassBody() {
-        return anonymousClassBody;
-    }
-
-    public List<Expression> getArgs() {
-        return args;
-    }
-
-    public Expression getScope() {
-        return scope;
-    }
-
-    public ClassOrInterfaceType getType() {
-        return type;
-    }
-
-    public List<Type> getTypeArgs() {
-        return typeArgs;
-    }
-
-    public void setAnonymousClassBody(final List<BodyDeclaration> anonymousClassBody) {
-        this.anonymousClassBody = anonymousClassBody;
-        setAsParentNodeOf(this.anonymousClassBody);
-    }
-
-    public void setArgs(final List<Expression> args) {
-        this.args = args;
-        setAsParentNodeOf(this.args);
-    }
-
-    public void setScope(final Expression scope) {
-        this.scope = scope;
-        setAsParentNodeOf(this.scope);
-    }
-
-    public void setType(final ClassOrInterfaceType type) {
-        this.type = type;
-        setAsParentNodeOf(this.type);
-    }
-
-    public void setTypeArgs(final List<Type> typeArgs) {
-        this.typeArgs = typeArgs;
-        setAsParentNodeOf(this.typeArgs);
-    }
+	private Expression scope;
+
+	private ClassOrInterfaceType type;
+
+	private List<Type> typeArgs;
+
+	private List<Expression> args;
+
+	private List<BodyDeclaration> anonymousClassBody;
+
+	public ObjectCreationExpr() {
+	}
+
+	public ObjectCreationExpr(final Expression scope, final ClassOrInterfaceType type, final List<Expression> args) {
+		setScope(scope);
+		setType(type);
+		setArgs(args);
+	}
+
+	public ObjectCreationExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression scope, final ClassOrInterfaceType type, final List<Type> typeArgs,
+			final List<Expression> args, final List<BodyDeclaration> anonymousBody) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setScope(scope);
+		setType(type);
+		setTypeArgs(typeArgs);
+		setArgs(args);
+		setAnonymousClassBody(anonymousBody);
+	}
+
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public List<BodyDeclaration> getAnonymousClassBody() {
+		return anonymousClassBody;
+	}
+
+	public List<Expression> getArgs() {
+		return args;
+	}
+
+	public Expression getScope() {
+		return scope;
+	}
+
+	public ClassOrInterfaceType getType() {
+		return type;
+	}
+
+	public List<Type> getTypeArgs() {
+		return typeArgs;
+	}
+
+	public void setAnonymousClassBody(final List<BodyDeclaration> anonymousClassBody) {
+		this.anonymousClassBody = anonymousClassBody;
+		setAsParentNodeOf(this.anonymousClassBody);
+	}
+
+	public void setArgs(final List<Expression> args) {
+		this.args = args;
+		setAsParentNodeOf(this.args);
+	}
+
+	public void setScope(final Expression scope) {
+		this.scope = scope;
+		setAsParentNodeOf(this.scope);
+	}
+
+	public void setType(final ClassOrInterfaceType type) {
+		this.type = type;
+		setAsParentNodeOf(this.type);
+	}
+
+	public void setTypeArgs(final List<Type> typeArgs) {
+		this.typeArgs = typeArgs;
+		setAsParentNodeOf(this.typeArgs);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/QualifiedNameExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/QualifiedNameExpr.java
index 68531f86b7..00a65aa7f9 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/QualifiedNameExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/QualifiedNameExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,38 +29,36 @@
  */
 public final class QualifiedNameExpr extends NameExpr {
 
-    private NameExpr qualifier;
+	private NameExpr qualifier;
 
-    public QualifiedNameExpr() {
-    }
+	public QualifiedNameExpr() {
+	}
 
-    public QualifiedNameExpr(final NameExpr scope, final String name) {
-        super(name);
-        setQualifier(scope);
-    }
+	public QualifiedNameExpr(final NameExpr scope, final String name) {
+		super(name);
+		setQualifier(scope);
+	}
 
-    public QualifiedNameExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                             final NameExpr scope, final String name) {
-        super(beginLine, beginColumn, endLine, endColumn, name);
-        setQualifier(scope);
-    }
+	public QualifiedNameExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final NameExpr scope, final String name) {
+		super(beginLine, beginColumn, endLine, endColumn, name);
+		setQualifier(scope);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public NameExpr getQualifier() {
-        return qualifier;
-    }
+	public NameExpr getQualifier() {
+		return qualifier;
+	}
 
-    public void setQualifier(final NameExpr qualifier) {
-        this.qualifier = qualifier;
-        setAsParentNodeOf(this.qualifier);
-    }
+	public void setQualifier(final NameExpr qualifier) {
+		this.qualifier = qualifier;
+		setAsParentNodeOf(this.qualifier);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
index 1aeaa46c7e..bd8adb1166 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/SingleMemberAnnotationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,39 +29,37 @@
  */
 public final class SingleMemberAnnotationExpr extends AnnotationExpr {
 
-    private Expression memberValue;
+	private Expression memberValue;
 
-    public SingleMemberAnnotationExpr() {
-    }
+	public SingleMemberAnnotationExpr() {
+	}
 
-    public SingleMemberAnnotationExpr(final NameExpr name, final Expression memberValue) {
-        setName(name);
-        setMemberValue(memberValue);
-    }
+	public SingleMemberAnnotationExpr(final NameExpr name, final Expression memberValue) {
+		setName(name);
+		setMemberValue(memberValue);
+	}
 
-    public SingleMemberAnnotationExpr(final int beginLine, final int beginColumn, final int endLine,
-                                      final int endColumn, final NameExpr name, final Expression memberValue) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setName(name);
-        setMemberValue(memberValue);
-    }
+	public SingleMemberAnnotationExpr(final int beginLine, final int beginColumn, final int endLine,
+			final int endColumn, final NameExpr name, final Expression memberValue) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setName(name);
+		setMemberValue(memberValue);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getMemberValue() {
-        return memberValue;
-    }
+	public Expression getMemberValue() {
+		return memberValue;
+	}
 
-    public void setMemberValue(final Expression memberValue) {
-        this.memberValue = memberValue;
-        setAsParentNodeOf(this.memberValue);
-    }
+	public void setMemberValue(final Expression memberValue) {
+		this.memberValue = memberValue;
+		setAsParentNodeOf(this.memberValue);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/StringLiteralExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/StringLiteralExpr.java
index d406c8e8a3..6876fa23e2 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/StringLiteralExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/StringLiteralExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,36 +29,34 @@
  */
 public class StringLiteralExpr extends LiteralExpr {
 
-    protected String value;
+	protected String value;
 
-    public StringLiteralExpr() {
-    }
+	public StringLiteralExpr() {
+	}
 
-    public StringLiteralExpr(final String value) {
-        this.value = value;
-    }
+	public StringLiteralExpr(final String value) {
+		this.value = value;
+	}
 
-    public StringLiteralExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                             final String value) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        this.value = value;
-    }
+	public StringLiteralExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final String value) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		this.value = value;
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public final String getValue() {
-        return value;
-    }
+	public final String getValue() {
+		return value;
+	}
 
-    public final void setValue(final String value) {
-        this.value = value;
-    }
+	public final void setValue(final String value) {
+		this.value = value;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/SuperExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/SuperExpr.java
index d2a5b58120..791d28bc90 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/SuperExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/SuperExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,37 +29,35 @@
  */
 public final class SuperExpr extends Expression {
 
-    private Expression classExpr;
+	private Expression classExpr;
 
-    public SuperExpr() {
-    }
+	public SuperExpr() {
+	}
 
-    public SuperExpr(final Expression classExpr) {
-        setClassExpr(classExpr);
-    }
+	public SuperExpr(final Expression classExpr) {
+		setClassExpr(classExpr);
+	}
 
-    public SuperExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                     final Expression classExpr) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setClassExpr(classExpr);
-    }
+	public SuperExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression classExpr) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setClassExpr(classExpr);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getClassExpr() {
-        return classExpr;
-    }
+	public Expression getClassExpr() {
+		return classExpr;
+	}
 
-    public void setClassExpr(final Expression classExpr) {
-        this.classExpr = classExpr;
-        setAsParentNodeOf(this.classExpr);
-    }
+	public void setClassExpr(final Expression classExpr) {
+		this.classExpr = classExpr;
+		setAsParentNodeOf(this.classExpr);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ThisExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ThisExpr.java
index 7751328a95..c269376c92 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ThisExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/ThisExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,37 +29,35 @@
  */
 public final class ThisExpr extends Expression {
 
-    private Expression classExpr;
+	private Expression classExpr;
 
-    public ThisExpr() {
-    }
+	public ThisExpr() {
+	}
 
-    public ThisExpr(final Expression classExpr) {
-        setClassExpr(classExpr);
-    }
+	public ThisExpr(final Expression classExpr) {
+		setClassExpr(classExpr);
+	}
 
-    public ThisExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                    final Expression classExpr) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setClassExpr(classExpr);
-    }
+	public ThisExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression classExpr) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setClassExpr(classExpr);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getClassExpr() {
-        return classExpr;
-    }
+	public Expression getClassExpr() {
+		return classExpr;
+	}
 
-    public void setClassExpr(final Expression classExpr) {
-        this.classExpr = classExpr;
-        setAsParentNodeOf(this.classExpr);
-    }
+	public void setClassExpr(final Expression classExpr) {
+		this.classExpr = classExpr;
+		setAsParentNodeOf(this.classExpr);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/TypeExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/TypeExpr.java
index bf64493c40..636d2c4a08 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/TypeExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/TypeExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.type.Type;
@@ -27,15 +27,14 @@
 
 /**
  * This class is just instantiated as scopes for MethodReferenceExpr nodes to encapsulate Types.
- *
  * @author Raquel Pau
+ *
  */
-public class TypeExpr extends Expression {
+public class TypeExpr extends Expression{
 
     private Type type;
 
-    public TypeExpr() {
-    }
+    public TypeExpr(){}
 
     public TypeExpr(int beginLine, int beginColumn, int endLine, int endColumn, Type type) {
         super(beginLine, beginColumn, endLine, endColumn);
@@ -62,4 +61,5 @@ public void setType(Type type) {
     }
 
 
+
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/UnaryExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/UnaryExpr.java
index 9a00579cd6..19d9360189 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/UnaryExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/UnaryExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,60 +29,58 @@
  */
 public final class UnaryExpr extends Expression {
 
-    public static enum Operator {
-        positive, // +
-        negative, // -
-        preIncrement, // ++
-        preDecrement, // --
-        not, // !
-        inverse, // ~
-        posIncrement, // ++
-        posDecrement, // --
-    }
+	public static enum Operator {
+		positive, // +
+		negative, // -
+		preIncrement, // ++
+		preDecrement, // --
+		not, // !
+		inverse, // ~
+		posIncrement, // ++
+		posDecrement, // --
+	}
 
-    private Expression expr;
+	private Expression expr;
 
-    private Operator op;
+	private Operator op;
 
-    public UnaryExpr() {
-    }
+	public UnaryExpr() {
+	}
 
-    public UnaryExpr(final Expression expr, final Operator op) {
-        setExpr(expr);
-        setOperator(op);
-    }
+	public UnaryExpr(final Expression expr, final Operator op) {
+		setExpr(expr);
+		setOperator(op);
+	}
 
-    public UnaryExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                     final Expression expr, final Operator op) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setExpr(expr);
-        setOperator(op);
-    }
+	public UnaryExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression expr, final Operator op) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setExpr(expr);
+		setOperator(op);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getExpr() {
-        return expr;
-    }
+	public Expression getExpr() {
+		return expr;
+	}
 
-    public Operator getOperator() {
-        return op;
-    }
+	public Operator getOperator() {
+		return op;
+	}
 
-    public void setExpr(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-    }
+	public void setExpr(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+	}
 
-    public void setOperator(final Operator op) {
-        this.op = op;
-    }
+	public void setOperator(final Operator op) {
+		this.op = op;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/VariableDeclarationExpr.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
index 28283be425..2dcaa22993 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/expr/VariableDeclarationExpr.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.expr;
 
 import com.github.javaparser.ast.body.ModifierSet;
@@ -34,86 +34,84 @@
  */
 public final class VariableDeclarationExpr extends Expression {
 
-    private int modifiers;
-
-    private List<AnnotationExpr> annotations;
-
-    private Type type;
-
-    private List<VariableDeclarator> vars;
-
-    public VariableDeclarationExpr() {
-    }
-
-    public VariableDeclarationExpr(final Type type, final List<VariableDeclarator> vars) {
-        setType(type);
-        setVars(vars);
-    }
-
-    public VariableDeclarationExpr(final int modifiers, final Type type, final List<VariableDeclarator> vars) {
-        setModifiers(modifiers);
-        setType(type);
-        setVars(vars);
-    }
-
-    public VariableDeclarationExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                                   final int modifiers, final List<AnnotationExpr> annotations, final Type type,
-                                   final List<VariableDeclarator> vars) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setModifiers(modifiers);
-        setAnnotations(annotations);
-        setType(type);
-        setVars(vars);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public List<AnnotationExpr> getAnnotations() {
-        return annotations;
-    }
-
-    /**
-     * Return the modifiers of this variable declaration.
-     *
-     * @return modifiers
-     * @see ModifierSet
-     */
-    public int getModifiers() {
-        return modifiers;
-    }
-
-    public Type getType() {
-        return type;
-    }
-
-    public List<VariableDeclarator> getVars() {
-        return vars;
-    }
-
-    public void setAnnotations(final List<AnnotationExpr> annotations) {
-        this.annotations = annotations;
-        setAsParentNodeOf(this.annotations);
-    }
-
-    public void setModifiers(final int modifiers) {
-        this.modifiers = modifiers;
-    }
-
-    public void setType(final Type type) {
-        this.type = type;
-        setAsParentNodeOf(this.type);
-    }
-
-    public void setVars(final List<VariableDeclarator> vars) {
-        this.vars = vars;
-        setAsParentNodeOf(this.vars);
-    }
+	private int modifiers;
+
+	private List<AnnotationExpr> annotations;
+
+	private Type type;
+
+	private List<VariableDeclarator> vars;
+
+	public VariableDeclarationExpr() {
+	}
+
+	public VariableDeclarationExpr(final Type type, final List<VariableDeclarator> vars) {
+		setType(type);
+		setVars(vars);
+	}
+
+	public VariableDeclarationExpr(final int modifiers, final Type type, final List<VariableDeclarator> vars) {
+		setModifiers(modifiers);
+		setType(type);
+		setVars(vars);
+	}
+
+	public VariableDeclarationExpr(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final int modifiers, final List<AnnotationExpr> annotations, final Type type,
+			final List<VariableDeclarator> vars) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setModifiers(modifiers);
+		setAnnotations(annotations);
+		setType(type);
+		setVars(vars);
+	}
+
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public List<AnnotationExpr> getAnnotations() {
+		return annotations;
+	}
+
+	/**
+	 * Return the modifiers of this variable declaration.
+	 * 
+	 * @see ModifierSet
+	 * @return modifiers
+	 */
+	public int getModifiers() {
+		return modifiers;
+	}
+
+	public Type getType() {
+		return type;
+	}
+
+	public List<VariableDeclarator> getVars() {
+		return vars;
+	}
+
+	public void setAnnotations(final List<AnnotationExpr> annotations) {
+		this.annotations = annotations;
+		setAsParentNodeOf(this.annotations);
+	}
+
+	public void setModifiers(final int modifiers) {
+		this.modifiers = modifiers;
+	}
+
+	public void setType(final Type type) {
+		this.type = type;
+		setAsParentNodeOf(this.type);
+	}
+
+	public void setVars(final List<VariableDeclarator> vars) {
+		this.vars = vars;
+		setAsParentNodeOf(this.vars);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/AssertStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/AssertStmt.java
index f478289d1f..60f61bca5e 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/AssertStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/AssertStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -30,56 +30,54 @@
  */
 public final class AssertStmt extends Statement {
 
-    private Expression check;
-
-    private Expression msg;
-
-    public AssertStmt() {
-    }
+	private Expression check;
 
-    public AssertStmt(final Expression check) {
-        setCheck(check);
-    }
+	private Expression msg;
 
-    public AssertStmt(final Expression check, final Expression msg) {
-        setCheck(check);
-        setMessage(msg);
-    }
+	public AssertStmt() {
+	}
 
-    public AssertStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                      final Expression check, final Expression msg) {
-        super(beginLine, beginColumn, endLine, endColumn);
+	public AssertStmt(final Expression check) {
+		setCheck(check);
+	}
 
-        setCheck(check);
-        setMessage(msg);
+	public AssertStmt(final Expression check, final Expression msg) {
+		setCheck(check);
+		setMessage(msg);
+	}
 
-    }
+	public AssertStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression check, final Expression msg) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		
+		setCheck(check);
+		setMessage(msg);
+		
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getCheck() {
-        return check;
-    }
+	public Expression getCheck() {
+		return check;
+	}
 
-    public Expression getMessage() {
-        return msg;
-    }
+	public Expression getMessage() {
+		return msg;
+	}
 
-    public void setCheck(final Expression check) {
-        this.check = check;
-        setAsParentNodeOf(this.check);
-    }
+	public void setCheck(final Expression check) {
+		this.check = check;
+		setAsParentNodeOf(this.check);
+	}
 
-    public void setMessage(final Expression msg) {
-        this.msg = msg;
-        setAsParentNodeOf(this.msg);
-    }
+	public void setMessage(final Expression msg) {
+		this.msg = msg;
+		setAsParentNodeOf(this.msg);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BlockStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BlockStmt.java
index 24da01dd0b..d8b16738ee 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BlockStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BlockStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -31,37 +31,37 @@
  */
 public final class BlockStmt extends Statement {
 
-    private List<Statement> stmts;
+	private List<Statement> stmts;
 
-    public BlockStmt() {
-    }
+	public BlockStmt() {
+	}
 
-    public BlockStmt(final List<Statement> stmts) {
-        setStmts(stmts);
-    }
+	public BlockStmt(final List<Statement> stmts) {
+		setStmts(stmts);
+	}
 
-    public BlockStmt(final int beginLine, final int beginColumn,
-                     final int endLine, final int endColumn, final List<Statement> stmts) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setStmts(stmts);
-    }
+	public BlockStmt(final int beginLine, final int beginColumn,
+			final int endLine, final int endColumn, final List<Statement> stmts) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setStmts(stmts);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public List<Statement> getStmts() {
-        return stmts;
-    }
+	public List<Statement> getStmts() {
+		return stmts;
+	}
 
-    public void setStmts(final List<Statement> stmts) {
-        this.stmts = stmts;
-        setAsParentNodeOf(this.stmts);
-    }
+	public void setStmts(final List<Statement> stmts) {
+		this.stmts = stmts;
+		setAsParentNodeOf(this.stmts);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BreakStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BreakStmt.java
index 8aad9ec2ea..1a80f3e677 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BreakStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/BreakStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,35 +29,33 @@
  */
 public final class BreakStmt extends Statement {
 
-    private String id;
+	private String id;
 
-    public BreakStmt() {
-    }
+	public BreakStmt() {
+	}
 
-    public BreakStmt(final String id) {
-        this.id = id;
-    }
+	public BreakStmt(final String id) {
+		this.id = id;
+	}
 
-    public BreakStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn, final String id) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        this.id = id;
-    }
+	public BreakStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn, final String id) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		this.id = id;
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public String getId() {
-        return id;
-    }
+	public String getId() {
+		return id;
+	}
 
-    public void setId(final String id) {
-        this.id = id;
-    }
+	public void setId(final String id) {
+		this.id = id;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/CatchClause.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/CatchClause.java
index d74899e72c..3f43e79771 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/CatchClause.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/CatchClause.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.Node;
@@ -47,44 +47,42 @@ public CatchClause(final MultiTypeParameter except, final BlockStmt catchBlock)
         setExcept(except);
         setCatchBlock(catchBlock);
     }
-
+	
     public CatchClause(int exceptModifier, List<AnnotationExpr> exceptAnnotations, List<Type> exceptTypes, VariableDeclaratorId exceptId, BlockStmt catchBlock) {
         this(new MultiTypeParameter(exceptModifier, exceptAnnotations, exceptTypes, exceptId), catchBlock);
     }
 
     public CatchClause(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                       final int exceptModifier, final List<AnnotationExpr> exceptAnnotations, final List<Type> exceptTypes,
-                       final VariableDeclaratorId exceptId, final BlockStmt catchBlock) {
+    	    final int exceptModifier, final List<AnnotationExpr> exceptAnnotations, final List<Type> exceptTypes, 
+    	    final VariableDeclaratorId exceptId, final BlockStmt catchBlock) {
         super(beginLine, beginColumn, endLine, endColumn);
         setExcept(new MultiTypeParameter(beginLine, beginColumn, endLine, endColumn, exceptModifier, exceptAnnotations, exceptTypes, exceptId));
         setCatchBlock(catchBlock);
     }
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public BlockStmt getCatchBlock() {
-        return catchBlock;
-    }
+	public BlockStmt getCatchBlock() {
+		return catchBlock;
+	}
 
-    public MultiTypeParameter getExcept() {
-        return except;
-    }
+	public MultiTypeParameter getExcept() {
+		return except;
+	}
 
-    public void setCatchBlock(final BlockStmt catchBlock) {
-        this.catchBlock = catchBlock;
-        setAsParentNodeOf(this.catchBlock);
-    }
+	public void setCatchBlock(final BlockStmt catchBlock) {
+		this.catchBlock = catchBlock;
+		setAsParentNodeOf(this.catchBlock);
+	}
 
-    public void setExcept(final MultiTypeParameter except) {
-        this.except = except;
-        setAsParentNodeOf(this.except);
-    }
+	public void setExcept(final MultiTypeParameter except) {
+		this.except = except;
+		setAsParentNodeOf(this.except);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ContinueStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ContinueStmt.java
index 2afdec0cf2..81760d0a00 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ContinueStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ContinueStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,36 +29,34 @@
  */
 public final class ContinueStmt extends Statement {
 
-    private String id;
+	private String id;
 
-    public ContinueStmt() {
-    }
+	public ContinueStmt() {
+	}
 
-    public ContinueStmt(final String id) {
-        this.id = id;
-    }
+	public ContinueStmt(final String id) {
+		this.id = id;
+	}
 
-    public ContinueStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                        final String id) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        this.id = id;
-    }
+	public ContinueStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final String id) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		this.id = id;
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public String getId() {
-        return id;
-    }
+	public String getId() {
+		return id;
+	}
 
-    public void setId(final String id) {
-        this.id = id;
-    }
+	public void setId(final String id) {
+		this.id = id;
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/DoStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/DoStmt.java
index 022b7bb19f..0a6a770407 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/DoStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/DoStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -30,50 +30,48 @@
  */
 public final class DoStmt extends Statement {
 
-    private Statement body;
+	private Statement body;
 
-    private Expression condition;
+	private Expression condition;
 
-    public DoStmt() {
-    }
+	public DoStmt() {
+	}
 
-    public DoStmt(final Statement body, final Expression condition) {
-        setBody(body);
-        setCondition(condition);
-    }
+	public DoStmt(final Statement body, final Expression condition) {
+		setBody(body);
+		setCondition(condition);
+	}
 
-    public DoStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                  final Statement body, final Expression condition) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setBody(body);
-        setCondition(condition);
-    }
+	public DoStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Statement body, final Expression condition) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setBody(body);
+		setCondition(condition);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Statement getBody() {
-        return body;
-    }
+	public Statement getBody() {
+		return body;
+	}
 
-    public Expression getCondition() {
-        return condition;
-    }
+	public Expression getCondition() {
+		return condition;
+	}
 
-    public void setBody(final Statement body) {
-        this.body = body;
-        setAsParentNodeOf(this.body);
-    }
+	public void setBody(final Statement body) {
+		this.body = body;
+		setAsParentNodeOf(this.body);
+	}
 
-    public void setCondition(final Expression condition) {
-        this.condition = condition;
-        setAsParentNodeOf(this.condition);
-    }
+	public void setCondition(final Expression condition) {
+		this.condition = condition;
+		setAsParentNodeOf(this.condition);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/EmptyStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/EmptyStmt.java
index f6f9091371..fb16c4d986 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/EmptyStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/EmptyStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,20 +29,18 @@
  */
 public final class EmptyStmt extends Statement {
 
-    public EmptyStmt() {
-    }
+	public EmptyStmt() {
+	}
 
-    public EmptyStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
-        super(beginLine, beginColumn, endLine, endColumn);
-    }
+	public EmptyStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
+		super(beginLine, beginColumn, endLine, endColumn);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
index 49d140a976..d0a9efe8c5 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExplicitConstructorInvocationStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -33,77 +33,77 @@
  */
 public final class ExplicitConstructorInvocationStmt extends Statement {
 
-    private List<Type> typeArgs;
-
-    private boolean isThis;
-
-    private Expression expr;
-
-    private List<Expression> args;
-
-    public ExplicitConstructorInvocationStmt() {
-    }
-
-    public ExplicitConstructorInvocationStmt(final boolean isThis,
-                                             final Expression expr, final List<Expression> args) {
-        setThis(isThis);
-        setExpr(expr);
-        setArgs(args);
-    }
-
-    public ExplicitConstructorInvocationStmt(final int beginLine,
-                                             final int beginColumn, final int endLine, final int endColumn,
-                                             final List<Type> typeArgs, final boolean isThis,
-                                             final Expression expr, final List<Expression> args) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setTypeArgs(typeArgs);
-        setThis(isThis);
-        setExpr(expr);
-        setArgs(args);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public List<Expression> getArgs() {
-        return args;
-    }
-
-    public Expression getExpr() {
-        return expr;
-    }
-
-    public List<Type> getTypeArgs() {
-        return typeArgs;
-    }
-
-    public boolean isThis() {
-        return isThis;
-    }
-
-    public void setArgs(final List<Expression> args) {
-        this.args = args;
-        setAsParentNodeOf(this.args);
-    }
-
-    public void setExpr(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-    }
-
-    public void setThis(final boolean isThis) {
-        this.isThis = isThis;
-    }
-
-    public void setTypeArgs(final List<Type> typeArgs) {
-        this.typeArgs = typeArgs;
-        setAsParentNodeOf(this.typeArgs);
-    }
+	private List<Type> typeArgs;
+
+	private boolean isThis;
+
+	private Expression expr;
+
+	private List<Expression> args;
+
+	public ExplicitConstructorInvocationStmt() {
+	}
+
+	public ExplicitConstructorInvocationStmt(final boolean isThis,
+			final Expression expr, final List<Expression> args) {
+		setThis(isThis);
+		setExpr(expr);
+		setArgs(args);
+	}
+
+	public ExplicitConstructorInvocationStmt(final int beginLine,
+			final int beginColumn, final int endLine, final int endColumn,
+			final List<Type> typeArgs, final boolean isThis,
+			final Expression expr, final List<Expression> args) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setTypeArgs(typeArgs);
+		setThis(isThis);
+		setExpr(expr);
+		setArgs(args);
+	}
+
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public List<Expression> getArgs() {
+		return args;
+	}
+
+	public Expression getExpr() {
+		return expr;
+	}
+
+	public List<Type> getTypeArgs() {
+		return typeArgs;
+	}
+
+	public boolean isThis() {
+		return isThis;
+	}
+
+	public void setArgs(final List<Expression> args) {
+		this.args = args;
+		setAsParentNodeOf(this.args);
+	}
+
+	public void setExpr(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+	}
+
+	public void setThis(final boolean isThis) {
+		this.isThis = isThis;
+	}
+
+	public void setTypeArgs(final List<Type> typeArgs) {
+		this.typeArgs = typeArgs;
+		setAsParentNodeOf(this.typeArgs);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExpressionStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExpressionStmt.java
index 2b5eb9884d..3c441e2a34 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExpressionStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ExpressionStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -30,37 +30,35 @@
  */
 public final class ExpressionStmt extends Statement {
 
-    private Expression expr;
+	private Expression expr;
 
-    public ExpressionStmt() {
-    }
+	public ExpressionStmt() {
+	}
 
-    public ExpressionStmt(final Expression expr) {
-        setExpression(expr);
-    }
+	public ExpressionStmt(final Expression expr) {
+		setExpression(expr);
+	}
 
-    public ExpressionStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                          final Expression expr) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setExpression(expr);
-    }
+	public ExpressionStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression expr) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setExpression(expr);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getExpression() {
-        return expr;
-    }
+	public Expression getExpression() {
+		return expr;
+	}
 
-    public void setExpression(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-    }
+	public void setExpression(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForStmt.java
index 4bc873256e..8e349bf2c0 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -32,79 +32,79 @@
  */
 public final class ForStmt extends Statement {
 
-    private List<Expression> init;
-
-    private Expression compare;
-
-    private List<Expression> update;
-
-    private Statement body;
-
-    public ForStmt() {
-    }
-
-    public ForStmt(final List<Expression> init, final Expression compare,
-                   final List<Expression> update, final Statement body) {
-        setCompare(compare);
-        setInit(init);
-        setUpdate(update);
-        setBody(body);
-    }
-
-    public ForStmt(final int beginLine, final int beginColumn,
-                   final int endLine, final int endColumn,
-                   final List<Expression> init, final Expression compare,
-                   final List<Expression> update, final Statement body) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setCompare(compare);
-        setInit(init);
-        setUpdate(update);
-        setBody(body);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public Statement getBody() {
-        return body;
-    }
-
-    public Expression getCompare() {
-        return compare;
-    }
-
-    public List<Expression> getInit() {
-        return init;
-    }
-
-    public List<Expression> getUpdate() {
-        return update;
-    }
-
-    public void setBody(final Statement body) {
-        this.body = body;
-        setAsParentNodeOf(this.body);
-    }
-
-    public void setCompare(final Expression compare) {
-        this.compare = compare;
-        setAsParentNodeOf(this.compare);
-    }
-
-    public void setInit(final List<Expression> init) {
-        this.init = init;
-        setAsParentNodeOf(this.init);
-    }
-
-    public void setUpdate(final List<Expression> update) {
-        this.update = update;
-        setAsParentNodeOf(this.update);
-    }
+	private List<Expression> init;
+
+	private Expression compare;
+
+	private List<Expression> update;
+
+	private Statement body;
+
+	public ForStmt() {
+	}
+
+	public ForStmt(final List<Expression> init, final Expression compare,
+			final List<Expression> update, final Statement body) {
+		setCompare(compare);
+		setInit(init);
+		setUpdate(update);
+		setBody(body);
+	}
+
+	public ForStmt(final int beginLine, final int beginColumn,
+			final int endLine, final int endColumn,
+			final List<Expression> init, final Expression compare,
+			final List<Expression> update, final Statement body) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setCompare(compare);
+		setInit(init);
+		setUpdate(update);
+		setBody(body);
+	}
+
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public Statement getBody() {
+		return body;
+	}
+
+	public Expression getCompare() {
+		return compare;
+	}
+
+	public List<Expression> getInit() {
+		return init;
+	}
+
+	public List<Expression> getUpdate() {
+		return update;
+	}
+
+	public void setBody(final Statement body) {
+		this.body = body;
+		setAsParentNodeOf(this.body);
+	}
+
+	public void setCompare(final Expression compare) {
+		this.compare = compare;
+		setAsParentNodeOf(this.compare);
+	}
+
+	public void setInit(final List<Expression> init) {
+		this.init = init;
+		setAsParentNodeOf(this.init);
+	}
+
+	public void setUpdate(final List<Expression> update) {
+		this.update = update;
+		setAsParentNodeOf(this.update);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForeachStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForeachStmt.java
index 8b5e24b38a..245622fc5b 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForeachStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ForeachStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -31,66 +31,66 @@
  */
 public final class ForeachStmt extends Statement {
 
-    private VariableDeclarationExpr var;
-
-    private Expression iterable;
-
-    private Statement body;
-
-    public ForeachStmt() {
-    }
-
-    public ForeachStmt(final VariableDeclarationExpr var,
-                       final Expression iterable, final Statement body) {
-        setVariable(var);
-        setIterable(iterable);
-        setBody(body);
-    }
-
-    public ForeachStmt(final int beginLine, final int beginColumn,
-                       final int endLine, final int endColumn,
-                       final VariableDeclarationExpr var, final Expression iterable,
-                       final Statement body) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setVariable(var);
-        setIterable(iterable);
-        setBody(body);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public Statement getBody() {
-        return body;
-    }
-
-    public Expression getIterable() {
-        return iterable;
-    }
-
-    public VariableDeclarationExpr getVariable() {
-        return var;
-    }
-
-    public void setBody(final Statement body) {
-        this.body = body;
-        setAsParentNodeOf(this.body);
-    }
-
-    public void setIterable(final Expression iterable) {
-        this.iterable = iterable;
-        setAsParentNodeOf(this.iterable);
-    }
-
-    public void setVariable(final VariableDeclarationExpr var) {
-        this.var = var;
-        setAsParentNodeOf(this.var);
-    }
+	private VariableDeclarationExpr var;
+
+	private Expression iterable;
+
+	private Statement body;
+
+	public ForeachStmt() {
+	}
+
+	public ForeachStmt(final VariableDeclarationExpr var,
+			final Expression iterable, final Statement body) {
+		setVariable(var);
+		setIterable(iterable);
+		setBody(body);
+	}
+
+	public ForeachStmt(final int beginLine, final int beginColumn,
+			final int endLine, final int endColumn,
+			final VariableDeclarationExpr var, final Expression iterable,
+			final Statement body) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setVariable(var);
+		setIterable(iterable);
+		setBody(body);
+	}
+
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public Statement getBody() {
+		return body;
+	}
+
+	public Expression getIterable() {
+		return iterable;
+	}
+
+	public VariableDeclarationExpr getVariable() {
+		return var;
+	}
+
+	public void setBody(final Statement body) {
+		this.body = body;
+		setAsParentNodeOf(this.body);
+	}
+
+	public void setIterable(final Expression iterable) {
+		this.iterable = iterable;
+		setAsParentNodeOf(this.iterable);
+	}
+
+	public void setVariable(final VariableDeclarationExpr var) {
+		this.var = var;
+		setAsParentNodeOf(this.var);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/IfStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/IfStmt.java
index 52ae78415d..ccddd903eb 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/IfStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/IfStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -30,63 +30,61 @@
  */
 public final class IfStmt extends Statement {
 
-    private Expression condition;
-
-    private Statement thenStmt;
-
-    private Statement elseStmt;
-
-    public IfStmt() {
-    }
-
-    public IfStmt(final Expression condition, final Statement thenStmt, final Statement elseStmt) {
-        setCondition(condition);
-        setThenStmt(thenStmt);
-        setElseStmt(elseStmt);
-    }
-
-    public IfStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                  final Expression condition, final Statement thenStmt, final Statement elseStmt) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setCondition(condition);
-        setThenStmt(thenStmt);
-        setElseStmt(elseStmt);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public Expression getCondition() {
-        return condition;
-    }
-
-    public Statement getElseStmt() {
-        return elseStmt;
-    }
-
-    public Statement getThenStmt() {
-        return thenStmt;
-    }
-
-    public void setCondition(final Expression condition) {
-        this.condition = condition;
-        setAsParentNodeOf(this.condition);
-    }
-
-    public void setElseStmt(final Statement elseStmt) {
-        this.elseStmt = elseStmt;
-        setAsParentNodeOf(this.elseStmt);
-    }
-
-    public void setThenStmt(final Statement thenStmt) {
-        this.thenStmt = thenStmt;
-        setAsParentNodeOf(this.thenStmt);
-    }
+	private Expression condition;
+
+	private Statement thenStmt;
+
+	private Statement elseStmt;
+
+	public IfStmt() {
+	}
+
+	public IfStmt(final Expression condition, final Statement thenStmt, final Statement elseStmt) {
+		setCondition(condition);
+		setThenStmt(thenStmt);
+		setElseStmt(elseStmt);
+	}
+
+	public IfStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression condition, final Statement thenStmt, final Statement elseStmt) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setCondition(condition);
+		setThenStmt(thenStmt);
+		setElseStmt(elseStmt);
+	}
+
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public Expression getCondition() {
+		return condition;
+	}
+
+	public Statement getElseStmt() {
+		return elseStmt;
+	}
+
+	public Statement getThenStmt() {
+		return thenStmt;
+	}
+
+	public void setCondition(final Expression condition) {
+		this.condition = condition;
+		setAsParentNodeOf(this.condition);
+	}
+
+	public void setElseStmt(final Statement elseStmt) {
+		this.elseStmt = elseStmt;
+		setAsParentNodeOf(this.elseStmt);
+	}
+
+	public void setThenStmt(final Statement thenStmt) {
+		this.thenStmt = thenStmt;
+		setAsParentNodeOf(this.thenStmt);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/LabeledStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/LabeledStmt.java
index 4d1ffc7e42..85d8e7b999 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/LabeledStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/LabeledStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,49 +29,47 @@
  */
 public final class LabeledStmt extends Statement {
 
-    private String label;
+	private String label;
 
-    private Statement stmt;
+	private Statement stmt;
 
-    public LabeledStmt() {
-    }
+	public LabeledStmt() {
+	}
 
-    public LabeledStmt(final String label, final Statement stmt) {
-        setLabel(label);
-        setStmt(stmt);
-    }
+	public LabeledStmt(final String label, final Statement stmt) {
+		setLabel(label);
+		setStmt(stmt);
+	}
 
-    public LabeledStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                       final String label, final Statement stmt) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setLabel(label);
-        setStmt(stmt);
-    }
+	public LabeledStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final String label, final Statement stmt) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setLabel(label);
+		setStmt(stmt);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public String getLabel() {
-        return label;
-    }
+	public String getLabel() {
+		return label;
+	}
 
-    public Statement getStmt() {
-        return stmt;
-    }
+	public Statement getStmt() {
+		return stmt;
+	}
 
-    public void setLabel(final String label) {
-        this.label = label;
-    }
+	public void setLabel(final String label) {
+		this.label = label;
+	}
 
-    public void setStmt(final Statement stmt) {
-        this.stmt = stmt;
-        setAsParentNodeOf(this.stmt);
-    }
+	public void setStmt(final Statement stmt) {
+		this.stmt = stmt;
+		setAsParentNodeOf(this.stmt);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ReturnStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ReturnStmt.java
index f176f6b7cb..3ac6fa65e6 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ReturnStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ReturnStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -30,37 +30,35 @@
  */
 public final class ReturnStmt extends Statement {
 
-    private Expression expr;
+	private Expression expr;
 
-    public ReturnStmt() {
-    }
+	public ReturnStmt() {
+	}
 
-    public ReturnStmt(final Expression expr) {
-        setExpr(expr);
-    }
+	public ReturnStmt(final Expression expr) {
+		setExpr(expr);
+	}
 
-    public ReturnStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                      final Expression expr) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setExpr(expr);
-    }
+	public ReturnStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression expr) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setExpr(expr);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getExpr() {
-        return expr;
-    }
+	public Expression getExpr() {
+		return expr;
+	}
 
-    public void setExpr(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-    }
+	public void setExpr(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/Statement.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/Statement.java
index 98bc475fa8..30c462d054 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/Statement.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/Statement.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.Node;
@@ -28,11 +28,11 @@
  */
 public abstract class Statement extends Node {
 
-    public Statement() {
-    }
+	public Statement() {
+	}
 
-    public Statement(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
-        super(beginLine, beginColumn, endLine, endColumn);
-    }
+	public Statement(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
+		super(beginLine, beginColumn, endLine, endColumn);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchEntryStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
index 3103c88c49..8f5a85ad57 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchEntryStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -32,51 +32,51 @@
  */
 public final class SwitchEntryStmt extends Statement {
 
-    private Expression label;
+	private Expression label;
 
-    private List<Statement> stmts;
+	private List<Statement> stmts;
 
-    public SwitchEntryStmt() {
-    }
+	public SwitchEntryStmt() {
+	}
 
-    public SwitchEntryStmt(final Expression label, final List<Statement> stmts) {
-        setLabel(label);
-        setStmts(stmts);
-    }
+	public SwitchEntryStmt(final Expression label, final List<Statement> stmts) {
+		setLabel(label);
+		setStmts(stmts);
+	}
 
-    public SwitchEntryStmt(final int beginLine, final int beginColumn,
-                           final int endLine, final int endColumn, final Expression label,
-                           final List<Statement> stmts) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setLabel(label);
-        setStmts(stmts);
-    }
+	public SwitchEntryStmt(final int beginLine, final int beginColumn,
+			final int endLine, final int endColumn, final Expression label,
+			final List<Statement> stmts) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setLabel(label);
+		setStmts(stmts);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getLabel() {
-        return label;
-    }
+	public Expression getLabel() {
+		return label;
+	}
 
-    public List<Statement> getStmts() {
-        return stmts;
-    }
+	public List<Statement> getStmts() {
+		return stmts;
+	}
 
-    public void setLabel(final Expression label) {
-        this.label = label;
-        setAsParentNodeOf(this.label);
-    }
+	public void setLabel(final Expression label) {
+		this.label = label;
+		setAsParentNodeOf(this.label);
+	}
 
-    public void setStmts(final List<Statement> stmts) {
-        this.stmts = stmts;
-        setAsParentNodeOf(this.stmts);
-    }
+	public void setStmts(final List<Statement> stmts) {
+		this.stmts = stmts;
+		setAsParentNodeOf(this.stmts);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchStmt.java
index e443e108c2..49fe903da6 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SwitchStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -32,52 +32,52 @@
  */
 public final class SwitchStmt extends Statement {
 
-    private Expression selector;
+	private Expression selector;
 
-    private List<SwitchEntryStmt> entries;
+	private List<SwitchEntryStmt> entries;
 
-    public SwitchStmt() {
-    }
+	public SwitchStmt() {
+	}
 
-    public SwitchStmt(final Expression selector,
-                      final List<SwitchEntryStmt> entries) {
-        setSelector(selector);
-        setEntries(entries);
-    }
+	public SwitchStmt(final Expression selector,
+			final List<SwitchEntryStmt> entries) {
+		setSelector(selector);
+		setEntries(entries);
+	}
 
-    public SwitchStmt(final int beginLine, final int beginColumn,
-                      final int endLine, final int endColumn, final Expression selector,
-                      final List<SwitchEntryStmt> entries) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setSelector(selector);
-        setEntries(entries);
-    }
+	public SwitchStmt(final int beginLine, final int beginColumn,
+			final int endLine, final int endColumn, final Expression selector,
+			final List<SwitchEntryStmt> entries) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setSelector(selector);
+		setEntries(entries);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public List<SwitchEntryStmt> getEntries() {
-        return entries;
-    }
+	public List<SwitchEntryStmt> getEntries() {
+		return entries;
+	}
 
-    public Expression getSelector() {
-        return selector;
-    }
+	public Expression getSelector() {
+		return selector;
+	}
 
-    public void setEntries(final List<SwitchEntryStmt> entries) {
-        this.entries = entries;
-        setAsParentNodeOf(this.entries);
-    }
+	public void setEntries(final List<SwitchEntryStmt> entries) {
+		this.entries = entries;
+		setAsParentNodeOf(this.entries);
+	}
 
-    public void setSelector(final Expression selector) {
-        this.selector = selector;
-        setAsParentNodeOf(this.selector);
-    }
+	public void setSelector(final Expression selector) {
+		this.selector = selector;
+		setAsParentNodeOf(this.selector);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SynchronizedStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SynchronizedStmt.java
index 0de7bf428a..e91fc0b194 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SynchronizedStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/SynchronizedStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -30,51 +30,51 @@
  */
 public final class SynchronizedStmt extends Statement {
 
-    private Expression expr;
+	private Expression expr;
 
-    private BlockStmt block;
+	private BlockStmt block;
 
-    public SynchronizedStmt() {
-    }
+	public SynchronizedStmt() {
+	}
 
-    public SynchronizedStmt(final Expression expr, final BlockStmt block) {
-        setExpr(expr);
-        setBlock(block);
-    }
+	public SynchronizedStmt(final Expression expr, final BlockStmt block) {
+		setExpr(expr);
+		setBlock(block);
+	}
 
-    public SynchronizedStmt(final int beginLine, final int beginColumn,
-                            final int endLine, final int endColumn, final Expression expr,
-                            final BlockStmt block) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setExpr(expr);
-        setBlock(block);
-    }
+	public SynchronizedStmt(final int beginLine, final int beginColumn,
+			final int endLine, final int endColumn, final Expression expr,
+			final BlockStmt block) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setExpr(expr);
+		setBlock(block);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public BlockStmt getBlock() {
-        return block;
-    }
+	public BlockStmt getBlock() {
+		return block;
+	}
 
-    public Expression getExpr() {
-        return expr;
-    }
+	public Expression getExpr() {
+		return expr;
+	}
 
-    public void setBlock(final BlockStmt block) {
-        this.block = block;
-        setAsParentNodeOf(this.block);
-    }
+	public void setBlock(final BlockStmt block) {
+		this.block = block;
+		setAsParentNodeOf(this.block);
+	}
 
-    public void setExpr(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-    }
+	public void setExpr(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ThrowStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ThrowStmt.java
index b97009d9e0..48283b16da 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ThrowStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/ThrowStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -30,37 +30,35 @@
  */
 public final class ThrowStmt extends Statement {
 
-    private Expression expr;
+	private Expression expr;
 
-    public ThrowStmt() {
-    }
+	public ThrowStmt() {
+	}
 
-    public ThrowStmt(final Expression expr) {
-        setExpr(expr);
-    }
+	public ThrowStmt(final Expression expr) {
+		setExpr(expr);
+	}
 
-    public ThrowStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                     final Expression expr) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setExpr(expr);
-    }
+	public ThrowStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression expr) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setExpr(expr);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Expression getExpr() {
-        return expr;
-    }
+	public Expression getExpr() {
+		return expr;
+	}
 
-    public void setExpr(final Expression expr) {
-        this.expr = expr;
-        setAsParentNodeOf(this.expr);
-    }
+	public void setExpr(final Expression expr) {
+		this.expr = expr;
+		setAsParentNodeOf(this.expr);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TryStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TryStmt.java
index f4fecf8696..44009c4c98 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TryStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TryStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -31,78 +31,78 @@
  * @author Julio Vilmar Gesser
  */
 public final class TryStmt extends Statement {
-
-    private List<VariableDeclarationExpr> resources;
-
-    private BlockStmt tryBlock;
-
-    private List<CatchClause> catchs;
-
-    private BlockStmt finallyBlock;
-
-    public TryStmt() {
-    }
-
-    public TryStmt(final BlockStmt tryBlock, final List<CatchClause> catchs,
-                   final BlockStmt finallyBlock) {
-        setTryBlock(tryBlock);
-        setCatchs(catchs);
-        setFinallyBlock(finallyBlock);
-    }
-
-    public TryStmt(final int beginLine, final int beginColumn,
-                   final int endLine, final int endColumn, List<VariableDeclarationExpr> resources,
-                   final BlockStmt tryBlock, final List<CatchClause> catchs, final BlockStmt finallyBlock) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setResources(resources);
-        setTryBlock(tryBlock);
-        setCatchs(catchs);
-        setFinallyBlock(finallyBlock);
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public List<CatchClause> getCatchs() {
-        return catchs;
-    }
-
-    public BlockStmt getFinallyBlock() {
-        return finallyBlock;
-    }
-
-    public BlockStmt getTryBlock() {
-        return tryBlock;
-    }
-
-    public List<VariableDeclarationExpr> getResources() {
-        return resources;
-    }
-
-    public void setCatchs(final List<CatchClause> catchs) {
-        this.catchs = catchs;
-        setAsParentNodeOf(this.catchs);
-    }
-
-    public void setFinallyBlock(final BlockStmt finallyBlock) {
-        this.finallyBlock = finallyBlock;
-        setAsParentNodeOf(this.finallyBlock);
-    }
-
-    public void setTryBlock(final BlockStmt tryBlock) {
-        this.tryBlock = tryBlock;
-        setAsParentNodeOf(this.tryBlock);
-    }
-
-    public void setResources(List<VariableDeclarationExpr> resources) {
-        this.resources = resources;
-        setAsParentNodeOf(this.resources);
-    }
+	
+	private List<VariableDeclarationExpr> resources;
+
+	private BlockStmt tryBlock;
+
+	private List<CatchClause> catchs;
+
+	private BlockStmt finallyBlock;
+
+	public TryStmt() {
+	}
+
+	public TryStmt(final BlockStmt tryBlock, final List<CatchClause> catchs,
+			final BlockStmt finallyBlock) {
+		setTryBlock(tryBlock);
+		setCatchs(catchs);
+		setFinallyBlock(finallyBlock);
+	}
+
+	public TryStmt(final int beginLine, final int beginColumn,
+			final int endLine, final int endColumn, List<VariableDeclarationExpr> resources,
+			final BlockStmt tryBlock, final List<CatchClause> catchs, final BlockStmt finallyBlock) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setResources(resources);
+		setTryBlock(tryBlock);
+		setCatchs(catchs);
+		setFinallyBlock(finallyBlock);
+	}
+
+	@Override
+	public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override
+	public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public List<CatchClause> getCatchs() {
+		return catchs;
+	}
+
+	public BlockStmt getFinallyBlock() {
+		return finallyBlock;
+	}
+
+	public BlockStmt getTryBlock() {
+		return tryBlock;
+	}
+	
+	public List<VariableDeclarationExpr> getResources() {
+		return resources;
+	}
+
+	public void setCatchs(final List<CatchClause> catchs) {
+		this.catchs = catchs;
+		setAsParentNodeOf(this.catchs);
+	}
+
+	public void setFinallyBlock(final BlockStmt finallyBlock) {
+		this.finallyBlock = finallyBlock;
+		setAsParentNodeOf(this.finallyBlock);
+	}
+
+	public void setTryBlock(final BlockStmt tryBlock) {
+		this.tryBlock = tryBlock;
+		setAsParentNodeOf(this.tryBlock);
+	}
+	
+	public void setResources(List<VariableDeclarationExpr> resources) {
+		this.resources = resources;
+		setAsParentNodeOf(this.resources);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
index 8e30292a3b..79b507a1f8 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/TypeDeclarationStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.body.TypeDeclaration;
@@ -30,37 +30,35 @@
  */
 public final class TypeDeclarationStmt extends Statement {
 
-    private TypeDeclaration typeDecl;
+	private TypeDeclaration typeDecl;
 
-    public TypeDeclarationStmt() {
-    }
+	public TypeDeclarationStmt() {
+	}
 
-    public TypeDeclarationStmt(final TypeDeclaration typeDecl) {
-        setTypeDeclaration(typeDecl);
-    }
+	public TypeDeclarationStmt(final TypeDeclaration typeDecl) {
+		setTypeDeclaration(typeDecl);
+	}
 
-    public TypeDeclarationStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                               final TypeDeclaration typeDecl) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setTypeDeclaration(typeDecl);
-    }
+	public TypeDeclarationStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final TypeDeclaration typeDecl) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setTypeDeclaration(typeDecl);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public TypeDeclaration getTypeDeclaration() {
-        return typeDecl;
-    }
+	public TypeDeclaration getTypeDeclaration() {
+		return typeDecl;
+	}
 
-    public void setTypeDeclaration(final TypeDeclaration typeDecl) {
-        this.typeDecl = typeDecl;
-        setAsParentNodeOf(this.typeDecl);
-    }
+	public void setTypeDeclaration(final TypeDeclaration typeDecl) {
+		this.typeDecl = typeDecl;
+		setAsParentNodeOf(this.typeDecl);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/WhileStmt.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/WhileStmt.java
index 47b093d061..51b2a1a232 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/WhileStmt.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/stmt/WhileStmt.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.stmt;
 
 import com.github.javaparser.ast.expr.Expression;
@@ -30,50 +30,48 @@
  */
 public final class WhileStmt extends Statement {
 
-    private Expression condition;
+	private Expression condition;
 
-    private Statement body;
+	private Statement body;
 
-    public WhileStmt() {
-    }
+	public WhileStmt() {
+	}
 
-    public WhileStmt(final Expression condition, final Statement body) {
-        setCondition(condition);
-        setBody(body);
-    }
+	public WhileStmt(final Expression condition, final Statement body) {
+		setCondition(condition);
+		setBody(body);
+	}
 
-    public WhileStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                     final Expression condition, final Statement body) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setCondition(condition);
-        setBody(body);
-    }
+	public WhileStmt(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Expression condition, final Statement body) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setCondition(condition);
+		setBody(body);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public Statement getBody() {
-        return body;
-    }
+	public Statement getBody() {
+		return body;
+	}
 
-    public Expression getCondition() {
-        return condition;
-    }
+	public Expression getCondition() {
+		return condition;
+	}
 
-    public void setBody(final Statement body) {
-        this.body = body;
-        setAsParentNodeOf(this.body);
-    }
+	public void setBody(final Statement body) {
+		this.body = body;
+		setAsParentNodeOf(this.body);
+	}
 
-    public void setCondition(final Expression condition) {
-        this.condition = condition;
-        setAsParentNodeOf(this.condition);
-    }
+	public void setCondition(final Expression condition) {
+		this.condition = condition;
+		setAsParentNodeOf(this.condition);
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/ClassOrInterfaceType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/ClassOrInterfaceType.java
index 9b3c6d625e..a7efbf4e36 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/ClassOrInterfaceType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/ClassOrInterfaceType.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/PrimitiveType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/PrimitiveType.java
index 1b599d3b93..561a89657c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/PrimitiveType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/PrimitiveType.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import java.util.HashMap;
@@ -31,70 +31,67 @@
  */
 public final class PrimitiveType extends Type {
 
-    public enum Primitive {
-        Boolean("Boolean"),
-        Char("Character"),
-        Byte("Byte"),
-        Short("Short"),
-        Int("Integer"),
-        Long("Long"),
-        Float("Float"),
-        Double("Double");
-
-        final String nameOfBoxedType;
-
-        public ClassOrInterfaceType toBoxedType() {
-            return new ClassOrInterfaceType(nameOfBoxedType);
-        }
-
-        private Primitive(String nameOfBoxedType) {
-            this.nameOfBoxedType = nameOfBoxedType;
-        }
-    }
-
-    static final HashMap<String, Primitive> unboxMap = new HashMap<String, Primitive>();
-
-    static {
-        for (Primitive unboxedType : Primitive.values()) {
-            unboxMap.put(unboxedType.nameOfBoxedType, unboxedType);
-        }
-    }
-
-    private Primitive type;
-
-    public PrimitiveType() {
-    }
-
-    public PrimitiveType(final Primitive type) {
-        this.type = type;
-    }
-
-    public PrimitiveType(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                         final Primitive type) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        this.type = type;
-    }
-
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public Primitive getType() {
-        return type;
-    }
-
-    public ClassOrInterfaceType toBoxedType() {
-        return type.toBoxedType();
-    }
-
-    public void setType(final Primitive type) {
-        this.type = type;
-    }
+	public enum Primitive {
+		Boolean ("Boolean"),
+		Char    ("Character"),
+		Byte    ("Byte"),
+		Short   ("Short"),
+		Int     ("Integer"),
+		Long    ("Long"),
+		Float   ("Float"),
+		Double  ("Double");
+
+		final String nameOfBoxedType;
+
+		public ClassOrInterfaceType toBoxedType() {
+			return new ClassOrInterfaceType(nameOfBoxedType);
+		}
+
+		private Primitive(String nameOfBoxedType) {
+			this.nameOfBoxedType = nameOfBoxedType;
+		}
+	}
+
+	static final HashMap<String, Primitive> unboxMap = new HashMap<String, Primitive>();
+	static {
+		for(Primitive unboxedType : Primitive.values()) {
+			unboxMap.put(unboxedType.nameOfBoxedType, unboxedType);
+		}
+	}
+
+	private Primitive type;
+
+	public PrimitiveType() {
+	}
+
+	public PrimitiveType(final Primitive type) {
+		this.type = type;
+	}
+
+	public PrimitiveType(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Primitive type) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		this.type = type;
+	}
+
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public Primitive getType() {
+		return type;
+	}
+
+	public ClassOrInterfaceType toBoxedType() {
+		return type.toBoxedType();
+	}
+
+	public void setType(final Primitive type) {
+		this.type = type;
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/ReferenceType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/ReferenceType.java
index 9de2bb4786..55d303492e 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/ReferenceType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/ReferenceType.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import com.github.javaparser.ast.expr.AnnotationExpr;
@@ -32,30 +32,30 @@
  */
 public final class ReferenceType extends Type {
 
-    private Type type;
+	private Type type;
 
-    private int arrayCount;
+	private int arrayCount;
 
     private List<List<AnnotationExpr>> arraysAnnotations;
 
     public ReferenceType() {
-    }
+	}
 
-    public ReferenceType(final Type type) {
-        setType(type);
-    }
+	public ReferenceType(final Type type) {
+		setType(type);
+	}
 
-    public ReferenceType(final Type type, final int arrayCount) {
-        setType(type);
-        setArrayCount(arrayCount);
-    }
+	public ReferenceType(final Type type, final int arrayCount) {
+		setType(type);
+		setArrayCount(arrayCount);
+	}
 
-    public ReferenceType(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                         final Type type, final int arrayCount) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setType(type);
-        setArrayCount(arrayCount);
-    }
+	public ReferenceType(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final Type type, final int arrayCount) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setType(type);
+		setArrayCount(arrayCount);
+	}
 
     public ReferenceType(int beginLine, int beginColumn, int endLine,
                          int endColumn, Type type, int arrayCount,
@@ -67,60 +67,58 @@ public ReferenceType(int beginLine, int beginColumn, int endLine,
         this.arraysAnnotations = arraysAnnotations;
     }
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
-
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
-
-    public int getArrayCount() {
-        return arrayCount;
-    }
-
-    public Type getType() {
-        return type;
-    }
-
-    public void setArrayCount(final int arrayCount) {
-        this.arrayCount = arrayCount;
-    }
-
-    public void setType(final Type type) {
-        this.type = type;
-        setAsParentNodeOf(this.type);
-    }
-
-    /**
-     * <p>Arrays annotations are annotations on the arrays modifiers of the type.
-     * Consider this example:</p>
-     *
-     * <p><pre>
-     * {@code
-     * int @Ann1 [] @Ann2 [] array;
-     * }</pre></p>
-     *
-     * <p>in this method will return a list with the annotation expressions <pre>@Ann1</pre>
-     * and <pre>@Ann2</pre></p>
-     *
-     * <p>Note that the first list element of arraysAnnotations will refer to the first array modifier encountered.
-     * Considering the example the first element will be a list containing just @Ann1 while the second element will
-     * be a list containing just @Ann2.
-     * </p>
-     *
-     * <p>This property is guaranteed to hold: <pre>{@code getArraysAnnotations().size() == getArrayCount()}</pre>
-     * If a certain array modifier has no annotation the corresponding entry of arraysAnnotations will be null</p>
-     */
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
+
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
+
+	public int getArrayCount() {
+		return arrayCount;
+	}
+
+	public Type getType() {
+		return type;
+	}
+
+	public void setArrayCount(final int arrayCount) {
+		this.arrayCount = arrayCount;
+	}
+
+	public void setType(final Type type) {
+		this.type = type;
+		setAsParentNodeOf(this.type);
+	}
+
+	/**
+	 * <p>Arrays annotations are annotations on the arrays modifiers of the type.
+	 * Consider this example:</p>
+	 * 
+	 * <p><pre>
+	 * {@code
+	 * int @Ann1 [] @Ann2 [] array;
+	 * }</pre></p>
+	 * 
+	 * <p>in this method will return a list with the annotation expressions <pre>@Ann1</pre>
+	 * and <pre>@Ann2</pre></p>
+	 * 
+	 * <p>Note that the first list element of arraysAnnotations will refer to the first array modifier encountered.
+	 * Considering the example the first element will be a list containing just @Ann1 while the second element will
+	 * be a list containing just @Ann2.
+	 * </p>
+	 *
+	 * <p>This property is guaranteed to hold: <pre>{@code getArraysAnnotations().size() == getArrayCount()}</pre>
+	 * If a certain array modifier has no annotation the corresponding entry of arraysAnnotations will be null</p>
+	 */
     public List<List<AnnotationExpr>> getArraysAnnotations() {
         return arraysAnnotations;
     }
 
-    /**
-     * For a description of the arrayAnnotations field refer to {@link #getArraysAnnotations()}
-     */
+	/**
+	 * For a description of the arrayAnnotations field refer to {@link #getArraysAnnotations()}
+	 */
     public void setArraysAnnotations(List<List<AnnotationExpr>> arraysAnnotations) {
         this.arraysAnnotations = arraysAnnotations;
     }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/Type.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/Type.java
index 298b95b533..22c91240fa 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/Type.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/Type.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import com.github.javaparser.ast.Node;
@@ -36,7 +36,7 @@ public abstract class Type extends Node {
     public Type() {
     }
 
-    public Type(List<AnnotationExpr> annotation) {
+    public Type(List<AnnotationExpr> annotation){
         this.annotations = annotation;
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/UnknownType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/UnknownType.java
index e40dd56f21..af6d4d979e 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/UnknownType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/UnknownType.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/VoidType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/VoidType.java
index e2246babcd..5dacbe1e7e 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/VoidType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/VoidType.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,21 +29,19 @@
  */
 public final class VoidType extends Type {
 
-    public VoidType() {
-    }
+	public VoidType() {
+	}
 
-    public VoidType(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
-        super(beginLine, beginColumn, endLine, endColumn);
-    }
+	public VoidType(final int beginLine, final int beginColumn, final int endLine, final int endColumn) {
+		super(beginLine, beginColumn, endLine, endColumn);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/WildcardType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/WildcardType.java
index 0d33a68586..8016ed70eb 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/WildcardType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/type/WildcardType.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.type;
 
 import com.github.javaparser.ast.visitor.GenericVisitor;
@@ -29,55 +29,53 @@
  */
 public final class WildcardType extends Type {
 
-    private ReferenceType ext;
+	private ReferenceType ext;
 
-    private ReferenceType sup;
+	private ReferenceType sup;
 
-    public WildcardType() {
-    }
+	public WildcardType() {
+	}
 
-    public WildcardType(final ReferenceType ext) {
-        setExtends(ext);
-    }
+	public WildcardType(final ReferenceType ext) {
+		setExtends(ext);
+	}
 
-    public WildcardType(final ReferenceType ext, final ReferenceType sup) {
-        setExtends(ext);
-        setSuper(sup);
-    }
+	public WildcardType(final ReferenceType ext, final ReferenceType sup) {
+		setExtends(ext);
+		setSuper(sup);
+	}
 
-    public WildcardType(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
-                        final ReferenceType ext, final ReferenceType sup) {
-        super(beginLine, beginColumn, endLine, endColumn);
-        setExtends(ext);
-        setSuper(sup);
-    }
+	public WildcardType(final int beginLine, final int beginColumn, final int endLine, final int endColumn,
+			final ReferenceType ext, final ReferenceType sup) {
+		super(beginLine, beginColumn, endLine, endColumn);
+		setExtends(ext);
+		setSuper(sup);
+	}
 
-    @Override
-    public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
-        return v.visit(this, arg);
-    }
+	@Override public <R, A> R accept(final GenericVisitor<R, A> v, final A arg) {
+		return v.visit(this, arg);
+	}
 
-    @Override
-    public <A> void accept(final VoidVisitor<A> v, final A arg) {
-        v.visit(this, arg);
-    }
+	@Override public <A> void accept(final VoidVisitor<A> v, final A arg) {
+		v.visit(this, arg);
+	}
 
-    public ReferenceType getExtends() {
-        return ext;
-    }
+	public ReferenceType getExtends() {
+		return ext;
+	}
 
-    public ReferenceType getSuper() {
-        return sup;
-    }
+	public ReferenceType getSuper() {
+		return sup;
+	}
 
-    public void setExtends(final ReferenceType ext) {
-        this.ext = ext;
-        setAsParentNodeOf(this.ext);
-    }
+	public void setExtends(final ReferenceType ext) {
+		this.ext = ext;
+		setAsParentNodeOf(this.ext);
+	}
 
-    public void setSuper(final ReferenceType sup) {
-        this.sup = sup;
-        setAsParentNodeOf(this.sup);
-    }
+	public void setSuper(final ReferenceType sup) {
+		this.sup = sup;
+		setAsParentNodeOf(this.sup);
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/CloneVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/CloneVisitor.java
index a81452213b..3d8d299aa0 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/CloneVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/CloneVisitor.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import java.util.ArrayList;
@@ -57,47 +57,47 @@
 
 public class CloneVisitor implements GenericVisitor<Node, Object> {
 
-    @Override
-    public Node visit(CompilationUnit _n, Object _arg) {
-        PackageDeclaration package_ = cloneNodes(_n.getPackage(), _arg);
-        List<ImportDeclaration> imports = visit(_n.getImports(), _arg);
-        List<TypeDeclaration> types = visit(_n.getTypes(), _arg);
-
-        return new CompilationUnit(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                package_, imports, types
-        );
-    }
-
-    @Override
-    public Node visit(PackageDeclaration _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        NameExpr name = cloneNodes(_n.getName(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        PackageDeclaration r = new PackageDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                annotations, name
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ImportDeclaration _n, Object _arg) {
-        NameExpr name = cloneNodes(_n.getName(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ImportDeclaration r = new ImportDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                name, _n.isStatic(), _n.isAsterisk()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(TypeParameter _n, Object _arg) {
+	@Override
+	public Node visit(CompilationUnit _n, Object _arg) {
+		PackageDeclaration package_ = cloneNodes(_n.getPackage(), _arg);
+		List<ImportDeclaration> imports = visit(_n.getImports(), _arg);
+		List<TypeDeclaration> types = visit(_n.getTypes(), _arg);
+
+		return new CompilationUnit(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				package_, imports, types
+		);
+	}
+
+	@Override
+	public Node visit(PackageDeclaration _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		NameExpr name = cloneNodes(_n.getName(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		PackageDeclaration r = new PackageDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				annotations, name
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ImportDeclaration _n, Object _arg) {
+		NameExpr name = cloneNodes(_n.getName(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ImportDeclaration r = new ImportDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				name, _n.isStatic(), _n.isAsterisk()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(TypeParameter _n, Object _arg) {
         List<ClassOrInterfaceType> typeBound = visit(_n.getTypeBound(), _arg);
 
         List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
@@ -107,1085 +107,1085 @@ public Node visit(TypeParameter _n, Object _arg) {
 
         Comment comment = cloneNodes(_n.getComment(), _arg);
         r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(LineComment _n, Object _arg) {
-        return new LineComment(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(), _n.getContent());
-    }
-
-    @Override
-    public Node visit(BlockComment _n, Object _arg) {
-        return new BlockComment(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(), _n.getContent());
-    }
-
-    @Override
-    public Node visit(ClassOrInterfaceDeclaration _n, Object _arg) {
-        JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        List<TypeParameter> typeParameters = visit(_n.getTypeParameters(), _arg);
-        List<ClassOrInterfaceType> extendsList = visit(_n.getExtends(), _arg);
-        List<ClassOrInterfaceType> implementsList = visit(_n.getImplements(), _arg);
-        List<BodyDeclaration> members = visit(_n.getMembers(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ClassOrInterfaceDeclaration r = new ClassOrInterfaceDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getModifiers(), annotations, _n.isInterface(), _n.getName(), typeParameters, extendsList, implementsList, members
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(EnumDeclaration _n, Object _arg) {
-        JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        List<ClassOrInterfaceType> implementsList = visit(_n.getImplements(), _arg);
-        List<EnumConstantDeclaration> entries = visit(_n.getEntries(), _arg);
-        List<BodyDeclaration> members = visit(_n.getMembers(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        EnumDeclaration r = new EnumDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getModifiers(), annotations, _n.getName(), implementsList, entries, members
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(EmptyTypeDeclaration _n, Object _arg) {
-        JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        EmptyTypeDeclaration r = new EmptyTypeDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(EnumConstantDeclaration _n, Object _arg) {
-        JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        List<Expression> args = visit(_n.getArgs(), _arg);
-        List<BodyDeclaration> classBody = visit(_n.getClassBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        EnumConstantDeclaration r = new EnumConstantDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                annotations, _n.getName(), args, classBody
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(AnnotationDeclaration _n, Object _arg) {
-        JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        List<BodyDeclaration> members = visit(_n.getMembers(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        AnnotationDeclaration r = new AnnotationDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getModifiers(), annotations, _n.getName(), members
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(AnnotationMemberDeclaration _n, Object _arg) {
-        JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        Type type_ = cloneNodes(_n.getType(), _arg);
-        Expression defaultValue = cloneNodes(_n.getDefaultValue(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        AnnotationMemberDeclaration r = new AnnotationMemberDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getModifiers(), annotations, type_, _n.getName(), defaultValue
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(FieldDeclaration _n, Object _arg) {
-        JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        Type type_ = cloneNodes(_n.getType(), _arg);
-        List<VariableDeclarator> variables = visit(_n.getVariables(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        FieldDeclaration r = new FieldDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getModifiers(), annotations, type_, variables
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(VariableDeclarator _n, Object _arg) {
-        VariableDeclaratorId id = cloneNodes(_n.getId(), _arg);
-        Expression init = cloneNodes(_n.getInit(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        VariableDeclarator r = new VariableDeclarator(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                id, init
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(VariableDeclaratorId _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        VariableDeclaratorId r = new VariableDeclaratorId(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getName(), _n.getArrayCount()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ConstructorDeclaration _n, Object _arg) {
-        JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        List<TypeParameter> typeParameters = visit(_n.getTypeParameters(), _arg);
-        List<Parameter> parameters = visit(_n.getParameters(), _arg);
-        List<NameExpr> throws_ = visit(_n.getThrows(), _arg);
-        BlockStmt block = cloneNodes(_n.getBlock(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ConstructorDeclaration r = new ConstructorDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getModifiers(), annotations, typeParameters, _n.getName(), parameters, throws_, block
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(MethodDeclaration _n, Object _arg) {
-        JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        List<TypeParameter> typeParameters = visit(_n.getTypeParameters(), _arg);
-        Type type_ = cloneNodes(_n.getType(), _arg);
-        List<Parameter> parameters = visit(_n.getParameters(), _arg);
-        List<NameExpr> throws_ = visit(_n.getThrows(), _arg);
-        BlockStmt block = cloneNodes(_n.getBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        MethodDeclaration r = new MethodDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getModifiers(), annotations, typeParameters, type_, _n.getName(), parameters, _n.getArrayCount(), throws_, block
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(Parameter _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        Type type_ = cloneNodes(_n.getType(), _arg);
-        VariableDeclaratorId id = cloneNodes(_n.getId(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        Parameter r = new Parameter(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getModifiers(), annotations, type_, _n.isVarArgs(), id
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(MultiTypeParameter _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        List<Type> types = visit(_n.getTypes(), _arg);
-        VariableDeclaratorId id = cloneNodes(_n.getId(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        MultiTypeParameter r = new MultiTypeParameter(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getModifiers(), annotations, types, id
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(EmptyMemberDeclaration _n, Object _arg) {
-        JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        EmptyMemberDeclaration r = new EmptyMemberDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(InitializerDeclaration _n, Object _arg) {
-        JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
-        BlockStmt block = cloneNodes(_n.getBlock(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        InitializerDeclaration r = new InitializerDeclaration(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.isStatic(), block
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(JavadocComment _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-        JavadocComment r = new JavadocComment(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getContent()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ClassOrInterfaceType _n, Object _arg) {
-        ClassOrInterfaceType scope = cloneNodes(_n.getScope(), _arg);
-        List<Type> typeArgs = visit(_n.getTypeArgs(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ClassOrInterfaceType r = new ClassOrInterfaceType(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                scope, _n.getName(), typeArgs
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(PrimitiveType _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        PrimitiveType r = new PrimitiveType(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getType()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ReferenceType _n, Object _arg) {
-        List<AnnotationExpr> ann = visit(_n.getAnnotations(), _arg);
-        Type type_ = cloneNodes(_n.getType(), _arg);
-        List<List<AnnotationExpr>> arraysAnnotations = _n.getArraysAnnotations();
-        List<List<AnnotationExpr>> _arraysAnnotations = null;
-        if (arraysAnnotations != null) {
-            _arraysAnnotations = new LinkedList<List<AnnotationExpr>>();
-            for (List<AnnotationExpr> aux : arraysAnnotations) {
-                _arraysAnnotations.add(visit(aux, _arg));
-            }
-        }
+		return r;
+	}
+
+	@Override
+	public Node visit(LineComment _n, Object _arg) {
+		return new LineComment(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(), _n.getContent());
+	}
+
+	@Override
+	public Node visit(BlockComment _n, Object _arg) {
+		return new BlockComment(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(), _n.getContent());
+	}
+
+	@Override
+	public Node visit(ClassOrInterfaceDeclaration _n, Object _arg) {
+		JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<TypeParameter> typeParameters = visit(_n.getTypeParameters(), _arg);
+		List<ClassOrInterfaceType> extendsList = visit(_n.getExtends(), _arg);
+		List<ClassOrInterfaceType> implementsList = visit(_n.getImplements(), _arg);
+		List<BodyDeclaration> members = visit(_n.getMembers(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ClassOrInterfaceDeclaration r = new ClassOrInterfaceDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getModifiers(), annotations, _n.isInterface(), _n.getName(), typeParameters, extendsList, implementsList, members
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(EnumDeclaration _n, Object _arg) {
+		JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<ClassOrInterfaceType> implementsList = visit(_n.getImplements(), _arg);
+		List<EnumConstantDeclaration> entries = visit(_n.getEntries(), _arg);
+		List<BodyDeclaration> members = visit(_n.getMembers(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		EnumDeclaration r = new EnumDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				 _n.getModifiers(), annotations, _n.getName(), implementsList, entries, members
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(EmptyTypeDeclaration _n, Object _arg) {
+		JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		EmptyTypeDeclaration r = new EmptyTypeDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(EnumConstantDeclaration _n, Object _arg) {
+		JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<Expression> args = visit(_n.getArgs(), _arg);
+		List<BodyDeclaration> classBody = visit(_n.getClassBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		EnumConstantDeclaration r = new EnumConstantDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				 annotations, _n.getName(), args, classBody
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(AnnotationDeclaration _n, Object _arg) {
+		JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<BodyDeclaration> members = visit(_n.getMembers(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		AnnotationDeclaration r = new AnnotationDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				 _n.getModifiers(), annotations, _n.getName(), members
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(AnnotationMemberDeclaration _n, Object _arg) {
+		JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		Type type_ = cloneNodes(_n.getType(), _arg);
+		Expression defaultValue = cloneNodes(_n.getDefaultValue(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		AnnotationMemberDeclaration r = new AnnotationMemberDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				 _n.getModifiers(), annotations, type_, _n.getName(), defaultValue
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(FieldDeclaration _n, Object _arg) {
+		JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		Type type_ = cloneNodes(_n.getType(), _arg);
+		List<VariableDeclarator> variables = visit(_n.getVariables(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		FieldDeclaration r = new FieldDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				 _n.getModifiers(), annotations, type_, variables
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(VariableDeclarator _n, Object _arg) {
+		VariableDeclaratorId id = cloneNodes(_n.getId(), _arg);
+		Expression init = cloneNodes(_n.getInit(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		VariableDeclarator r = new VariableDeclarator(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				id, init
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(VariableDeclaratorId _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		VariableDeclaratorId r = new VariableDeclaratorId(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getName(), _n.getArrayCount()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ConstructorDeclaration _n, Object _arg) {
+		JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<TypeParameter> typeParameters = visit(_n.getTypeParameters(), _arg);
+		List<Parameter> parameters = visit(_n.getParameters(), _arg);
+		List<NameExpr> throws_ = visit(_n.getThrows(), _arg);
+		BlockStmt block = cloneNodes(_n.getBlock(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ConstructorDeclaration r = new ConstructorDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				 _n.getModifiers(), annotations, typeParameters, _n.getName(), parameters, throws_, block
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(MethodDeclaration _n, Object _arg) {
+		JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<TypeParameter> typeParameters = visit(_n.getTypeParameters(), _arg);
+		Type type_ = cloneNodes(_n.getType(), _arg);
+		List<Parameter> parameters = visit(_n.getParameters(), _arg);
+		List<NameExpr> throws_ = visit(_n.getThrows(), _arg);
+		BlockStmt block = cloneNodes(_n.getBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		MethodDeclaration r = new MethodDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				 _n.getModifiers(), annotations, typeParameters, type_, _n.getName(), parameters, _n.getArrayCount(), throws_, block
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(Parameter _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		Type type_ = cloneNodes(_n.getType(), _arg);
+		VariableDeclaratorId id = cloneNodes(_n.getId(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		Parameter r = new Parameter(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getModifiers(), annotations, type_, _n.isVarArgs(), id
+		);
+		r.setComment(comment);
+		return r;
+	}
+	
+	@Override
+	public Node visit(MultiTypeParameter _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		List<Type> types = visit(_n.getTypes(), _arg);
+		VariableDeclaratorId id = cloneNodes(_n.getId(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		MultiTypeParameter r = new MultiTypeParameter(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getModifiers(), annotations, types, id
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(EmptyMemberDeclaration _n, Object _arg) {
+		JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		EmptyMemberDeclaration r = new EmptyMemberDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(InitializerDeclaration _n, Object _arg) {
+		JavadocComment javaDoc = cloneNodes(_n.getJavaDoc(), _arg);
+		BlockStmt block = cloneNodes(_n.getBlock(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		InitializerDeclaration r = new InitializerDeclaration(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				 _n.isStatic(), block
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(JavadocComment _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+		JavadocComment r = new JavadocComment(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getContent()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ClassOrInterfaceType _n, Object _arg) {
+		ClassOrInterfaceType scope = cloneNodes(_n.getScope(), _arg);
+		List<Type> typeArgs = visit(_n.getTypeArgs(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ClassOrInterfaceType r = new ClassOrInterfaceType(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				scope, _n.getName(), typeArgs
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(PrimitiveType _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		PrimitiveType r = new PrimitiveType(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getType()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ReferenceType _n, Object _arg) {
+		List<AnnotationExpr> ann = visit(_n.getAnnotations(), _arg);
+		Type type_ = cloneNodes(_n.getType(), _arg);
+		List<List<AnnotationExpr>> arraysAnnotations = _n.getArraysAnnotations();
+		List<List<AnnotationExpr>> _arraysAnnotations = null;
+		if(arraysAnnotations != null){
+			_arraysAnnotations = new LinkedList<List<AnnotationExpr>>();
+			for(List<AnnotationExpr> aux: arraysAnnotations){
+				_arraysAnnotations.add(visit(aux, _arg));
+			}
+		}
 
         ReferenceType r = new ReferenceType(_n.getBeginLine(),
                 _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(), type_,
                 _n.getArrayCount(), ann, _arraysAnnotations);
         Comment comment = cloneNodes(_n.getComment(), _arg);
         r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(VoidType _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        VoidType r = new VoidType(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn());
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(WildcardType _n, Object _arg) {
-        ReferenceType ext = cloneNodes(_n.getExtends(), _arg);
-        ReferenceType sup = cloneNodes(_n.getSuper(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        WildcardType r = new WildcardType(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                ext, sup
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(UnknownType _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        UnknownType r = new UnknownType();
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ArrayAccessExpr _n, Object _arg) {
-        Expression name = cloneNodes(_n.getName(), _arg);
-        Expression index = cloneNodes(_n.getIndex(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ArrayAccessExpr r = new ArrayAccessExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                name, index
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ArrayCreationExpr _n, Object _arg) {
-        Type type_ = cloneNodes(_n.getType(), _arg);
-        List<Expression> dimensions = visit(_n.getDimensions(), _arg);
-        ArrayCreationExpr r = new ArrayCreationExpr(_n.getBeginLine(),
-                _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(), type_,
-                dimensions, _n.getArrayCount());
-        if (_n.getInitializer() != null) {// ArrayCreationExpr has two mutually
-            // exclusive constructors
-            r.setInitializer(cloneNodes(_n.getInitializer(), _arg));
-        }
-        List<List<AnnotationExpr>> arraysAnnotations = _n.getArraysAnnotations();
-        List<List<AnnotationExpr>> _arraysAnnotations = null;
-        if (arraysAnnotations != null) {
-            _arraysAnnotations = new LinkedList<List<AnnotationExpr>>();
-            for (List<AnnotationExpr> aux : arraysAnnotations) {
-                _arraysAnnotations.add(visit(aux, _arg));
-            }
-        }
-        r.setArraysAnnotations(_arraysAnnotations);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ArrayInitializerExpr _n, Object _arg) {
-        List<Expression> values = visit(_n.getValues(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ArrayInitializerExpr r = new ArrayInitializerExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                values
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(AssignExpr _n, Object _arg) {
-        Expression target = cloneNodes(_n.getTarget(), _arg);
-        Expression value = cloneNodes(_n.getValue(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        AssignExpr r = new AssignExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                target, value, _n.getOperator());
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(BinaryExpr _n, Object _arg) {
-        Expression left = cloneNodes(_n.getLeft(), _arg);
-        Expression right = cloneNodes(_n.getRight(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        BinaryExpr r = new BinaryExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                left, right, _n.getOperator()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(CastExpr _n, Object _arg) {
-        Type type_ = cloneNodes(_n.getType(), _arg);
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        CastExpr r = new CastExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                type_, expr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ClassExpr _n, Object _arg) {
-        Type type_ = cloneNodes(_n.getType(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ClassExpr r = new ClassExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                type_
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ConditionalExpr _n, Object _arg) {
-        Expression condition = cloneNodes(_n.getCondition(), _arg);
-        Expression thenExpr = cloneNodes(_n.getThenExpr(), _arg);
-        Expression elseExpr = cloneNodes(_n.getElseExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ConditionalExpr r = new ConditionalExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                condition, thenExpr, elseExpr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(EnclosedExpr _n, Object _arg) {
-        Expression inner = cloneNodes(_n.getInner(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        EnclosedExpr r = new EnclosedExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                inner
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(FieldAccessExpr _n, Object _arg) {
-        Expression scope = cloneNodes(_n.getScope(), _arg);
-        List<Type> typeArgs = visit(_n.getTypeArgs(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        FieldAccessExpr r = new FieldAccessExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                scope, typeArgs, _n.getField()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(InstanceOfExpr _n, Object _arg) {
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        Type type_ = cloneNodes(_n.getType(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        InstanceOfExpr r = new InstanceOfExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                expr, type_
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(StringLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-        StringLiteralExpr r = new StringLiteralExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getValue()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(IntegerLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        IntegerLiteralExpr r = new IntegerLiteralExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getValue()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(LongLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        LongLiteralExpr r = new LongLiteralExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getValue()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(IntegerLiteralMinValueExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        IntegerLiteralMinValueExpr r = new IntegerLiteralMinValueExpr(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn());
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(LongLiteralMinValueExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        LongLiteralMinValueExpr r = new LongLiteralMinValueExpr(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn());
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(CharLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        CharLiteralExpr r = new CharLiteralExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getValue()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(DoubleLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        DoubleLiteralExpr r = new DoubleLiteralExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getValue()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(BooleanLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        BooleanLiteralExpr r = new BooleanLiteralExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getValue()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(NullLiteralExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        NullLiteralExpr r = new NullLiteralExpr(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn());
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(MethodCallExpr _n, Object _arg) {
-        Expression scope = cloneNodes(_n.getScope(), _arg);
-        List<Type> typeArgs = visit(_n.getTypeArgs(), _arg);
-        List<Expression> args = visit(_n.getArgs(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        MethodCallExpr r = new MethodCallExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                scope, typeArgs, _n.getName(), args
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(NameExpr _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        NameExpr r = new NameExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getName()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ObjectCreationExpr _n, Object _arg) {
-        Expression scope = cloneNodes(_n.getScope(), _arg);
-        ClassOrInterfaceType type_ = cloneNodes(_n.getType(), _arg);
-        List<Type> typeArgs = visit(_n.getTypeArgs(), _arg);
-        List<Expression> args = visit(_n.getArgs(), _arg);
-        List<BodyDeclaration> anonymousBody = visit(_n.getAnonymousClassBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ObjectCreationExpr r = new ObjectCreationExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                scope, type_, typeArgs, args, anonymousBody
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(QualifiedNameExpr _n, Object _arg) {
-        NameExpr scope = cloneNodes(_n.getQualifier(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        QualifiedNameExpr r = new QualifiedNameExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                scope, _n.getName()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ThisExpr _n, Object _arg) {
-        Expression classExpr = cloneNodes(_n.getClassExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ThisExpr r = new ThisExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                classExpr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(SuperExpr _n, Object _arg) {
-        Expression classExpr = cloneNodes(_n.getClassExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        SuperExpr r = new SuperExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                classExpr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(UnaryExpr _n, Object _arg) {
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        UnaryExpr r = new UnaryExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                expr, _n.getOperator()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(VariableDeclarationExpr _n, Object _arg) {
-        List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
-        Type type_ = cloneNodes(_n.getType(), _arg);
-        List<VariableDeclarator> vars = visit(_n.getVars(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        VariableDeclarationExpr r = new VariableDeclarationExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getModifiers(), annotations, type_, vars
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(MarkerAnnotationExpr _n, Object _arg) {
-        NameExpr name = cloneNodes(_n.getName(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        MarkerAnnotationExpr r = new MarkerAnnotationExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                name
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(SingleMemberAnnotationExpr _n, Object _arg) {
-        NameExpr name = cloneNodes(_n.getName(), _arg);
-        Expression memberValue = cloneNodes(_n.getMemberValue(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        SingleMemberAnnotationExpr r = new SingleMemberAnnotationExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                name, memberValue
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(NormalAnnotationExpr _n, Object _arg) {
-        NameExpr name = cloneNodes(_n.getName(), _arg);
-        List<MemberValuePair> pairs = visit(_n.getPairs(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        NormalAnnotationExpr r = new NormalAnnotationExpr(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                name, pairs
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(MemberValuePair _n, Object _arg) {
-        Expression value = cloneNodes(_n.getValue(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        MemberValuePair r = new MemberValuePair(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getName(), value
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ExplicitConstructorInvocationStmt _n, Object _arg) {
-        List<Type> typeArgs = visit(_n.getTypeArgs(), _arg);
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        List<Expression> args = visit(_n.getArgs(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ExplicitConstructorInvocationStmt r = new ExplicitConstructorInvocationStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                typeArgs, _n.isThis(), expr, args
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(TypeDeclarationStmt _n, Object _arg) {
-        TypeDeclaration typeDecl = cloneNodes(_n.getTypeDeclaration(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        TypeDeclarationStmt r = new TypeDeclarationStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                typeDecl
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(AssertStmt _n, Object _arg) {
-        Expression check = cloneNodes(_n.getCheck(), _arg);
-        Expression message = cloneNodes(_n.getMessage(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        AssertStmt r = new AssertStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                check, message
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(BlockStmt _n, Object _arg) {
-        List<Statement> stmts = visit(_n.getStmts(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        BlockStmt r = new BlockStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                stmts
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(LabeledStmt _n, Object _arg) {
-        Statement stmt = cloneNodes(_n.getStmt(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        LabeledStmt r = new LabeledStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getLabel(), stmt
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(EmptyStmt _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        EmptyStmt r = new EmptyStmt(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn());
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ExpressionStmt _n, Object _arg) {
-        Expression expr = cloneNodes(_n.getExpression(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ExpressionStmt r = new ExpressionStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                expr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(SwitchStmt _n, Object _arg) {
-        Expression selector = cloneNodes(_n.getSelector(), _arg);
-        List<SwitchEntryStmt> entries = visit(_n.getEntries(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        SwitchStmt r = new SwitchStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                selector, entries
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(SwitchEntryStmt _n, Object _arg) {
-        Expression label = cloneNodes(_n.getLabel(), _arg);
-        List<Statement> stmts = visit(_n.getStmts(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        SwitchEntryStmt r = new SwitchEntryStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                label, stmts
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(BreakStmt _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        BreakStmt r = new BreakStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getId()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ReturnStmt _n, Object _arg) {
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ReturnStmt r = new ReturnStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                expr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(IfStmt _n, Object _arg) {
-        Expression condition = cloneNodes(_n.getCondition(), _arg);
-        Statement thenStmt = cloneNodes(_n.getThenStmt(), _arg);
-        Statement elseStmt = cloneNodes(_n.getElseStmt(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        IfStmt r = new IfStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                condition, thenStmt, elseStmt
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(WhileStmt _n, Object _arg) {
-        Expression condition = cloneNodes(_n.getCondition(), _arg);
-        Statement body = cloneNodes(_n.getBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        WhileStmt r = new WhileStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                condition, body
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ContinueStmt _n, Object _arg) {
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ContinueStmt r = new ContinueStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                _n.getId()
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(DoStmt _n, Object _arg) {
-        Statement body = cloneNodes(_n.getBody(), _arg);
-        Expression condition = cloneNodes(_n.getCondition(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        DoStmt r = new DoStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                body, condition
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ForeachStmt _n, Object _arg) {
-        VariableDeclarationExpr var = cloneNodes(_n.getVariable(), _arg);
-        Expression iterable = cloneNodes(_n.getIterable(), _arg);
-        Statement body = cloneNodes(_n.getBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ForeachStmt r = new ForeachStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                var, iterable, body
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ForStmt _n, Object _arg) {
-        List<Expression> init = visit(_n.getInit(), _arg);
-        Expression compare = cloneNodes(_n.getCompare(), _arg);
-        List<Expression> update = visit(_n.getUpdate(), _arg);
-        Statement body = cloneNodes(_n.getBody(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ForStmt r = new ForStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                init, compare, update, body
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(ThrowStmt _n, Object _arg) {
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        ThrowStmt r = new ThrowStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                expr
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(SynchronizedStmt _n, Object _arg) {
-        Expression expr = cloneNodes(_n.getExpr(), _arg);
-        BlockStmt block = cloneNodes(_n.getBlock(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        SynchronizedStmt r = new SynchronizedStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                expr, block
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(TryStmt _n, Object _arg) {
-        List<VariableDeclarationExpr> resources = visit(_n.getResources(), _arg);
-        BlockStmt tryBlock = cloneNodes(_n.getTryBlock(), _arg);
-        List<CatchClause> catchs = visit(_n.getCatchs(), _arg);
-        BlockStmt finallyBlock = cloneNodes(_n.getFinallyBlock(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        TryStmt r = new TryStmt(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                resources, tryBlock, catchs, finallyBlock
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(CatchClause _n, Object _arg) {
-        MultiTypeParameter except = cloneNodes(_n.getExcept(), _arg);
-        BlockStmt catchBlock = cloneNodes(_n.getCatchBlock(), _arg);
-        Comment comment = cloneNodes(_n.getComment(), _arg);
-
-        CatchClause r = new CatchClause(
-                _n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
-                except.getModifiers(), except.getAnnotations(), except.getTypes(), except.getId(), catchBlock
-        );
-        r.setComment(comment);
-        return r;
-    }
-
-    @Override
-    public Node visit(LambdaExpr _n, Object _arg) {
-
-        List<Parameter> lambdaParameters = visit(_n.getParameters(), _arg);
-
-        Statement body = cloneNodes(_n.getBody(), _arg);
-
-        LambdaExpr r = new LambdaExpr(_n.getBeginLine(), _n.getBeginColumn(),
-                _n.getEndLine(), _n.getEndColumn(), lambdaParameters, body,
-                _n.isParametersEnclosed());
-
-        return r;
-    }
-
-    @Override
-    public Node visit(MethodReferenceExpr _n, Object arg) {
-
-        List<TypeParameter> typeParams = visit(_n.getTypeParameters(), arg);
-        Expression scope = cloneNodes(_n.getScope(), arg);
-
-        MethodReferenceExpr r = new MethodReferenceExpr(_n.getBeginLine(),
-                _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(), scope,
-                typeParams, _n.getIdentifier());
-        return r;
-    }
-
-    @Override
-    public Node visit(TypeExpr n, Object arg) {
-
-        Type t = cloneNodes(n.getType(), arg);
-
-        TypeExpr r = new TypeExpr(n.getBeginLine(), n.getBeginColumn(),
-                n.getEndLine(), n.getEndColumn(), t);
-
-        return r;
-    }
+		return r;
+	}
+
+	@Override
+	public Node visit(VoidType _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		VoidType r = new VoidType(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn());
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(WildcardType _n, Object _arg) {
+		ReferenceType ext = cloneNodes(_n.getExtends(), _arg);
+		ReferenceType sup = cloneNodes(_n.getSuper(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		WildcardType r = new WildcardType(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				ext, sup
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(UnknownType _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		UnknownType r = new UnknownType();
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ArrayAccessExpr _n, Object _arg) {
+		Expression name = cloneNodes(_n.getName(), _arg);
+		Expression index = cloneNodes(_n.getIndex(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ArrayAccessExpr r = new ArrayAccessExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				name, index
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ArrayCreationExpr _n, Object _arg) {
+		Type type_ = cloneNodes(_n.getType(), _arg);
+		List<Expression> dimensions = visit(_n.getDimensions(), _arg);
+		ArrayCreationExpr r = new ArrayCreationExpr(_n.getBeginLine(),
+				_n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(), type_,
+				dimensions, _n.getArrayCount());
+		if (_n.getInitializer() != null) {// ArrayCreationExpr has two mutually
+			// exclusive constructors
+			r.setInitializer(cloneNodes(_n.getInitializer(), _arg));
+		}
+		List<List<AnnotationExpr>> arraysAnnotations = _n.getArraysAnnotations();
+		List<List<AnnotationExpr>> _arraysAnnotations = null;
+		if(arraysAnnotations != null){
+			_arraysAnnotations = new LinkedList<List<AnnotationExpr>>();
+			for(List<AnnotationExpr> aux: arraysAnnotations){
+				_arraysAnnotations.add(visit(aux, _arg));
+			}
+		}
+		r.setArraysAnnotations(_arraysAnnotations);
+        Comment comment = cloneNodes(_n.getComment(), _arg);
+        r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ArrayInitializerExpr _n, Object _arg) {
+		List<Expression> values = visit(_n.getValues(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ArrayInitializerExpr r = new ArrayInitializerExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				values
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(AssignExpr _n, Object _arg) {
+		Expression target = cloneNodes(_n.getTarget(), _arg);
+		Expression value = cloneNodes(_n.getValue(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		AssignExpr r = new AssignExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				target, value, _n.getOperator());
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(BinaryExpr _n, Object _arg) {
+		Expression left = cloneNodes(_n.getLeft(), _arg);
+		Expression right = cloneNodes(_n.getRight(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		BinaryExpr r = new BinaryExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				left, right, _n.getOperator()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(CastExpr _n, Object _arg) {
+		Type type_ = cloneNodes(_n.getType(), _arg);
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		CastExpr r = new CastExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				type_, expr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ClassExpr _n, Object _arg) {
+		Type type_ = cloneNodes(_n.getType(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ClassExpr r = new ClassExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				type_
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ConditionalExpr _n, Object _arg) {
+		Expression condition = cloneNodes(_n.getCondition(), _arg);
+		Expression thenExpr = cloneNodes(_n.getThenExpr(), _arg);
+		Expression elseExpr = cloneNodes(_n.getElseExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ConditionalExpr r = new ConditionalExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				condition, thenExpr, elseExpr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(EnclosedExpr _n, Object _arg) {
+		Expression inner = cloneNodes(_n.getInner(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		EnclosedExpr r = new EnclosedExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				inner
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(FieldAccessExpr _n, Object _arg) {
+		Expression scope = cloneNodes(_n.getScope(), _arg);
+		List<Type> typeArgs = visit(_n.getTypeArgs(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		FieldAccessExpr r = new FieldAccessExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				scope, typeArgs, _n.getField()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(InstanceOfExpr _n, Object _arg) {
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		Type type_ = cloneNodes(_n.getType(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		InstanceOfExpr r = new InstanceOfExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				expr, type_
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(StringLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+		StringLiteralExpr r = new StringLiteralExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getValue()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(IntegerLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		IntegerLiteralExpr r = new IntegerLiteralExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getValue()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(LongLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		LongLiteralExpr r = new LongLiteralExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getValue()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(IntegerLiteralMinValueExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		IntegerLiteralMinValueExpr r = new IntegerLiteralMinValueExpr(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn());
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(LongLiteralMinValueExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		LongLiteralMinValueExpr r = new LongLiteralMinValueExpr(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn());
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(CharLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		CharLiteralExpr r = new CharLiteralExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getValue()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(DoubleLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		DoubleLiteralExpr r = new DoubleLiteralExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getValue()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(BooleanLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		BooleanLiteralExpr r = new BooleanLiteralExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getValue()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(NullLiteralExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		NullLiteralExpr r = new NullLiteralExpr(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn());
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(MethodCallExpr _n, Object _arg) {
+		Expression scope = cloneNodes(_n.getScope(), _arg);
+		List<Type> typeArgs = visit(_n.getTypeArgs(), _arg);
+		List<Expression> args = visit(_n.getArgs(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		MethodCallExpr r = new MethodCallExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				scope, typeArgs, _n.getName(), args
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(NameExpr _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		NameExpr r = new NameExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getName()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ObjectCreationExpr _n, Object _arg) {
+		Expression scope = cloneNodes(_n.getScope(), _arg);
+		ClassOrInterfaceType type_ = cloneNodes(_n.getType(), _arg);
+		List<Type> typeArgs = visit(_n.getTypeArgs(), _arg);
+		List<Expression> args = visit(_n.getArgs(), _arg);
+		List<BodyDeclaration> anonymousBody = visit(_n.getAnonymousClassBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ObjectCreationExpr r = new ObjectCreationExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				scope, type_, typeArgs, args, anonymousBody
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(QualifiedNameExpr _n, Object _arg) {
+		NameExpr scope = cloneNodes(_n.getQualifier(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		QualifiedNameExpr r = new QualifiedNameExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				scope, _n.getName()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ThisExpr _n, Object _arg) {
+		Expression classExpr = cloneNodes(_n.getClassExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ThisExpr r = new ThisExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				classExpr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(SuperExpr _n, Object _arg) {
+		Expression classExpr = cloneNodes(_n.getClassExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		SuperExpr r = new SuperExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				classExpr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(UnaryExpr _n, Object _arg) {
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		UnaryExpr r = new UnaryExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				expr, _n.getOperator()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(VariableDeclarationExpr _n, Object _arg) {
+		List<AnnotationExpr> annotations = visit(_n.getAnnotations(), _arg);
+		Type type_ = cloneNodes(_n.getType(), _arg);
+		List<VariableDeclarator> vars = visit(_n.getVars(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		VariableDeclarationExpr r = new VariableDeclarationExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getModifiers(), annotations, type_, vars
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(MarkerAnnotationExpr _n, Object _arg) {
+		NameExpr name = cloneNodes(_n.getName(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		MarkerAnnotationExpr r = new MarkerAnnotationExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				name
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(SingleMemberAnnotationExpr _n, Object _arg) {
+		NameExpr name = cloneNodes(_n.getName(), _arg);
+		Expression memberValue = cloneNodes(_n.getMemberValue(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		SingleMemberAnnotationExpr r = new SingleMemberAnnotationExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				name, memberValue
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(NormalAnnotationExpr _n, Object _arg) {
+		NameExpr name = cloneNodes(_n.getName(), _arg);
+		List<MemberValuePair> pairs = visit(_n.getPairs(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		NormalAnnotationExpr r = new NormalAnnotationExpr(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				name, pairs
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(MemberValuePair _n, Object _arg) {
+		Expression value = cloneNodes(_n.getValue(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		MemberValuePair r = new MemberValuePair(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getName(), value
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ExplicitConstructorInvocationStmt _n, Object _arg) {
+		List<Type> typeArgs = visit(_n.getTypeArgs(), _arg);
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		List<Expression> args = visit(_n.getArgs(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ExplicitConstructorInvocationStmt r = new ExplicitConstructorInvocationStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				typeArgs, _n.isThis(), expr, args
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(TypeDeclarationStmt _n, Object _arg) {
+		TypeDeclaration typeDecl = cloneNodes(_n.getTypeDeclaration(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		TypeDeclarationStmt r = new TypeDeclarationStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				typeDecl
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(AssertStmt _n, Object _arg) {
+		Expression check = cloneNodes(_n.getCheck(), _arg);
+		Expression message = cloneNodes(_n.getMessage(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		AssertStmt r = new AssertStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				check, message
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(BlockStmt _n, Object _arg) {
+		List<Statement> stmts = visit(_n.getStmts(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		BlockStmt r = new BlockStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				stmts
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(LabeledStmt _n, Object _arg) {
+		Statement stmt = cloneNodes(_n.getStmt(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		LabeledStmt r = new LabeledStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getLabel(), stmt
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(EmptyStmt _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		EmptyStmt r = new EmptyStmt(_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn());
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ExpressionStmt _n, Object _arg) {
+		Expression expr = cloneNodes(_n.getExpression(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ExpressionStmt r = new ExpressionStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				expr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(SwitchStmt _n, Object _arg) {
+		Expression selector = cloneNodes(_n.getSelector(), _arg);
+		List<SwitchEntryStmt> entries = visit(_n.getEntries(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		SwitchStmt r = new SwitchStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				selector, entries
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(SwitchEntryStmt _n, Object _arg) {
+		Expression label = cloneNodes(_n.getLabel(), _arg);
+		List<Statement> stmts = visit(_n.getStmts(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		SwitchEntryStmt r = new SwitchEntryStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				label, stmts
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(BreakStmt _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		BreakStmt r = new BreakStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getId()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ReturnStmt _n, Object _arg) {
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ReturnStmt r = new ReturnStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				expr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(IfStmt _n, Object _arg) {
+		Expression condition = cloneNodes(_n.getCondition(), _arg);
+		Statement thenStmt = cloneNodes(_n.getThenStmt(), _arg);
+		Statement elseStmt = cloneNodes(_n.getElseStmt(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		IfStmt r = new IfStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				condition, thenStmt, elseStmt
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(WhileStmt _n, Object _arg) {
+		Expression condition = cloneNodes(_n.getCondition(), _arg);
+		Statement body = cloneNodes(_n.getBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		WhileStmt r = new WhileStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				condition, body
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ContinueStmt _n, Object _arg) {
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ContinueStmt r = new ContinueStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				_n.getId()
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(DoStmt _n, Object _arg) {
+		Statement body = cloneNodes(_n.getBody(), _arg);
+		Expression condition = cloneNodes(_n.getCondition(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		DoStmt r = new DoStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				body, condition
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ForeachStmt _n, Object _arg) {
+		VariableDeclarationExpr var = cloneNodes(_n.getVariable(), _arg);
+		Expression iterable = cloneNodes(_n.getIterable(), _arg);
+		Statement body = cloneNodes(_n.getBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ForeachStmt r = new ForeachStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				var, iterable, body
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ForStmt _n, Object _arg) {
+		List<Expression> init = visit(_n.getInit(), _arg);
+		Expression compare = cloneNodes(_n.getCompare(), _arg);
+		List<Expression> update = visit(_n.getUpdate(), _arg);
+		Statement body = cloneNodes(_n.getBody(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ForStmt r = new ForStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				init, compare, update, body
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(ThrowStmt _n, Object _arg) {
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		ThrowStmt r = new ThrowStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				expr
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(SynchronizedStmt _n, Object _arg) {
+		Expression expr = cloneNodes(_n.getExpr(), _arg);
+		BlockStmt block = cloneNodes(_n.getBlock(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		SynchronizedStmt r = new SynchronizedStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				expr, block
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(TryStmt _n, Object _arg) {
+		List<VariableDeclarationExpr> resources = visit(_n.getResources(),_arg);
+		BlockStmt tryBlock = cloneNodes(_n.getTryBlock(), _arg);
+		List<CatchClause> catchs = visit(_n.getCatchs(), _arg);
+		BlockStmt finallyBlock = cloneNodes(_n.getFinallyBlock(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		TryStmt r = new TryStmt(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				resources, tryBlock, catchs, finallyBlock
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(CatchClause _n, Object _arg) {
+		MultiTypeParameter except = cloneNodes(_n.getExcept(), _arg);
+		BlockStmt catchBlock = cloneNodes(_n.getCatchBlock(), _arg);
+		Comment comment = cloneNodes(_n.getComment(), _arg);
+
+		CatchClause r = new CatchClause(
+				_n.getBeginLine(), _n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(),
+				except.getModifiers(), except.getAnnotations(), except.getTypes(), except.getId(), catchBlock
+		);
+		r.setComment(comment);
+		return r;
+	}
+
+	@Override
+	public Node visit(LambdaExpr _n, Object _arg) {
+
+		List<Parameter> lambdaParameters = visit(_n.getParameters(), _arg);
+
+		Statement body = cloneNodes(_n.getBody(), _arg);
+
+		LambdaExpr r = new LambdaExpr(_n.getBeginLine(), _n.getBeginColumn(),
+				_n.getEndLine(), _n.getEndColumn(), lambdaParameters, body,
+				_n.isParametersEnclosed());
+
+		return r;
+	}
+
+	@Override
+	public Node visit(MethodReferenceExpr _n, Object arg) {
+
+		List<TypeParameter> typeParams = visit(_n.getTypeParameters(), arg);
+		Expression scope = cloneNodes(_n.getScope(), arg);
+
+		MethodReferenceExpr r = new MethodReferenceExpr(_n.getBeginLine(),
+				_n.getBeginColumn(), _n.getEndLine(), _n.getEndColumn(), scope,
+				typeParams, _n.getIdentifier());
+		return r;
+	}
+
+	@Override
+	public Node visit(TypeExpr n, Object arg) {
+
+		Type t = cloneNodes(n.getType(), arg);
+
+		TypeExpr r = new TypeExpr(n.getBeginLine(), n.getBeginColumn(),
+				n.getEndLine(), n.getEndColumn(), t);
+
+		return r;
+	}
 
     public <T extends Node> List<T> visit(List<T> _nodes, Object _arg) {
         if (_nodes == null)
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/DumpVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/DumpVisitor.java
index 0b90e3789d..8b04afe0aa 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/DumpVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/DumpVisitor.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,11 +18,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import static com.github.javaparser.PositionUtils.sortByBeginPosition;
-
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.ImportDeclaration;
 import com.github.javaparser.ast.Node;
@@ -83,7 +82,7 @@
 
 /**
  * Dumps the AST to formatted Java source code.
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public final class DumpVisitor implements VoidVisitor<Object> {
@@ -98,1565 +97,1483 @@ public DumpVisitor(boolean printComments) {
         this.printComments = printComments;
     }
 
-    private static class SourcePrinter {
-
-        private int level = 0;
-
-        private boolean indented = false;
-
-        private final StringBuilder buf = new StringBuilder();
-
-        public void indent() {
-            level++;
-        }
-
-        public void unindent() {
-            level--;
-        }
-
-        private void makeIndent() {
-            for (int i = 0; i < level; i++) {
-                buf.append("    ");
-            }
-        }
-
-        public void print(final String arg) {
-            if (!indented) {
-                makeIndent();
-                indented = true;
-            }
-            buf.append(arg);
-        }
-
-        public void printLn(final String arg) {
-            print(arg);
-            printLn();
-        }
-
-        public void printLn() {
-            buf.append(System.getProperty("line.separator"));
-            indented = false;
-        }
-
-        public String getSource() {
-            return buf.toString();
-        }
-
-        @Override
-        public String toString() {
-            return getSource();
-        }
-    }
-
-    private final SourcePrinter printer = new SourcePrinter();
-
-    public String getSource() {
-        return printer.getSource();
-    }
-
-    private void printModifiers(final int modifiers) {
-        if (ModifierSet.isPrivate(modifiers)) {
-            printer.print("private ");
-        }
-        if (ModifierSet.isProtected(modifiers)) {
-            printer.print("protected ");
-        }
-        if (ModifierSet.isPublic(modifiers)) {
-            printer.print("public ");
-        }
-        if (ModifierSet.isAbstract(modifiers)) {
-            printer.print("abstract ");
-        }
-        if (ModifierSet.isStatic(modifiers)) {
-            printer.print("static ");
-        }
-        if (ModifierSet.isFinal(modifiers)) {
-            printer.print("final ");
-        }
-        if (ModifierSet.isNative(modifiers)) {
-            printer.print("native ");
-        }
-        if (ModifierSet.isStrictfp(modifiers)) {
-            printer.print("strictfp ");
-        }
-        if (ModifierSet.isSynchronized(modifiers)) {
-            printer.print("synchronized ");
-        }
-        if (ModifierSet.isTransient(modifiers)) {
-            printer.print("transient ");
-        }
-        if (ModifierSet.isVolatile(modifiers)) {
-            printer.print("volatile ");
-        }
-    }
-
-    private void printMembers(final List<BodyDeclaration> members, final Object arg) {
-        for (final BodyDeclaration member : members) {
-            printer.printLn();
-            member.accept(this, arg);
-            printer.printLn();
-        }
-    }
-
-    private void printMemberAnnotations(final List<AnnotationExpr> annotations, final Object arg) {
-        if (!isNullOrEmpty(annotations)) {
-            for (final AnnotationExpr a : annotations) {
-                a.accept(this, arg);
-                printer.printLn();
-            }
-        }
-    }
-
-    private void printAnnotations(final List<AnnotationExpr> annotations, final Object arg) {
-        if (!isNullOrEmpty(annotations)) {
-            for (final AnnotationExpr a : annotations) {
-                a.accept(this, arg);
-                printer.print(" ");
-            }
-        }
-    }
-
-    private void printTypeArgs(final List<Type> args, final Object arg) {
+	private static class SourcePrinter {
+
+		private int level = 0;
+
+		private boolean indented = false;
+
+		private final StringBuilder buf = new StringBuilder();
+
+		public void indent() {
+			level++;
+		}
+
+		public void unindent() {
+			level--;
+		}
+
+		private void makeIndent() {
+			for (int i = 0; i < level; i++) {
+				buf.append("    ");
+			}
+		}
+
+		public void print(final String arg) {
+			if (!indented) {
+				makeIndent();
+				indented = true;
+			}
+			buf.append(arg);
+		}
+
+		public void printLn(final String arg) {
+			print(arg);
+			printLn();
+		}
+
+		public void printLn() {
+			buf.append(System.getProperty("line.separator"));
+			indented = false;
+		}
+
+		public String getSource() {
+			return buf.toString();
+		}
+
+		@Override public String toString() {
+			return getSource();
+		}
+	}
+
+	private final SourcePrinter printer = new SourcePrinter();
+
+	public String getSource() {
+		return printer.getSource();
+	}
+
+	private void printModifiers(final int modifiers) {
+		if (ModifierSet.isPrivate(modifiers)) {
+			printer.print("private ");
+		}
+		if (ModifierSet.isProtected(modifiers)) {
+			printer.print("protected ");
+		}
+		if (ModifierSet.isPublic(modifiers)) {
+			printer.print("public ");
+		}
+		if (ModifierSet.isAbstract(modifiers)) {
+			printer.print("abstract ");
+		}
+		if (ModifierSet.isStatic(modifiers)) {
+			printer.print("static ");
+		}
+		if (ModifierSet.isFinal(modifiers)) {
+			printer.print("final ");
+		}
+		if (ModifierSet.isNative(modifiers)) {
+			printer.print("native ");
+		}
+		if (ModifierSet.isStrictfp(modifiers)) {
+			printer.print("strictfp ");
+		}
+		if (ModifierSet.isSynchronized(modifiers)) {
+			printer.print("synchronized ");
+		}
+		if (ModifierSet.isTransient(modifiers)) {
+			printer.print("transient ");
+		}
+		if (ModifierSet.isVolatile(modifiers)) {
+			printer.print("volatile ");
+		}
+	}
+
+	private void printMembers(final List<BodyDeclaration> members, final Object arg) {
+		for (final BodyDeclaration member : members) {
+			printer.printLn();
+			member.accept(this, arg);
+			printer.printLn();
+		}
+	}
+
+	private void printMemberAnnotations(final List<AnnotationExpr> annotations, final Object arg) {
+		if (!isNullOrEmpty(annotations)) {
+			for (final AnnotationExpr a : annotations) {
+				a.accept(this, arg);
+				printer.printLn();
+			}
+		}
+	}
+
+	private void printAnnotations(final List<AnnotationExpr> annotations, final Object arg) {
+		if (!isNullOrEmpty(annotations)) {
+			for (final AnnotationExpr a : annotations) {
+				a.accept(this, arg);
+				printer.print(" ");
+			}
+		}
+	}
+
+	private void printTypeArgs(final List<Type> args, final Object arg) {
         if (!isNullOrEmpty(args)) {
-            printer.print("<");
-            for (final Iterator<Type> i = args.iterator(); i.hasNext(); ) {
-                final Type t = i.next();
-                t.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-            printer.print(">");
-        }
-    }
-
-    private void printTypeParameters(final List<TypeParameter> args, final Object arg) {
+			printer.print("<");
+			for (final Iterator<Type> i = args.iterator(); i.hasNext();) {
+				final Type t = i.next();
+				t.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+			printer.print(">");
+		}
+	}
+
+	private void printTypeParameters(final List<TypeParameter> args, final Object arg) {
         if (!isNullOrEmpty(args)) {
-            printer.print("<");
-            for (final Iterator<TypeParameter> i = args.iterator(); i.hasNext(); ) {
-                final TypeParameter t = i.next();
-                t.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-            printer.print(">");
-        }
-    }
-
-    private void printArguments(final List<Expression> args, final Object arg) {
-        printer.print("(");
+			printer.print("<");
+			for (final Iterator<TypeParameter> i = args.iterator(); i.hasNext();) {
+				final TypeParameter t = i.next();
+				t.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+			printer.print(">");
+		}
+	}
+
+	private void printArguments(final List<Expression> args, final Object arg) {
+		printer.print("(");
         if (!isNullOrEmpty(args)) {
-            for (final Iterator<Expression> i = args.iterator(); i.hasNext(); ) {
-                final Expression e = i.next();
-                e.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print(")");
-    }
-
-    private void printJavadoc(final JavadocComment javadoc, final Object arg) {
-        if (javadoc != null) {
-            javadoc.accept(this, arg);
-        }
-    }
-
-    private void printJavaComment(final Comment javacomment, final Object arg) {
-        if (javacomment != null) {
-            javacomment.accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final CompilationUnit n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-
-        if (n.getPackage() != null) {
-            n.getPackage().accept(this, arg);
-        }
-
-        if (n.getImports() != null) {
-            for (final ImportDeclaration i : n.getImports()) {
-                i.accept(this, arg);
-            }
-            printer.printLn();
-        }
-
-        if (n.getTypes() != null) {
-            for (final Iterator<TypeDeclaration> i = n.getTypes().iterator(); i.hasNext(); ) {
-                i.next().accept(this, arg);
-                printer.printLn();
-                if (i.hasNext()) {
-                    printer.printLn();
-                }
-            }
-        }
+			for (final Iterator<Expression> i = args.iterator(); i.hasNext();) {
+				final Expression e = i.next();
+				e.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print(")");
+	}
+
+	private void printJavadoc(final JavadocComment javadoc, final Object arg) {
+		if (javadoc != null) {
+			javadoc.accept(this, arg);
+		}
+	}
+
+	private void printJavaComment(final Comment javacomment, final Object arg) {
+		if (javacomment != null) {
+			javacomment.accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final CompilationUnit n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+
+		if (n.getPackage() != null) {
+			n.getPackage().accept(this, arg);
+		}
+
+		if (n.getImports() != null) {
+			for (final ImportDeclaration i : n.getImports()) {
+				i.accept(this, arg);
+			}
+			printer.printLn();
+		}
+
+		if (n.getTypes() != null) {
+			for (final Iterator<TypeDeclaration> i = n.getTypes().iterator(); i.hasNext();) {
+				i.next().accept(this, arg);
+				printer.printLn();
+				if (i.hasNext()) {
+					printer.printLn();
+				}
+			}
+		}
 
         printOrphanCommentsEnding(n);
-    }
+	}
 
-    @Override
-    public void visit(final PackageDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printAnnotations(n.getAnnotations(), arg);
-        printer.print("package ");
-        n.getName().accept(this, arg);
-        printer.printLn(";");
-        printer.printLn();
+	@Override public void visit(final PackageDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printAnnotations(n.getAnnotations(), arg);
+		printer.print("package ");
+		n.getName().accept(this, arg);
+		printer.printLn(";");
+		printer.printLn();
 
         printOrphanCommentsEnding(n);
-    }
+	}
 
-    @Override
-    public void visit(final NameExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getName());
+	@Override public void visit(final NameExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getName());
 
         printOrphanCommentsEnding(n);
-    }
+	}
 
-    @Override
-    public void visit(final QualifiedNameExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getQualifier().accept(this, arg);
-        printer.print(".");
-        printer.print(n.getName());
+	@Override public void visit(final QualifiedNameExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getQualifier().accept(this, arg);
+		printer.print(".");
+		printer.print(n.getName());
 
         printOrphanCommentsEnding(n);
-    }
-
-    @Override
-    public void visit(final ImportDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("import ");
-        if (n.isStatic()) {
-            printer.print("static ");
-        }
-        n.getName().accept(this, arg);
-        if (n.isAsterisk()) {
-            printer.print(".*");
-        }
-        printer.printLn(";");
+	}
+
+	@Override public void visit(final ImportDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("import ");
+		if (n.isStatic()) {
+			printer.print("static ");
+		}
+		n.getName().accept(this, arg);
+		if (n.isAsterisk()) {
+			printer.print(".*");
+		}
+		printer.printLn(";");
 
         printOrphanCommentsEnding(n);
-    }
-
-    @Override
-    public void visit(final ClassOrInterfaceDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printJavadoc(n.getJavaDoc(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-
-        if (n.isInterface()) {
-            printer.print("interface ");
-        } else {
-            printer.print("class ");
-        }
-
-        printer.print(n.getName());
-
-        printTypeParameters(n.getTypeParameters(), arg);
-
-        if (!isNullOrEmpty(n.getExtends())) {
-            printer.print(" extends ");
-            for (final Iterator<ClassOrInterfaceType> i = n.getExtends().iterator(); i.hasNext(); ) {
-                final ClassOrInterfaceType c = i.next();
-                c.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-
-        if (!isNullOrEmpty(n.getImplements())) {
-            printer.print(" implements ");
-            for (final Iterator<ClassOrInterfaceType> i = n.getImplements().iterator(); i.hasNext(); ) {
-                final ClassOrInterfaceType c = i.next();
-                c.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-
-        printer.printLn(" {");
-        printer.indent();
-        if (!isNullOrEmpty(n.getMembers())) {
-            printMembers(n.getMembers(), arg);
-        }
+	}
+
+	@Override public void visit(final ClassOrInterfaceDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printJavadoc(n.getJavaDoc(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+
+		if (n.isInterface()) {
+			printer.print("interface ");
+		} else {
+			printer.print("class ");
+		}
+
+		printer.print(n.getName());
+
+		printTypeParameters(n.getTypeParameters(), arg);
+
+		if (!isNullOrEmpty(n.getExtends())) {
+			printer.print(" extends ");
+			for (final Iterator<ClassOrInterfaceType> i = n.getExtends().iterator(); i.hasNext();) {
+				final ClassOrInterfaceType c = i.next();
+				c.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+
+		if (!isNullOrEmpty(n.getImplements())) {
+			printer.print(" implements ");
+			for (final Iterator<ClassOrInterfaceType> i = n.getImplements().iterator(); i.hasNext();) {
+				final ClassOrInterfaceType c = i.next();
+				c.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+
+		printer.printLn(" {");
+		printer.indent();
+		if (!isNullOrEmpty(n.getMembers())) {
+			printMembers(n.getMembers(), arg);
+		}
 
         printOrphanCommentsEnding(n);
 
-        printer.unindent();
-        printer.print("}");
-    }
+		printer.unindent();
+		printer.print("}");
+	}
 
-    @Override
-    public void visit(final EmptyTypeDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printJavadoc(n.getJavaDoc(), arg);
-        printer.print(";");
+	@Override public void visit(final EmptyTypeDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printJavadoc(n.getJavaDoc(), arg);
+		printer.print(";");
 
         printOrphanCommentsEnding(n);
-    }
-
-    @Override
-    public void visit(final JavadocComment n, final Object arg) {
-        printer.print("/**");
-        printer.print(n.getContent());
-        printer.printLn("*/");
-    }
-
-    @Override
-    public void visit(final ClassOrInterfaceType n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-
-        if (n.getAnnotations() != null) {
-            for (AnnotationExpr ae : n.getAnnotations()) {
-                ae.accept(this, arg);
-                printer.print(" ");
-            }
-        }
-
-        if (n.getScope() != null) {
-            n.getScope().accept(this, arg);
-            printer.print(".");
-        }
-        printer.print(n.getName());
-        printTypeArgs(n.getTypeArgs(), arg);
-    }
-
-    @Override
-    public void visit(final TypeParameter n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getAnnotations() != null) {
-            for (AnnotationExpr ann : n.getAnnotations()) {
-                ann.accept(this, arg);
-                printer.print(" ");
-            }
-        }
-        printer.print(n.getName());
-        if (n.getTypeBound() != null) {
-            printer.print(" extends ");
-            for (final Iterator<ClassOrInterfaceType> i = n.getTypeBound().iterator(); i.hasNext(); ) {
-                final ClassOrInterfaceType c = i.next();
-                c.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(" & ");
-                }
-            }
-        }
-    }
-
-    @Override
-    public void visit(final PrimitiveType n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getAnnotations() != null) {
-            for (AnnotationExpr ae : n.getAnnotations()) {
-                ae.accept(this, arg);
-                printer.print(" ");
-            }
-        }
-        switch (n.getType()) {
-            case Boolean:
-                printer.print("boolean");
-                break;
-            case Byte:
-                printer.print("byte");
-                break;
-            case Char:
-                printer.print("char");
-                break;
-            case Double:
-                printer.print("double");
-                break;
-            case Float:
-                printer.print("float");
-                break;
-            case Int:
-                printer.print("int");
-                break;
-            case Long:
-                printer.print("long");
-                break;
-            case Short:
-                printer.print("short");
-                break;
-        }
-    }
-
-    @Override
-    public void visit(final ReferenceType n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getAnnotations() != null) {
-            for (AnnotationExpr ae : n.getAnnotations()) {
-                ae.accept(this, arg);
-                printer.print(" ");
-            }
-        }
-        n.getType().accept(this, arg);
-        List<List<AnnotationExpr>> arraysAnnotations = n.getArraysAnnotations();
-        for (int i = 0; i < n.getArrayCount(); i++) {
-            if (arraysAnnotations != null && i < arraysAnnotations.size()) {
-                List<AnnotationExpr> annotations = arraysAnnotations.get(i);
-                if (annotations != null) {
-                    for (AnnotationExpr ae : annotations) {
-                        printer.print(" ");
-                        ae.accept(this, arg);
-
-                    }
-                }
-            }
-            printer.print("[]");
-        }
-    }
-
-    @Override
-    public void visit(final WildcardType n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getAnnotations() != null) {
-            for (AnnotationExpr ae : n.getAnnotations()) {
-                printer.print(" ");
-                ae.accept(this, arg);
-            }
-        }
-        printer.print("?");
-        if (n.getExtends() != null) {
-            printer.print(" extends ");
-            n.getExtends().accept(this, arg);
-        }
-        if (n.getSuper() != null) {
-            printer.print(" super ");
-            n.getSuper().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final UnknownType n, final Object arg) {
-        // Nothing to dump
-    }
+	}
+
+	@Override public void visit(final JavadocComment n, final Object arg) {
+		printer.print("/**");
+		printer.print(n.getContent());
+		printer.printLn("*/");
+	}
+
+	@Override public void visit(final ClassOrInterfaceType n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+
+		if (n.getAnnotations() != null) {
+			for (AnnotationExpr ae : n.getAnnotations()) {
+				ae.accept(this, arg);
+				printer.print(" ");
+			}
+		}
+
+		if (n.getScope() != null) {
+			n.getScope().accept(this, arg);
+			printer.print(".");
+		}
+		printer.print(n.getName());
+		printTypeArgs(n.getTypeArgs(), arg);
+	}
+
+	@Override public void visit(final TypeParameter n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getAnnotations() != null) {
+			for (AnnotationExpr ann : n.getAnnotations()) {
+				ann.accept(this, arg);
+				printer.print(" ");
+			}
+		}
+		printer.print(n.getName());
+		if (n.getTypeBound() != null) {
+			printer.print(" extends ");
+			for (final Iterator<ClassOrInterfaceType> i = n.getTypeBound().iterator(); i.hasNext();) {
+				final ClassOrInterfaceType c = i.next();
+				c.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(" & ");
+				}
+			}
+		}
+	}
+
+	@Override public void visit(final PrimitiveType n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getAnnotations() != null) {
+			for (AnnotationExpr ae : n.getAnnotations()) {
+				ae.accept(this, arg);
+				printer.print(" ");
+			}
+		}
+		switch (n.getType()) {
+		case Boolean:
+			printer.print("boolean");
+			break;
+		case Byte:
+			printer.print("byte");
+			break;
+		case Char:
+			printer.print("char");
+			break;
+		case Double:
+			printer.print("double");
+			break;
+		case Float:
+			printer.print("float");
+			break;
+		case Int:
+			printer.print("int");
+			break;
+		case Long:
+			printer.print("long");
+			break;
+		case Short:
+			printer.print("short");
+			break;
+		}
+	}
+
+	@Override public void visit(final ReferenceType n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getAnnotations() != null) {
+			for (AnnotationExpr ae : n.getAnnotations()) {
+				ae.accept(this, arg);
+				printer.print(" ");
+			}
+		}
+		n.getType().accept(this, arg);
+		List<List<AnnotationExpr>> arraysAnnotations = n.getArraysAnnotations();
+		for (int i = 0; i < n.getArrayCount(); i++) {
+			if (arraysAnnotations != null && i < arraysAnnotations.size()) {
+				List<AnnotationExpr> annotations = arraysAnnotations.get(i);
+				if (annotations != null) {
+					for (AnnotationExpr ae : annotations) {
+						printer.print(" ");
+						ae.accept(this, arg);
+
+					}
+				}
+			}
+			printer.print("[]");
+		}
+	}
+
+	@Override public void visit(final WildcardType n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getAnnotations() != null) {
+			for (AnnotationExpr ae : n.getAnnotations()) {
+				printer.print(" ");
+				ae.accept(this, arg);
+			}
+		}
+		printer.print("?");
+		if (n.getExtends() != null) {
+			printer.print(" extends ");
+			n.getExtends().accept(this, arg);
+		}
+		if (n.getSuper() != null) {
+			printer.print(" super ");
+			n.getSuper().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final UnknownType n, final Object arg) {
+		// Nothing to dump
+	}
+
+	@Override public void visit(final FieldDeclaration n, final Object arg) {
+        printOrphanCommentsBeforeThisChildNode(n);
 
-    @Override
-    public void visit(final FieldDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printJavadoc(n.getJavaDoc(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+		n.getType().accept(this, arg);
+
+		printer.print(" ");
+		for (final Iterator<VariableDeclarator> i = n.getVariables().iterator(); i.hasNext();) {
+			final VariableDeclarator var = i.next();
+			var.accept(this, arg);
+			if (i.hasNext()) {
+				printer.print(", ");
+			}
+		}
+
+		printer.print(";");
+	}
+
+	@Override public void visit(final VariableDeclarator n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getId().accept(this, arg);
+		if (n.getInit() != null) {
+			printer.print(" = ");
+			n.getInit().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final VariableDeclaratorId n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getName());
+		for (int i = 0; i < n.getArrayCount(); i++) {
+			printer.print("[]");
+		}
+	}
+
+	@Override public void visit(final ArrayInitializerExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("{");
+		if (n.getValues() != null) {
+			printer.print(" ");
+			for (final Iterator<Expression> i = n.getValues().iterator(); i.hasNext();) {
+				final Expression expr = i.next();
+				expr.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+			printer.print(" ");
+		}
+		printer.print("}");
+	}
+
+	@Override public void visit(final VoidType n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("void");
+	}
+
+	@Override public void visit(final ArrayAccessExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getName().accept(this, arg);
+		printer.print("[");
+		n.getIndex().accept(this, arg);
+		printer.print("]");
+	}
+
+	@Override public void visit(final ArrayCreationExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("new ");
+		n.getType().accept(this, arg);
+		List<List<AnnotationExpr>> arraysAnnotations = n.getArraysAnnotations();
+		if (n.getDimensions() != null) {
+			int j = 0;
+			for (final Expression dim : n.getDimensions()) {
+
+				if (arraysAnnotations != null && j < arraysAnnotations.size()) {
+					List<AnnotationExpr> annotations = arraysAnnotations.get(j);
+					if (annotations != null) {
+						for (AnnotationExpr ae : annotations) {
+							printer.print(" ");
+							ae.accept(this, arg);
+						}
+					}
+				}
+				printer.print("[");
+				dim.accept(this, arg);
+				printer.print("]");
+				j++;
+			}
+			for (int i = 0; i < n.getArrayCount(); i++) {
+				if (arraysAnnotations != null && i < arraysAnnotations.size()) {
+
+					List<AnnotationExpr> annotations = arraysAnnotations.get(i);
+					if (annotations != null) {
+						for (AnnotationExpr ae : annotations) {
+							printer.print(" ");
+							ae.accept(this, arg);
+
+						}
+					}
+				}
+				printer.print("[]");
+			}
+
+		} else {
+			for (int i = 0; i < n.getArrayCount(); i++) {
+				if (arraysAnnotations != null && i < arraysAnnotations.size()) {
+					List<AnnotationExpr> annotations = arraysAnnotations.get(i);
+					if (annotations != null) {
+						for (AnnotationExpr ae : annotations) {
+							ae.accept(this, arg);
+							printer.print(" ");
+						}
+					}
+				}
+				printer.print("[]");
+			}
+			printer.print(" ");
+			n.getInitializer().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final AssignExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getTarget().accept(this, arg);
+		printer.print(" ");
+		switch (n.getOperator()) {
+		case assign:
+			printer.print("=");
+			break;
+		case and:
+			printer.print("&=");
+			break;
+		case or:
+			printer.print("|=");
+			break;
+		case xor:
+			printer.print("^=");
+			break;
+		case plus:
+			printer.print("+=");
+			break;
+		case minus:
+			printer.print("-=");
+			break;
+		case rem:
+			printer.print("%=");
+			break;
+		case slash:
+			printer.print("/=");
+			break;
+		case star:
+			printer.print("*=");
+			break;
+		case lShift:
+			printer.print("<<=");
+			break;
+		case rSignedShift:
+			printer.print(">>=");
+			break;
+		case rUnsignedShift:
+			printer.print(">>>=");
+			break;
+		}
+		printer.print(" ");
+		n.getValue().accept(this, arg);
+	}
+
+	@Override public void visit(final BinaryExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getLeft().accept(this, arg);
+		printer.print(" ");
+		switch (n.getOperator()) {
+		case or:
+			printer.print("||");
+			break;
+		case and:
+			printer.print("&&");
+			break;
+		case binOr:
+			printer.print("|");
+			break;
+		case binAnd:
+			printer.print("&");
+			break;
+		case xor:
+			printer.print("^");
+			break;
+		case equals:
+			printer.print("==");
+			break;
+		case notEquals:
+			printer.print("!=");
+			break;
+		case less:
+			printer.print("<");
+			break;
+		case greater:
+			printer.print(">");
+			break;
+		case lessEquals:
+			printer.print("<=");
+			break;
+		case greaterEquals:
+			printer.print(">=");
+			break;
+		case lShift:
+			printer.print("<<");
+			break;
+		case rSignedShift:
+			printer.print(">>");
+			break;
+		case rUnsignedShift:
+			printer.print(">>>");
+			break;
+		case plus:
+			printer.print("+");
+			break;
+		case minus:
+			printer.print("-");
+			break;
+		case times:
+			printer.print("*");
+			break;
+		case divide:
+			printer.print("/");
+			break;
+		case remainder:
+			printer.print("%");
+			break;
+		}
+		printer.print(" ");
+		n.getRight().accept(this, arg);
+	}
+
+	@Override public void visit(final CastExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("(");
+		n.getType().accept(this, arg);
+		printer.print(") ");
+		n.getExpr().accept(this, arg);
+	}
+
+	@Override public void visit(final ClassExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getType().accept(this, arg);
+		printer.print(".class");
+	}
+
+	@Override public void visit(final ConditionalExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getCondition().accept(this, arg);
+		printer.print(" ? ");
+		n.getThenExpr().accept(this, arg);
+		printer.print(" : ");
+		n.getElseExpr().accept(this, arg);
+	}
+
+	@Override public void visit(final EnclosedExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("(");
+		if (n.getInner() != null) {
+		n.getInner().accept(this, arg);
+		}
+		printer.print(")");
+	}
+
+	@Override public void visit(final FieldAccessExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getScope().accept(this, arg);
+		printer.print(".");
+		printer.print(n.getField());
+	}
+
+	@Override public void visit(final InstanceOfExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getExpr().accept(this, arg);
+		printer.print(" instanceof ");
+		n.getType().accept(this, arg);
+	}
+
+	@Override public void visit(final CharLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("'");
+		printer.print(n.getValue());
+		printer.print("'");
+	}
+
+	@Override public void visit(final DoubleLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getValue());
+	}
+
+	@Override public void visit(final IntegerLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getValue());
+	}
+
+	@Override public void visit(final LongLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getValue());
+	}
+
+	@Override public void visit(final IntegerLiteralMinValueExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getValue());
+	}
+
+	@Override public void visit(final LongLiteralMinValueExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getValue());
+	}
+
+	@Override public void visit(final StringLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("\"");
+		printer.print(n.getValue());
+		printer.print("\"");
+	}
+
+	@Override public void visit(final BooleanLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(String.valueOf(n.getValue()));
+	}
+
+	@Override public void visit(final NullLiteralExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("null");
+	}
+
+	@Override public void visit(final ThisExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getClassExpr() != null) {
+			n.getClassExpr().accept(this, arg);
+			printer.print(".");
+		}
+		printer.print("this");
+	}
+
+	@Override public void visit(final SuperExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getClassExpr() != null) {
+			n.getClassExpr().accept(this, arg);
+			printer.print(".");
+		}
+		printer.print("super");
+	}
+
+	@Override public void visit(final MethodCallExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getScope() != null) {
+			n.getScope().accept(this, arg);
+			printer.print(".");
+		}
+		printTypeArgs(n.getTypeArgs(), arg);
+		printer.print(n.getName());
+		printArguments(n.getArgs(), arg);
+	}
+
+	@Override public void visit(final ObjectCreationExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getScope() != null) {
+			n.getScope().accept(this, arg);
+			printer.print(".");
+		}
+
+		printer.print("new ");
+
+		printTypeArgs(n.getTypeArgs(), arg);
+		if (!isNullOrEmpty(n.getTypeArgs())) {
+			printer.print(" ");
+		}
+
+		n.getType().accept(this, arg);
+
+		printArguments(n.getArgs(), arg);
+
+		if (n.getAnonymousClassBody() != null) {
+			printer.printLn(" {");
+			printer.indent();
+			printMembers(n.getAnonymousClassBody(), arg);
+			printer.unindent();
+			printer.print("}");
+		}
+	}
+
+	@Override public void visit(final UnaryExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		switch (n.getOperator()) {
+		case positive:
+			printer.print("+");
+			break;
+		case negative:
+			printer.print("-");
+			break;
+		case inverse:
+			printer.print("~");
+			break;
+		case not:
+			printer.print("!");
+			break;
+		case preIncrement:
+			printer.print("++");
+			break;
+		case preDecrement:
+			printer.print("--");
+			break;
+		default:
+		}
+
+		n.getExpr().accept(this, arg);
+
+		switch (n.getOperator()) {
+		case posIncrement:
+			printer.print("++");
+			break;
+		case posDecrement:
+			printer.print("--");
+			break;
+		default:
+		}
+	}
+
+	@Override public void visit(final ConstructorDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printJavadoc(n.getJavaDoc(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+
+		printTypeParameters(n.getTypeParameters(), arg);
+		if (n.getTypeParameters() != null) {
+			printer.print(" ");
+		}
+		printer.print(n.getName());
+
+		printer.print("(");
+		if (n.getParameters() != null) {
+			for (final Iterator<Parameter> i = n.getParameters().iterator(); i.hasNext();) {
+				final Parameter p = i.next();
+				p.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print(")");
+
+		if (!isNullOrEmpty(n.getThrows())) {
+			printer.print(" throws ");
+			for (final Iterator<NameExpr> i = n.getThrows().iterator(); i.hasNext();) {
+				final NameExpr name = i.next();
+				name.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print(" ");
+		n.getBlock().accept(this, arg);
+	}
+
+	@Override public void visit(final MethodDeclaration n, final Object arg) {
         printOrphanCommentsBeforeThisChildNode(n);
 
-        printJavaComment(n.getComment(), arg);
-        printJavadoc(n.getJavaDoc(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
+		printJavaComment(n.getComment(), arg);
+		printJavadoc(n.getJavaDoc(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+		if (n.isDefault()) {
+			printer.print("default ");
+		}
+		printTypeParameters(n.getTypeParameters(), arg);
+		if (n.getTypeParameters() != null) {
+			printer.print(" ");
+		}
+
+		n.getType().accept(this, arg);
+		printer.print(" ");
+		printer.print(n.getName());
+
+		printer.print("(");
+		if (n.getParameters() != null) {
+			for (final Iterator<Parameter> i = n.getParameters().iterator(); i.hasNext();) {
+				final Parameter p = i.next();
+				p.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print(")");
+
+		for (int i = 0; i < n.getArrayCount(); i++) {
+			printer.print("[]");
+		}
+
+		if (!isNullOrEmpty(n.getThrows())) {
+			printer.print(" throws ");
+			for (final Iterator<NameExpr> i = n.getThrows().iterator(); i.hasNext();) {
+				final NameExpr name = i.next();
+				name.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		if (n.getBody() == null) {
+			printer.print(";");
+		} else {
+			printer.print(" ");
+			n.getBody().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final Parameter n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+		if (n.getType() != null) {
+			n.getType().accept(this, arg);
+		}
+		if (n.isVarArgs()) {
+			printer.print("...");
+		}
+		printer.print(" ");
+		n.getId().accept(this, arg);
+	}
+	
+    @Override public void visit(MultiTypeParameter n, Object arg) {
+        printAnnotations(n.getAnnotations(), arg);
         printModifiers(n.getModifiers());
-        n.getType().accept(this, arg);
 
-        printer.print(" ");
-        for (final Iterator<VariableDeclarator> i = n.getVariables().iterator(); i.hasNext(); ) {
-            final VariableDeclarator var = i.next();
-            var.accept(this, arg);
-            if (i.hasNext()) {
-                printer.print(", ");
-            }
+        Iterator<Type> types = n.getTypes().iterator();
+        types.next().accept(this, arg);
+        while (types.hasNext()) {
+        	printer.print(" | ");
+        	types.next().accept(this, arg);
         }
-
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final VariableDeclarator n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
+        
+        printer.print(" ");
         n.getId().accept(this, arg);
-        if (n.getInit() != null) {
-            printer.print(" = ");
-            n.getInit().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final VariableDeclaratorId n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getName());
-        for (int i = 0; i < n.getArrayCount(); i++) {
-            printer.print("[]");
-        }
-    }
-
-    @Override
-    public void visit(final ArrayInitializerExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("{");
-        if (n.getValues() != null) {
-            printer.print(" ");
-            for (final Iterator<Expression> i = n.getValues().iterator(); i.hasNext(); ) {
-                final Expression expr = i.next();
-                expr.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-            printer.print(" ");
-        }
-        printer.print("}");
-    }
-
-    @Override
-    public void visit(final VoidType n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("void");
     }
 
-    @Override
-    public void visit(final ArrayAccessExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getName().accept(this, arg);
-        printer.print("[");
-        n.getIndex().accept(this, arg);
-        printer.print("]");
-    }
-
-    @Override
-    public void visit(final ArrayCreationExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("new ");
-        n.getType().accept(this, arg);
-        List<List<AnnotationExpr>> arraysAnnotations = n.getArraysAnnotations();
-        if (n.getDimensions() != null) {
-            int j = 0;
-            for (final Expression dim : n.getDimensions()) {
-
-                if (arraysAnnotations != null && j < arraysAnnotations.size()) {
-                    List<AnnotationExpr> annotations = arraysAnnotations.get(j);
-                    if (annotations != null) {
-                        for (AnnotationExpr ae : annotations) {
-                            printer.print(" ");
-                            ae.accept(this, arg);
-                        }
-                    }
-                }
-                printer.print("[");
-                dim.accept(this, arg);
-                printer.print("]");
-                j++;
-            }
-            for (int i = 0; i < n.getArrayCount(); i++) {
-                if (arraysAnnotations != null && i < arraysAnnotations.size()) {
-
-                    List<AnnotationExpr> annotations = arraysAnnotations.get(i);
-                    if (annotations != null) {
-                        for (AnnotationExpr ae : annotations) {
-                            printer.print(" ");
-                            ae.accept(this, arg);
-
-                        }
-                    }
-                }
-                printer.print("[]");
-            }
-
-        } else {
-            for (int i = 0; i < n.getArrayCount(); i++) {
-                if (arraysAnnotations != null && i < arraysAnnotations.size()) {
-                    List<AnnotationExpr> annotations = arraysAnnotations.get(i);
-                    if (annotations != null) {
-                        for (AnnotationExpr ae : annotations) {
-                            ae.accept(this, arg);
-                            printer.print(" ");
-                        }
-                    }
-                }
-                printer.print("[]");
-            }
-            printer.print(" ");
-            n.getInitializer().accept(this, arg);
+	@Override public void visit(final ExplicitConstructorInvocationStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.isThis()) {
+			printTypeArgs(n.getTypeArgs(), arg);
+			printer.print("this");
+		} else {
+			if (n.getExpr() != null) {
+				n.getExpr().accept(this, arg);
+				printer.print(".");
+			}
+			printTypeArgs(n.getTypeArgs(), arg);
+			printer.print("super");
+		}
+		printArguments(n.getArgs(), arg);
+		printer.print(";");
+	}
+
+	@Override public void visit(final VariableDeclarationExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+
+		n.getType().accept(this, arg);
+		printer.print(" ");
+
+		for (final Iterator<VariableDeclarator> i = n.getVars().iterator(); i.hasNext();) {
+			final VariableDeclarator v = i.next();
+			v.accept(this, arg);
+			if (i.hasNext()) {
+				printer.print(", ");
+			}
+		}
+	}
+
+	@Override public void visit(final TypeDeclarationStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		n.getTypeDeclaration().accept(this, arg);
+	}
+
+	@Override public void visit(final AssertStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("assert ");
+		n.getCheck().accept(this, arg);
+		if (n.getMessage() != null) {
+			printer.print(" : ");
+			n.getMessage().accept(this, arg);
+		}
+		printer.print(";");
+	}
+
+	@Override public void visit(final BlockStmt n, final Object arg) {
+        printOrphanCommentsBeforeThisChildNode(n);
+		printJavaComment(n.getComment(), arg);
+		printer.printLn("{");
+		if (n.getStmts() != null) {
+			printer.indent();
+			for (final Statement s : n.getStmts()) {
+				s.accept(this, arg);
+				printer.printLn();
+			}
+			printer.unindent();
+		}
+		printOrphanCommentsEnding(n);
+		printer.print("}");
+
+	}
+
+	@Override public void visit(final LabeledStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getLabel());
+		printer.print(": ");
+		n.getStmt().accept(this, arg);
+	}
+
+	@Override public void visit(final EmptyStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(";");
+	}
+
+	@Override public void visit(final ExpressionStmt n, final Object arg) {
+		printOrphanCommentsBeforeThisChildNode(n);
+		printJavaComment(n.getComment(), arg);
+		n.getExpression().accept(this, arg);
+		printer.print(";");
+	}
+
+	@Override public void visit(final SwitchStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("switch(");
+		n.getSelector().accept(this, arg);
+		printer.printLn(") {");
+		if (n.getEntries() != null) {
+			printer.indent();
+			for (final SwitchEntryStmt e : n.getEntries()) {
+				e.accept(this, arg);
+			}
+			printer.unindent();
+		}
+		printer.print("}");
+
+	}
+
+	@Override public void visit(final SwitchEntryStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		if (n.getLabel() != null) {
+			printer.print("case ");
+			n.getLabel().accept(this, arg);
+			printer.print(":");
+		} else {
+			printer.print("default:");
+		}
+		printer.printLn();
+		printer.indent();
+		if (n.getStmts() != null) {
+			for (final Statement s : n.getStmts()) {
+				s.accept(this, arg);
+				printer.printLn();
+			}
+		}
+		printer.unindent();
+	}
+
+	@Override public void visit(final BreakStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("break");
+		if (n.getId() != null) {
+			printer.print(" ");
+			printer.print(n.getId());
+		}
+		printer.print(";");
+	}
+
+	@Override public void visit(final ReturnStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("return");
+		if (n.getExpr() != null) {
+			printer.print(" ");
+			n.getExpr().accept(this, arg);
+		}
+		printer.print(";");
+	}
+
+	@Override public void visit(final EnumDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printJavadoc(n.getJavaDoc(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+
+		printer.print("enum ");
+		printer.print(n.getName());
+
+		if (n.getImplements() != null) {
+			printer.print(" implements ");
+			for (final Iterator<ClassOrInterfaceType> i = n.getImplements().iterator(); i.hasNext();) {
+				final ClassOrInterfaceType c = i.next();
+				c.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+
+		printer.printLn(" {");
+		printer.indent();
+		if (n.getEntries() != null) {
+			printer.printLn();
+			for (final Iterator<EnumConstantDeclaration> i = n.getEntries().iterator(); i.hasNext();) {
+				final EnumConstantDeclaration e = i.next();
+				e.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		if (n.getMembers() != null) {
+			printer.printLn(";");
+			printMembers(n.getMembers(), arg);
+		} else {
+			if (n.getEntries() != null) {
+				printer.printLn();
+			}
+		}
+		printer.unindent();
+		printer.print("}");
+	}
+
+	@Override public void visit(final EnumConstantDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printJavadoc(n.getJavaDoc(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printer.print(n.getName());
+
+		if (n.getArgs() != null) {
+			printArguments(n.getArgs(), arg);
+		}
+
+		if (n.getClassBody() != null) {
+			printer.printLn(" {");
+			printer.indent();
+			printMembers(n.getClassBody(), arg);
+			printer.unindent();
+			printer.printLn("}");
+		}
+	}
+
+	@Override public void visit(final EmptyMemberDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printJavadoc(n.getJavaDoc(), arg);
+		printer.print(";");
+	}
+
+	@Override public void visit(final InitializerDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printJavadoc(n.getJavaDoc(), arg);
+		if (n.isStatic()) {
+			printer.print("static ");
+		}
+		n.getBlock().accept(this, arg);
+	}
+
+	@Override public void visit(final IfStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("if (");
+		n.getCondition().accept(this, arg);
+		final boolean thenBlock = n.getThenStmt() instanceof BlockStmt;
+		if (thenBlock) // block statement should start on the same line
+			printer.print(") ");
+		else {
+			printer.printLn(")");
+			printer.indent();
+		}
+		n.getThenStmt().accept(this, arg);
+		if (!thenBlock)
+			printer.unindent();
+		if (n.getElseStmt() != null) {
+			if (thenBlock)
+				printer.print(" ");
+			else
+				printer.printLn();
+			final boolean elseIf = n.getElseStmt() instanceof IfStmt;
+			final boolean elseBlock = n.getElseStmt() instanceof BlockStmt;
+			if (elseIf || elseBlock) // put chained if and start of block statement on a same level
+				printer.print("else ");
+			else {
+				printer.printLn("else");
+				printer.indent();
+			}
+			n.getElseStmt().accept(this, arg);
+			if (!(elseIf || elseBlock))
+				printer.unindent();
+		}
+	}
+
+	@Override public void visit(final WhileStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("while (");
+		n.getCondition().accept(this, arg);
+		printer.print(") ");
+		n.getBody().accept(this, arg);
+	}
+
+	@Override public void visit(final ContinueStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("continue");
+		if (n.getId() != null) {
+			printer.print(" ");
+			printer.print(n.getId());
+		}
+		printer.print(";");
+	}
+
+	@Override public void visit(final DoStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("do ");
+		n.getBody().accept(this, arg);
+		printer.print(" while (");
+		n.getCondition().accept(this, arg);
+		printer.print(");");
+	}
+
+	@Override public void visit(final ForeachStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("for (");
+		n.getVariable().accept(this, arg);
+		printer.print(" : ");
+		n.getIterable().accept(this, arg);
+		printer.print(") ");
+		n.getBody().accept(this, arg);
+	}
+
+	@Override public void visit(final ForStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("for (");
+		if (n.getInit() != null) {
+			for (final Iterator<Expression> i = n.getInit().iterator(); i.hasNext();) {
+				final Expression e = i.next();
+				e.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print("; ");
+		if (n.getCompare() != null) {
+			n.getCompare().accept(this, arg);
+		}
+		printer.print("; ");
+		if (n.getUpdate() != null) {
+			for (final Iterator<Expression> i = n.getUpdate().iterator(); i.hasNext();) {
+				final Expression e = i.next();
+				e.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print(") ");
+		n.getBody().accept(this, arg);
+	}
+
+	@Override public void visit(final ThrowStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("throw ");
+		n.getExpr().accept(this, arg);
+		printer.print(";");
+	}
+
+	@Override public void visit(final SynchronizedStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("synchronized (");
+		n.getExpr().accept(this, arg);
+		printer.print(") ");
+		n.getBlock().accept(this, arg);
+	}
+
+	@Override public void visit(final TryStmt n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("try ");
+		if (!n.getResources().isEmpty()) {
+			printer.print("(");
+			Iterator<VariableDeclarationExpr> resources = n.getResources().iterator();
+			boolean first = true;
+			while (resources.hasNext()) {
+				visit(resources.next(), arg);
+				if (resources.hasNext()) {
+					printer.print(";");
+					printer.printLn();
+					if (first) {
+						printer.indent();
+					}
+				}
+				first = false;
+			}
+			if (n.getResources().size() > 1) {
+				printer.unindent();
+			}
+			printer.print(") ");
+		}
+		n.getTryBlock().accept(this, arg);
+		if (n.getCatchs() != null) {
+			for (final CatchClause c : n.getCatchs()) {
+				c.accept(this, arg);
+			}
+		}
+		if (n.getFinallyBlock() != null) {
+			printer.print(" finally ");
+			n.getFinallyBlock().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final CatchClause n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(" catch (");
+		n.getExcept().accept(this, arg);
+		printer.print(") ");
+		n.getCatchBlock().accept(this, arg);
+
+	}
+
+	@Override public void visit(final AnnotationDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printJavadoc(n.getJavaDoc(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+
+		printer.print("@interface ");
+		printer.print(n.getName());
+		printer.printLn(" {");
+		printer.indent();
+		if (n.getMembers() != null) {
+			printMembers(n.getMembers(), arg);
+		}
+		printer.unindent();
+		printer.print("}");
+	}
+
+	@Override public void visit(final AnnotationMemberDeclaration n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printJavadoc(n.getJavaDoc(), arg);
+		printMemberAnnotations(n.getAnnotations(), arg);
+		printModifiers(n.getModifiers());
+
+		n.getType().accept(this, arg);
+		printer.print(" ");
+		printer.print(n.getName());
+		printer.print("()");
+		if (n.getDefaultValue() != null) {
+			printer.print(" default ");
+			n.getDefaultValue().accept(this, arg);
+		}
+		printer.print(";");
+	}
+
+	@Override public void visit(final MarkerAnnotationExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("@");
+		n.getName().accept(this, arg);
+	}
+
+	@Override public void visit(final SingleMemberAnnotationExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("@");
+		n.getName().accept(this, arg);
+		printer.print("(");
+		n.getMemberValue().accept(this, arg);
+		printer.print(")");
+	}
+
+	@Override public void visit(final NormalAnnotationExpr n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print("@");
+		n.getName().accept(this, arg);
+		printer.print("(");
+		if (n.getPairs() != null) {
+			for (final Iterator<MemberValuePair> i = n.getPairs().iterator(); i.hasNext();) {
+				final MemberValuePair m = i.next();
+				m.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		printer.print(")");
+	}
+
+	@Override public void visit(final MemberValuePair n, final Object arg) {
+		printJavaComment(n.getComment(), arg);
+		printer.print(n.getName());
+		printer.print(" = ");
+		n.getValue().accept(this, arg);
+	}
+
+	@Override public void visit(final LineComment n, final Object arg) {
+		if (!this.printComments) {
+            return;
         }
-    }
+        printer.print("//");
+		String tmp = n.getContent();
+		tmp = tmp.replace('\r', ' ');
+		tmp = tmp.replace('\n', ' ');
+		printer.printLn(tmp);
+	}
 
-    @Override
-    public void visit(final AssignExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getTarget().accept(this, arg);
-        printer.print(" ");
-        switch (n.getOperator()) {
-            case assign:
-                printer.print("=");
-                break;
-            case and:
-                printer.print("&=");
-                break;
-            case or:
-                printer.print("|=");
-                break;
-            case xor:
-                printer.print("^=");
-                break;
-            case plus:
-                printer.print("+=");
-                break;
-            case minus:
-                printer.print("-=");
-                break;
-            case rem:
-                printer.print("%=");
-                break;
-            case slash:
-                printer.print("/=");
-                break;
-            case star:
-                printer.print("*=");
-                break;
-            case lShift:
-                printer.print("<<=");
-                break;
-            case rSignedShift:
-                printer.print(">>=");
-                break;
-            case rUnsignedShift:
-                printer.print(">>>=");
-                break;
+	@Override public void visit(final BlockComment n, final Object arg) {
+        if (!this.printComments) {
+            return;
         }
-        printer.print(" ");
-        n.getValue().accept(this, arg);
-    }
+        printer.print("/*");
+		printer.print(n.getContent());
+		printer.printLn("*/");
+	}
 
-    @Override
-    public void visit(final BinaryExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getLeft().accept(this, arg);
-        printer.print(" ");
-        switch (n.getOperator()) {
-            case or:
-                printer.print("||");
-                break;
-            case and:
-                printer.print("&&");
-                break;
-            case binOr:
-                printer.print("|");
-                break;
-            case binAnd:
-                printer.print("&");
-                break;
-            case xor:
-                printer.print("^");
-                break;
-            case equals:
-                printer.print("==");
-                break;
-            case notEquals:
-                printer.print("!=");
-                break;
-            case less:
-                printer.print("<");
-                break;
-            case greater:
-                printer.print(">");
-                break;
-            case lessEquals:
-                printer.print("<=");
-                break;
-            case greaterEquals:
-                printer.print(">=");
-                break;
-            case lShift:
-                printer.print("<<");
-                break;
-            case rSignedShift:
-                printer.print(">>");
-                break;
-            case rUnsignedShift:
-                printer.print(">>>");
-                break;
-            case plus:
-                printer.print("+");
-                break;
-            case minus:
-                printer.print("-");
-                break;
-            case times:
-                printer.print("*");
-                break;
-            case divide:
-                printer.print("/");
-                break;
-            case remainder:
-                printer.print("%");
-                break;
-        }
-        printer.print(" ");
-        n.getRight().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final CastExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("(");
-        n.getType().accept(this, arg);
-        printer.print(") ");
-        n.getExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ClassExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getType().accept(this, arg);
-        printer.print(".class");
-    }
-
-    @Override
-    public void visit(final ConditionalExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getCondition().accept(this, arg);
-        printer.print(" ? ");
-        n.getThenExpr().accept(this, arg);
-        printer.print(" : ");
-        n.getElseExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final EnclosedExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("(");
-        if (n.getInner() != null) {
-            n.getInner().accept(this, arg);
-        }
-        printer.print(")");
-    }
-
-    @Override
-    public void visit(final FieldAccessExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getScope().accept(this, arg);
-        printer.print(".");
-        printer.print(n.getField());
-    }
-
-    @Override
-    public void visit(final InstanceOfExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getExpr().accept(this, arg);
-        printer.print(" instanceof ");
-        n.getType().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final CharLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("'");
-        printer.print(n.getValue());
-        printer.print("'");
-    }
-
-    @Override
-    public void visit(final DoubleLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getValue());
-    }
-
-    @Override
-    public void visit(final IntegerLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getValue());
-    }
-
-    @Override
-    public void visit(final LongLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getValue());
-    }
-
-    @Override
-    public void visit(final IntegerLiteralMinValueExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getValue());
-    }
-
-    @Override
-    public void visit(final LongLiteralMinValueExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getValue());
-    }
-
-    @Override
-    public void visit(final StringLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("\"");
-        printer.print(n.getValue());
-        printer.print("\"");
-    }
-
-    @Override
-    public void visit(final BooleanLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(String.valueOf(n.getValue()));
-    }
-
-    @Override
-    public void visit(final NullLiteralExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("null");
-    }
-
-    @Override
-    public void visit(final ThisExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getClassExpr() != null) {
-            n.getClassExpr().accept(this, arg);
-            printer.print(".");
-        }
-        printer.print("this");
-    }
-
-    @Override
-    public void visit(final SuperExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getClassExpr() != null) {
-            n.getClassExpr().accept(this, arg);
-            printer.print(".");
-        }
-        printer.print("super");
-    }
-
-    @Override
-    public void visit(final MethodCallExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getScope() != null) {
-            n.getScope().accept(this, arg);
-            printer.print(".");
-        }
-        printTypeArgs(n.getTypeArgs(), arg);
-        printer.print(n.getName());
-        printArguments(n.getArgs(), arg);
-    }
-
-    @Override
-    public void visit(final ObjectCreationExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getScope() != null) {
-            n.getScope().accept(this, arg);
-            printer.print(".");
-        }
-
-        printer.print("new ");
-
-        printTypeArgs(n.getTypeArgs(), arg);
-        if (!isNullOrEmpty(n.getTypeArgs())) {
-            printer.print(" ");
-        }
-
-        n.getType().accept(this, arg);
-
-        printArguments(n.getArgs(), arg);
-
-        if (n.getAnonymousClassBody() != null) {
-            printer.printLn(" {");
-            printer.indent();
-            printMembers(n.getAnonymousClassBody(), arg);
-            printer.unindent();
-            printer.print("}");
-        }
-    }
-
-    @Override
-    public void visit(final UnaryExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        switch (n.getOperator()) {
-            case positive:
-                printer.print("+");
-                break;
-            case negative:
-                printer.print("-");
-                break;
-            case inverse:
-                printer.print("~");
-                break;
-            case not:
-                printer.print("!");
-                break;
-            case preIncrement:
-                printer.print("++");
-                break;
-            case preDecrement:
-                printer.print("--");
-                break;
-            default:
-        }
-
-        n.getExpr().accept(this, arg);
-
-        switch (n.getOperator()) {
-            case posIncrement:
-                printer.print("++");
-                break;
-            case posDecrement:
-                printer.print("--");
-                break;
-            default:
-        }
-    }
-
-    @Override
-    public void visit(final ConstructorDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printJavadoc(n.getJavaDoc(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-
-        printTypeParameters(n.getTypeParameters(), arg);
-        if (n.getTypeParameters() != null) {
-            printer.print(" ");
-        }
-        printer.print(n.getName());
-
-        printer.print("(");
-        if (n.getParameters() != null) {
-            for (final Iterator<Parameter> i = n.getParameters().iterator(); i.hasNext(); ) {
-                final Parameter p = i.next();
-                p.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print(")");
-
-        if (!isNullOrEmpty(n.getThrows())) {
-            printer.print(" throws ");
-            for (final Iterator<NameExpr> i = n.getThrows().iterator(); i.hasNext(); ) {
-                final NameExpr name = i.next();
-                name.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print(" ");
-        n.getBlock().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final MethodDeclaration n, final Object arg) {
-        printOrphanCommentsBeforeThisChildNode(n);
-
-        printJavaComment(n.getComment(), arg);
-        printJavadoc(n.getJavaDoc(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-        if (n.isDefault()) {
-            printer.print("default ");
-        }
-        printTypeParameters(n.getTypeParameters(), arg);
-        if (n.getTypeParameters() != null) {
-            printer.print(" ");
-        }
-
-        n.getType().accept(this, arg);
-        printer.print(" ");
-        printer.print(n.getName());
-
-        printer.print("(");
-        if (n.getParameters() != null) {
-            for (final Iterator<Parameter> i = n.getParameters().iterator(); i.hasNext(); ) {
-                final Parameter p = i.next();
-                p.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print(")");
-
-        for (int i = 0; i < n.getArrayCount(); i++) {
-            printer.print("[]");
-        }
-
-        if (!isNullOrEmpty(n.getThrows())) {
-            printer.print(" throws ");
-            for (final Iterator<NameExpr> i = n.getThrows().iterator(); i.hasNext(); ) {
-                final NameExpr name = i.next();
-                name.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        if (n.getBody() == null) {
-            printer.print(";");
-        } else {
-            printer.print(" ");
-            n.getBody().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final Parameter n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-        if (n.getType() != null) {
-            n.getType().accept(this, arg);
-        }
-        if (n.isVarArgs()) {
-            printer.print("...");
-        }
-        printer.print(" ");
-        n.getId().accept(this, arg);
-    }
-
-    @Override
-    public void visit(MultiTypeParameter n, Object arg) {
-        printAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-
-        Iterator<Type> types = n.getTypes().iterator();
-        types.next().accept(this, arg);
-        while (types.hasNext()) {
-            printer.print(" | ");
-            types.next().accept(this, arg);
-        }
-
-        printer.print(" ");
-        n.getId().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ExplicitConstructorInvocationStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.isThis()) {
-            printTypeArgs(n.getTypeArgs(), arg);
-            printer.print("this");
-        } else {
-            if (n.getExpr() != null) {
-                n.getExpr().accept(this, arg);
-                printer.print(".");
-            }
-            printTypeArgs(n.getTypeArgs(), arg);
-            printer.print("super");
-        }
-        printArguments(n.getArgs(), arg);
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final VariableDeclarationExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-
-        n.getType().accept(this, arg);
-        printer.print(" ");
-
-        for (final Iterator<VariableDeclarator> i = n.getVars().iterator(); i.hasNext(); ) {
-            final VariableDeclarator v = i.next();
-            v.accept(this, arg);
-            if (i.hasNext()) {
-                printer.print(", ");
-            }
-        }
-    }
-
-    @Override
-    public void visit(final TypeDeclarationStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        n.getTypeDeclaration().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final AssertStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("assert ");
-        n.getCheck().accept(this, arg);
-        if (n.getMessage() != null) {
-            printer.print(" : ");
-            n.getMessage().accept(this, arg);
-        }
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final BlockStmt n, final Object arg) {
-        printOrphanCommentsBeforeThisChildNode(n);
-        printJavaComment(n.getComment(), arg);
-        printer.printLn("{");
-        if (n.getStmts() != null) {
-            printer.indent();
-            for (final Statement s : n.getStmts()) {
-                s.accept(this, arg);
-                printer.printLn();
-            }
-            printer.unindent();
-        }
-        printOrphanCommentsEnding(n);
-        printer.print("}");
-
-    }
-
-    @Override
-    public void visit(final LabeledStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getLabel());
-        printer.print(": ");
-        n.getStmt().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final EmptyStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final ExpressionStmt n, final Object arg) {
-        printOrphanCommentsBeforeThisChildNode(n);
-        printJavaComment(n.getComment(), arg);
-        n.getExpression().accept(this, arg);
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final SwitchStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("switch(");
-        n.getSelector().accept(this, arg);
-        printer.printLn(") {");
-        if (n.getEntries() != null) {
-            printer.indent();
-            for (final SwitchEntryStmt e : n.getEntries()) {
-                e.accept(this, arg);
-            }
-            printer.unindent();
-        }
-        printer.print("}");
-
-    }
-
-    @Override
-    public void visit(final SwitchEntryStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        if (n.getLabel() != null) {
-            printer.print("case ");
-            n.getLabel().accept(this, arg);
-            printer.print(":");
-        } else {
-            printer.print("default:");
-        }
-        printer.printLn();
-        printer.indent();
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
-                s.accept(this, arg);
-                printer.printLn();
-            }
-        }
-        printer.unindent();
-    }
-
-    @Override
-    public void visit(final BreakStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("break");
-        if (n.getId() != null) {
-            printer.print(" ");
-            printer.print(n.getId());
-        }
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final ReturnStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("return");
-        if (n.getExpr() != null) {
-            printer.print(" ");
-            n.getExpr().accept(this, arg);
-        }
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final EnumDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printJavadoc(n.getJavaDoc(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-
-        printer.print("enum ");
-        printer.print(n.getName());
-
-        if (n.getImplements() != null) {
-            printer.print(" implements ");
-            for (final Iterator<ClassOrInterfaceType> i = n.getImplements().iterator(); i.hasNext(); ) {
-                final ClassOrInterfaceType c = i.next();
-                c.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-
-        printer.printLn(" {");
-        printer.indent();
-        if (n.getEntries() != null) {
-            printer.printLn();
-            for (final Iterator<EnumConstantDeclaration> i = n.getEntries().iterator(); i.hasNext(); ) {
-                final EnumConstantDeclaration e = i.next();
-                e.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        if (n.getMembers() != null) {
-            printer.printLn(";");
-            printMembers(n.getMembers(), arg);
-        } else {
-            if (n.getEntries() != null) {
-                printer.printLn();
-            }
-        }
-        printer.unindent();
-        printer.print("}");
-    }
-
-    @Override
-    public void visit(final EnumConstantDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printJavadoc(n.getJavaDoc(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printer.print(n.getName());
-
-        if (n.getArgs() != null) {
-            printArguments(n.getArgs(), arg);
-        }
-
-        if (n.getClassBody() != null) {
-            printer.printLn(" {");
-            printer.indent();
-            printMembers(n.getClassBody(), arg);
-            printer.unindent();
-            printer.printLn("}");
-        }
-    }
-
-    @Override
-    public void visit(final EmptyMemberDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printJavadoc(n.getJavaDoc(), arg);
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final InitializerDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printJavadoc(n.getJavaDoc(), arg);
-        if (n.isStatic()) {
-            printer.print("static ");
-        }
-        n.getBlock().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final IfStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("if (");
-        n.getCondition().accept(this, arg);
-        final boolean thenBlock = n.getThenStmt() instanceof BlockStmt;
-        if (thenBlock) // block statement should start on the same line
-            printer.print(") ");
-        else {
-            printer.printLn(")");
-            printer.indent();
-        }
-        n.getThenStmt().accept(this, arg);
-        if (!thenBlock)
-            printer.unindent();
-        if (n.getElseStmt() != null) {
-            if (thenBlock)
-                printer.print(" ");
-            else
-                printer.printLn();
-            final boolean elseIf = n.getElseStmt() instanceof IfStmt;
-            final boolean elseBlock = n.getElseStmt() instanceof BlockStmt;
-            if (elseIf || elseBlock) // put chained if and start of block statement on a same level
-                printer.print("else ");
-            else {
-                printer.printLn("else");
-                printer.indent();
-            }
-            n.getElseStmt().accept(this, arg);
-            if (!(elseIf || elseBlock))
-                printer.unindent();
-        }
-    }
-
-    @Override
-    public void visit(final WhileStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("while (");
-        n.getCondition().accept(this, arg);
-        printer.print(") ");
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ContinueStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("continue");
-        if (n.getId() != null) {
-            printer.print(" ");
-            printer.print(n.getId());
-        }
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final DoStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("do ");
-        n.getBody().accept(this, arg);
-        printer.print(" while (");
-        n.getCondition().accept(this, arg);
-        printer.print(");");
-    }
-
-    @Override
-    public void visit(final ForeachStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("for (");
-        n.getVariable().accept(this, arg);
-        printer.print(" : ");
-        n.getIterable().accept(this, arg);
-        printer.print(") ");
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ForStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("for (");
-        if (n.getInit() != null) {
-            for (final Iterator<Expression> i = n.getInit().iterator(); i.hasNext(); ) {
-                final Expression e = i.next();
-                e.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print("; ");
-        if (n.getCompare() != null) {
-            n.getCompare().accept(this, arg);
-        }
-        printer.print("; ");
-        if (n.getUpdate() != null) {
-            for (final Iterator<Expression> i = n.getUpdate().iterator(); i.hasNext(); ) {
-                final Expression e = i.next();
-                e.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print(") ");
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ThrowStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("throw ");
-        n.getExpr().accept(this, arg);
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final SynchronizedStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("synchronized (");
-        n.getExpr().accept(this, arg);
-        printer.print(") ");
-        n.getBlock().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final TryStmt n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("try ");
-        if (!n.getResources().isEmpty()) {
-            printer.print("(");
-            Iterator<VariableDeclarationExpr> resources = n.getResources().iterator();
-            boolean first = true;
-            while (resources.hasNext()) {
-                visit(resources.next(), arg);
-                if (resources.hasNext()) {
-                    printer.print(";");
-                    printer.printLn();
-                    if (first) {
-                        printer.indent();
-                    }
-                }
-                first = false;
-            }
-            if (n.getResources().size() > 1) {
-                printer.unindent();
-            }
-            printer.print(") ");
-        }
-        n.getTryBlock().accept(this, arg);
-        if (n.getCatchs() != null) {
-            for (final CatchClause c : n.getCatchs()) {
-                c.accept(this, arg);
-            }
-        }
-        if (n.getFinallyBlock() != null) {
-            printer.print(" finally ");
-            n.getFinallyBlock().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final CatchClause n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(" catch (");
-        n.getExcept().accept(this, arg);
-        printer.print(") ");
-        n.getCatchBlock().accept(this, arg);
-
-    }
-
-    @Override
-    public void visit(final AnnotationDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printJavadoc(n.getJavaDoc(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-
-        printer.print("@interface ");
-        printer.print(n.getName());
-        printer.printLn(" {");
-        printer.indent();
-        if (n.getMembers() != null) {
-            printMembers(n.getMembers(), arg);
-        }
-        printer.unindent();
-        printer.print("}");
-    }
-
-    @Override
-    public void visit(final AnnotationMemberDeclaration n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printJavadoc(n.getJavaDoc(), arg);
-        printMemberAnnotations(n.getAnnotations(), arg);
-        printModifiers(n.getModifiers());
-
-        n.getType().accept(this, arg);
-        printer.print(" ");
-        printer.print(n.getName());
-        printer.print("()");
-        if (n.getDefaultValue() != null) {
-            printer.print(" default ");
-            n.getDefaultValue().accept(this, arg);
-        }
-        printer.print(";");
-    }
-
-    @Override
-    public void visit(final MarkerAnnotationExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("@");
-        n.getName().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final SingleMemberAnnotationExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("@");
-        n.getName().accept(this, arg);
-        printer.print("(");
-        n.getMemberValue().accept(this, arg);
-        printer.print(")");
-    }
-
-    @Override
-    public void visit(final NormalAnnotationExpr n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print("@");
-        n.getName().accept(this, arg);
-        printer.print("(");
-        if (n.getPairs() != null) {
-            for (final Iterator<MemberValuePair> i = n.getPairs().iterator(); i.hasNext(); ) {
-                final MemberValuePair m = i.next();
-                m.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        printer.print(")");
-    }
-
-    @Override
-    public void visit(final MemberValuePair n, final Object arg) {
-        printJavaComment(n.getComment(), arg);
-        printer.print(n.getName());
-        printer.print(" = ");
-        n.getValue().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final LineComment n, final Object arg) {
-        if (!this.printComments) {
-            return;
-        }
-        printer.print("//");
-        String tmp = n.getContent();
-        tmp = tmp.replace('\r', ' ');
-        tmp = tmp.replace('\n', ' ');
-        printer.printLn(tmp);
-    }
-
-    @Override
-    public void visit(final BlockComment n, final Object arg) {
-        if (!this.printComments) {
-            return;
-        }
-        printer.print("/*");
-        printer.print(n.getContent());
-        printer.printLn("*/");
-    }
-
-    @Override
-    public void visit(LambdaExpr n, Object arg) {
+	@Override
+	public void visit(LambdaExpr n, Object arg) {
         printJavaComment(n.getComment(), arg);
 
         List<Parameter> parameters = n.getParameters();
-        boolean printPar = false;
-        printPar = n.isParametersEnclosed();
-
-        if (printPar) {
-            printer.print("(");
-        }
-        if (parameters != null) {
-            for (Iterator<Parameter> i = parameters.iterator(); i.hasNext(); ) {
-                Parameter p = i.next();
-                p.accept(this, arg);
-                if (i.hasNext()) {
-                    printer.print(", ");
-                }
-            }
-        }
-        if (printPar) {
-            printer.print(")");
-        }
-
-        printer.print(" -> ");
-        Statement body = n.getBody();
-        if (body instanceof ExpressionStmt) {
-            // Print the expression directly
-            ((ExpressionStmt) body).getExpression().accept(this, arg);
-        } else {
-            body.accept(this, arg);
-        }
-    }
+		boolean printPar = false;
+		printPar = n.isParametersEnclosed();
+
+		if (printPar) {
+			printer.print("(");
+		}
+		if (parameters != null) {
+			for (Iterator<Parameter> i = parameters.iterator(); i.hasNext();) {
+				Parameter p = i.next();
+				p.accept(this, arg);
+				if (i.hasNext()) {
+					printer.print(", ");
+				}
+			}
+		}
+		if (printPar) {
+			printer.print(")");
+		}
+
+		printer.print(" -> ");
+		Statement body = n.getBody();
+		if (body instanceof ExpressionStmt) {
+			// Print the expression directly
+			((ExpressionStmt) body).getExpression().accept(this, arg);
+		} else {
+			body.accept(this, arg);
+		}
+	}
 
 
     @Override
@@ -1672,7 +1589,7 @@ public void visit(MethodReferenceExpr n, Object arg) {
         if (n.getTypeParameters() != null) {
             printer.print("<");
             for (Iterator<TypeParameter> i = n.getTypeParameters().iterator(); i
-                    .hasNext(); ) {
+                    .hasNext();) {
                 TypeParameter p = i.next();
                 p.accept(this, arg);
                 if (i.hasNext()) {
@@ -1695,47 +1612,46 @@ public void visit(TypeExpr n, Object arg) {
         }
     }
 
-    private void printOrphanCommentsBeforeThisChildNode(final Node node) {
+    private void printOrphanCommentsBeforeThisChildNode(final Node node){
         if (node instanceof Comment) return;
 
         Node parent = node.getParentNode();
-        if (parent == null) return;
+        if (parent==null) return;
         List<Node> everything = new LinkedList<Node>();
         everything.addAll(parent.getChildrenNodes());
         sortByBeginPosition(everything);
         int positionOfTheChild = -1;
-        for (int i = 0; i < everything.size(); i++) {
-            if (everything.get(i) == node) positionOfTheChild = i;
+        for (int i=0;i<everything.size();i++){
+            if (everything.get(i)==node) positionOfTheChild=i;
         }
-        if (positionOfTheChild == -1) throw new RuntimeException("My index not found!!! " + node);
+        if (positionOfTheChild==-1) throw new RuntimeException("My index not found!!! "+node);
         int positionOfPreviousChild = -1;
-        for (int i = positionOfTheChild - 1; i >= 0 && positionOfPreviousChild == -1; i--) {
+        for (int i=positionOfTheChild-1;i>=0 && positionOfPreviousChild==-1;i--){
             if (!(everything.get(i) instanceof Comment)) positionOfPreviousChild = i;
         }
-        for (int i = positionOfPreviousChild + 1; i < positionOfTheChild; i++) {
+        for (int i=positionOfPreviousChild+1;i<positionOfTheChild;i++){
             Node nodeToPrint = everything.get(i);
-            if (!(nodeToPrint instanceof Comment))
-                throw new RuntimeException("Expected comment, instead " + nodeToPrint.getClass() + ". Position of previous child: " + positionOfPreviousChild + ", position of child " + positionOfTheChild);
-            nodeToPrint.accept(this, null);
+            if (!(nodeToPrint instanceof Comment)) throw new RuntimeException("Expected comment, instead "+nodeToPrint.getClass()+". Position of previous child: "+positionOfPreviousChild+", position of child "+positionOfTheChild);
+            nodeToPrint.accept(this,null);
         }
     }
 
 
-    private void printOrphanCommentsEnding(final Node node) {
+    private void printOrphanCommentsEnding(final Node node){
         List<Node> everything = new LinkedList<Node>();
         everything.addAll(node.getChildrenNodes());
         sortByBeginPosition(everything);
-        if (everything.size() == 0) return;
+        if (everything.size()==0) return;
 
         int commentsAtEnd = 0;
         boolean findingComments = true;
-        while (findingComments && commentsAtEnd < everything.size()) {
-            Node last = everything.get(everything.size() - 1 - commentsAtEnd);
+        while (findingComments&&commentsAtEnd<everything.size()){
+            Node last = everything.get(everything.size()-1-commentsAtEnd);
             findingComments = (last instanceof Comment);
             if (findingComments) commentsAtEnd++;
         }
-        for (int i = 0; i < commentsAtEnd; i++) {
-            everything.get(everything.size() - commentsAtEnd + i).accept(this, null);
+        for (int i=0;i<commentsAtEnd;i++){
+            everything.get(everything.size()-commentsAtEnd+i).accept(this,null);
         }
     }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/EqualsVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/EqualsVisitor.java
index c87ecde82d..8f4a786c01 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/EqualsVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/EqualsVisitor.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import com.github.javaparser.ast.comments.BlockComment;
@@ -77,15 +77,15 @@
  */
 public class EqualsVisitor implements GenericVisitor<Boolean, Node> {
 
-    private static final EqualsVisitor SINGLETON = new EqualsVisitor();
+	private static final EqualsVisitor SINGLETON = new EqualsVisitor();
 
-    public static boolean equals(final Node n1, final Node n2) {
-        return SINGLETON.nodeEquals(n1, n2);
-    }
+	public static boolean equals(final Node n1, final Node n2) {
+		return SINGLETON.nodeEquals(n1, n2);
+	}
 
-    private EqualsVisitor() {
-        // hide constructor
-    }
+	private EqualsVisitor() {
+		// hide constructor
+	}
 
     /**
      * Check for equality that can be applied to each kind of node,
@@ -95,1413 +95,1337 @@ private boolean commonNodeEquality(Node n1, Node n2) {
         if (!nodeEquals(n1.getComment(), n2.getComment())) {
             return false;
         }
-        if (!nodesEquals(n1.getOrphanComments(), n2.getOrphanComments())) {
+        if (!nodesEquals(n1.getOrphanComments(), n2.getOrphanComments())){
             return false;
         }
         return true;
     }
 
-    private <T extends Node> boolean nodesEquals(final List<T> nodes1, final List<T> nodes2) {
-        if (nodes1 == null) {
-            if (nodes2 == null) {
-                return true;
-            }
+	private <T extends Node> boolean nodesEquals(final List<T> nodes1, final List<T> nodes2) {
+		if (nodes1 == null) {
+			if (nodes2 == null) {
+				return true;
+			}
+			return false;
+		} else if (nodes2 == null) {
+			return false;
+		}
+		if (nodes1.size() != nodes2.size()) {
+			return false;
+		}
+		for (int i = 0; i < nodes1.size(); i++) {
+			if (!nodeEquals(nodes1.get(i), nodes2.get(i))) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	private <T extends Node> boolean nodeEquals(final T n1, final T n2) {
+		if (n1 == n2) {
+			return true;
+		}
+		if (n1 == null) {
+			if (n2 == null) {
+				return true;
+			}
+			return false;
+		} else if (n2 == null) {
+			return false;
+		}
+		if (n1.getClass() != n2.getClass()) {
+			return false;
+		}
+        if (!commonNodeEquality(n1, n2)){
             return false;
-        } else if (nodes2 == null) {
-            return false;
-        }
-        if (nodes1.size() != nodes2.size()) {
-            return false;
-        }
-        for (int i = 0; i < nodes1.size(); i++) {
-            if (!nodeEquals(nodes1.get(i), nodes2.get(i))) {
-                return false;
-            }
         }
-        return true;
-    }
+		return n1.accept(this, n2).booleanValue();
+	}
+
+	private boolean objEquals(final Object n1, final Object n2) {
+		if (n1 == n2) {
+			return true;
+		}
+		if (n1 == null) {
+			if (n2 == null) {
+				return true;
+			}
+			return false;
+		} else if (n2 == null) {
+			return false;
+		}
+		return n1.equals(n2);
+	}
+
+	@Override public Boolean visit(final CompilationUnit n1, final Node arg) {
+		final CompilationUnit n2 = (CompilationUnit) arg;
+
+		if (!nodeEquals(n1.getPackage(), n2.getPackage())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getImports(), n2.getImports())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getTypes(), n2.getTypes())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getComments(), n2.getComments())) {
+			return Boolean.FALSE;
+		}
+
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final PackageDeclaration n1, final Node arg) {
+		final PackageDeclaration n2 = (PackageDeclaration) arg;
+
+		if (!nodeEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
+
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final ImportDeclaration n1, final Node arg) {
+		final ImportDeclaration n2 = (ImportDeclaration) arg;
+
+		if (!nodeEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
+
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final TypeParameter n1, final Node arg) {
+		final TypeParameter n2 = (TypeParameter) arg;
+
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getTypeBound(), n2.getTypeBound())) {
+			return Boolean.FALSE;
+		}
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final LineComment n1, final Node arg) {
+		final LineComment n2 = (LineComment) arg;
+
+		if (!objEquals(n1.getContent(), n2.getContent())) {
+			return Boolean.FALSE;
+		}
 
-    private <T extends Node> boolean nodeEquals(final T n1, final T n2) {
-        if (n1 == n2) {
-            return true;
-        }
-        if (n1 == null) {
-            if (n2 == null) {
-                return true;
-            }
-            return false;
-        } else if (n2 == null) {
-            return false;
-        }
-        if (n1.getClass() != n2.getClass()) {
-            return false;
-        }
-        if (!commonNodeEquality(n1, n2)) {
-            return false;
-        }
-        return n1.accept(this, n2).booleanValue();
-    }
+        if (!objEquals(n1.getBeginLine(), n2.getBeginLine())) {
+      		return Boolean.FALSE;
+      	}
 
-    private boolean objEquals(final Object n1, final Object n2) {
-        if (n1 == n2) {
-            return true;
-        }
-        if (n1 == null) {
-            if (n2 == null) {
-                return true;
-            }
-            return false;
-        } else if (n2 == null) {
-            return false;
-        }
-        return n1.equals(n2);
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final CompilationUnit n1, final Node arg) {
-        final CompilationUnit n2 = (CompilationUnit) arg;
+	@Override public Boolean visit(final BlockComment n1, final Node arg) {
+		final BlockComment n2 = (BlockComment) arg;
 
-        if (!nodeEquals(n1.getPackage(), n2.getPackage())) {
-            return Boolean.FALSE;
-        }
+		if (!objEquals(n1.getContent(), n2.getContent())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getImports(), n2.getImports())) {
-            return Boolean.FALSE;
-        }
+        if (!objEquals(n1.getBeginLine(), n2.getBeginLine())) {
+      			return Boolean.FALSE;
+      	}
 
-        if (!nodesEquals(n1.getTypes(), n2.getTypes())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getComments(), n2.getComments())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final ClassOrInterfaceDeclaration n1, final Node arg) {
+		final ClassOrInterfaceDeclaration n2 = (ClassOrInterfaceDeclaration) arg;
 
-        return Boolean.TRUE;
-    }
+		// javadoc are checked at CompilationUnit
 
-    @Override
-    public Boolean visit(final PackageDeclaration n1, final Node arg) {
-        final PackageDeclaration n2 = (PackageDeclaration) arg;
+		if (n1.getModifiers() != n2.getModifiers()) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		if (n1.isInterface() != n2.isInterface()) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final ImportDeclaration n1, final Node arg) {
-        final ImportDeclaration n2 = (ImportDeclaration) arg;
+		if (!nodesEquals(n1.getTypeParameters(), n2.getTypeParameters())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getExtends(), n2.getExtends())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		if (!nodesEquals(n1.getImplements(), n2.getImplements())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final TypeParameter n1, final Node arg) {
-        final TypeParameter n2 = (TypeParameter) arg;
+		if (!nodesEquals(n1.getMembers(), n2.getMembers())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getTypeBound(), n2.getTypeBound())) {
-            return Boolean.FALSE;
-        }
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final EnumDeclaration n1, final Node arg) {
+		final EnumDeclaration n2 = (EnumDeclaration) arg;
 
-    @Override
-    public Boolean visit(final LineComment n1, final Node arg) {
-        final LineComment n2 = (LineComment) arg;
+		// javadoc are checked at CompilationUnit
 
-        if (!objEquals(n1.getContent(), n2.getContent())) {
-            return Boolean.FALSE;
-        }
+		if (n1.getModifiers() != n2.getModifiers()) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getBeginLine(), n2.getBeginLine())) {
-            return Boolean.FALSE;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final BlockComment n1, final Node arg) {
-        final BlockComment n2 = (BlockComment) arg;
+		if (!nodesEquals(n1.getImplements(), n2.getImplements())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getContent(), n2.getContent())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getEntries(), n2.getEntries())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getBeginLine(), n2.getBeginLine())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getMembers(), n2.getMembers())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final ClassOrInterfaceDeclaration n1, final Node arg) {
-        final ClassOrInterfaceDeclaration n2 = (ClassOrInterfaceDeclaration) arg;
+	@Override public Boolean visit(final EmptyTypeDeclaration n1, final Node arg) {
+		return Boolean.TRUE;
+	}
 
-        // javadoc are checked at CompilationUnit
+	@Override public Boolean visit(final EnumConstantDeclaration n1, final Node arg) {
+		final EnumConstantDeclaration n2 = (EnumConstantDeclaration) arg;
 
-        if (n1.getModifiers() != n2.getModifiers()) {
-            return Boolean.FALSE;
-        }
+		// javadoc are checked at CompilationUnit
 
-        if (n1.isInterface() != n2.isInterface()) {
-            return Boolean.FALSE;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getTypeParameters(), n2.getTypeParameters())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getClassBody(), n2.getClassBody())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getExtends(), n2.getExtends())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getImplements(), n2.getImplements())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final AnnotationDeclaration n1, final Node arg) {
+		final AnnotationDeclaration n2 = (AnnotationDeclaration) arg;
 
-        if (!nodesEquals(n1.getMembers(), n2.getMembers())) {
-            return Boolean.FALSE;
-        }
+		// javadoc are checked at CompilationUnit
 
-        return Boolean.TRUE;
-    }
+		if (n1.getModifiers() != n2.getModifiers()) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final EnumDeclaration n1, final Node arg) {
-        final EnumDeclaration n2 = (EnumDeclaration) arg;
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-        // javadoc are checked at CompilationUnit
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
 
-        if (n1.getModifiers() != n2.getModifiers()) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getMembers(), n2.getMembers())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final AnnotationMemberDeclaration n1, final Node arg) {
+		final AnnotationMemberDeclaration n2 = (AnnotationMemberDeclaration) arg;
 
-        if (!nodesEquals(n1.getImplements(), n2.getImplements())) {
-            return Boolean.FALSE;
-        }
+		// javadoc are checked at CompilationUnit
 
-        if (!nodesEquals(n1.getEntries(), n2.getEntries())) {
-            return Boolean.FALSE;
-        }
+		if (n1.getModifiers() != n2.getModifiers()) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getMembers(), n2.getMembers())) {
-            return Boolean.FALSE;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final EmptyTypeDeclaration n1, final Node arg) {
-        return Boolean.TRUE;
-    }
+		if (!nodeEquals(n1.getDefaultValue(), n2.getDefaultValue())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final EnumConstantDeclaration n1, final Node arg) {
-        final EnumConstantDeclaration n2 = (EnumConstantDeclaration) arg;
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return Boolean.FALSE;
+		}
 
-        // javadoc are checked at CompilationUnit
+		return Boolean.TRUE;
+	}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final FieldDeclaration n1, final Node arg) {
+		final FieldDeclaration n2 = (FieldDeclaration) arg;
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
+		// javadoc are checked at CompilationUnit
 
-        if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
-            return Boolean.FALSE;
-        }
+		if (n1.getModifiers() != n2.getModifiers()) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getClassBody(), n2.getClassBody())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final AnnotationDeclaration n1, final Node arg) {
-        final AnnotationDeclaration n2 = (AnnotationDeclaration) arg;
+		if (!nodesEquals(n1.getVariables(), n2.getVariables())) {
+			return Boolean.FALSE;
+		}
 
-        // javadoc are checked at CompilationUnit
+		return Boolean.TRUE;
+	}
 
-        if (n1.getModifiers() != n2.getModifiers()) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final VariableDeclarator n1, final Node arg) {
+		final VariableDeclarator n2 = (VariableDeclarator) arg;
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getId(), n2.getId())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getInit(), n2.getInit())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getMembers(), n2.getMembers())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final VariableDeclaratorId n1, final Node arg) {
+		final VariableDeclaratorId n2 = (VariableDeclaratorId) arg;
 
-    @Override
-    public Boolean visit(final AnnotationMemberDeclaration n1, final Node arg) {
-        final AnnotationMemberDeclaration n2 = (AnnotationMemberDeclaration) arg;
+		if (n1.getArrayCount() != n2.getArrayCount()) {
+			return Boolean.FALSE;
+		}
 
-        // javadoc are checked at CompilationUnit
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-        if (n1.getModifiers() != n2.getModifiers()) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final ConstructorDeclaration n1, final Node arg) {
+		final ConstructorDeclaration n2 = (ConstructorDeclaration) arg;
+
+		// javadoc are checked at CompilationUnit
+
+		if (n1.getModifiers() != n2.getModifiers()) {
+			return Boolean.FALSE;
+		}
+
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodeEquals(n1.getBlock(), n2.getBlock())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getParameters(), n2.getParameters())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getThrows(), n2.getThrows())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getTypeParameters(), n2.getTypeParameters())) {
+			return Boolean.FALSE;
+		}
+
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final MethodDeclaration n1, final Node arg) {
+		final MethodDeclaration n2 = (MethodDeclaration) arg;
+
+		// javadoc are checked at CompilationUnit
+
+		if (n1.getModifiers() != n2.getModifiers()) {
+			return Boolean.FALSE;
+		}
+
+		if (n1.getArrayCount() != n2.getArrayCount()) {
+			return Boolean.FALSE;
+		}
+
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getParameters(), n2.getParameters())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getThrows(), n2.getThrows())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getTypeParameters(), n2.getTypeParameters())) {
+			return Boolean.FALSE;
+		}
+		if(n1.isDefault() != n2.isDefault()){
+			return Boolean.FALSE;
+		}
+		return Boolean.TRUE;
+	}
+	
+	@Override public Boolean visit(final Parameter n1, final Node arg) {
+		final Parameter n2 = (Parameter) arg;
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return Boolean.FALSE;
+		}
+		return visit((BaseParameter) n1, arg);
+	}
+	
+	@Override public Boolean visit(MultiTypeParameter n1, Node arg) {
+		MultiTypeParameter n2 = (MultiTypeParameter) arg;
+		if (n1.getTypes().size() != n2.getTypes().size()) {
+			return Boolean.FALSE;
+		}
+		Iterator<Type> n1types = n1.getTypes().iterator();
+		Iterator<Type> n2types = n2.getTypes().iterator();
+		while (n1types.hasNext() && n2types.hasNext()) {
+			if (!nodeEquals(n1types.next(), n2types.next())) {
+				return Boolean.FALSE;
+			}
+		}
+		return visit((BaseParameter) n1, arg);
+	}
+
+	protected Boolean visit(final BaseParameter n1, final Node arg) {
+		final BaseParameter n2 = (BaseParameter) arg;
+
+		if (n1.getModifiers() != n2.getModifiers()) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodeEquals(n1.getId(), n2.getId())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
+
+		return Boolean.TRUE;
+	}
+	
+	@Override public Boolean visit(final EmptyMemberDeclaration n1, final Node arg) {
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final InitializerDeclaration n1, final Node arg) {
+		final InitializerDeclaration n2 = (InitializerDeclaration) arg;
+
+		if (!nodeEquals(n1.getBlock(), n2.getBlock())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
+
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final JavadocComment n1, final Node arg) {
+		final JavadocComment n2 = (JavadocComment) arg;
+
+		if (!objEquals(n1.getContent(), n2.getContent())) {
+			return Boolean.FALSE;
+		}
+
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final ClassOrInterfaceType n1, final Node arg) {
+		final ClassOrInterfaceType n2 = (ClassOrInterfaceType) arg;
+
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodeEquals(n1.getScope(), n2.getScope())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getTypeArgs(), n2.getTypeArgs())) {
+			return Boolean.FALSE;
+		}
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final PrimitiveType n1, final Node arg) {
+		final PrimitiveType n2 = (PrimitiveType) arg;
+
+		if (n1.getType() != n2.getType()) {
+			return Boolean.FALSE;
+		}
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final ReferenceType n1, final Node arg) {
+		final ReferenceType n2 = (ReferenceType) arg;
+
+		if (n1.getArrayCount() != n2.getArrayCount()) {
+			return Boolean.FALSE;
+		}
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return Boolean.FALSE;
+		}
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
+		List<List<AnnotationExpr>> n1a = n1.getArraysAnnotations();
+		List<List<AnnotationExpr>> n2a = n2.getArraysAnnotations();
+
+		if (n1a !=null && n2a!= null) {
+			if(n1a.size() != n2a.size()){
+				return Boolean.FALSE;
+			}
+			else{
+				int i = 0;
+				for(List<AnnotationExpr> aux: n1a){
+					if(!nodesEquals(aux, n2a.get(i))){
+						return Boolean.FALSE;
+					}
+					i++;
+				}
+			}
+		}
+		else if (n1a != n2a){
+			return Boolean.FALSE;
+		}
+		return Boolean.TRUE;
+	}
+
+	public Boolean visit(VoidType n1, Node arg) {
+		VoidType n2 = (VoidType) arg;
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final WildcardType n1, final Node arg) {
+		final WildcardType n2 = (WildcardType) arg;
+
+		if (!nodeEquals(n1.getExtends(), n2.getExtends())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodeEquals(n1.getSuper(), n2.getSuper())) {
+			return Boolean.FALSE;
+		}
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final UnknownType n1, final Node arg) {
+		final WildcardType n2 = (WildcardType) arg;
+
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final ArrayAccessExpr n1, final Node arg) {
+		final ArrayAccessExpr n2 = (ArrayAccessExpr) arg;
+
+		if (!nodeEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodeEquals(n1.getIndex(), n2.getIndex())) {
+			return Boolean.FALSE;
+		}
+
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final ArrayCreationExpr n1, final Node arg) {
+		final ArrayCreationExpr n2 = (ArrayCreationExpr) arg;
+
+		if (n1.getArrayCount() != n2.getArrayCount()) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodeEquals(n1.getInitializer(), n2.getInitializer())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodesEquals(n1.getDimensions(), n2.getDimensions())) {
+			return Boolean.FALSE;
+		}
+		List<List<AnnotationExpr>> n1a = n1.getArraysAnnotations();
+		List<List<AnnotationExpr>> n2a = n2.getArraysAnnotations();
+
+		if (n1a !=null && n2a!= null) {
+			if(n1a.size() != n2a.size()){
+				return Boolean.FALSE;
+			}
+			else{
+				int i = 0;
+				for(List<AnnotationExpr> aux: n1a){
+					if(!nodesEquals(aux, n2a.get(i))){
+						return Boolean.FALSE;
+					}
+					i++;
+				}
+			}
+		}
+		else if (n1a != n2a){
+			return Boolean.FALSE;
+		}
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final ArrayInitializerExpr n1, final Node arg) {
+		final ArrayInitializerExpr n2 = (ArrayInitializerExpr) arg;
+
+		if (!nodesEquals(n1.getValues(), n2.getValues())) {
+			return Boolean.FALSE;
+		}
+
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final AssignExpr n1, final Node arg) {
+		final AssignExpr n2 = (AssignExpr) arg;
+
+		if (n1.getOperator() != n2.getOperator()) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodeEquals(n1.getTarget(), n2.getTarget())) {
+			return Boolean.FALSE;
+		}
+
+		if (!nodeEquals(n1.getValue(), n2.getValue())) {
+			return Boolean.FALSE;
+		}
+
+		return Boolean.TRUE;
+	}
+
+	@Override public Boolean visit(final BinaryExpr n1, final Node arg) {
+		final BinaryExpr n2 = (BinaryExpr) arg;
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		if (n1.getOperator() != n2.getOperator()) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getLeft(), n2.getLeft())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getDefaultValue(), n2.getDefaultValue())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getRight(), n2.getRight())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final CastExpr n1, final Node arg) {
+		final CastExpr n2 = (CastExpr) arg;
 
-    @Override
-    public Boolean visit(final FieldDeclaration n1, final Node arg) {
-        final FieldDeclaration n2 = (FieldDeclaration) arg;
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return Boolean.FALSE;
+		}
 
-        // javadoc are checked at CompilationUnit
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return Boolean.FALSE;
+		}
 
-        if (n1.getModifiers() != n2.getModifiers()) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final ClassExpr n1, final Node arg) {
+		final ClassExpr n2 = (ClassExpr) arg;
 
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getVariables(), n2.getVariables())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final ConditionalExpr n1, final Node arg) {
+		final ConditionalExpr n2 = (ConditionalExpr) arg;
 
-    @Override
-    public Boolean visit(final VariableDeclarator n1, final Node arg) {
-        final VariableDeclarator n2 = (VariableDeclarator) arg;
+		if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getId(), n2.getId())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getThenExpr(), n2.getThenExpr())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getInit(), n2.getInit())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getElseExpr(), n2.getElseExpr())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final VariableDeclaratorId n1, final Node arg) {
-        final VariableDeclaratorId n2 = (VariableDeclaratorId) arg;
+	@Override public Boolean visit(final EnclosedExpr n1, final Node arg) {
+		final EnclosedExpr n2 = (EnclosedExpr) arg;
 
-        if (n1.getArrayCount() != n2.getArrayCount()) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getInner(), n2.getInner())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final FieldAccessExpr n1, final Node arg) {
+		final FieldAccessExpr n2 = (FieldAccessExpr) arg;
 
-    @Override
-    public Boolean visit(final ConstructorDeclaration n1, final Node arg) {
-        final ConstructorDeclaration n2 = (ConstructorDeclaration) arg;
+		if (!nodeEquals(n1.getScope(), n2.getScope())) {
+			return Boolean.FALSE;
+		}
 
-        // javadoc are checked at CompilationUnit
+		if (!objEquals(n1.getField(), n2.getField())) {
+			return Boolean.FALSE;
+		}
 
-        if (n1.getModifiers() != n2.getModifiers()) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getTypeArgs(), n2.getTypeArgs())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final InstanceOfExpr n1, final Node arg) {
+		final InstanceOfExpr n2 = (InstanceOfExpr) arg;
 
-        if (!nodeEquals(n1.getBlock(), n2.getBlock())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getParameters(), n2.getParameters())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getThrows(), n2.getThrows())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getTypeParameters(), n2.getTypeParameters())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final StringLiteralExpr n1, final Node arg) {
+		final StringLiteralExpr n2 = (StringLiteralExpr) arg;
 
-        return Boolean.TRUE;
-    }
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final MethodDeclaration n1, final Node arg) {
-        final MethodDeclaration n2 = (MethodDeclaration) arg;
+		return Boolean.TRUE;
+	}
 
-        // javadoc are checked at CompilationUnit
+	@Override public Boolean visit(final IntegerLiteralExpr n1, final Node arg) {
+		final IntegerLiteralExpr n2 = (IntegerLiteralExpr) arg;
 
-        if (n1.getModifiers() != n2.getModifiers()) {
-            return Boolean.FALSE;
-        }
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return Boolean.FALSE;
+		}
 
-        if (n1.getArrayCount() != n2.getArrayCount()) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final LongLiteralExpr n1, final Node arg) {
+		final LongLiteralExpr n2 = (LongLiteralExpr) arg;
 
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return Boolean.FALSE;
-        }
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final IntegerLiteralMinValueExpr n1, final Node arg) {
+		final IntegerLiteralMinValueExpr n2 = (IntegerLiteralMinValueExpr) arg;
 
-        if (!nodesEquals(n1.getParameters(), n2.getParameters())) {
-            return Boolean.FALSE;
-        }
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getThrows(), n2.getThrows())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getTypeParameters(), n2.getTypeParameters())) {
-            return Boolean.FALSE;
-        }
-        if (n1.isDefault() != n2.isDefault()) {
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final LongLiteralMinValueExpr n1, final Node arg) {
+		final LongLiteralMinValueExpr n2 = (LongLiteralMinValueExpr) arg;
 
-    @Override
-    public Boolean visit(final Parameter n1, final Node arg) {
-        final Parameter n2 = (Parameter) arg;
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return Boolean.FALSE;
-        }
-        return visit((BaseParameter) n1, arg);
-    }
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(MultiTypeParameter n1, Node arg) {
-        MultiTypeParameter n2 = (MultiTypeParameter) arg;
-        if (n1.getTypes().size() != n2.getTypes().size()) {
-            return Boolean.FALSE;
-        }
-        Iterator<Type> n1types = n1.getTypes().iterator();
-        Iterator<Type> n2types = n2.getTypes().iterator();
-        while (n1types.hasNext() && n2types.hasNext()) {
-            if (!nodeEquals(n1types.next(), n2types.next())) {
-                return Boolean.FALSE;
-            }
-        }
-        return visit((BaseParameter) n1, arg);
-    }
+		return Boolean.TRUE;
+	}
 
-    protected Boolean visit(final BaseParameter n1, final Node arg) {
-        final BaseParameter n2 = (BaseParameter) arg;
+	@Override public Boolean visit(final CharLiteralExpr n1, final Node arg) {
+		final CharLiteralExpr n2 = (CharLiteralExpr) arg;
 
-        if (n1.getModifiers() != n2.getModifiers()) {
-            return Boolean.FALSE;
-        }
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getId(), n2.getId())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final DoubleLiteralExpr n1, final Node arg) {
+		final DoubleLiteralExpr n2 = (DoubleLiteralExpr) arg;
 
-        return Boolean.TRUE;
-    }
+		if (!objEquals(n1.getValue(), n2.getValue())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final EmptyMemberDeclaration n1, final Node arg) {
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final InitializerDeclaration n1, final Node arg) {
-        final InitializerDeclaration n2 = (InitializerDeclaration) arg;
+	@Override public Boolean visit(final BooleanLiteralExpr n1, final Node arg) {
+		final BooleanLiteralExpr n2 = (BooleanLiteralExpr) arg;
 
-        if (!nodeEquals(n1.getBlock(), n2.getBlock())) {
-            return Boolean.FALSE;
-        }
+		if (n1.getValue() != n2.getValue()) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final NullLiteralExpr n1, final Node arg) {
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final JavadocComment n1, final Node arg) {
-        final JavadocComment n2 = (JavadocComment) arg;
+	@Override public Boolean visit(final MethodCallExpr n1, final Node arg) {
+		final MethodCallExpr n2 = (MethodCallExpr) arg;
 
-        if (!objEquals(n1.getContent(), n2.getContent())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getScope(), n2.getScope())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final ClassOrInterfaceType n1, final Node arg) {
-        final ClassOrInterfaceType n2 = (ClassOrInterfaceType) arg;
+		if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getTypeArgs(), n2.getTypeArgs())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getScope(), n2.getScope())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getTypeArgs(), n2.getTypeArgs())) {
-            return Boolean.FALSE;
-        }
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final NameExpr n1, final Node arg) {
+		final NameExpr n2 = (NameExpr) arg;
 
-    @Override
-    public Boolean visit(final PrimitiveType n1, final Node arg) {
-        final PrimitiveType n2 = (PrimitiveType) arg;
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-        if (n1.getType() != n2.getType()) {
-            return Boolean.FALSE;
-        }
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final ReferenceType n1, final Node arg) {
-        final ReferenceType n2 = (ReferenceType) arg;
+	@Override public Boolean visit(final ObjectCreationExpr n1, final Node arg) {
+		final ObjectCreationExpr n2 = (ObjectCreationExpr) arg;
 
-        if (n1.getArrayCount() != n2.getArrayCount()) {
-            return Boolean.FALSE;
-        }
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return Boolean.FALSE;
-        }
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
-        List<List<AnnotationExpr>> n1a = n1.getArraysAnnotations();
-        List<List<AnnotationExpr>> n2a = n2.getArraysAnnotations();
-
-        if (n1a != null && n2a != null) {
-            if (n1a.size() != n2a.size()) {
-                return Boolean.FALSE;
-            } else {
-                int i = 0;
-                for (List<AnnotationExpr> aux : n1a) {
-                    if (!nodesEquals(aux, n2a.get(i))) {
-                        return Boolean.FALSE;
-                    }
-                    i++;
-                }
-            }
-        } else if (n1a != n2a) {
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
+		if (!nodeEquals(n1.getScope(), n2.getScope())) {
+			return Boolean.FALSE;
+		}
 
-    public Boolean visit(VoidType n1, Node arg) {
-        VoidType n2 = (VoidType) arg;
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final WildcardType n1, final Node arg) {
-        final WildcardType n2 = (WildcardType) arg;
+		if (!nodesEquals(n1.getAnonymousClassBody(), n2.getAnonymousClassBody())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getExtends(), n2.getExtends())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getSuper(), n2.getSuper())) {
-            return Boolean.FALSE;
-        }
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
+		if (!nodesEquals(n1.getTypeArgs(), n2.getTypeArgs())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final UnknownType n1, final Node arg) {
-        final WildcardType n2 = (WildcardType) arg;
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final QualifiedNameExpr n1, final Node arg) {
+		final QualifiedNameExpr n2 = (QualifiedNameExpr) arg;
 
-    @Override
-    public Boolean visit(final ArrayAccessExpr n1, final Node arg) {
-        final ArrayAccessExpr n2 = (ArrayAccessExpr) arg;
+		if (!nodeEquals(n1.getQualifier(), n2.getQualifier())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getIndex(), n2.getIndex())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final ThisExpr n1, final Node arg) {
+		final ThisExpr n2 = (ThisExpr) arg;
 
-    @Override
-    public Boolean visit(final ArrayCreationExpr n1, final Node arg) {
-        final ArrayCreationExpr n2 = (ArrayCreationExpr) arg;
+		if (!nodeEquals(n1.getClassExpr(), n2.getClassExpr())) {
+			return Boolean.FALSE;
+		}
 
-        if (n1.getArrayCount() != n2.getArrayCount()) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final SuperExpr n1, final Node arg) {
+		final SuperExpr n2 = (SuperExpr) arg;
 
-        if (!nodeEquals(n1.getInitializer(), n2.getInitializer())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getClassExpr(), n2.getClassExpr())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getDimensions(), n2.getDimensions())) {
-            return Boolean.FALSE;
-        }
-        List<List<AnnotationExpr>> n1a = n1.getArraysAnnotations();
-        List<List<AnnotationExpr>> n2a = n2.getArraysAnnotations();
-
-        if (n1a != null && n2a != null) {
-            if (n1a.size() != n2a.size()) {
-                return Boolean.FALSE;
-            } else {
-                int i = 0;
-                for (List<AnnotationExpr> aux : n1a) {
-                    if (!nodesEquals(aux, n2a.get(i))) {
-                        return Boolean.FALSE;
-                    }
-                    i++;
-                }
-            }
-        } else if (n1a != n2a) {
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final ArrayInitializerExpr n1, final Node arg) {
-        final ArrayInitializerExpr n2 = (ArrayInitializerExpr) arg;
+	@Override public Boolean visit(final UnaryExpr n1, final Node arg) {
+		final UnaryExpr n2 = (UnaryExpr) arg;
 
-        if (!nodesEquals(n1.getValues(), n2.getValues())) {
-            return Boolean.FALSE;
-        }
+		if (n1.getOperator() != n2.getOperator()) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final AssignExpr n1, final Node arg) {
-        final AssignExpr n2 = (AssignExpr) arg;
+		return Boolean.TRUE;
+	}
 
-        if (n1.getOperator() != n2.getOperator()) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final VariableDeclarationExpr n1, final Node arg) {
+		final VariableDeclarationExpr n2 = (VariableDeclarationExpr) arg;
 
-        if (!nodeEquals(n1.getTarget(), n2.getTarget())) {
-            return Boolean.FALSE;
-        }
+		if (n1.getModifiers() != n2.getModifiers()) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getValue(), n2.getValue())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		if (!nodeEquals(n1.getType(), n2.getType())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final BinaryExpr n1, final Node arg) {
-        final BinaryExpr n2 = (BinaryExpr) arg;
+		if (!nodesEquals(n1.getVars(), n2.getVars())) {
+			return Boolean.FALSE;
+		}
 
-        if (n1.getOperator() != n2.getOperator()) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodeEquals(n1.getLeft(), n2.getLeft())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final MarkerAnnotationExpr n1, final Node arg) {
+		final MarkerAnnotationExpr n2 = (MarkerAnnotationExpr) arg;
 
-        if (!nodeEquals(n1.getRight(), n2.getRight())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final CastExpr n1, final Node arg) {
-        final CastExpr n2 = (CastExpr) arg;
+	@Override public Boolean visit(final SingleMemberAnnotationExpr n1, final Node arg) {
+		final SingleMemberAnnotationExpr n2 = (SingleMemberAnnotationExpr) arg;
 
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getMemberValue(), n2.getMemberValue())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final ClassExpr n1, final Node arg) {
-        final ClassExpr n2 = (ClassExpr) arg;
+	@Override public Boolean visit(final NormalAnnotationExpr n1, final Node arg) {
+		final NormalAnnotationExpr n2 = (NormalAnnotationExpr) arg;
 
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		if (!nodesEquals(n1.getPairs(), n2.getPairs())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final ConditionalExpr n1, final Node arg) {
-        final ConditionalExpr n2 = (ConditionalExpr) arg;
+		return Boolean.TRUE;
+	}
 
-        if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final MemberValuePair n1, final Node arg) {
+		final MemberValuePair n2 = (MemberValuePair) arg;
 
-        if (!nodeEquals(n1.getThenExpr(), n2.getThenExpr())) {
-            return Boolean.FALSE;
-        }
+		if (!objEquals(n1.getName(), n2.getName())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getElseExpr(), n2.getElseExpr())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getValue(), n2.getValue())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final EnclosedExpr n1, final Node arg) {
-        final EnclosedExpr n2 = (EnclosedExpr) arg;
+	@Override public Boolean visit(final ExplicitConstructorInvocationStmt n1, final Node arg) {
+		final ExplicitConstructorInvocationStmt n2 = (ExplicitConstructorInvocationStmt) arg;
 
-        if (!nodeEquals(n1.getInner(), n2.getInner())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final FieldAccessExpr n1, final Node arg) {
-        final FieldAccessExpr n2 = (FieldAccessExpr) arg;
+		if (!nodesEquals(n1.getTypeArgs(), n2.getTypeArgs())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getScope(), n2.getScope())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!objEquals(n1.getField(), n2.getField())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final TypeDeclarationStmt n1, final Node arg) {
+		final TypeDeclarationStmt n2 = (TypeDeclarationStmt) arg;
 
-        if (!nodesEquals(n1.getTypeArgs(), n2.getTypeArgs())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getTypeDeclaration(), n2.getTypeDeclaration())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final InstanceOfExpr n1, final Node arg) {
-        final InstanceOfExpr n2 = (InstanceOfExpr) arg;
+	@Override public Boolean visit(final AssertStmt n1, final Node arg) {
+		final AssertStmt n2 = (AssertStmt) arg;
 
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getCheck(), n2.getCheck())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getMessage(), n2.getMessage())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final StringLiteralExpr n1, final Node arg) {
-        final StringLiteralExpr n2 = (StringLiteralExpr) arg;
+	@Override public Boolean visit(final BlockStmt n1, final Node arg) {
+		final BlockStmt n2 = (BlockStmt) arg;
 
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getStmts(), n2.getStmts())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final IntegerLiteralExpr n1, final Node arg) {
-        final IntegerLiteralExpr n2 = (IntegerLiteralExpr) arg;
+	@Override public Boolean visit(final LabeledStmt n1, final Node arg) {
+		final LabeledStmt n2 = (LabeledStmt) arg;
 
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getStmt(), n2.getStmt())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final LongLiteralExpr n1, final Node arg) {
-        final LongLiteralExpr n2 = (LongLiteralExpr) arg;
+	@Override public Boolean visit(final EmptyStmt n1, final Node arg) {
+		return Boolean.TRUE;
+	}
 
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final ExpressionStmt n1, final Node arg) {
+		final ExpressionStmt n2 = (ExpressionStmt) arg;
 
-        return Boolean.TRUE;
-    }
+		if (!nodeEquals(n1.getExpression(), n2.getExpression())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final IntegerLiteralMinValueExpr n1, final Node arg) {
-        final IntegerLiteralMinValueExpr n2 = (IntegerLiteralMinValueExpr) arg;
+		return Boolean.TRUE;
+	}
 
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final SwitchStmt n1, final Node arg) {
+		final SwitchStmt n2 = (SwitchStmt) arg;
 
-        return Boolean.TRUE;
-    }
+		if (!nodeEquals(n1.getSelector(), n2.getSelector())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final LongLiteralMinValueExpr n1, final Node arg) {
-        final LongLiteralMinValueExpr n2 = (LongLiteralMinValueExpr) arg;
+		if (!nodesEquals(n1.getEntries(), n2.getEntries())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final SwitchEntryStmt n1, final Node arg) {
+		final SwitchEntryStmt n2 = (SwitchEntryStmt) arg;
 
-    @Override
-    public Boolean visit(final CharLiteralExpr n1, final Node arg) {
-        final CharLiteralExpr n2 = (CharLiteralExpr) arg;
+		if (!nodeEquals(n1.getLabel(), n2.getLabel())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getStmts(), n2.getStmts())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final DoubleLiteralExpr n1, final Node arg) {
-        final DoubleLiteralExpr n2 = (DoubleLiteralExpr) arg;
+	@Override public Boolean visit(final BreakStmt n1, final Node arg) {
+		final BreakStmt n2 = (BreakStmt) arg;
 
-        if (!objEquals(n1.getValue(), n2.getValue())) {
-            return Boolean.FALSE;
-        }
+		if (!objEquals(n1.getId(), n2.getId())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final BooleanLiteralExpr n1, final Node arg) {
-        final BooleanLiteralExpr n2 = (BooleanLiteralExpr) arg;
+	@Override public Boolean visit(final ReturnStmt n1, final Node arg) {
+		final ReturnStmt n2 = (ReturnStmt) arg;
 
-        if (n1.getValue() != n2.getValue()) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final NullLiteralExpr n1, final Node arg) {
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final IfStmt n1, final Node arg) {
+		final IfStmt n2 = (IfStmt) arg;
 
-    @Override
-    public Boolean visit(final MethodCallExpr n1, final Node arg) {
-        final MethodCallExpr n2 = (MethodCallExpr) arg;
+		if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getScope(), n2.getScope())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getThenStmt(), n2.getThenStmt())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getElseStmt(), n2.getElseStmt())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getTypeArgs(), n2.getTypeArgs())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final WhileStmt n1, final Node arg) {
+		final WhileStmt n2 = (WhileStmt) arg;
 
-        return Boolean.TRUE;
-    }
+		if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final NameExpr n1, final Node arg) {
-        final NameExpr n2 = (NameExpr) arg;
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final ContinueStmt n1, final Node arg) {
+		final ContinueStmt n2 = (ContinueStmt) arg;
 
-    @Override
-    public Boolean visit(final ObjectCreationExpr n1, final Node arg) {
-        final ObjectCreationExpr n2 = (ObjectCreationExpr) arg;
+		if (!objEquals(n1.getId(), n2.getId())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getScope(), n2.getScope())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final DoStmt n1, final Node arg) {
+		final DoStmt n2 = (DoStmt) arg;
 
-        if (!nodesEquals(n1.getAnonymousClassBody(), n2.getAnonymousClassBody())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getTypeArgs(), n2.getTypeArgs())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final ForeachStmt n1, final Node arg) {
+		final ForeachStmt n2 = (ForeachStmt) arg;
 
-    @Override
-    public Boolean visit(final QualifiedNameExpr n1, final Node arg) {
-        final QualifiedNameExpr n2 = (QualifiedNameExpr) arg;
+		if (!nodeEquals(n1.getVariable(), n2.getVariable())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getQualifier(), n2.getQualifier())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getIterable(), n2.getIterable())) {
+			return Boolean.FALSE;
+		}
 
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final ThisExpr n1, final Node arg) {
-        final ThisExpr n2 = (ThisExpr) arg;
+	@Override public Boolean visit(final ForStmt n1, final Node arg) {
+		final ForStmt n2 = (ForStmt) arg;
 
-        if (!nodeEquals(n1.getClassExpr(), n2.getClassExpr())) {
-            return Boolean.FALSE;
-        }
+		if (!nodesEquals(n1.getInit(), n2.getInit())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		if (!nodeEquals(n1.getCompare(), n2.getCompare())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final SuperExpr n1, final Node arg) {
-        final SuperExpr n2 = (SuperExpr) arg;
+		if (!nodesEquals(n1.getUpdate(), n2.getUpdate())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getClassExpr(), n2.getClassExpr())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getBody(), n2.getBody())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final UnaryExpr n1, final Node arg) {
-        final UnaryExpr n2 = (UnaryExpr) arg;
+	@Override public Boolean visit(final ThrowStmt n1, final Node arg) {
+		final ThrowStmt n2 = (ThrowStmt) arg;
 
-        if (n1.getOperator() != n2.getOperator()) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        return Boolean.TRUE;
-    }
+	@Override public Boolean visit(final SynchronizedStmt n1, final Node arg) {
+		final SynchronizedStmt n2 = (SynchronizedStmt) arg;
 
-    @Override
-    public Boolean visit(final VariableDeclarationExpr n1, final Node arg) {
-        final VariableDeclarationExpr n2 = (VariableDeclarationExpr) arg;
+		if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
+			return Boolean.FALSE;
+		}
 
-        if (n1.getModifiers() != n2.getModifiers()) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getBlock(), n2.getBlock())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodesEquals(n1.getAnnotations(), n2.getAnnotations())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getType(), n2.getType())) {
-            return Boolean.FALSE;
-        }
+		return Boolean.TRUE;
+	}
 
-        if (!nodesEquals(n1.getVars(), n2.getVars())) {
-            return Boolean.FALSE;
-        }
+	@Override public Boolean visit(final TryStmt n1, final Node arg) {
+		final TryStmt n2 = (TryStmt) arg;
 
-        return Boolean.TRUE;
-    }
+		if (!nodeEquals(n1.getTryBlock(), n2.getTryBlock())) {
+			return Boolean.FALSE;
+		}
 
-    @Override
-    public Boolean visit(final MarkerAnnotationExpr n1, final Node arg) {
-        final MarkerAnnotationExpr n2 = (MarkerAnnotationExpr) arg;
+		if (!nodesEquals(n1.getCatchs(), n2.getCatchs())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getFinallyBlock(), n2.getFinallyBlock())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
-    @Override
-    public Boolean visit(final SingleMemberAnnotationExpr n1, final Node arg) {
-        final SingleMemberAnnotationExpr n2 = (SingleMemberAnnotationExpr) arg;
+	@Override public Boolean visit(final CatchClause n1, final Node arg) {
+		final CatchClause n2 = (CatchClause) arg;
 
-        if (!nodeEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getExcept(), n2.getExcept())) {
+			return Boolean.FALSE;
+		}
 
-        if (!nodeEquals(n1.getMemberValue(), n2.getMemberValue())) {
-            return Boolean.FALSE;
-        }
+		if (!nodeEquals(n1.getCatchBlock(), n2.getCatchBlock())) {
+			return Boolean.FALSE;
+		}
 
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final NormalAnnotationExpr n1, final Node arg) {
-        final NormalAnnotationExpr n2 = (NormalAnnotationExpr) arg;
-
-        if (!nodeEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodesEquals(n1.getPairs(), n2.getPairs())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final MemberValuePair n1, final Node arg) {
-        final MemberValuePair n2 = (MemberValuePair) arg;
-
-        if (!objEquals(n1.getName(), n2.getName())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getValue(), n2.getValue())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final ExplicitConstructorInvocationStmt n1, final Node arg) {
-        final ExplicitConstructorInvocationStmt n2 = (ExplicitConstructorInvocationStmt) arg;
-
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodesEquals(n1.getArgs(), n2.getArgs())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodesEquals(n1.getTypeArgs(), n2.getTypeArgs())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final TypeDeclarationStmt n1, final Node arg) {
-        final TypeDeclarationStmt n2 = (TypeDeclarationStmt) arg;
-
-        if (!nodeEquals(n1.getTypeDeclaration(), n2.getTypeDeclaration())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final AssertStmt n1, final Node arg) {
-        final AssertStmt n2 = (AssertStmt) arg;
-
-        if (!nodeEquals(n1.getCheck(), n2.getCheck())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getMessage(), n2.getMessage())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final BlockStmt n1, final Node arg) {
-        final BlockStmt n2 = (BlockStmt) arg;
-
-        if (!nodesEquals(n1.getStmts(), n2.getStmts())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final LabeledStmt n1, final Node arg) {
-        final LabeledStmt n2 = (LabeledStmt) arg;
-
-        if (!nodeEquals(n1.getStmt(), n2.getStmt())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final EmptyStmt n1, final Node arg) {
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final ExpressionStmt n1, final Node arg) {
-        final ExpressionStmt n2 = (ExpressionStmt) arg;
-
-        if (!nodeEquals(n1.getExpression(), n2.getExpression())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final SwitchStmt n1, final Node arg) {
-        final SwitchStmt n2 = (SwitchStmt) arg;
-
-        if (!nodeEquals(n1.getSelector(), n2.getSelector())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodesEquals(n1.getEntries(), n2.getEntries())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final SwitchEntryStmt n1, final Node arg) {
-        final SwitchEntryStmt n2 = (SwitchEntryStmt) arg;
-
-        if (!nodeEquals(n1.getLabel(), n2.getLabel())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodesEquals(n1.getStmts(), n2.getStmts())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final BreakStmt n1, final Node arg) {
-        final BreakStmt n2 = (BreakStmt) arg;
-
-        if (!objEquals(n1.getId(), n2.getId())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final ReturnStmt n1, final Node arg) {
-        final ReturnStmt n2 = (ReturnStmt) arg;
-
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final IfStmt n1, final Node arg) {
-        final IfStmt n2 = (IfStmt) arg;
-
-        if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getThenStmt(), n2.getThenStmt())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getElseStmt(), n2.getElseStmt())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final WhileStmt n1, final Node arg) {
-        final WhileStmt n2 = (WhileStmt) arg;
-
-        if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final ContinueStmt n1, final Node arg) {
-        final ContinueStmt n2 = (ContinueStmt) arg;
-
-        if (!objEquals(n1.getId(), n2.getId())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final DoStmt n1, final Node arg) {
-        final DoStmt n2 = (DoStmt) arg;
-
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getCondition(), n2.getCondition())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final ForeachStmt n1, final Node arg) {
-        final ForeachStmt n2 = (ForeachStmt) arg;
-
-        if (!nodeEquals(n1.getVariable(), n2.getVariable())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getIterable(), n2.getIterable())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final ForStmt n1, final Node arg) {
-        final ForStmt n2 = (ForStmt) arg;
-
-        if (!nodesEquals(n1.getInit(), n2.getInit())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getCompare(), n2.getCompare())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodesEquals(n1.getUpdate(), n2.getUpdate())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getBody(), n2.getBody())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final ThrowStmt n1, final Node arg) {
-        final ThrowStmt n2 = (ThrowStmt) arg;
-
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final SynchronizedStmt n1, final Node arg) {
-        final SynchronizedStmt n2 = (SynchronizedStmt) arg;
-
-        if (!nodeEquals(n1.getExpr(), n2.getExpr())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getBlock(), n2.getBlock())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final TryStmt n1, final Node arg) {
-        final TryStmt n2 = (TryStmt) arg;
-
-        if (!nodeEquals(n1.getTryBlock(), n2.getTryBlock())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodesEquals(n1.getCatchs(), n2.getCatchs())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getFinallyBlock(), n2.getFinallyBlock())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
-
-    @Override
-    public Boolean visit(final CatchClause n1, final Node arg) {
-        final CatchClause n2 = (CatchClause) arg;
-
-        if (!nodeEquals(n1.getExcept(), n2.getExcept())) {
-            return Boolean.FALSE;
-        }
-
-        if (!nodeEquals(n1.getCatchBlock(), n2.getCatchBlock())) {
-            return Boolean.FALSE;
-        }
-
-        return Boolean.TRUE;
-    }
+		return Boolean.TRUE;
+	}
 
     @Override
     public Boolean visit(LambdaExpr n1, Node arg) {
@@ -1509,7 +1433,7 @@ public Boolean visit(LambdaExpr n1, Node arg) {
         if (!nodesEquals(n1.getParameters(), n2.getParameters())) {
             return Boolean.FALSE;
         }
-        if (n1.isParametersEnclosed() != n2.isParametersEnclosed()) {
+        if(n1.isParametersEnclosed() != n2.isParametersEnclosed()){
             return Boolean.FALSE;
         }
         if (!nodeEquals(n1.getBody(), n2.getBody())) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitor.java
index 968d082e92..58fbf6db9f 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitor.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import com.github.javaparser.ast.comments.BlockComment;
@@ -69,182 +69,182 @@
 
 /**
  * A visitor that has a return value.
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public interface GenericVisitor<R, A> {
 
-    //- Compilation Unit ----------------------------------
-
-    public R visit(CompilationUnit n, A arg);
+	//- Compilation Unit ----------------------------------
 
-    public R visit(PackageDeclaration n, A arg);
+	public R visit(CompilationUnit n, A arg);
 
-    public R visit(ImportDeclaration n, A arg);
+	public R visit(PackageDeclaration n, A arg);
 
-    public R visit(TypeParameter n, A arg);
+	public R visit(ImportDeclaration n, A arg);
 
-    public R visit(LineComment n, A arg);
+	public R visit(TypeParameter n, A arg);
 
-    public R visit(BlockComment n, A arg);
+	public R visit(LineComment n, A arg);
 
-    //- Body ----------------------------------------------
+	public R visit(BlockComment n, A arg);
 
-    public R visit(ClassOrInterfaceDeclaration n, A arg);
+	//- Body ----------------------------------------------
 
-    public R visit(EnumDeclaration n, A arg);
+	public R visit(ClassOrInterfaceDeclaration n, A arg);
 
-    public R visit(EmptyTypeDeclaration n, A arg);
+	public R visit(EnumDeclaration n, A arg);
 
-    public R visit(EnumConstantDeclaration n, A arg);
+	public R visit(EmptyTypeDeclaration n, A arg);
 
-    public R visit(AnnotationDeclaration n, A arg);
+	public R visit(EnumConstantDeclaration n, A arg);
 
-    public R visit(AnnotationMemberDeclaration n, A arg);
+	public R visit(AnnotationDeclaration n, A arg);
 
-    public R visit(FieldDeclaration n, A arg);
+	public R visit(AnnotationMemberDeclaration n, A arg);
 
-    public R visit(VariableDeclarator n, A arg);
+	public R visit(FieldDeclaration n, A arg);
 
-    public R visit(VariableDeclaratorId n, A arg);
+	public R visit(VariableDeclarator n, A arg);
 
-    public R visit(ConstructorDeclaration n, A arg);
+	public R visit(VariableDeclaratorId n, A arg);
 
-    public R visit(MethodDeclaration n, A arg);
+	public R visit(ConstructorDeclaration n, A arg);
 
-    public R visit(Parameter n, A arg);
+	public R visit(MethodDeclaration n, A arg);
 
-    public R visit(MultiTypeParameter n, A arg);
+	public R visit(Parameter n, A arg);
+	
+	public R visit(MultiTypeParameter n, A arg);
 
-    public R visit(EmptyMemberDeclaration n, A arg);
+	public R visit(EmptyMemberDeclaration n, A arg);
 
-    public R visit(InitializerDeclaration n, A arg);
+	public R visit(InitializerDeclaration n, A arg);
 
-    public R visit(JavadocComment n, A arg);
+	public R visit(JavadocComment n, A arg);
 
-    //- Type ----------------------------------------------
+	//- Type ----------------------------------------------
 
-    public R visit(ClassOrInterfaceType n, A arg);
+	public R visit(ClassOrInterfaceType n, A arg);
 
-    public R visit(PrimitiveType n, A arg);
+	public R visit(PrimitiveType n, A arg);
 
-    public R visit(ReferenceType n, A arg);
+	public R visit(ReferenceType n, A arg);
 
-    public R visit(VoidType n, A arg);
+	public R visit(VoidType n, A arg);
 
-    public R visit(WildcardType n, A arg);
+	public R visit(WildcardType n, A arg);
 
-    public R visit(UnknownType n, A arg);
+	public R visit(UnknownType n, A arg);
 
-    //- Expression ----------------------------------------
+	//- Expression ----------------------------------------
 
-    public R visit(ArrayAccessExpr n, A arg);
+	public R visit(ArrayAccessExpr n, A arg);
 
-    public R visit(ArrayCreationExpr n, A arg);
+	public R visit(ArrayCreationExpr n, A arg);
 
-    public R visit(ArrayInitializerExpr n, A arg);
+	public R visit(ArrayInitializerExpr n, A arg);
 
-    public R visit(AssignExpr n, A arg);
+	public R visit(AssignExpr n, A arg);
 
-    public R visit(BinaryExpr n, A arg);
+	public R visit(BinaryExpr n, A arg);
 
-    public R visit(CastExpr n, A arg);
+	public R visit(CastExpr n, A arg);
 
-    public R visit(ClassExpr n, A arg);
+	public R visit(ClassExpr n, A arg);
 
-    public R visit(ConditionalExpr n, A arg);
+	public R visit(ConditionalExpr n, A arg);
 
-    public R visit(EnclosedExpr n, A arg);
+	public R visit(EnclosedExpr n, A arg);
 
-    public R visit(FieldAccessExpr n, A arg);
+	public R visit(FieldAccessExpr n, A arg);
 
-    public R visit(InstanceOfExpr n, A arg);
+	public R visit(InstanceOfExpr n, A arg);
 
-    public R visit(StringLiteralExpr n, A arg);
+	public R visit(StringLiteralExpr n, A arg);
 
-    public R visit(IntegerLiteralExpr n, A arg);
+	public R visit(IntegerLiteralExpr n, A arg);
 
-    public R visit(LongLiteralExpr n, A arg);
+	public R visit(LongLiteralExpr n, A arg);
 
-    public R visit(IntegerLiteralMinValueExpr n, A arg);
+	public R visit(IntegerLiteralMinValueExpr n, A arg);
 
-    public R visit(LongLiteralMinValueExpr n, A arg);
+	public R visit(LongLiteralMinValueExpr n, A arg);
 
-    public R visit(CharLiteralExpr n, A arg);
+	public R visit(CharLiteralExpr n, A arg);
 
-    public R visit(DoubleLiteralExpr n, A arg);
+	public R visit(DoubleLiteralExpr n, A arg);
 
-    public R visit(BooleanLiteralExpr n, A arg);
+	public R visit(BooleanLiteralExpr n, A arg);
 
-    public R visit(NullLiteralExpr n, A arg);
+	public R visit(NullLiteralExpr n, A arg);
 
-    public R visit(MethodCallExpr n, A arg);
+	public R visit(MethodCallExpr n, A arg);
 
-    public R visit(NameExpr n, A arg);
+	public R visit(NameExpr n, A arg);
 
-    public R visit(ObjectCreationExpr n, A arg);
+	public R visit(ObjectCreationExpr n, A arg);
 
-    public R visit(QualifiedNameExpr n, A arg);
+	public R visit(QualifiedNameExpr n, A arg);
 
-    public R visit(ThisExpr n, A arg);
+	public R visit(ThisExpr n, A arg);
 
-    public R visit(SuperExpr n, A arg);
+	public R visit(SuperExpr n, A arg);
 
-    public R visit(UnaryExpr n, A arg);
+	public R visit(UnaryExpr n, A arg);
 
-    public R visit(VariableDeclarationExpr n, A arg);
+	public R visit(VariableDeclarationExpr n, A arg);
 
-    public R visit(MarkerAnnotationExpr n, A arg);
+	public R visit(MarkerAnnotationExpr n, A arg);
 
-    public R visit(SingleMemberAnnotationExpr n, A arg);
+	public R visit(SingleMemberAnnotationExpr n, A arg);
 
-    public R visit(NormalAnnotationExpr n, A arg);
+	public R visit(NormalAnnotationExpr n, A arg);
 
-    public R visit(MemberValuePair n, A arg);
+	public R visit(MemberValuePair n, A arg);
 
-    //- Statements ----------------------------------------
+	//- Statements ----------------------------------------
 
-    public R visit(ExplicitConstructorInvocationStmt n, A arg);
+	public R visit(ExplicitConstructorInvocationStmt n, A arg);
 
-    public R visit(TypeDeclarationStmt n, A arg);
+	public R visit(TypeDeclarationStmt n, A arg);
 
-    public R visit(AssertStmt n, A arg);
+	public R visit(AssertStmt n, A arg);
 
-    public R visit(BlockStmt n, A arg);
+	public R visit(BlockStmt n, A arg);
 
-    public R visit(LabeledStmt n, A arg);
+	public R visit(LabeledStmt n, A arg);
 
-    public R visit(EmptyStmt n, A arg);
+	public R visit(EmptyStmt n, A arg);
 
-    public R visit(ExpressionStmt n, A arg);
+	public R visit(ExpressionStmt n, A arg);
 
-    public R visit(SwitchStmt n, A arg);
+	public R visit(SwitchStmt n, A arg);
 
-    public R visit(SwitchEntryStmt n, A arg);
+	public R visit(SwitchEntryStmt n, A arg);
 
-    public R visit(BreakStmt n, A arg);
+	public R visit(BreakStmt n, A arg);
 
-    public R visit(ReturnStmt n, A arg);
+	public R visit(ReturnStmt n, A arg);
 
-    public R visit(IfStmt n, A arg);
+	public R visit(IfStmt n, A arg);
 
-    public R visit(WhileStmt n, A arg);
+	public R visit(WhileStmt n, A arg);
 
-    public R visit(ContinueStmt n, A arg);
+	public R visit(ContinueStmt n, A arg);
 
-    public R visit(DoStmt n, A arg);
+	public R visit(DoStmt n, A arg);
 
-    public R visit(ForeachStmt n, A arg);
+	public R visit(ForeachStmt n, A arg);
 
-    public R visit(ForStmt n, A arg);
+	public R visit(ForStmt n, A arg);
 
-    public R visit(ThrowStmt n, A arg);
+	public R visit(ThrowStmt n, A arg);
 
-    public R visit(SynchronizedStmt n, A arg);
+	public R visit(SynchronizedStmt n, A arg);
 
-    public R visit(TryStmt n, A arg);
+	public R visit(TryStmt n, A arg);
 
-    public R visit(CatchClause n, A arg);
+	public R visit(CatchClause n, A arg);
 
     public R visit(LambdaExpr n, A arg);
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
index d7700c9592..eac9cab405 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import com.github.javaparser.ast.comments.BlockComment;
@@ -75,1515 +75,1515 @@
  */
 public abstract class GenericVisitorAdapter<R, A> implements GenericVisitor<R, A> {
 
-    @Override
-    public R visit(final AnnotationDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            {
-                R result = n.getJavaDoc().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getMembers() != null) {
-            for (final BodyDeclaration member : n.getMembers()) {
-                {
-                    R result = member.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final AnnotationMemberDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            {
-                R result = n.getJavaDoc().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getDefaultValue() != null) {
-            {
-                R result = n.getDefaultValue().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ArrayAccessExpr n, final A arg) {
-        {
-            R result = n.getName().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getIndex().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ArrayCreationExpr n, final A arg) {
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getDimensions() != null) {
-            for (final Expression dim : n.getDimensions()) {
-                {
-                    R result = dim.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        } else {
-            {
-                R result = n.getInitializer().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ArrayInitializerExpr n, final A arg) {
-        if (n.getValues() != null) {
-            for (final Expression expr : n.getValues()) {
-                {
-                    R result = expr.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final AssertStmt n, final A arg) {
-        {
-            R result = n.getCheck().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getMessage() != null) {
-            {
-                R result = n.getMessage().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final AssignExpr n, final A arg) {
-        {
-            R result = n.getTarget().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getValue().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final BinaryExpr n, final A arg) {
-        {
-            R result = n.getLeft().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getRight().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final BlockStmt n, final A arg) {
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
-                {
-                    R result = s.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-
-    }
-
-    @Override
-    public R visit(final BooleanLiteralExpr n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final BreakStmt n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final CastExpr n, final A arg) {
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getExpr().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final CatchClause n, final A arg) {
-        {
-            R result = n.getExcept().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getCatchBlock().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-
-    }
-
-    @Override
-    public R visit(final CharLiteralExpr n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final ClassExpr n, final A arg) {
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ClassOrInterfaceDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            {
-                R result = n.getJavaDoc().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getTypeParameters() != null) {
-            for (final TypeParameter t : n.getTypeParameters()) {
-                {
-                    R result = t.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getExtends() != null) {
-            for (final ClassOrInterfaceType c : n.getExtends()) {
-                {
-                    R result = c.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-
-        if (n.getImplements() != null) {
-            for (final ClassOrInterfaceType c : n.getImplements()) {
-                {
-                    R result = c.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getMembers() != null) {
-            for (final BodyDeclaration member : n.getMembers()) {
-                {
-                    R result = member.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ClassOrInterfaceType n, final A arg) {
-        if (n.getScope() != null) {
-            {
-                R result = n.getScope().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getTypeArgs() != null) {
-            for (final Type t : n.getTypeArgs()) {
-                {
-                    R result = t.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final CompilationUnit n, final A arg) {
-        if (n.getPackage() != null) {
-            {
-                R result = n.getPackage().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getImports() != null) {
-            for (final ImportDeclaration i : n.getImports()) {
-                {
-                    R result = i.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getTypes() != null) {
-            for (final TypeDeclaration typeDeclaration : n.getTypes()) {
-                {
-                    R result = typeDeclaration.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ConditionalExpr n, final A arg) {
-        {
-            R result = n.getCondition().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getThenExpr().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getElseExpr().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ConstructorDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            {
-                R result = n.getJavaDoc().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getTypeParameters() != null) {
-            for (final TypeParameter t : n.getTypeParameters()) {
-                {
-                    R result = t.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getParameters() != null) {
-            for (final Parameter p : n.getParameters()) {
-                {
-                    R result = p.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getThrows() != null) {
-            for (final NameExpr name : n.getThrows()) {
-                {
-                    R result = name.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getBlock().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ContinueStmt n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final DoStmt n, final A arg) {
-        {
-            R result = n.getBody().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getCondition().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final DoubleLiteralExpr n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final EmptyMemberDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            {
-                R result = n.getJavaDoc().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final EmptyStmt n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final EmptyTypeDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            {
-                R result = n.getJavaDoc().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final EnclosedExpr n, final A arg) {
-        {
-            R result = n.getInner().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final EnumConstantDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            {
-                R result = n.getJavaDoc().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getClassBody() != null) {
-            for (final BodyDeclaration member : n.getClassBody()) {
-                {
-                    R result = member.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final EnumDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            {
-                R result = n.getJavaDoc().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getImplements() != null) {
-            for (final ClassOrInterfaceType c : n.getImplements()) {
-                {
-                    R result = c.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getEntries() != null) {
-            for (final EnumConstantDeclaration e : n.getEntries()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getMembers() != null) {
-            for (final BodyDeclaration member : n.getMembers()) {
-                {
-                    R result = member.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ExplicitConstructorInvocationStmt n, final A arg) {
-        if (!n.isThis()) {
-            if (n.getExpr() != null) {
-                {
-                    R result = n.getExpr().accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getTypeArgs() != null) {
-            for (final Type t : n.getTypeArgs()) {
-                {
-                    R result = t.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ExpressionStmt n, final A arg) {
-        {
-            R result = n.getExpression().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final FieldAccessExpr n, final A arg) {
-        {
-            R result = n.getScope().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final FieldDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            {
-                R result = n.getJavaDoc().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        for (final VariableDeclarator var : n.getVariables()) {
-            {
-                R result = var.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ForeachStmt n, final A arg) {
-        {
-            R result = n.getVariable().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getIterable().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getBody().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ForStmt n, final A arg) {
-        if (n.getInit() != null) {
-            for (final Expression e : n.getInit()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getCompare() != null) {
-            {
-                R result = n.getCompare().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getUpdate() != null) {
-            for (final Expression e : n.getUpdate()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getBody().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final IfStmt n, final A arg) {
-        {
-            R result = n.getCondition().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getThenStmt().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getElseStmt() != null) {
-            {
-                R result = n.getElseStmt().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ImportDeclaration n, final A arg) {
-        {
-            R result = n.getName().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final InitializerDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            {
-                R result = n.getJavaDoc().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        {
-            R result = n.getBlock().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final InstanceOfExpr n, final A arg) {
-        {
-            R result = n.getExpr().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final IntegerLiteralExpr n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final IntegerLiteralMinValueExpr n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final JavadocComment n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final LabeledStmt n, final A arg) {
-        {
-            R result = n.getStmt().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final LongLiteralExpr n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final LongLiteralMinValueExpr n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final MarkerAnnotationExpr n, final A arg) {
-        {
-            R result = n.getName().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final MemberValuePair n, final A arg) {
-        {
-            R result = n.getValue().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final MethodCallExpr n, final A arg) {
-        if (n.getScope() != null) {
-            {
-                R result = n.getScope().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getTypeArgs() != null) {
-            for (final Type t : n.getTypeArgs()) {
-                {
-                    R result = t.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final MethodDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            {
-                R result = n.getJavaDoc().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getTypeParameters() != null) {
-            for (final TypeParameter t : n.getTypeParameters()) {
-                {
-                    R result = t.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getParameters() != null) {
-            for (final Parameter p : n.getParameters()) {
-                {
-                    R result = p.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getThrows() != null) {
-            for (final NameExpr name : n.getThrows()) {
-                {
-                    R result = name.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getBody() != null) {
-            {
-                R result = n.getBody().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final NameExpr n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final NormalAnnotationExpr n, final A arg) {
-        {
-            R result = n.getName().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getPairs() != null) {
-            for (final MemberValuePair m : n.getPairs()) {
-                {
-                    R result = m.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final NullLiteralExpr n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final ObjectCreationExpr n, final A arg) {
-        if (n.getScope() != null) {
-            {
-                R result = n.getScope().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getTypeArgs() != null) {
-            for (final Type t : n.getTypeArgs()) {
-                {
-                    R result = t.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getAnonymousClassBody() != null) {
-            for (final BodyDeclaration member : n.getAnonymousClassBody()) {
-                {
-                    R result = member.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final PackageDeclaration n, final A arg) {
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getName().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final Parameter n, final A arg) {
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getId().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final MultiTypeParameter n, final A arg) {
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            for (final Type type : n.getTypes()) {
-                R result = type.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        {
-            R result = n.getId().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final PrimitiveType n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final QualifiedNameExpr n, final A arg) {
-        {
-            R result = n.getQualifier().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ReferenceType n, final A arg) {
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ReturnStmt n, final A arg) {
-        if (n.getExpr() != null) {
-            {
-                R result = n.getExpr().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final SingleMemberAnnotationExpr n, final A arg) {
-        {
-            R result = n.getName().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getMemberValue().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final StringLiteralExpr n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final SuperExpr n, final A arg) {
-        if (n.getClassExpr() != null) {
-            {
-                R result = n.getClassExpr().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final SwitchEntryStmt n, final A arg) {
-        if (n.getLabel() != null) {
-            {
-                R result = n.getLabel().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
-                {
-                    R result = s.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final SwitchStmt n, final A arg) {
-        {
-            R result = n.getSelector().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getEntries() != null) {
-            for (final SwitchEntryStmt e : n.getEntries()) {
-                {
-                    R result = e.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-
-    }
-
-    @Override
-    public R visit(final SynchronizedStmt n, final A arg) {
-        {
-            if (n.getExpr() != null) {
-                R result = n.getExpr().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        {
-            R result = n.getBlock().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ThisExpr n, final A arg) {
-        if (n.getClassExpr() != null) {
-            {
-                R result = n.getClassExpr().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final ThrowStmt n, final A arg) {
-        {
-            R result = n.getExpr().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final TryStmt n, final A arg) {
-        if (n.getResources() != null) {
-            for (final VariableDeclarationExpr v : n.getResources()) {
-                {
-                    R result = v.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getTryBlock().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getCatchs() != null) {
-            for (final CatchClause c : n.getCatchs()) {
-                {
-                    R result = c.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        if (n.getFinallyBlock() != null) {
-            {
-                R result = n.getFinallyBlock().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final TypeDeclarationStmt n, final A arg) {
-        {
-            R result = n.getTypeDeclaration().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final TypeParameter n, final A arg) {
-        if (n.getTypeBound() != null) {
-            for (final ClassOrInterfaceType c : n.getTypeBound()) {
-                {
-                    R result = c.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final UnaryExpr n, final A arg) {
-        {
-            R result = n.getExpr().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final UnknownType n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final VariableDeclarationExpr n, final A arg) {
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                {
-                    R result = a.accept(this, arg);
-                    if (result != null) {
-                        return result;
-                    }
-                }
-            }
-        }
-        {
-            R result = n.getType().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        for (final VariableDeclarator v : n.getVars()) {
-            {
-                R result = v.accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final VariableDeclarator n, final A arg) {
-        {
-            R result = n.getId().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        if (n.getInit() != null) {
-            {
-                R result = n.getInit().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final VariableDeclaratorId n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final VoidType n, final A arg) {
-        return null;
-    }
-
-    @Override
-    public R visit(final WhileStmt n, final A arg) {
-        {
-            R result = n.getCondition().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        {
-            R result = n.getBody().accept(this, arg);
-            if (result != null) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public R visit(final WildcardType n, final A arg) {
-        if (n.getExtends() != null) {
-            {
-                R result = n.getExtends().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        if (n.getSuper() != null) {
-            {
-                R result = n.getSuper().accept(this, arg);
-                if (result != null) {
-                    return result;
-                }
-            }
-        }
-        return null;
-    }
+	@Override
+	public R visit(final AnnotationDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			{
+				R result = n.getJavaDoc().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getMembers() != null) {
+			for (final BodyDeclaration member : n.getMembers()) {
+				{
+					R result = member.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final AnnotationMemberDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			{
+				R result = n.getJavaDoc().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getDefaultValue() != null) {
+			{
+				R result = n.getDefaultValue().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ArrayAccessExpr n, final A arg) {
+		{
+			R result = n.getName().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getIndex().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ArrayCreationExpr n, final A arg) {
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getDimensions() != null) {
+			for (final Expression dim : n.getDimensions()) {
+				{
+					R result = dim.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		} else {
+			{
+				R result = n.getInitializer().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ArrayInitializerExpr n, final A arg) {
+		if (n.getValues() != null) {
+			for (final Expression expr : n.getValues()) {
+				{
+					R result = expr.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final AssertStmt n, final A arg) {
+		{
+			R result = n.getCheck().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getMessage() != null) {
+			{
+				R result = n.getMessage().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final AssignExpr n, final A arg) {
+		{
+			R result = n.getTarget().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getValue().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final BinaryExpr n, final A arg) {
+		{
+			R result = n.getLeft().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getRight().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final BlockStmt n, final A arg) {
+		if (n.getStmts() != null) {
+			for (final Statement s : n.getStmts()) {
+				{
+					R result = s.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+
+	}
+
+	@Override
+	public R visit(final BooleanLiteralExpr n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final BreakStmt n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final CastExpr n, final A arg) {
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getExpr().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final CatchClause n, final A arg) {
+		{
+			R result = n.getExcept().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getCatchBlock().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+
+	}
+
+	@Override
+	public R visit(final CharLiteralExpr n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final ClassExpr n, final A arg) {
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ClassOrInterfaceDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			{
+				R result = n.getJavaDoc().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getTypeParameters() != null) {
+			for (final TypeParameter t : n.getTypeParameters()) {
+				{
+					R result = t.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getExtends() != null) {
+			for (final ClassOrInterfaceType c : n.getExtends()) {
+				{
+					R result = c.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+
+		if (n.getImplements() != null) {
+			for (final ClassOrInterfaceType c : n.getImplements()) {
+				{
+					R result = c.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getMembers() != null) {
+			for (final BodyDeclaration member : n.getMembers()) {
+				{
+					R result = member.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ClassOrInterfaceType n, final A arg) {
+		if (n.getScope() != null) {
+			{
+				R result = n.getScope().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getTypeArgs() != null) {
+			for (final Type t : n.getTypeArgs()) {
+				{
+					R result = t.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final CompilationUnit n, final A arg) {
+		if (n.getPackage() != null) {
+			{
+				R result = n.getPackage().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getImports() != null) {
+			for (final ImportDeclaration i : n.getImports()) {
+				{
+					R result = i.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getTypes() != null) {
+			for (final TypeDeclaration typeDeclaration : n.getTypes()) {
+				{
+					R result = typeDeclaration.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ConditionalExpr n, final A arg) {
+		{
+			R result = n.getCondition().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getThenExpr().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getElseExpr().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ConstructorDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			{
+				R result = n.getJavaDoc().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getTypeParameters() != null) {
+			for (final TypeParameter t : n.getTypeParameters()) {
+				{
+					R result = t.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getParameters() != null) {
+			for (final Parameter p : n.getParameters()) {
+				{
+					R result = p.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getThrows() != null) {
+			for (final NameExpr name : n.getThrows()) {
+				{
+					R result = name.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getBlock().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ContinueStmt n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final DoStmt n, final A arg) {
+		{
+			R result = n.getBody().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getCondition().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final DoubleLiteralExpr n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final EmptyMemberDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			{
+				R result = n.getJavaDoc().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final EmptyStmt n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final EmptyTypeDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			{
+				R result = n.getJavaDoc().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final EnclosedExpr n, final A arg) {
+		{
+			R result = n.getInner().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final EnumConstantDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			{
+				R result = n.getJavaDoc().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getClassBody() != null) {
+			for (final BodyDeclaration member : n.getClassBody()) {
+				{
+					R result = member.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final EnumDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			{
+				R result = n.getJavaDoc().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getImplements() != null) {
+			for (final ClassOrInterfaceType c : n.getImplements()) {
+				{
+					R result = c.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getEntries() != null) {
+			for (final EnumConstantDeclaration e : n.getEntries()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getMembers() != null) {
+			for (final BodyDeclaration member : n.getMembers()) {
+				{
+					R result = member.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ExplicitConstructorInvocationStmt n, final A arg) {
+		if (!n.isThis()) {
+			if (n.getExpr() != null) {
+				{
+					R result = n.getExpr().accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getTypeArgs() != null) {
+			for (final Type t : n.getTypeArgs()) {
+				{
+					R result = t.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ExpressionStmt n, final A arg) {
+		{
+			R result = n.getExpression().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final FieldAccessExpr n, final A arg) {
+		{
+			R result = n.getScope().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final FieldDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			{
+				R result = n.getJavaDoc().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		for (final VariableDeclarator var : n.getVariables()) {
+			{
+				R result = var.accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ForeachStmt n, final A arg) {
+		{
+			R result = n.getVariable().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getIterable().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getBody().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ForStmt n, final A arg) {
+		if (n.getInit() != null) {
+			for (final Expression e : n.getInit()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getCompare() != null) {
+			{
+				R result = n.getCompare().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getUpdate() != null) {
+			for (final Expression e : n.getUpdate()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getBody().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final IfStmt n, final A arg) {
+		{
+			R result = n.getCondition().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getThenStmt().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getElseStmt() != null) {
+			{
+				R result = n.getElseStmt().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ImportDeclaration n, final A arg) {
+		{
+			R result = n.getName().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final InitializerDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			{
+				R result = n.getJavaDoc().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		{
+			R result = n.getBlock().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final InstanceOfExpr n, final A arg) {
+		{
+			R result = n.getExpr().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final IntegerLiteralExpr n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final IntegerLiteralMinValueExpr n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final JavadocComment n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final LabeledStmt n, final A arg) {
+		{
+			R result = n.getStmt().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final LongLiteralExpr n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final LongLiteralMinValueExpr n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final MarkerAnnotationExpr n, final A arg) {
+		{
+			R result = n.getName().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final MemberValuePair n, final A arg) {
+		{
+			R result = n.getValue().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final MethodCallExpr n, final A arg) {
+		if (n.getScope() != null) {
+			{
+				R result = n.getScope().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getTypeArgs() != null) {
+			for (final Type t : n.getTypeArgs()) {
+				{
+					R result = t.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final MethodDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			{
+				R result = n.getJavaDoc().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getTypeParameters() != null) {
+			for (final TypeParameter t : n.getTypeParameters()) {
+				{
+					R result = t.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getParameters() != null) {
+			for (final Parameter p : n.getParameters()) {
+				{
+					R result = p.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getThrows() != null) {
+			for (final NameExpr name : n.getThrows()) {
+				{
+					R result = name.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getBody() != null) {
+			{
+				R result = n.getBody().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final NameExpr n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final NormalAnnotationExpr n, final A arg) {
+		{
+			R result = n.getName().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getPairs() != null) {
+			for (final MemberValuePair m : n.getPairs()) {
+				{
+					R result = m.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final NullLiteralExpr n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final ObjectCreationExpr n, final A arg) {
+		if (n.getScope() != null) {
+			{
+				R result = n.getScope().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getTypeArgs() != null) {
+			for (final Type t : n.getTypeArgs()) {
+				{
+					R result = t.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getAnonymousClassBody() != null) {
+			for (final BodyDeclaration member : n.getAnonymousClassBody()) {
+				{
+					R result = member.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final PackageDeclaration n, final A arg) {
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getName().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final Parameter n, final A arg) {
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getId().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public R visit(final MultiTypeParameter n, final A arg) {
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			for (final Type type : n.getTypes()) {
+				R result = type.accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		{
+			R result = n.getId().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final PrimitiveType n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final QualifiedNameExpr n, final A arg) {
+		{
+			R result = n.getQualifier().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ReferenceType n, final A arg) {
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ReturnStmt n, final A arg) {
+		if (n.getExpr() != null) {
+			{
+				R result = n.getExpr().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final SingleMemberAnnotationExpr n, final A arg) {
+		{
+			R result = n.getName().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getMemberValue().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final StringLiteralExpr n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final SuperExpr n, final A arg) {
+		if (n.getClassExpr() != null) {
+			{
+				R result = n.getClassExpr().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final SwitchEntryStmt n, final A arg) {
+		if (n.getLabel() != null) {
+			{
+				R result = n.getLabel().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getStmts() != null) {
+			for (final Statement s : n.getStmts()) {
+				{
+					R result = s.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final SwitchStmt n, final A arg) {
+		{
+			R result = n.getSelector().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getEntries() != null) {
+			for (final SwitchEntryStmt e : n.getEntries()) {
+				{
+					R result = e.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+
+	}
+
+	@Override
+	public R visit(final SynchronizedStmt n, final A arg) {
+		{
+			if (n.getExpr() != null) {
+			    R result = n.getExpr().accept(this, arg);
+			    if (result != null) {
+				    return result;
+			    }
+			}
+		}
+		{
+			R result = n.getBlock().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ThisExpr n, final A arg) {
+		if (n.getClassExpr() != null) {
+			{
+				R result = n.getClassExpr().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final ThrowStmt n, final A arg) {
+		{
+			R result = n.getExpr().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final TryStmt n, final A arg) {
+		if (n.getResources() != null) {
+			for (final VariableDeclarationExpr v : n.getResources()) {
+				{
+					R result = v.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getTryBlock().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getCatchs() != null) {
+			for (final CatchClause c : n.getCatchs()) {
+				{
+					R result = c.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		if (n.getFinallyBlock() != null) {
+			{
+				R result = n.getFinallyBlock().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final TypeDeclarationStmt n, final A arg) {
+		{
+			R result = n.getTypeDeclaration().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final TypeParameter n, final A arg) {
+		if (n.getTypeBound() != null) {
+			for (final ClassOrInterfaceType c : n.getTypeBound()) {
+				{
+					R result = c.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final UnaryExpr n, final A arg) {
+		{
+			R result = n.getExpr().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final UnknownType n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final VariableDeclarationExpr n, final A arg) {
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				{
+					R result = a.accept(this, arg);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+		}
+		{
+			R result = n.getType().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		for (final VariableDeclarator v : n.getVars()) {
+			{
+				R result = v.accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final VariableDeclarator n, final A arg) {
+		{
+			R result = n.getId().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		if (n.getInit() != null) {
+			{
+				R result = n.getInit().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final VariableDeclaratorId n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final VoidType n, final A arg) {
+		return null;
+	}
+
+	@Override
+	public R visit(final WhileStmt n, final A arg) {
+		{
+			R result = n.getCondition().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		{
+			R result = n.getBody().accept(this, arg);
+			if (result != null) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public R visit(final WildcardType n, final A arg) {
+		if (n.getExtends() != null) {
+			{
+				R result = n.getExtends().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		if (n.getSuper() != null) {
+			{
+				R result = n.getSuper().accept(this, arg);
+				if (result != null) {
+					return result;
+				}
+			}
+		}
+		return null;
+	}
 
     @Override
     public R visit(LambdaExpr n, A arg) {
@@ -1591,23 +1591,23 @@ public R visit(LambdaExpr n, A arg) {
     }
 
     @Override
-    public R visit(MethodReferenceExpr n, A arg) {
+    public R visit(MethodReferenceExpr n, A arg){
         return null;
     }
 
     @Override
-    public R visit(TypeExpr n, A arg) {
+    public R visit(TypeExpr n, A arg){
         return null;
     }
 
-    @Override
-    public R visit(final BlockComment n, final A arg) {
-        return null;
-    }
+	@Override
+	public R visit(final BlockComment n, final A arg) {
+		return null;
+	}
 
-    @Override
-    public R visit(final LineComment n, final A arg) {
-        return null;
-    }
+	@Override
+	public R visit(final LineComment n, final A arg) {
+		return null;
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
index 056838917c..3d23cea5ad 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/ModifierVisitorAdapter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import com.github.javaparser.ast.comments.BlockComment;
@@ -115,943 +115,859 @@
  * This visitor adapter can be used to save time when some specific nodes needs
  * to be changed. To do that just extend this class and override the methods
  * from the nodes who needs to be changed, returning the changed node.
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public abstract class ModifierVisitorAdapter<A> implements GenericVisitor<Node, A> {
 
-    private void removeNulls(final List<?> list) {
-        for (int i = list.size() - 1; i >= 0; i--) {
-            if (list.get(i) == null) {
-                list.remove(i);
-            }
-        }
-    }
-
-    @Override
-    public Node visit(final AnnotationDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
-        }
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        final List<BodyDeclaration> members = n.getMembers();
-        if (members != null) {
-            for (int i = 0; i < members.size(); i++) {
-                members.set(i, (BodyDeclaration) members.get(i).accept(this, arg));
-            }
-            removeNulls(members);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final AnnotationMemberDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
-        }
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        n.setType((Type) n.getType().accept(this, arg));
-        if (n.getDefaultValue() != null) {
-            n.setDefaultValue((Expression) n.getDefaultValue().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ArrayAccessExpr n, final A arg) {
-        n.setName((Expression) n.getName().accept(this, arg));
-        n.setIndex((Expression) n.getIndex().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ArrayCreationExpr n, final A arg) {
-        n.setType((Type) n.getType().accept(this, arg));
-        if (n.getDimensions() != null) {
-            final List<Expression> dimensions = n.getDimensions();
-            if (dimensions != null) {
-                for (int i = 0; i < dimensions.size(); i++) {
-                    dimensions.set(i, (Expression) dimensions.get(i).accept(this, arg));
-                }
-                removeNulls(dimensions);
-            }
-        } else {
-            n.setInitializer((ArrayInitializerExpr) n.getInitializer().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ArrayInitializerExpr n, final A arg) {
-        if (n.getValues() != null) {
-            final List<Expression> values = n.getValues();
-            if (values != null) {
-                for (int i = 0; i < values.size(); i++) {
-                    values.set(i, (Expression) values.get(i).accept(this, arg));
-                }
-                removeNulls(values);
-            }
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final AssertStmt n, final A arg) {
-        n.setCheck((Expression) n.getCheck().accept(this, arg));
-        if (n.getMessage() != null) {
-            n.setMessage((Expression) n.getMessage().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final AssignExpr n, final A arg) {
-        n.setTarget((Expression) n.getTarget().accept(this, arg));
-        n.setValue((Expression) n.getValue().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final BinaryExpr n, final A arg) {
-        n.setLeft((Expression) n.getLeft().accept(this, arg));
-        n.setRight((Expression) n.getRight().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final BlockStmt n, final A arg) {
-        final List<Statement> stmts = n.getStmts();
-        if (stmts != null) {
-            for (int i = 0; i < stmts.size(); i++) {
-                stmts.set(i, (Statement) stmts.get(i).accept(this, arg));
-            }
-            removeNulls(stmts);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final BooleanLiteralExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final BreakStmt n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final CastExpr n, final A arg) {
-        n.setType((Type) n.getType().accept(this, arg));
-        n.setExpr((Expression) n.getExpr().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final CatchClause n, final A arg) {
-        n.setExcept((MultiTypeParameter) n.getExcept().accept(this, arg));
-        n.setCatchBlock((BlockStmt) n.getCatchBlock().accept(this, arg));
-        return n;
-
-    }
-
-    @Override
-    public Node visit(final CharLiteralExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final ClassExpr n, final A arg) {
-        n.setType((Type) n.getType().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ClassOrInterfaceDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
-        }
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        final List<TypeParameter> typeParameters = n.getTypeParameters();
-        if (typeParameters != null) {
-            for (int i = 0; i < typeParameters.size(); i++) {
-                typeParameters.set(i, (TypeParameter) typeParameters.get(i).accept(this, arg));
-            }
-            removeNulls(typeParameters);
-        }
-        final List<ClassOrInterfaceType> extendz = n.getExtends();
-        if (extendz != null) {
-            for (int i = 0; i < extendz.size(); i++) {
-                extendz.set(i, (ClassOrInterfaceType) extendz.get(i).accept(this, arg));
-            }
-            removeNulls(extendz);
-        }
-        final List<ClassOrInterfaceType> implementz = n.getImplements();
-        if (implementz != null) {
-            for (int i = 0; i < implementz.size(); i++) {
-                implementz.set(i, (ClassOrInterfaceType) implementz.get(i).accept(this, arg));
-            }
-            removeNulls(implementz);
-        }
-        final List<BodyDeclaration> members = n.getMembers();
-        if (members != null) {
-            for (int i = 0; i < members.size(); i++) {
-                members.set(i, (BodyDeclaration) members.get(i).accept(this, arg));
-            }
-            removeNulls(members);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ClassOrInterfaceType n, final A arg) {
-        if (n.getScope() != null) {
-            n.setScope((ClassOrInterfaceType) n.getScope().accept(this, arg));
-        }
-        final List<Type> typeArgs = n.getTypeArgs();
-        if (typeArgs != null) {
-            for (int i = 0; i < typeArgs.size(); i++) {
-                typeArgs.set(i, (Type) typeArgs.get(i).accept(this, arg));
-            }
-            removeNulls(typeArgs);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final CompilationUnit n, final A arg) {
-        if (n.getPackage() != null) {
-            n.setPackage((PackageDeclaration) n.getPackage().accept(this, arg));
-        }
-        final List<ImportDeclaration> imports = n.getImports();
-        if (imports != null) {
-            for (int i = 0; i < imports.size(); i++) {
-                imports.set(i, (ImportDeclaration) imports.get(i).accept(this, arg));
-            }
-            removeNulls(imports);
-        }
-        final List<TypeDeclaration> types = n.getTypes();
-        if (types != null) {
-            for (int i = 0; i < types.size(); i++) {
-                types.set(i, (TypeDeclaration) types.get(i).accept(this, arg));
-            }
-            removeNulls(types);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ConditionalExpr n, final A arg) {
-        n.setCondition((Expression) n.getCondition().accept(this, arg));
-        n.setThenExpr((Expression) n.getThenExpr().accept(this, arg));
-        n.setElseExpr((Expression) n.getElseExpr().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ConstructorDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
-        }
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        final List<TypeParameter> typeParameters = n.getTypeParameters();
-        if (typeParameters != null) {
-            for (int i = 0; i < typeParameters.size(); i++) {
-                typeParameters.set(i, (TypeParameter) typeParameters.get(i).accept(this, arg));
-            }
-            removeNulls(typeParameters);
-        }
-        final List<Parameter> parameters = n.getParameters();
-        if (parameters != null) {
-            for (int i = 0; i < parameters.size(); i++) {
-                parameters.set(i, (Parameter) parameters.get(i).accept(this, arg));
-            }
-            removeNulls(parameters);
-        }
-        final List<NameExpr> throwz = n.getThrows();
-        if (throwz != null) {
-            for (int i = 0; i < throwz.size(); i++) {
-                throwz.set(i, (NameExpr) throwz.get(i).accept(this, arg));
-            }
-            removeNulls(throwz);
-        }
-        n.setBlock((BlockStmt) n.getBlock().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ContinueStmt n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final DoStmt n, final A arg) {
-        n.setBody((Statement) n.getBody().accept(this, arg));
-        n.setCondition((Expression) n.getCondition().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final DoubleLiteralExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final EmptyMemberDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final EmptyStmt n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final EmptyTypeDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final EnclosedExpr n, final A arg) {
-        n.setInner((Expression) n.getInner().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final EnumConstantDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
-        }
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        final List<Expression> args = n.getArgs();
-        if (args != null) {
-            for (int i = 0; i < args.size(); i++) {
-                args.set(i, (Expression) args.get(i).accept(this, arg));
-            }
-            removeNulls(args);
-        }
-        final List<BodyDeclaration> classBody = n.getClassBody();
-        if (classBody != null) {
-            for (int i = 0; i < classBody.size(); i++) {
-                classBody.set(i, (BodyDeclaration) classBody.get(i).accept(this, arg));
-            }
-            removeNulls(classBody);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final EnumDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
-        }
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        final List<ClassOrInterfaceType> implementz = n.getImplements();
-        if (implementz != null) {
-            for (int i = 0; i < implementz.size(); i++) {
-                implementz.set(i, (ClassOrInterfaceType) implementz.get(i).accept(this, arg));
-            }
-            removeNulls(implementz);
-        }
-        final List<EnumConstantDeclaration> entries = n.getEntries();
-        if (entries != null) {
-            for (int i = 0; i < entries.size(); i++) {
-                entries.set(i, (EnumConstantDeclaration) entries.get(i).accept(this, arg));
-            }
-            removeNulls(entries);
-        }
-        final List<BodyDeclaration> members = n.getMembers();
-        if (members != null) {
-            for (int i = 0; i < members.size(); i++) {
-                members.set(i, (BodyDeclaration) members.get(i).accept(this, arg));
-            }
-            removeNulls(members);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ExplicitConstructorInvocationStmt n, final A arg) {
-        if (!n.isThis()) {
-            if (n.getExpr() != null) {
-                n.setExpr((Expression) n.getExpr().accept(this, arg));
-            }
-        }
-        final List<Type> typeArgs = n.getTypeArgs();
-        if (typeArgs != null) {
-            for (int i = 0; i < typeArgs.size(); i++) {
-                typeArgs.set(i, (Type) typeArgs.get(i).accept(this, arg));
-            }
-            removeNulls(typeArgs);
-        }
-        final List<Expression> args = n.getArgs();
-        if (args != null) {
-            for (int i = 0; i < args.size(); i++) {
-                args.set(i, (Expression) args.get(i).accept(this, arg));
-            }
-            removeNulls(args);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ExpressionStmt n, final A arg) {
-        n.setExpression((Expression) n.getExpression().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final FieldAccessExpr n, final A arg) {
-        n.setScope((Expression) n.getScope().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final FieldDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
-        }
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        n.setType((Type) n.getType().accept(this, arg));
-        final List<VariableDeclarator> variables = n.getVariables();
-        for (int i = 0; i < variables.size(); i++) {
-            variables.set(i, (VariableDeclarator) variables.get(i).accept(this, arg));
-        }
-        removeNulls(variables);
-        return n;
-    }
-
-    @Override
-    public Node visit(final ForeachStmt n, final A arg) {
-        n.setVariable((VariableDeclarationExpr) n.getVariable().accept(this, arg));
-        n.setIterable((Expression) n.getIterable().accept(this, arg));
-        n.setBody((Statement) n.getBody().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ForStmt n, final A arg) {
-        final List<Expression> init = n.getInit();
-        if (init != null) {
-            for (int i = 0; i < init.size(); i++) {
-                init.set(i, (Expression) init.get(i).accept(this, arg));
-            }
-            removeNulls(init);
-        }
-        if (n.getCompare() != null) {
-            n.setCompare((Expression) n.getCompare().accept(this, arg));
-        }
-        final List<Expression> update = n.getUpdate();
-        if (update != null) {
-            for (int i = 0; i < update.size(); i++) {
-                update.set(i, (Expression) update.get(i).accept(this, arg));
-            }
-            removeNulls(update);
-        }
-        n.setBody((Statement) n.getBody().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final IfStmt n, final A arg) {
-        n.setCondition((Expression) n.getCondition().accept(this, arg));
-        n.setThenStmt((Statement) n.getThenStmt().accept(this, arg));
-        if (n.getElseStmt() != null) {
-            n.setElseStmt((Statement) n.getElseStmt().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ImportDeclaration n, final A arg) {
-        n.setName((NameExpr) n.getName().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final InitializerDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
-        }
-        n.setBlock((BlockStmt) n.getBlock().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final InstanceOfExpr n, final A arg) {
-        n.setExpr((Expression) n.getExpr().accept(this, arg));
-        n.setType((Type) n.getType().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final IntegerLiteralExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final IntegerLiteralMinValueExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final JavadocComment n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final LabeledStmt n, final A arg) {
-        n.setStmt((Statement) n.getStmt().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final LongLiteralExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final LongLiteralMinValueExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final MarkerAnnotationExpr n, final A arg) {
-        n.setName((NameExpr) n.getName().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final MemberValuePair n, final A arg) {
-        n.setValue((Expression) n.getValue().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final MethodCallExpr n, final A arg) {
-        if (n.getScope() != null) {
-            n.setScope((Expression) n.getScope().accept(this, arg));
-        }
-        final List<Type> typeArgs = n.getTypeArgs();
-        if (typeArgs != null) {
-            for (int i = 0; i < typeArgs.size(); i++) {
-                typeArgs.set(i, (Type) typeArgs.get(i).accept(this, arg));
-            }
-            removeNulls(typeArgs);
-        }
-        final List<Expression> args = n.getArgs();
-        if (args != null) {
-            for (int i = 0; i < args.size(); i++) {
-                args.set(i, (Expression) args.get(i).accept(this, arg));
-            }
-            removeNulls(args);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final MethodDeclaration n, final A arg) {
-        if (n.getJavaDoc() != null) {
-            n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
-        }
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        final List<TypeParameter> typeParameters = n.getTypeParameters();
-        if (typeParameters != null) {
-            for (int i = 0; i < typeParameters.size(); i++) {
-                typeParameters.set(i, (TypeParameter) typeParameters.get(i).accept(this, arg));
-            }
-            removeNulls(typeParameters);
-        }
-        n.setType((Type) n.getType().accept(this, arg));
-        final List<Parameter> parameters = n.getParameters();
-        if (parameters != null) {
-            for (int i = 0; i < parameters.size(); i++) {
-                parameters.set(i, (Parameter) parameters.get(i).accept(this, arg));
-            }
-            removeNulls(parameters);
-        }
-        final List<NameExpr> throwz = n.getThrows();
-        if (throwz != null) {
-            for (int i = 0; i < throwz.size(); i++) {
-                throwz.set(i, (NameExpr) throwz.get(i).accept(this, arg));
-            }
-            removeNulls(throwz);
-        }
-        if (n.getBody() != null) {
-            n.setBody((BlockStmt) n.getBody().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final NameExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final NormalAnnotationExpr n, final A arg) {
-        n.setName((NameExpr) n.getName().accept(this, arg));
-        final List<MemberValuePair> pairs = n.getPairs();
-        if (pairs != null) {
-            for (int i = 0; i < pairs.size(); i++) {
-                pairs.set(i, (MemberValuePair) pairs.get(i).accept(this, arg));
-            }
-            removeNulls(pairs);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final NullLiteralExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final ObjectCreationExpr n, final A arg) {
-        if (n.getScope() != null) {
-            n.setScope((Expression) n.getScope().accept(this, arg));
-        }
-        final List<Type> typeArgs = n.getTypeArgs();
-        if (typeArgs != null) {
-            for (int i = 0; i < typeArgs.size(); i++) {
-                typeArgs.set(i, (Type) typeArgs.get(i).accept(this, arg));
-            }
-            removeNulls(typeArgs);
-        }
-        n.setType((ClassOrInterfaceType) n.getType().accept(this, arg));
-        final List<Expression> args = n.getArgs();
-        if (args != null) {
-            for (int i = 0; i < args.size(); i++) {
-                args.set(i, (Expression) args.get(i).accept(this, arg));
-            }
-            removeNulls(args);
-        }
-        final List<BodyDeclaration> anonymousClassBody = n.getAnonymousClassBody();
-        if (anonymousClassBody != null) {
-            for (int i = 0; i < anonymousClassBody.size(); i++) {
-                anonymousClassBody.set(i, (BodyDeclaration) anonymousClassBody.get(i).accept(this, arg));
-            }
-            removeNulls(anonymousClassBody);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final PackageDeclaration n, final A arg) {
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        n.setName((NameExpr) n.getName().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final Parameter n, final A arg) {
-        visit((BaseParameter) n, arg);
-        n.setType((Type) n.getType().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(MultiTypeParameter n, A arg) {
-        visit((BaseParameter) n, arg);
-        List<Type> types = new LinkedList<Type>();
-        for (Type type : n.getTypes()) {
-            types.add((Type) type.accept(this, arg));
-        }
+	private void removeNulls(final List<?> list) {
+		for (int i = list.size() - 1; i >= 0; i--) {
+			if (list.get(i) == null) {
+				list.remove(i);
+			}
+		}
+	}
+
+	@Override public Node visit(final AnnotationDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
+		}
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		final List<BodyDeclaration> members = n.getMembers();
+		if (members != null) {
+			for (int i = 0; i < members.size(); i++) {
+				members.set(i, (BodyDeclaration) members.get(i).accept(this, arg));
+			}
+			removeNulls(members);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final AnnotationMemberDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
+		}
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		n.setType((Type) n.getType().accept(this, arg));
+		if (n.getDefaultValue() != null) {
+			n.setDefaultValue((Expression) n.getDefaultValue().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ArrayAccessExpr n, final A arg) {
+		n.setName((Expression) n.getName().accept(this, arg));
+		n.setIndex((Expression) n.getIndex().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ArrayCreationExpr n, final A arg) {
+		n.setType((Type) n.getType().accept(this, arg));
+		if (n.getDimensions() != null) {
+			final List<Expression> dimensions = n.getDimensions();
+			if (dimensions != null) {
+				for (int i = 0; i < dimensions.size(); i++) {
+					dimensions.set(i, (Expression) dimensions.get(i).accept(this, arg));
+				}
+				removeNulls(dimensions);
+			}
+		} else {
+			n.setInitializer((ArrayInitializerExpr) n.getInitializer().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ArrayInitializerExpr n, final A arg) {
+		if (n.getValues() != null) {
+			final List<Expression> values = n.getValues();
+			if (values != null) {
+				for (int i = 0; i < values.size(); i++) {
+					values.set(i, (Expression) values.get(i).accept(this, arg));
+				}
+				removeNulls(values);
+			}
+		}
+		return n;
+	}
+
+	@Override public Node visit(final AssertStmt n, final A arg) {
+		n.setCheck((Expression) n.getCheck().accept(this, arg));
+		if (n.getMessage() != null) {
+			n.setMessage((Expression) n.getMessage().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final AssignExpr n, final A arg) {
+		n.setTarget((Expression) n.getTarget().accept(this, arg));
+		n.setValue((Expression) n.getValue().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final BinaryExpr n, final A arg) {
+		n.setLeft((Expression) n.getLeft().accept(this, arg));
+		n.setRight((Expression) n.getRight().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final BlockStmt n, final A arg) {
+		final List<Statement> stmts = n.getStmts();
+		if (stmts != null) {
+			for (int i = 0; i < stmts.size(); i++) {
+				stmts.set(i, (Statement) stmts.get(i).accept(this, arg));
+			}
+			removeNulls(stmts);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final BooleanLiteralExpr n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final BreakStmt n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final CastExpr n, final A arg) {
+		n.setType((Type) n.getType().accept(this, arg));
+		n.setExpr((Expression) n.getExpr().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final CatchClause n, final A arg) {
+		n.setExcept((MultiTypeParameter) n.getExcept().accept(this, arg));
+		n.setCatchBlock((BlockStmt) n.getCatchBlock().accept(this, arg));
+		return n;
+
+	}
+
+	@Override public Node visit(final CharLiteralExpr n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final ClassExpr n, final A arg) {
+		n.setType((Type) n.getType().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ClassOrInterfaceDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
+		}
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		final List<TypeParameter> typeParameters = n.getTypeParameters();
+		if (typeParameters != null) {
+			for (int i = 0; i < typeParameters.size(); i++) {
+				typeParameters.set(i, (TypeParameter) typeParameters.get(i).accept(this, arg));
+			}
+			removeNulls(typeParameters);
+		}
+		final List<ClassOrInterfaceType> extendz = n.getExtends();
+		if (extendz != null) {
+			for (int i = 0; i < extendz.size(); i++) {
+				extendz.set(i, (ClassOrInterfaceType) extendz.get(i).accept(this, arg));
+			}
+			removeNulls(extendz);
+		}
+		final List<ClassOrInterfaceType> implementz = n.getImplements();
+		if (implementz != null) {
+			for (int i = 0; i < implementz.size(); i++) {
+				implementz.set(i, (ClassOrInterfaceType) implementz.get(i).accept(this, arg));
+			}
+			removeNulls(implementz);
+		}
+		final List<BodyDeclaration> members = n.getMembers();
+		if (members != null) {
+			for (int i = 0; i < members.size(); i++) {
+				members.set(i, (BodyDeclaration) members.get(i).accept(this, arg));
+			}
+			removeNulls(members);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ClassOrInterfaceType n, final A arg) {
+		if (n.getScope() != null) {
+			n.setScope((ClassOrInterfaceType) n.getScope().accept(this, arg));
+		}
+		final List<Type> typeArgs = n.getTypeArgs();
+		if (typeArgs != null) {
+			for (int i = 0; i < typeArgs.size(); i++) {
+				typeArgs.set(i, (Type) typeArgs.get(i).accept(this, arg));
+			}
+			removeNulls(typeArgs);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final CompilationUnit n, final A arg) {
+		if (n.getPackage() != null) {
+			n.setPackage((PackageDeclaration) n.getPackage().accept(this, arg));
+		}
+		final List<ImportDeclaration> imports = n.getImports();
+		if (imports != null) {
+			for (int i = 0; i < imports.size(); i++) {
+				imports.set(i, (ImportDeclaration) imports.get(i).accept(this, arg));
+			}
+			removeNulls(imports);
+		}
+		final List<TypeDeclaration> types = n.getTypes();
+		if (types != null) {
+			for (int i = 0; i < types.size(); i++) {
+				types.set(i, (TypeDeclaration) types.get(i).accept(this, arg));
+			}
+			removeNulls(types);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ConditionalExpr n, final A arg) {
+		n.setCondition((Expression) n.getCondition().accept(this, arg));
+		n.setThenExpr((Expression) n.getThenExpr().accept(this, arg));
+		n.setElseExpr((Expression) n.getElseExpr().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ConstructorDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
+		}
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		final List<TypeParameter> typeParameters = n.getTypeParameters();
+		if (typeParameters != null) {
+			for (int i = 0; i < typeParameters.size(); i++) {
+				typeParameters.set(i, (TypeParameter) typeParameters.get(i).accept(this, arg));
+			}
+			removeNulls(typeParameters);
+		}
+		final List<Parameter> parameters = n.getParameters();
+		if (parameters != null) {
+			for (int i = 0; i < parameters.size(); i++) {
+				parameters.set(i, (Parameter) parameters.get(i).accept(this, arg));
+			}
+			removeNulls(parameters);
+		}
+		final List<NameExpr> throwz = n.getThrows();
+		if (throwz != null) {
+			for (int i = 0; i < throwz.size(); i++) {
+				throwz.set(i, (NameExpr) throwz.get(i).accept(this, arg));
+			}
+			removeNulls(throwz);
+		}
+		n.setBlock((BlockStmt) n.getBlock().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ContinueStmt n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final DoStmt n, final A arg) {
+		n.setBody((Statement) n.getBody().accept(this, arg));
+		n.setCondition((Expression) n.getCondition().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final DoubleLiteralExpr n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final EmptyMemberDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final EmptyStmt n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final EmptyTypeDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final EnclosedExpr n, final A arg) {
+		n.setInner((Expression) n.getInner().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final EnumConstantDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
+		}
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		final List<Expression> args = n.getArgs();
+		if (args != null) {
+			for (int i = 0; i < args.size(); i++) {
+				args.set(i, (Expression) args.get(i).accept(this, arg));
+			}
+			removeNulls(args);
+		}
+		final List<BodyDeclaration> classBody = n.getClassBody();
+		if (classBody != null) {
+			for (int i = 0; i < classBody.size(); i++) {
+				classBody.set(i, (BodyDeclaration) classBody.get(i).accept(this, arg));
+			}
+			removeNulls(classBody);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final EnumDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
+		}
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		final List<ClassOrInterfaceType> implementz = n.getImplements();
+		if (implementz != null) {
+			for (int i = 0; i < implementz.size(); i++) {
+				implementz.set(i, (ClassOrInterfaceType) implementz.get(i).accept(this, arg));
+			}
+			removeNulls(implementz);
+		}
+		final List<EnumConstantDeclaration> entries = n.getEntries();
+		if (entries != null) {
+			for (int i = 0; i < entries.size(); i++) {
+				entries.set(i, (EnumConstantDeclaration) entries.get(i).accept(this, arg));
+			}
+			removeNulls(entries);
+		}
+		final List<BodyDeclaration> members = n.getMembers();
+		if (members != null) {
+			for (int i = 0; i < members.size(); i++) {
+				members.set(i, (BodyDeclaration) members.get(i).accept(this, arg));
+			}
+			removeNulls(members);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ExplicitConstructorInvocationStmt n, final A arg) {
+		if (!n.isThis()) {
+			if (n.getExpr() != null) {
+				n.setExpr((Expression) n.getExpr().accept(this, arg));
+			}
+		}
+		final List<Type> typeArgs = n.getTypeArgs();
+		if (typeArgs != null) {
+			for (int i = 0; i < typeArgs.size(); i++) {
+				typeArgs.set(i, (Type) typeArgs.get(i).accept(this, arg));
+			}
+			removeNulls(typeArgs);
+		}
+		final List<Expression> args = n.getArgs();
+		if (args != null) {
+			for (int i = 0; i < args.size(); i++) {
+				args.set(i, (Expression) args.get(i).accept(this, arg));
+			}
+			removeNulls(args);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ExpressionStmt n, final A arg) {
+		n.setExpression((Expression) n.getExpression().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final FieldAccessExpr n, final A arg) {
+		n.setScope((Expression) n.getScope().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final FieldDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
+		}
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		n.setType((Type) n.getType().accept(this, arg));
+		final List<VariableDeclarator> variables = n.getVariables();
+		for (int i = 0; i < variables.size(); i++) {
+			variables.set(i, (VariableDeclarator) variables.get(i).accept(this, arg));
+		}
+		removeNulls(variables);
+		return n;
+	}
+
+	@Override public Node visit(final ForeachStmt n, final A arg) {
+		n.setVariable((VariableDeclarationExpr) n.getVariable().accept(this, arg));
+		n.setIterable((Expression) n.getIterable().accept(this, arg));
+		n.setBody((Statement) n.getBody().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ForStmt n, final A arg) {
+		final List<Expression> init = n.getInit();
+		if (init != null) {
+			for (int i = 0; i < init.size(); i++) {
+				init.set(i, (Expression) init.get(i).accept(this, arg));
+			}
+			removeNulls(init);
+		}
+		if (n.getCompare() != null) {
+			n.setCompare((Expression) n.getCompare().accept(this, arg));
+		}
+		final List<Expression> update = n.getUpdate();
+		if (update != null) {
+			for (int i = 0; i < update.size(); i++) {
+				update.set(i, (Expression) update.get(i).accept(this, arg));
+			}
+			removeNulls(update);
+		}
+		n.setBody((Statement) n.getBody().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final IfStmt n, final A arg) {
+		n.setCondition((Expression) n.getCondition().accept(this, arg));
+		n.setThenStmt((Statement) n.getThenStmt().accept(this, arg));
+		if (n.getElseStmt() != null) {
+			n.setElseStmt((Statement) n.getElseStmt().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ImportDeclaration n, final A arg) {
+		n.setName((NameExpr) n.getName().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final InitializerDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
+		}
+		n.setBlock((BlockStmt) n.getBlock().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final InstanceOfExpr n, final A arg) {
+		n.setExpr((Expression) n.getExpr().accept(this, arg));
+		n.setType((Type) n.getType().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final IntegerLiteralExpr n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final IntegerLiteralMinValueExpr n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final JavadocComment n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final LabeledStmt n, final A arg) {
+		n.setStmt((Statement) n.getStmt().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final LongLiteralExpr n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final LongLiteralMinValueExpr n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final MarkerAnnotationExpr n, final A arg) {
+		n.setName((NameExpr) n.getName().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final MemberValuePair n, final A arg) {
+		n.setValue((Expression) n.getValue().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final MethodCallExpr n, final A arg) {
+		if (n.getScope() != null) {
+			n.setScope((Expression) n.getScope().accept(this, arg));
+		}
+		final List<Type> typeArgs = n.getTypeArgs();
+		if (typeArgs != null) {
+			for (int i = 0; i < typeArgs.size(); i++) {
+				typeArgs.set(i, (Type) typeArgs.get(i).accept(this, arg));
+			}
+			removeNulls(typeArgs);
+		}
+		final List<Expression> args = n.getArgs();
+		if (args != null) {
+			for (int i = 0; i < args.size(); i++) {
+				args.set(i, (Expression) args.get(i).accept(this, arg));
+			}
+			removeNulls(args);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final MethodDeclaration n, final A arg) {
+		if (n.getJavaDoc() != null) {
+			n.setJavaDoc((JavadocComment) n.getJavaDoc().accept(this, arg));
+		}
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		final List<TypeParameter> typeParameters = n.getTypeParameters();
+		if (typeParameters != null) {
+			for (int i = 0; i < typeParameters.size(); i++) {
+				typeParameters.set(i, (TypeParameter) typeParameters.get(i).accept(this, arg));
+			}
+			removeNulls(typeParameters);
+		}
+		n.setType((Type) n.getType().accept(this, arg));
+		final List<Parameter> parameters = n.getParameters();
+		if (parameters != null) {
+			for (int i = 0; i < parameters.size(); i++) {
+				parameters.set(i, (Parameter) parameters.get(i).accept(this, arg));
+			}
+			removeNulls(parameters);
+		}
+		final List<NameExpr> throwz = n.getThrows();
+		if (throwz != null) {
+			for (int i = 0; i < throwz.size(); i++) {
+				throwz.set(i, (NameExpr) throwz.get(i).accept(this, arg));
+			}
+			removeNulls(throwz);
+		}
+		if (n.getBody() != null) {
+			n.setBody((BlockStmt) n.getBody().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final NameExpr n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final NormalAnnotationExpr n, final A arg) {
+		n.setName((NameExpr) n.getName().accept(this, arg));
+		final List<MemberValuePair> pairs = n.getPairs();
+		if (pairs != null) {
+			for (int i = 0; i < pairs.size(); i++) {
+				pairs.set(i, (MemberValuePair) pairs.get(i).accept(this, arg));
+			}
+			removeNulls(pairs);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final NullLiteralExpr n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final ObjectCreationExpr n, final A arg) {
+		if (n.getScope() != null) {
+			n.setScope((Expression) n.getScope().accept(this, arg));
+		}
+		final List<Type> typeArgs = n.getTypeArgs();
+		if (typeArgs != null) {
+			for (int i = 0; i < typeArgs.size(); i++) {
+				typeArgs.set(i, (Type) typeArgs.get(i).accept(this, arg));
+			}
+			removeNulls(typeArgs);
+		}
+		n.setType((ClassOrInterfaceType) n.getType().accept(this, arg));
+		final List<Expression> args = n.getArgs();
+		if (args != null) {
+			for (int i = 0; i < args.size(); i++) {
+				args.set(i, (Expression) args.get(i).accept(this, arg));
+			}
+			removeNulls(args);
+		}
+		final List<BodyDeclaration> anonymousClassBody = n.getAnonymousClassBody();
+		if (anonymousClassBody != null) {
+			for (int i = 0; i < anonymousClassBody.size(); i++) {
+				anonymousClassBody.set(i, (BodyDeclaration) anonymousClassBody.get(i).accept(this, arg));
+			}
+			removeNulls(anonymousClassBody);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final PackageDeclaration n, final A arg) {
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		n.setName((NameExpr) n.getName().accept(this, arg));
+		return n;
+	}
+	
+	@Override public Node visit(final Parameter n, final A arg) {
+		visit((BaseParameter) n, arg);
+		n.setType((Type) n.getType().accept(this, arg));
+		return n;
+	}
+	
+	@Override public Node visit(MultiTypeParameter n, A arg) {
+    	visit((BaseParameter) n, arg);
+    	List<Type> types = new LinkedList<Type>();
+    	for (Type type : n.getTypes()) {
+    		types.add((Type) type.accept(this, arg));
+    	}
         n.setTypes(types);
         return n;
     }
 
-    protected Node visit(final BaseParameter n, final A arg) {
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-
-        n.setId((VariableDeclaratorId) n.getId().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final PrimitiveType n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final QualifiedNameExpr n, final A arg) {
-        n.setQualifier((NameExpr) n.getQualifier().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ReferenceType n, final A arg) {
-        n.setType((Type) n.getType().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ReturnStmt n, final A arg) {
-        if (n.getExpr() != null) {
-            n.setExpr((Expression) n.getExpr().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final SingleMemberAnnotationExpr n, final A arg) {
-        n.setName((NameExpr) n.getName().accept(this, arg));
-        n.setMemberValue((Expression) n.getMemberValue().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final StringLiteralExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final SuperExpr n, final A arg) {
-        if (n.getClassExpr() != null) {
-            n.setClassExpr((Expression) n.getClassExpr().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final SwitchEntryStmt n, final A arg) {
-        if (n.getLabel() != null) {
-            n.setLabel((Expression) n.getLabel().accept(this, arg));
-        }
-        final List<Statement> stmts = n.getStmts();
-        if (stmts != null) {
-            for (int i = 0; i < stmts.size(); i++) {
-                stmts.set(i, (Statement) stmts.get(i).accept(this, arg));
-            }
-            removeNulls(stmts);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final SwitchStmt n, final A arg) {
-        n.setSelector((Expression) n.getSelector().accept(this, arg));
-        final List<SwitchEntryStmt> entries = n.getEntries();
-        if (entries != null) {
-            for (int i = 0; i < entries.size(); i++) {
-                entries.set(i, (SwitchEntryStmt) entries.get(i).accept(this, arg));
-            }
-            removeNulls(entries);
-        }
-        return n;
-
-    }
-
-    @Override
-    public Node visit(final SynchronizedStmt n, final A arg) {
-        n.setExpr((Expression) n.getExpr().accept(this, arg));
-        n.setBlock((BlockStmt) n.getBlock().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final ThisExpr n, final A arg) {
-        if (n.getClassExpr() != null) {
-            n.setClassExpr((Expression) n.getClassExpr().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final ThrowStmt n, final A arg) {
-        n.setExpr((Expression) n.getExpr().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final TryStmt n, final A arg) {
-        n.setTryBlock((BlockStmt) n.getTryBlock().accept(this, arg));
-        final List<CatchClause> catchs = n.getCatchs();
-        if (catchs != null) {
-            for (int i = 0; i < catchs.size(); i++) {
-                catchs.set(i, (CatchClause) catchs.get(i).accept(this, arg));
-            }
-            removeNulls(catchs);
-        }
-        if (n.getFinallyBlock() != null) {
-            n.setFinallyBlock((BlockStmt) n.getFinallyBlock().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final TypeDeclarationStmt n, final A arg) {
-        n.setTypeDeclaration((TypeDeclaration) n.getTypeDeclaration().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final TypeParameter n, final A arg) {
-        final List<ClassOrInterfaceType> typeBound = n.getTypeBound();
-        if (typeBound != null) {
-            for (int i = 0; i < typeBound.size(); i++) {
-                typeBound.set(i, (ClassOrInterfaceType) typeBound.get(i).accept(this, arg));
-            }
-            removeNulls(typeBound);
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final UnaryExpr n, final A arg) {
-        n.setExpr((Expression) n.getExpr().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final UnknownType n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final VariableDeclarationExpr n, final A arg) {
-        final List<AnnotationExpr> annotations = n.getAnnotations();
-        if (annotations != null) {
-            for (int i = 0; i < annotations.size(); i++) {
-                annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
-            }
-            removeNulls(annotations);
-        }
-        n.setType((Type) n.getType().accept(this, arg));
-        final List<VariableDeclarator> vars = n.getVars();
-        for (int i = 0; i < vars.size(); i++) {
-            vars.set(i, (VariableDeclarator) vars.get(i).accept(this, arg));
-        }
-        removeNulls(vars);
-        return n;
-    }
-
-    @Override
-    public Node visit(final VariableDeclarator n, final A arg) {
-        n.setId((VariableDeclaratorId) n.getId().accept(this, arg));
-        if (n.getInit() != null) {
-            n.setInit((Expression) n.getInit().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final VariableDeclaratorId n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final VoidType n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final WhileStmt n, final A arg) {
-        n.setCondition((Expression) n.getCondition().accept(this, arg));
-        n.setBody((Statement) n.getBody().accept(this, arg));
-        return n;
-    }
-
-    @Override
-    public Node visit(final WildcardType n, final A arg) {
-        if (n.getExtends() != null) {
-            n.setExtends((ReferenceType) n.getExtends().accept(this, arg));
-        }
-        if (n.getSuper() != null) {
-            n.setSuper((ReferenceType) n.getSuper().accept(this, arg));
-        }
-        return n;
-    }
-
-    @Override
-    public Node visit(final LambdaExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final MethodReferenceExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final TypeExpr n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final BlockComment n, final A arg) {
-        return n;
-    }
-
-    @Override
-    public Node visit(final LineComment n, final A arg) {
-        return n;
-    }
+	protected Node visit(final BaseParameter n, final A arg) {
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		
+		n.setId((VariableDeclaratorId) n.getId().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final PrimitiveType n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final QualifiedNameExpr n, final A arg) {
+		n.setQualifier((NameExpr) n.getQualifier().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ReferenceType n, final A arg) {
+		n.setType((Type) n.getType().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ReturnStmt n, final A arg) {
+		if (n.getExpr() != null) {
+			n.setExpr((Expression) n.getExpr().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final SingleMemberAnnotationExpr n, final A arg) {
+		n.setName((NameExpr) n.getName().accept(this, arg));
+		n.setMemberValue((Expression) n.getMemberValue().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final StringLiteralExpr n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final SuperExpr n, final A arg) {
+		if (n.getClassExpr() != null) {
+			n.setClassExpr((Expression) n.getClassExpr().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final SwitchEntryStmt n, final A arg) {
+		if (n.getLabel() != null) {
+			n.setLabel((Expression) n.getLabel().accept(this, arg));
+		}
+		final List<Statement> stmts = n.getStmts();
+		if (stmts != null) {
+			for (int i = 0; i < stmts.size(); i++) {
+				stmts.set(i, (Statement) stmts.get(i).accept(this, arg));
+			}
+			removeNulls(stmts);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final SwitchStmt n, final A arg) {
+		n.setSelector((Expression) n.getSelector().accept(this, arg));
+		final List<SwitchEntryStmt> entries = n.getEntries();
+		if (entries != null) {
+			for (int i = 0; i < entries.size(); i++) {
+				entries.set(i, (SwitchEntryStmt) entries.get(i).accept(this, arg));
+			}
+			removeNulls(entries);
+		}
+		return n;
+
+	}
+
+	@Override public Node visit(final SynchronizedStmt n, final A arg) {
+		n.setExpr((Expression) n.getExpr().accept(this, arg));
+		n.setBlock((BlockStmt) n.getBlock().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final ThisExpr n, final A arg) {
+		if (n.getClassExpr() != null) {
+			n.setClassExpr((Expression) n.getClassExpr().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final ThrowStmt n, final A arg) {
+		n.setExpr((Expression) n.getExpr().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final TryStmt n, final A arg) {
+		n.setTryBlock((BlockStmt) n.getTryBlock().accept(this, arg));
+		final List<CatchClause> catchs = n.getCatchs();
+		if (catchs != null) {
+			for (int i = 0; i < catchs.size(); i++) {
+				catchs.set(i, (CatchClause) catchs.get(i).accept(this, arg));
+			}
+			removeNulls(catchs);
+		}
+		if (n.getFinallyBlock() != null) {
+			n.setFinallyBlock((BlockStmt) n.getFinallyBlock().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final TypeDeclarationStmt n, final A arg) {
+		n.setTypeDeclaration((TypeDeclaration) n.getTypeDeclaration().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final TypeParameter n, final A arg) {
+		final List<ClassOrInterfaceType> typeBound = n.getTypeBound();
+		if (typeBound != null) {
+			for (int i = 0; i < typeBound.size(); i++) {
+				typeBound.set(i, (ClassOrInterfaceType) typeBound.get(i).accept(this, arg));
+			}
+			removeNulls(typeBound);
+		}
+		return n;
+	}
+
+	@Override public Node visit(final UnaryExpr n, final A arg) {
+		n.setExpr((Expression) n.getExpr().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final UnknownType n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final VariableDeclarationExpr n, final A arg) {
+		final List<AnnotationExpr> annotations = n.getAnnotations();
+		if (annotations != null) {
+			for (int i = 0; i < annotations.size(); i++) {
+				annotations.set(i, (AnnotationExpr) annotations.get(i).accept(this, arg));
+			}
+			removeNulls(annotations);
+		}
+		n.setType((Type) n.getType().accept(this, arg));
+		final List<VariableDeclarator> vars = n.getVars();
+		for (int i = 0; i < vars.size(); i++) {
+			vars.set(i, (VariableDeclarator) vars.get(i).accept(this, arg));
+		}
+		removeNulls(vars);
+		return n;
+	}
+
+	@Override public Node visit(final VariableDeclarator n, final A arg) {
+		n.setId((VariableDeclaratorId) n.getId().accept(this, arg));
+		if (n.getInit() != null) {
+			n.setInit((Expression) n.getInit().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final VariableDeclaratorId n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final VoidType n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final WhileStmt n, final A arg) {
+		n.setCondition((Expression) n.getCondition().accept(this, arg));
+		n.setBody((Statement) n.getBody().accept(this, arg));
+		return n;
+	}
+
+	@Override public Node visit(final WildcardType n, final A arg) {
+		if (n.getExtends() != null) {
+			n.setExtends((ReferenceType) n.getExtends().accept(this, arg));
+		}
+		if (n.getSuper() != null) {
+			n.setSuper((ReferenceType) n.getSuper().accept(this, arg));
+		}
+		return n;
+	}
+
+	@Override public Node visit(final LambdaExpr n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final MethodReferenceExpr n, final A arg){
+		return n;
+	}
+
+	@Override public Node visit(final TypeExpr n, final A arg){
+		return n;
+	}
+
+	@Override public Node visit(final BlockComment n, final A arg) {
+		return n;
+	}
+
+	@Override public Node visit(final LineComment n, final A arg) {
+		return n;
+	}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitor.java
index 6e6352b9ee..b85bd55a77 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitor.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import com.github.javaparser.ast.comments.BlockComment;
@@ -69,182 +69,182 @@
 
 /**
  * A visitor that does not return anything.
- *
+ * 
  * @author Julio Vilmar Gesser
  */
 public interface VoidVisitor<A> {
 
-    //- Compilation Unit ----------------------------------
-
-    void visit(CompilationUnit n, A arg);
+	//- Compilation Unit ----------------------------------
 
-    void visit(PackageDeclaration n, A arg);
+	void visit(CompilationUnit n, A arg);
 
-    void visit(ImportDeclaration n, A arg);
+	void visit(PackageDeclaration n, A arg);
 
-    void visit(TypeParameter n, A arg);
+	void visit(ImportDeclaration n, A arg);
 
-    void visit(LineComment n, A arg);
+	void visit(TypeParameter n, A arg);
 
-    void visit(BlockComment n, A arg);
+	void visit(LineComment n, A arg);
 
-    //- Body ----------------------------------------------
+	void visit(BlockComment n, A arg);
 
-    void visit(ClassOrInterfaceDeclaration n, A arg);
+	//- Body ----------------------------------------------
 
-    void visit(EnumDeclaration n, A arg);
+	void visit(ClassOrInterfaceDeclaration n, A arg);
 
-    void visit(EmptyTypeDeclaration n, A arg);
+	void visit(EnumDeclaration n, A arg);
 
-    void visit(EnumConstantDeclaration n, A arg);
+	void visit(EmptyTypeDeclaration n, A arg);
 
-    void visit(AnnotationDeclaration n, A arg);
+	void visit(EnumConstantDeclaration n, A arg);
 
-    void visit(AnnotationMemberDeclaration n, A arg);
+	void visit(AnnotationDeclaration n, A arg);
 
-    void visit(FieldDeclaration n, A arg);
+	void visit(AnnotationMemberDeclaration n, A arg);
 
-    void visit(VariableDeclarator n, A arg);
+	void visit(FieldDeclaration n, A arg);
 
-    void visit(VariableDeclaratorId n, A arg);
+	void visit(VariableDeclarator n, A arg);
 
-    void visit(ConstructorDeclaration n, A arg);
+	void visit(VariableDeclaratorId n, A arg);
 
-    void visit(MethodDeclaration n, A arg);
+	void visit(ConstructorDeclaration n, A arg);
 
-    void visit(Parameter n, A arg);
+	void visit(MethodDeclaration n, A arg);
 
-    void visit(MultiTypeParameter n, A arg);
+	void visit(Parameter n, A arg);
+	
+	void visit(MultiTypeParameter n, A arg);
 
-    void visit(EmptyMemberDeclaration n, A arg);
+	void visit(EmptyMemberDeclaration n, A arg);
 
-    void visit(InitializerDeclaration n, A arg);
+	void visit(InitializerDeclaration n, A arg);
 
-    void visit(JavadocComment n, A arg);
+	void visit(JavadocComment n, A arg);
 
-    //- Type ----------------------------------------------
+	//- Type ----------------------------------------------
 
-    void visit(ClassOrInterfaceType n, A arg);
+	void visit(ClassOrInterfaceType n, A arg);
 
-    void visit(PrimitiveType n, A arg);
+	void visit(PrimitiveType n, A arg);
 
-    void visit(ReferenceType n, A arg);
+	void visit(ReferenceType n, A arg);
 
-    void visit(VoidType n, A arg);
+	void visit(VoidType n, A arg);
 
-    void visit(WildcardType n, A arg);
+	void visit(WildcardType n, A arg);
 
-    void visit(UnknownType n, A arg);
+	void visit(UnknownType n, A arg);
 
-    //- Expression ----------------------------------------
+	//- Expression ----------------------------------------
 
-    void visit(ArrayAccessExpr n, A arg);
+	void visit(ArrayAccessExpr n, A arg);
 
-    void visit(ArrayCreationExpr n, A arg);
+	void visit(ArrayCreationExpr n, A arg);
 
-    void visit(ArrayInitializerExpr n, A arg);
+	void visit(ArrayInitializerExpr n, A arg);
 
-    void visit(AssignExpr n, A arg);
+	void visit(AssignExpr n, A arg);
 
-    void visit(BinaryExpr n, A arg);
+	void visit(BinaryExpr n, A arg);
 
-    void visit(CastExpr n, A arg);
+	void visit(CastExpr n, A arg);
 
-    void visit(ClassExpr n, A arg);
+	void visit(ClassExpr n, A arg);
 
-    void visit(ConditionalExpr n, A arg);
+	void visit(ConditionalExpr n, A arg);
 
-    void visit(EnclosedExpr n, A arg);
+	void visit(EnclosedExpr n, A arg);
 
-    void visit(FieldAccessExpr n, A arg);
+	void visit(FieldAccessExpr n, A arg);
 
-    void visit(InstanceOfExpr n, A arg);
+	void visit(InstanceOfExpr n, A arg);
 
-    void visit(StringLiteralExpr n, A arg);
+	void visit(StringLiteralExpr n, A arg);
 
-    void visit(IntegerLiteralExpr n, A arg);
+	void visit(IntegerLiteralExpr n, A arg);
 
-    void visit(LongLiteralExpr n, A arg);
+	void visit(LongLiteralExpr n, A arg);
 
-    void visit(IntegerLiteralMinValueExpr n, A arg);
+	void visit(IntegerLiteralMinValueExpr n, A arg);
 
-    void visit(LongLiteralMinValueExpr n, A arg);
+	void visit(LongLiteralMinValueExpr n, A arg);
 
-    void visit(CharLiteralExpr n, A arg);
+	void visit(CharLiteralExpr n, A arg);
 
-    void visit(DoubleLiteralExpr n, A arg);
+	void visit(DoubleLiteralExpr n, A arg);
 
-    void visit(BooleanLiteralExpr n, A arg);
+	void visit(BooleanLiteralExpr n, A arg);
 
-    void visit(NullLiteralExpr n, A arg);
+	void visit(NullLiteralExpr n, A arg);
 
-    void visit(MethodCallExpr n, A arg);
+	void visit(MethodCallExpr n, A arg);
 
-    void visit(NameExpr n, A arg);
+	void visit(NameExpr n, A arg);
 
-    void visit(ObjectCreationExpr n, A arg);
+	void visit(ObjectCreationExpr n, A arg);
 
-    void visit(QualifiedNameExpr n, A arg);
+	void visit(QualifiedNameExpr n, A arg);
 
-    void visit(ThisExpr n, A arg);
+	void visit(ThisExpr n, A arg);
 
-    void visit(SuperExpr n, A arg);
+	void visit(SuperExpr n, A arg);
 
-    void visit(UnaryExpr n, A arg);
+	void visit(UnaryExpr n, A arg);
 
-    void visit(VariableDeclarationExpr n, A arg);
+	void visit(VariableDeclarationExpr n, A arg);
 
-    void visit(MarkerAnnotationExpr n, A arg);
+	void visit(MarkerAnnotationExpr n, A arg);
 
-    void visit(SingleMemberAnnotationExpr n, A arg);
+	void visit(SingleMemberAnnotationExpr n, A arg);
 
-    void visit(NormalAnnotationExpr n, A arg);
+	void visit(NormalAnnotationExpr n, A arg);
 
-    void visit(MemberValuePair n, A arg);
+	void visit(MemberValuePair n, A arg);
 
-    //- Statements ----------------------------------------
+	//- Statements ----------------------------------------
 
-    void visit(ExplicitConstructorInvocationStmt n, A arg);
+	void visit(ExplicitConstructorInvocationStmt n, A arg);
 
-    void visit(TypeDeclarationStmt n, A arg);
+	void visit(TypeDeclarationStmt n, A arg);
 
-    void visit(AssertStmt n, A arg);
+	void visit(AssertStmt n, A arg);
 
-    void visit(BlockStmt n, A arg);
+	void visit(BlockStmt n, A arg);
 
-    void visit(LabeledStmt n, A arg);
+	void visit(LabeledStmt n, A arg);
 
-    void visit(EmptyStmt n, A arg);
+	void visit(EmptyStmt n, A arg);
 
-    void visit(ExpressionStmt n, A arg);
+	void visit(ExpressionStmt n, A arg);
 
-    void visit(SwitchStmt n, A arg);
+	void visit(SwitchStmt n, A arg);
 
-    void visit(SwitchEntryStmt n, A arg);
+	void visit(SwitchEntryStmt n, A arg);
 
-    void visit(BreakStmt n, A arg);
+	void visit(BreakStmt n, A arg);
 
-    void visit(ReturnStmt n, A arg);
+	void visit(ReturnStmt n, A arg);
 
-    void visit(IfStmt n, A arg);
+	void visit(IfStmt n, A arg);
 
-    void visit(WhileStmt n, A arg);
+	void visit(WhileStmt n, A arg);
 
-    void visit(ContinueStmt n, A arg);
+	void visit(ContinueStmt n, A arg);
 
-    void visit(DoStmt n, A arg);
+	void visit(DoStmt n, A arg);
 
-    void visit(ForeachStmt n, A arg);
+	void visit(ForeachStmt n, A arg);
 
-    void visit(ForStmt n, A arg);
+	void visit(ForStmt n, A arg);
 
-    void visit(ThrowStmt n, A arg);
+	void visit(ThrowStmt n, A arg);
 
-    void visit(SynchronizedStmt n, A arg);
+	void visit(SynchronizedStmt n, A arg);
 
-    void visit(TryStmt n, A arg);
+	void visit(TryStmt n, A arg);
 
-    void visit(CatchClause n, A arg);
+	void visit(CatchClause n, A arg);
 
     void visit(LambdaExpr n, A arg);
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
index b4fca84c34..ddad12fb7c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javaparser_src/proper_source/com/github/javaparser/ast/visitor/VoidVisitorAdapter.java
@@ -3,12 +3,12 @@
  * Copyright (C) 2011, 2013-2015 The JavaParser Team.
  *
  * This file is part of JavaParser.
- *
+ * 
  * JavaParser can be used either under the terms of
  * a) the GNU Lesser General Public License as published by
  *     the Free Software Foundation, either version 3 of the License, or
  *     (at your option) any later version.
- * b) the terms of the Apache License
+ * b) the terms of the Apache License 
  *
  * You should have received a copy of both licenses in LICENCE.LGPL and
  * LICENCE.APACHE. Please refer to those files for details.
@@ -18,7 +18,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
  */
-
+ 
 package com.github.javaparser.ast.visitor;
 
 import com.github.javaparser.ast.comments.BlockComment;
@@ -78,815 +78,734 @@
  */
 public abstract class VoidVisitorAdapter<A> implements VoidVisitor<A> {
 
-    @Override
-    public void visit(final AnnotationDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getJavaDoc() != null) {
-            n.getJavaDoc().accept(this, arg);
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                a.accept(this, arg);
-            }
-        }
-        if (n.getMembers() != null) {
-            for (final BodyDeclaration member : n.getMembers()) {
-                member.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final AnnotationMemberDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getJavaDoc() != null) {
-            n.getJavaDoc().accept(this, arg);
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                a.accept(this, arg);
-            }
-        }
-        n.getType().accept(this, arg);
-        if (n.getDefaultValue() != null) {
-            n.getDefaultValue().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final ArrayAccessExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getName().accept(this, arg);
-        n.getIndex().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ArrayCreationExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getType().accept(this, arg);
-        if (!isNullOrEmpty(n.getDimensions())) {
-            for (final Expression dim : n.getDimensions()) {
-                dim.accept(this, arg);
-            }
-        } else {
-            n.getInitializer().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final ArrayInitializerExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getValues() != null) {
-            for (final Expression expr : n.getValues()) {
-                expr.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final AssertStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getCheck().accept(this, arg);
-        if (n.getMessage() != null) {
-            n.getMessage().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final AssignExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getTarget().accept(this, arg);
-        n.getValue().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final BinaryExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getLeft().accept(this, arg);
-        n.getRight().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final BlockComment n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final BlockStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
-                s.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final BooleanLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final BreakStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final CastExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getType().accept(this, arg);
-        n.getExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final CatchClause n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getExcept().accept(this, arg);
-        n.getCatchBlock().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final CharLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final ClassExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getType().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ClassOrInterfaceDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getJavaDoc() != null) {
-            n.getJavaDoc().accept(this, arg);
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                a.accept(this, arg);
-            }
-        }
-        if (n.getTypeParameters() != null) {
-            for (final TypeParameter t : n.getTypeParameters()) {
-                t.accept(this, arg);
-            }
-        }
-        if (n.getExtends() != null) {
-            for (final ClassOrInterfaceType c : n.getExtends()) {
-                c.accept(this, arg);
-            }
-        }
-
-        if (n.getImplements() != null) {
-            for (final ClassOrInterfaceType c : n.getImplements()) {
-                c.accept(this, arg);
-            }
-        }
-        if (n.getMembers() != null) {
-            for (final BodyDeclaration member : n.getMembers()) {
-                member.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final ClassOrInterfaceType n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getScope() != null) {
-            n.getScope().accept(this, arg);
-        }
-        if (n.getTypeArgs() != null) {
-            for (final Type t : n.getTypeArgs()) {
-                t.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final CompilationUnit n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getPackage() != null) {
-            n.getPackage().accept(this, arg);
-        }
-        if (n.getImports() != null) {
-            for (final ImportDeclaration i : n.getImports()) {
-                i.accept(this, arg);
-            }
-        }
-        if (n.getTypes() != null) {
-            for (final TypeDeclaration typeDeclaration : n.getTypes()) {
-                typeDeclaration.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final ConditionalExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getCondition().accept(this, arg);
-        n.getThenExpr().accept(this, arg);
-        n.getElseExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ConstructorDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getJavaDoc() != null) {
-            n.getJavaDoc().accept(this, arg);
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                a.accept(this, arg);
-            }
-        }
-        if (n.getTypeParameters() != null) {
-            for (final TypeParameter t : n.getTypeParameters()) {
-                t.accept(this, arg);
-            }
-        }
-        if (n.getParameters() != null) {
-            for (final Parameter p : n.getParameters()) {
-                p.accept(this, arg);
-            }
-        }
-        if (n.getThrows() != null) {
-            for (final NameExpr name : n.getThrows()) {
-                name.accept(this, arg);
-            }
-        }
-        n.getBlock().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ContinueStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final DoStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getBody().accept(this, arg);
-        n.getCondition().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final DoubleLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final EmptyMemberDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getJavaDoc() != null) {
-            n.getJavaDoc().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final EmptyStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final EmptyTypeDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getJavaDoc() != null) {
-            n.getJavaDoc().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final EnclosedExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getInner().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final EnumConstantDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getJavaDoc() != null) {
-            n.getJavaDoc().accept(this, arg);
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                a.accept(this, arg);
-            }
-        }
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                e.accept(this, arg);
-            }
-        }
-        if (n.getClassBody() != null) {
-            for (final BodyDeclaration member : n.getClassBody()) {
-                member.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final EnumDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getJavaDoc() != null) {
-            n.getJavaDoc().accept(this, arg);
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                a.accept(this, arg);
-            }
-        }
-        if (n.getImplements() != null) {
-            for (final ClassOrInterfaceType c : n.getImplements()) {
-                c.accept(this, arg);
-            }
-        }
-        if (n.getEntries() != null) {
-            for (final EnumConstantDeclaration e : n.getEntries()) {
-                e.accept(this, arg);
-            }
-        }
-        if (n.getMembers() != null) {
-            for (final BodyDeclaration member : n.getMembers()) {
-                member.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final ExplicitConstructorInvocationStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (!n.isThis()) {
-            if (n.getExpr() != null) {
-                n.getExpr().accept(this, arg);
-            }
-        }
-        if (n.getTypeArgs() != null) {
-            for (final Type t : n.getTypeArgs()) {
-                t.accept(this, arg);
-            }
-        }
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                e.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final ExpressionStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getExpression().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final FieldAccessExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getScope().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final FieldDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getJavaDoc() != null) {
-            n.getJavaDoc().accept(this, arg);
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                a.accept(this, arg);
-            }
-        }
-        n.getType().accept(this, arg);
-        for (final VariableDeclarator var : n.getVariables()) {
-            var.accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final ForeachStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getVariable().accept(this, arg);
-        n.getIterable().accept(this, arg);
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ForStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getInit() != null) {
-            for (final Expression e : n.getInit()) {
-                e.accept(this, arg);
-            }
-        }
-        if (n.getCompare() != null) {
-            n.getCompare().accept(this, arg);
-        }
-        if (n.getUpdate() != null) {
-            for (final Expression e : n.getUpdate()) {
-                e.accept(this, arg);
-            }
-        }
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final IfStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getCondition().accept(this, arg);
-        n.getThenStmt().accept(this, arg);
-        if (n.getElseStmt() != null) {
-            n.getElseStmt().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final ImportDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getName().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final InitializerDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getJavaDoc() != null) {
-            n.getJavaDoc().accept(this, arg);
-        }
-        n.getBlock().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final InstanceOfExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getExpr().accept(this, arg);
-        n.getType().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final IntegerLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final IntegerLiteralMinValueExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final JavadocComment n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final LabeledStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getStmt().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final LineComment n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final LongLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final LongLiteralMinValueExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final MarkerAnnotationExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getName().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final MemberValuePair n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getValue().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final MethodCallExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getScope() != null) {
-            n.getScope().accept(this, arg);
-        }
-        if (n.getTypeArgs() != null) {
-            for (final Type t : n.getTypeArgs()) {
-                t.accept(this, arg);
-            }
-        }
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                e.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final MethodDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getJavaDoc() != null) {
-            n.getJavaDoc().accept(this, arg);
-        }
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                a.accept(this, arg);
-            }
-        }
-        if (n.getTypeParameters() != null) {
-            for (final TypeParameter t : n.getTypeParameters()) {
-                t.accept(this, arg);
-            }
-        }
-        n.getType().accept(this, arg);
-        if (n.getParameters() != null) {
-            for (final Parameter p : n.getParameters()) {
-                p.accept(this, arg);
-            }
-        }
-        if (n.getThrows() != null) {
-            for (final NameExpr name : n.getThrows()) {
-                name.accept(this, arg);
-            }
-        }
-        if (n.getBody() != null) {
-            n.getBody().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final NameExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final NormalAnnotationExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getName().accept(this, arg);
-        if (n.getPairs() != null) {
-            for (final MemberValuePair m : n.getPairs()) {
-                m.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final NullLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final ObjectCreationExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getScope() != null) {
-            n.getScope().accept(this, arg);
-        }
-        if (n.getTypeArgs() != null) {
-            for (final Type t : n.getTypeArgs()) {
-                t.accept(this, arg);
-            }
-        }
-        n.getType().accept(this, arg);
-        if (n.getArgs() != null) {
-            for (final Expression e : n.getArgs()) {
-                e.accept(this, arg);
-            }
-        }
-        if (n.getAnonymousClassBody() != null) {
-            for (final BodyDeclaration member : n.getAnonymousClassBody()) {
-                member.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final PackageDeclaration n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                a.accept(this, arg);
-            }
-        }
-        n.getName().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final Parameter n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                a.accept(this, arg);
-            }
-        }
-        n.getType().accept(this, arg);
-        n.getId().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final MultiTypeParameter n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                a.accept(this, arg);
-            }
-        }
-        for (final Type type : n.getTypes()) {
-            type.accept(this, arg);
-        }
-        n.getId().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final PrimitiveType n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final QualifiedNameExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getQualifier().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ReferenceType n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getType().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ReturnStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getExpr() != null) {
-            n.getExpr().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final SingleMemberAnnotationExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getName().accept(this, arg);
-        n.getMemberValue().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final StringLiteralExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final SuperExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getClassExpr() != null) {
-            n.getClassExpr().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final SwitchEntryStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getLabel() != null) {
-            n.getLabel().accept(this, arg);
-        }
-        if (n.getStmts() != null) {
-            for (final Statement s : n.getStmts()) {
-                s.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final SwitchStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getSelector().accept(this, arg);
-        if (n.getEntries() != null) {
-            for (final SwitchEntryStmt e : n.getEntries()) {
-                e.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final SynchronizedStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getExpr().accept(this, arg);
-        n.getBlock().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final ThisExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getClassExpr() != null) {
-            n.getClassExpr().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final ThrowStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final TryStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getResources() != null) {
-            for (final VariableDeclarationExpr v : n.getResources()) {
-                v.accept(this, arg);
-            }
-        }
-        n.getTryBlock().accept(this, arg);
-        if (n.getCatchs() != null) {
-            for (final CatchClause c : n.getCatchs()) {
-                c.accept(this, arg);
-            }
-        }
-        if (n.getFinallyBlock() != null) {
-            n.getFinallyBlock().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final TypeDeclarationStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getTypeDeclaration().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final TypeParameter n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getTypeBound() != null) {
-            for (final ClassOrInterfaceType c : n.getTypeBound()) {
-                c.accept(this, arg);
-            }
-        }
-    }
-
-    @Override
-    public void visit(final UnaryExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getExpr().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final UnknownType n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final VariableDeclarationExpr n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getAnnotations() != null) {
-            for (final AnnotationExpr a : n.getAnnotations()) {
-                a.accept(this, arg);
-            }
-        }
-        n.getType().accept(this, arg);
-        for (final VariableDeclarator v : n.getVars()) {
-            v.accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final VariableDeclarator n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getId().accept(this, arg);
-        if (n.getInit() != null) {
-            n.getInit().accept(this, arg);
-        }
-    }
-
-    @Override
-    public void visit(final VariableDeclaratorId n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final VoidType n, final A arg) {
-        visitComment(n.getComment(), arg);
-    }
-
-    @Override
-    public void visit(final WhileStmt n, final A arg) {
-        visitComment(n.getComment(), arg);
-        n.getCondition().accept(this, arg);
-        n.getBody().accept(this, arg);
-    }
-
-    @Override
-    public void visit(final WildcardType n, final A arg) {
-        visitComment(n.getComment(), arg);
-        if (n.getExtends() != null) {
-            n.getExtends().accept(this, arg);
-        }
-        if (n.getSuper() != null) {
-            n.getSuper().accept(this, arg);
-        }
-    }
+	@Override public void visit(final AnnotationDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getJavaDoc() != null) {
+			n.getJavaDoc().accept(this, arg);
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				a.accept(this, arg);
+			}
+		}
+		if (n.getMembers() != null) {
+			for (final BodyDeclaration member : n.getMembers()) {
+				member.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final AnnotationMemberDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getJavaDoc() != null) {
+			n.getJavaDoc().accept(this, arg);
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				a.accept(this, arg);
+			}
+		}
+		n.getType().accept(this, arg);
+		if (n.getDefaultValue() != null) {
+			n.getDefaultValue().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final ArrayAccessExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getName().accept(this, arg);
+		n.getIndex().accept(this, arg);
+	}
+
+	@Override public void visit(final ArrayCreationExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getType().accept(this, arg);
+		if (!isNullOrEmpty(n.getDimensions())) {
+			for (final Expression dim : n.getDimensions()) {
+				dim.accept(this, arg);
+			}
+		} else {
+			n.getInitializer().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final ArrayInitializerExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getValues() != null) {
+			for (final Expression expr : n.getValues()) {
+				expr.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final AssertStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getCheck().accept(this, arg);
+		if (n.getMessage() != null) {
+			n.getMessage().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final AssignExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getTarget().accept(this, arg);
+		n.getValue().accept(this, arg);
+	}
+
+	@Override public void visit(final BinaryExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getLeft().accept(this, arg);
+		n.getRight().accept(this, arg);
+	}
+
+	@Override public void visit(final BlockComment n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final BlockStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getStmts() != null) {
+			for (final Statement s : n.getStmts()) {
+				s.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final BooleanLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final BreakStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final CastExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getType().accept(this, arg);
+		n.getExpr().accept(this, arg);
+	}
+
+	@Override public void visit(final CatchClause n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getExcept().accept(this, arg);
+		n.getCatchBlock().accept(this, arg);
+	}
+
+	@Override public void visit(final CharLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final ClassExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getType().accept(this, arg);
+	}
+
+	@Override public void visit(final ClassOrInterfaceDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getJavaDoc() != null) {
+			n.getJavaDoc().accept(this, arg);
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				a.accept(this, arg);
+			}
+		}
+		if (n.getTypeParameters() != null) {
+			for (final TypeParameter t : n.getTypeParameters()) {
+				t.accept(this, arg);
+			}
+		}
+		if (n.getExtends() != null) {
+			for (final ClassOrInterfaceType c : n.getExtends()) {
+				c.accept(this, arg);
+			}
+		}
+
+		if (n.getImplements() != null) {
+			for (final ClassOrInterfaceType c : n.getImplements()) {
+				c.accept(this, arg);
+			}
+		}
+		if (n.getMembers() != null) {
+			for (final BodyDeclaration member : n.getMembers()) {
+				member.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final ClassOrInterfaceType n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getScope() != null) {
+			n.getScope().accept(this, arg);
+		}
+		if (n.getTypeArgs() != null) {
+			for (final Type t : n.getTypeArgs()) {
+				t.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final CompilationUnit n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getPackage() != null) {
+			n.getPackage().accept(this, arg);
+		}
+		if (n.getImports() != null) {
+			for (final ImportDeclaration i : n.getImports()) {
+				i.accept(this, arg);
+			}
+		}
+		if (n.getTypes() != null) {
+			for (final TypeDeclaration typeDeclaration : n.getTypes()) {
+				typeDeclaration.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final ConditionalExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getCondition().accept(this, arg);
+		n.getThenExpr().accept(this, arg);
+		n.getElseExpr().accept(this, arg);
+	}
+
+	@Override public void visit(final ConstructorDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getJavaDoc() != null) {
+			n.getJavaDoc().accept(this, arg);
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				a.accept(this, arg);
+			}
+		}
+		if (n.getTypeParameters() != null) {
+			for (final TypeParameter t : n.getTypeParameters()) {
+				t.accept(this, arg);
+			}
+		}
+		if (n.getParameters() != null) {
+			for (final Parameter p : n.getParameters()) {
+				p.accept(this, arg);
+			}
+		}
+		if (n.getThrows() != null) {
+			for (final NameExpr name : n.getThrows()) {
+				name.accept(this, arg);
+			}
+		}
+		n.getBlock().accept(this, arg);
+	}
+
+	@Override public void visit(final ContinueStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final DoStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getBody().accept(this, arg);
+		n.getCondition().accept(this, arg);
+	}
+
+	@Override public void visit(final DoubleLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final EmptyMemberDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getJavaDoc() != null) {
+			n.getJavaDoc().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final EmptyStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final EmptyTypeDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getJavaDoc() != null) {
+			n.getJavaDoc().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final EnclosedExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getInner().accept(this, arg);
+	}
+
+	@Override public void visit(final EnumConstantDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getJavaDoc() != null) {
+			n.getJavaDoc().accept(this, arg);
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				a.accept(this, arg);
+			}
+		}
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				e.accept(this, arg);
+			}
+		}
+		if (n.getClassBody() != null) {
+			for (final BodyDeclaration member : n.getClassBody()) {
+				member.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final EnumDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getJavaDoc() != null) {
+			n.getJavaDoc().accept(this, arg);
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				a.accept(this, arg);
+			}
+		}
+		if (n.getImplements() != null) {
+			for (final ClassOrInterfaceType c : n.getImplements()) {
+				c.accept(this, arg);
+			}
+		}
+		if (n.getEntries() != null) {
+			for (final EnumConstantDeclaration e : n.getEntries()) {
+				e.accept(this, arg);
+			}
+		}
+		if (n.getMembers() != null) {
+			for (final BodyDeclaration member : n.getMembers()) {
+				member.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final ExplicitConstructorInvocationStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (!n.isThis()) {
+			if (n.getExpr() != null) {
+				n.getExpr().accept(this, arg);
+			}
+		}
+		if (n.getTypeArgs() != null) {
+			for (final Type t : n.getTypeArgs()) {
+				t.accept(this, arg);
+			}
+		}
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				e.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final ExpressionStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getExpression().accept(this, arg);
+	}
+
+	@Override public void visit(final FieldAccessExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getScope().accept(this, arg);
+	}
+
+	@Override public void visit(final FieldDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getJavaDoc() != null) {
+			n.getJavaDoc().accept(this, arg);
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				a.accept(this, arg);
+			}
+		}
+		n.getType().accept(this, arg);
+		for (final VariableDeclarator var : n.getVariables()) {
+			var.accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final ForeachStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getVariable().accept(this, arg);
+		n.getIterable().accept(this, arg);
+		n.getBody().accept(this, arg);
+	}
+
+	@Override public void visit(final ForStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getInit() != null) {
+			for (final Expression e : n.getInit()) {
+				e.accept(this, arg);
+			}
+		}
+		if (n.getCompare() != null) {
+			n.getCompare().accept(this, arg);
+		}
+		if (n.getUpdate() != null) {
+			for (final Expression e : n.getUpdate()) {
+				e.accept(this, arg);
+			}
+		}
+		n.getBody().accept(this, arg);
+	}
+
+	@Override public void visit(final IfStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getCondition().accept(this, arg);
+		n.getThenStmt().accept(this, arg);
+		if (n.getElseStmt() != null) {
+			n.getElseStmt().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final ImportDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getName().accept(this, arg);
+	}
+
+	@Override public void visit(final InitializerDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getJavaDoc() != null) {
+			n.getJavaDoc().accept(this, arg);
+		}
+		n.getBlock().accept(this, arg);
+	}
+
+	@Override public void visit(final InstanceOfExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getExpr().accept(this, arg);
+		n.getType().accept(this, arg);
+	}
+
+	@Override public void visit(final IntegerLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final IntegerLiteralMinValueExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final JavadocComment n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final LabeledStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getStmt().accept(this, arg);
+	}
+
+	@Override public void visit(final LineComment n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final LongLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final LongLiteralMinValueExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final MarkerAnnotationExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getName().accept(this, arg);
+	}
+
+	@Override public void visit(final MemberValuePair n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getValue().accept(this, arg);
+	}
+
+	@Override public void visit(final MethodCallExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getScope() != null) {
+			n.getScope().accept(this, arg);
+		}
+		if (n.getTypeArgs() != null) {
+			for (final Type t : n.getTypeArgs()) {
+				t.accept(this, arg);
+			}
+		}
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				e.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final MethodDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getJavaDoc() != null) {
+			n.getJavaDoc().accept(this, arg);
+		}
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				a.accept(this, arg);
+			}
+		}
+		if (n.getTypeParameters() != null) {
+			for (final TypeParameter t : n.getTypeParameters()) {
+				t.accept(this, arg);
+			}
+		}
+		n.getType().accept(this, arg);
+		if (n.getParameters() != null) {
+			for (final Parameter p : n.getParameters()) {
+				p.accept(this, arg);
+			}
+		}
+		if (n.getThrows() != null) {
+			for (final NameExpr name : n.getThrows()) {
+				name.accept(this, arg);
+			}
+		}
+		if (n.getBody() != null) {
+			n.getBody().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final NameExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final NormalAnnotationExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getName().accept(this, arg);
+		if (n.getPairs() != null) {
+			for (final MemberValuePair m : n.getPairs()) {
+				m.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final NullLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final ObjectCreationExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getScope() != null) {
+			n.getScope().accept(this, arg);
+		}
+		if (n.getTypeArgs() != null) {
+			for (final Type t : n.getTypeArgs()) {
+				t.accept(this, arg);
+			}
+		}
+		n.getType().accept(this, arg);
+		if (n.getArgs() != null) {
+			for (final Expression e : n.getArgs()) {
+				e.accept(this, arg);
+			}
+		}
+		if (n.getAnonymousClassBody() != null) {
+			for (final BodyDeclaration member : n.getAnonymousClassBody()) {
+				member.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final PackageDeclaration n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				a.accept(this, arg);
+			}
+		}
+		n.getName().accept(this, arg);
+	}
+
+	@Override public void visit(final Parameter n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				a.accept(this, arg);
+			}
+		}
+		n.getType().accept(this, arg);
+		n.getId().accept(this, arg);
+	}
+	
+	@Override public void visit(final MultiTypeParameter n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				a.accept(this, arg);
+			}
+		}
+		for (final Type type : n.getTypes()) {
+			type.accept(this, arg);
+		}
+		n.getId().accept(this, arg);
+	}
+
+	@Override public void visit(final PrimitiveType n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final QualifiedNameExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getQualifier().accept(this, arg);
+	}
+
+	@Override public void visit(final ReferenceType n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getType().accept(this, arg);
+	}
+
+	@Override public void visit(final ReturnStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getExpr() != null) {
+			n.getExpr().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final SingleMemberAnnotationExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getName().accept(this, arg);
+		n.getMemberValue().accept(this, arg);
+	}
+
+	@Override public void visit(final StringLiteralExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final SuperExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getClassExpr() != null) {
+			n.getClassExpr().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final SwitchEntryStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getLabel() != null) {
+			n.getLabel().accept(this, arg);
+		}
+		if (n.getStmts() != null) {
+			for (final Statement s : n.getStmts()) {
+				s.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final SwitchStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getSelector().accept(this, arg);
+		if (n.getEntries() != null) {
+			for (final SwitchEntryStmt e : n.getEntries()) {
+				e.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final SynchronizedStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getExpr().accept(this, arg);
+		n.getBlock().accept(this, arg);
+	}
+
+	@Override public void visit(final ThisExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getClassExpr() != null) {
+			n.getClassExpr().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final ThrowStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getExpr().accept(this, arg);
+	}
+
+	@Override public void visit(final TryStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getResources() != null) {
+			for (final VariableDeclarationExpr v : n.getResources()) {
+				v.accept(this, arg);
+			}
+		}
+		n.getTryBlock().accept(this, arg);
+		if (n.getCatchs() != null) {
+			for (final CatchClause c : n.getCatchs()) {
+				c.accept(this, arg);
+			}
+		}
+		if (n.getFinallyBlock() != null) {
+			n.getFinallyBlock().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final TypeDeclarationStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getTypeDeclaration().accept(this, arg);
+	}
+
+	@Override public void visit(final TypeParameter n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getTypeBound() != null) {
+			for (final ClassOrInterfaceType c : n.getTypeBound()) {
+				c.accept(this, arg);
+			}
+		}
+	}
+
+	@Override public void visit(final UnaryExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getExpr().accept(this, arg);
+	}
+
+	@Override public void visit(final UnknownType n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final VariableDeclarationExpr n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getAnnotations() != null) {
+			for (final AnnotationExpr a : n.getAnnotations()) {
+				a.accept(this, arg);
+			}
+		}
+		n.getType().accept(this, arg);
+		for (final VariableDeclarator v : n.getVars()) {
+			v.accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final VariableDeclarator n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getId().accept(this, arg);
+		if (n.getInit() != null) {
+			n.getInit().accept(this, arg);
+		}
+	}
+
+	@Override public void visit(final VariableDeclaratorId n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final VoidType n, final A arg) {
+		visitComment(n.getComment(), arg);
+	}
+
+	@Override public void visit(final WhileStmt n, final A arg) {
+		visitComment(n.getComment(), arg);
+		n.getCondition().accept(this, arg);
+		n.getBody().accept(this, arg);
+	}
+
+	@Override public void visit(final WildcardType n, final A arg) {
+		visitComment(n.getComment(), arg);
+		if (n.getExtends() != null) {
+			n.getExtends().accept(this, arg);
+		}
+		if (n.getSuper() != null) {
+			n.getSuper().accept(this, arg);
+		}
+	}
 
     @Override
     public void visit(LambdaExpr n, final A arg) {
@@ -920,8 +839,8 @@ public void visit(TypeExpr n, final A arg) {
     }
 
     private void visitComment(final Comment n, final A arg) {
-        if (n != null) {
-            n.accept(this, arg);
-        }
-    }
+		if (n != null) {
+			n.accept(this, arg);
+		}
+	}
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java
index 545a086d1a..e98eb10b94 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFacade.java
@@ -183,21 +183,21 @@ public SymbolReference<ConstructorDeclaration> solve(ExplicitConstructorInvocati
         return res;
     }
 
-    public SymbolReference<TypeDeclaration> solve(ThisExpr node) {
+    public SymbolReference<TypeDeclaration> solve(ThisExpr node){
         // If 'this' is prefixed by a class eg. MyClass.this
-        if (node.getClassExpr().isPresent()) {
+        if (node.getClassExpr().isPresent()){
             // Get the class name
             String className = node.getClassExpr().get().toString();
             // Attempt to resolve using a typeSolver
             SymbolReference<ReferenceTypeDeclaration> clazz = typeSolver.tryToSolveType(className);
-            if (clazz.isSolved()) {
+            if (clazz.isSolved()){
                 return SymbolReference.solved(clazz.getCorrespondingDeclaration());
             }
             // Attempt to resolve locally in Compilation unit
             Optional<CompilationUnit> cu = node.getAncestorOfType(CompilationUnit.class);
-            if (cu.isPresent()) {
+            if (cu.isPresent()){
                 Optional<ClassOrInterfaceDeclaration> classByName = cu.get().getClassByName(className);
-                if (classByName.isPresent()) {
+                if (classByName.isPresent()){
                     return SymbolReference.solved(getTypeDeclaration(classByName.get()));
                 }
             }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFactory.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFactory.java
index 2b3ad3edfa..132c7527d4 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFactory.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/JavaParserFactory.java
@@ -76,7 +76,7 @@ public static Context getContext(Node node, TypeSolver typeSolver) {
         } else if (node instanceof CatchClause) {
             return new CatchClauseContext((CatchClause) node, typeSolver);
         } else if (node instanceof ObjectCreationExpr &&
-                ((ObjectCreationExpr) node).getAnonymousClassBody().isPresent()) {
+            ((ObjectCreationExpr) node).getAnonymousClassBody().isPresent()) {
             return new AnonymousClassDeclarationContext((ObjectCreationExpr) node, typeSolver);
         } else {
             if (node instanceof NameExpr) {
@@ -86,7 +86,7 @@ public static Context getContext(Node node, TypeSolver typeSolver) {
                 }
             }
             final Node parentNode = getParentNode(node);
-            if (parentNode instanceof ObjectCreationExpr && node == ((ObjectCreationExpr) parentNode).getType()) {
+            if(parentNode instanceof ObjectCreationExpr && node == ((ObjectCreationExpr) parentNode).getType()) {
                 return getContext(getParentNode(parentNode), typeSolver);
             }
             return getContext(parentNode, typeSolver);
@@ -114,7 +114,7 @@ public static SymbolDeclarator getSymbolDeclarator(Node node, TypeSolver typeSol
             return new NoSymbolDeclarator<Node>(node, typeSolver);
         }
     }
-
+    
     public static ReferenceTypeDeclaration toTypeDeclaration(Node node, TypeSolver typeSolver) {
         if (node instanceof ClassOrInterfaceDeclaration) {
             if (((ClassOrInterfaceDeclaration) node).isInterface()) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/TypeExtractor.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/TypeExtractor.java
index ec1d4b4aa7..2048e6cea3 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/TypeExtractor.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/TypeExtractor.java
@@ -186,14 +186,14 @@ public Type visit(FieldAccessExpr node, Boolean solveLambdas) {
                 return solveDotExpressionType(
                         typeAccessedStatically.getCorrespondingDeclaration().asReferenceType(), node);
             }
-        } else if (node.getScope() instanceof ThisExpr) {
+        } else if (node.getScope()instanceof ThisExpr){
             // If we are accessing through a 'this' expression, first resolve the type
             // corresponding to 'this'
             SymbolReference<TypeDeclaration> solve = facade.solve((ThisExpr) node.getScope());
             // If found get it's declaration and get the field in there
-            if (solve.isSolved()) {
+            if (solve.isSolved()){
                 TypeDeclaration correspondingDeclaration = solve.getCorrespondingDeclaration();
-                if (correspondingDeclaration instanceof ReferenceTypeDeclaration) {
+                if (correspondingDeclaration instanceof ReferenceTypeDeclaration){
                     return solveDotExpressionType(correspondingDeclaration.asReferenceType(), node);
                 }
             }
@@ -297,19 +297,19 @@ public Type visit(ObjectCreationExpr node, Boolean solveLambdas) {
     @Override
     public Type visit(ThisExpr node, Boolean solveLambdas) {
         // If 'this' is prefixed by a class eg. MyClass.this
-        if (node.getClassExpr().isPresent()) {
+        if (node.getClassExpr().isPresent()){
             // Get the class name
             String className = node.getClassExpr().get().toString();
             // Attempt to resolve using a typeSolver
             SymbolReference<ReferenceTypeDeclaration> clazz = typeSolver.tryToSolveType(className);
-            if (clazz.isSolved()) {
-                return new ReferenceTypeImpl(clazz.getCorrespondingDeclaration(), typeSolver);
+            if (clazz.isSolved()){
+                return new ReferenceTypeImpl(clazz.getCorrespondingDeclaration(),typeSolver);
             }
             // Attempt to resolve locally in Compilation unit
             Optional<CompilationUnit> cu = node.getAncestorOfType(CompilationUnit.class);
-            if (cu.isPresent()) {
+            if (cu.isPresent()){
                 Optional<ClassOrInterfaceDeclaration> classByName = cu.get().getClassByName(className);
-                if (classByName.isPresent()) {
+                if (classByName.isPresent()){
                     return new ReferenceTypeImpl(facade.getTypeDeclaration(classByName.get()), typeSolver);
                 }
             }
@@ -379,7 +379,7 @@ public Type visit(LambdaExpr node, Boolean solveLambdas) {
                         NameExpr nameExpr = (NameExpr) scope;
                         try {
                             SymbolReference<TypeDeclaration> type = JavaParserFactory.getContext(nameExpr, typeSolver).solveType(nameExpr.getName().getId(), typeSolver);
-                            if (type.isSolved()) {
+                            if (type.isSolved()){
                                 staticCall = true;
                             }
                         } catch (Exception e) {
@@ -419,7 +419,7 @@ public Type visit(LambdaExpr node, Boolean solveLambdas) {
                     Type actualType;
 
                     if (lambdaExpr.getBody() instanceof ExpressionStmt) {
-                        actualType = facade.getType(((ExpressionStmt) lambdaExpr.getBody()).getExpression());
+                        actualType = facade.getType(((ExpressionStmt)lambdaExpr.getBody()).getExpression());
                     } else if (lambdaExpr.getBody() instanceof BlockStmt) {
                         BlockStmt blockStmt = (BlockStmt) lambdaExpr.getBody();
                         NodeList<Statement> statements = blockStmt.getStatements();
@@ -427,20 +427,20 @@ public Type visit(LambdaExpr node, Boolean solveLambdas) {
                         // Get all the return statements in the lambda block
                         List<ReturnStmt> returnStmts = blockStmt.getNodesByType(ReturnStmt.class);
 
-                        if (returnStmts.size() > 0) {
+                        if (returnStmts.size() > 0){
 
                             actualType = returnStmts.stream()
-                                    .map(returnStmt -> {
-                                        Optional<Expression> expression = returnStmt.getExpression();
-                                        if (expression.isPresent()) {
-                                            return facade.getType(expression.get());
-                                        } else {
-                                            return VoidType.INSTANCE;
-                                        }
-                                    })
-                                    .filter(x -> x != null && !x.isVoid() && !x.isNull())
-                                    .findFirst()
-                                    .orElse(VoidType.INSTANCE);
+                            .map(returnStmt -> {
+                                Optional<Expression> expression = returnStmt.getExpression();
+                                if (expression.isPresent()){
+                                    return facade.getType(expression.get());
+                                } else{
+                                    return VoidType.INSTANCE;
+                                }
+                            })
+                            .filter(x -> x != null && !x.isVoid() && !x.isNull())
+                            .findFirst()
+                            .orElse(VoidType.INSTANCE);
 
                         } else {
                             return VoidType.INSTANCE;
@@ -460,7 +460,7 @@ public Type visit(LambdaExpr node, Boolean solveLambdas) {
 
                     // if the functional method returns void anyway
                     // we don't need to bother inferring types
-                    if (!(formalType instanceof VoidType)) {
+                    if (!(formalType instanceof VoidType)){
                         lambdaCtx.addPair(result, functionalTypeWithReturn);
                         result = lambdaCtx.resolve(lambdaCtx.addSingle(result));
                     }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/UnsolvedSymbolException.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/UnsolvedSymbolException.java
index 760f2ed5f7..21dcf7c9e3 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/UnsolvedSymbolException.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/UnsolvedSymbolException.java
@@ -21,6 +21,7 @@
 
 /**
  * @author Federico Tomassetti
+ *
  * @deprecated Use {@link com.github.javaparser.symbolsolver.model.resolution.UnsolvedSymbolException} instead
  */
 // Use the one in model instead
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractMethodLikeDeclarationContext.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractMethodLikeDeclarationContext.java
index 63fdce80eb..7a93633f4d 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractMethodLikeDeclarationContext.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AbstractMethodLikeDeclarationContext.java
@@ -77,7 +77,7 @@ public final SymbolReference<TypeDeclaration> solveType(String name, TypeSolver
                 }
             }
         }
-
+        
         // Local types
         List<com.github.javaparser.ast.body.TypeDeclaration> localTypes = wrappedNode.getChildNodesByType(
                 com.github.javaparser.ast.body.TypeDeclaration.class);
@@ -89,7 +89,7 @@ public final SymbolReference<TypeDeclaration> solveType(String name, TypeSolver
                         name.substring(localType.getName().getId().length() + 1), typeSolver);
             }
         }
-
+        
         return getParent().solveType(name, typeSolver);
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnonymousClassDeclarationContext.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnonymousClassDeclarationContext.java
index 6843b3501e..3eef0c9b11 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnonymousClassDeclarationContext.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/AnonymousClassDeclarationContext.java
@@ -7,7 +7,7 @@
 import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
 import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFactory;
 import com.github.javaparser.symbolsolver.javaparsermodel.declarations
-        .JavaParserAnonymousClassDeclaration;
+    .JavaParserAnonymousClassDeclaration;
 import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserTypeParameter;
 import com.github.javaparser.symbolsolver.model.declarations.MethodDeclaration;
 import com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration;
@@ -29,158 +29,158 @@
  */
 public class AnonymousClassDeclarationContext extends AbstractJavaParserContext<ObjectCreationExpr> {
 
-    private final JavaParserAnonymousClassDeclaration myDeclaration =
-            new JavaParserAnonymousClassDeclaration(wrappedNode, typeSolver);
-
-    public AnonymousClassDeclarationContext(ObjectCreationExpr node, TypeSolver typeSolver) {
-        super(node, typeSolver);
-        Preconditions.checkArgument(node.getAnonymousClassBody().isPresent(),
-                "An anonymous class must have a body");
-    }
-
-    @Override
-    public SymbolReference<MethodDeclaration> solveMethod(String name,
-                                                          List<Type> argumentsTypes,
-                                                          boolean staticOnly,
-                                                          TypeSolver typeSolver) {
-        List<MethodDeclaration> candidateMethods =
-                myDeclaration
-                        .getDeclaredMethods()
-                        .stream()
-                        .filter(m -> m.getName().equals(name) && (!staticOnly || m.isStatic()))
-                        .collect(Collectors.toList());
-
-        if (!Object.class.getCanonicalName().equals(myDeclaration.getQualifiedName())) {
-            for (ReferenceType ancestor : myDeclaration.getAncestors()) {
-                SymbolReference<MethodDeclaration> res =
-                        MethodResolutionLogic.solveMethodInType(ancestor.getTypeDeclaration(),
-                                name,
-                                argumentsTypes,
-                                staticOnly,
-                                typeSolver);
-                // consider methods from superclasses and only default methods from interfaces :
-                // not true, we should keep abstract as a valid candidate
-                // abstract are removed in MethodResolutionLogic.isApplicable is necessary
-                if (res.isSolved()) {
-                    candidateMethods.add(res.getCorrespondingDeclaration());
-                }
-            }
-        }
-
-        // We want to avoid infinite recursion when a class is using its own method
-        // see issue #75
-        if (candidateMethods.isEmpty()) {
-            SymbolReference<MethodDeclaration> parentSolution =
-                    getParent().solveMethod(name, argumentsTypes, staticOnly, typeSolver);
-            if (parentSolution.isSolved()) {
-                candidateMethods.add(parentSolution.getCorrespondingDeclaration());
-            }
+  private final JavaParserAnonymousClassDeclaration myDeclaration =
+      new JavaParserAnonymousClassDeclaration(wrappedNode, typeSolver);
+
+  public AnonymousClassDeclarationContext(ObjectCreationExpr node, TypeSolver typeSolver) {
+    super(node, typeSolver);
+    Preconditions.checkArgument(node.getAnonymousClassBody().isPresent(),
+                                "An anonymous class must have a body");
+  }
+
+  @Override
+  public SymbolReference<MethodDeclaration> solveMethod(String name,
+                                                        List<Type> argumentsTypes,
+                                                        boolean staticOnly,
+                                                        TypeSolver typeSolver) {
+    List<MethodDeclaration> candidateMethods =
+        myDeclaration
+            .getDeclaredMethods()
+            .stream()
+            .filter(m -> m.getName().equals(name) && (!staticOnly || m.isStatic()))
+            .collect(Collectors.toList());
+
+    if (!Object.class.getCanonicalName().equals(myDeclaration.getQualifiedName())) {
+      for (ReferenceType ancestor : myDeclaration.getAncestors()) {
+        SymbolReference<MethodDeclaration> res =
+            MethodResolutionLogic.solveMethodInType(ancestor.getTypeDeclaration(),
+                                                    name,
+                                                    argumentsTypes,
+                                                    staticOnly,
+                                                    typeSolver);
+        // consider methods from superclasses and only default methods from interfaces :
+        // not true, we should keep abstract as a valid candidate
+        // abstract are removed in MethodResolutionLogic.isApplicable is necessary
+        if (res.isSolved()) {
+          candidateMethods.add(res.getCorrespondingDeclaration());
         }
+      }
+    }
 
-        // if is interface and candidate method list is empty, we should check the Object Methods
-        if (candidateMethods.isEmpty() && myDeclaration.getSuperTypeDeclaration().isInterface()) {
-            SymbolReference<MethodDeclaration> res =
-                    MethodResolutionLogic.solveMethodInType(new ReflectionClassDeclaration(Object.class,
-                                    typeSolver),
-                            name,
-                            argumentsTypes,
-                            false,
-                            typeSolver);
-            if (res.isSolved()) {
-                candidateMethods.add(res.getCorrespondingDeclaration());
-            }
-        }
+    // We want to avoid infinite recursion when a class is using its own method
+    // see issue #75
+    if (candidateMethods.isEmpty()) {
+      SymbolReference<MethodDeclaration> parentSolution =
+          getParent().solveMethod(name, argumentsTypes, staticOnly, typeSolver);
+      if (parentSolution.isSolved()) {
+        candidateMethods.add(parentSolution.getCorrespondingDeclaration());
+      }
+    }
 
-        return MethodResolutionLogic.findMostApplicable(candidateMethods,
-                name,
-                argumentsTypes,
-                typeSolver);
+    // if is interface and candidate method list is empty, we should check the Object Methods
+    if (candidateMethods.isEmpty() && myDeclaration.getSuperTypeDeclaration().isInterface()) {
+      SymbolReference<MethodDeclaration> res =
+          MethodResolutionLogic.solveMethodInType(new ReflectionClassDeclaration(Object.class,
+                                                                                 typeSolver),
+                                                  name,
+                                                  argumentsTypes,
+                                                  false,
+                                                  typeSolver);
+      if (res.isSolved()) {
+        candidateMethods.add(res.getCorrespondingDeclaration());
+      }
     }
 
-    @Override
-    public SymbolReference<TypeDeclaration> solveType(String name, TypeSolver typeSolver) {
-        List<com.github.javaparser.ast.body.TypeDeclaration> typeDeclarations =
-                myDeclaration
-                        .findMembersOfKind(com.github.javaparser.ast.body.TypeDeclaration.class);
-
-        Optional<SymbolReference<TypeDeclaration>> exactMatch =
-                typeDeclarations
-                        .stream()
-                        .filter(internalType -> internalType.getName().getId().equals(name))
-                        .findFirst()
-                        .map(internalType ->
-                                SymbolReference.solved(
-                                        JavaParserFacade.get(typeSolver).getTypeDeclaration(internalType)));
-
-        if (exactMatch.isPresent()) {
-            return exactMatch.get();
-        }
+    return MethodResolutionLogic.findMostApplicable(candidateMethods,
+                                                    name,
+                                                    argumentsTypes,
+                                                    typeSolver);
+  }
+
+  @Override
+  public SymbolReference<TypeDeclaration> solveType(String name, TypeSolver typeSolver) {
+    List<com.github.javaparser.ast.body.TypeDeclaration> typeDeclarations =
+        myDeclaration
+            .findMembersOfKind(com.github.javaparser.ast.body.TypeDeclaration.class);
+
+    Optional<SymbolReference<TypeDeclaration>> exactMatch =
+        typeDeclarations
+            .stream()
+            .filter(internalType -> internalType.getName().getId().equals(name))
+            .findFirst()
+            .map(internalType ->
+                     SymbolReference.solved(
+                         JavaParserFacade.get(typeSolver).getTypeDeclaration(internalType)));
+
+    if(exactMatch.isPresent()){
+      return exactMatch.get();
+    }
 
-        Optional<SymbolReference<TypeDeclaration>> recursiveMatch =
-                typeDeclarations
-                        .stream()
-                        .filter(internalType -> name.startsWith(String.format("%s.", internalType.getName())))
-                        .findFirst()
-                        .map(internalType ->
-                                JavaParserFactory
-                                        .getContext(internalType, typeSolver)
-                                        .solveType(name.substring(internalType.getName().getId().length() + 1),
-                                                typeSolver));
-
-        if (recursiveMatch.isPresent()) {
-            return recursiveMatch.get();
-        }
+    Optional<SymbolReference<TypeDeclaration>> recursiveMatch =
+        typeDeclarations
+            .stream()
+            .filter(internalType -> name.startsWith(String.format("%s.", internalType.getName())))
+            .findFirst()
+            .map(internalType ->
+                     JavaParserFactory
+                         .getContext(internalType, typeSolver)
+                         .solveType(name.substring(internalType.getName().getId().length() + 1),
+                                    typeSolver));
+
+    if (recursiveMatch.isPresent()) {
+      return recursiveMatch.get();
+    }
 
-        Optional<SymbolReference<TypeDeclaration>> typeArgumentsMatch =
-                wrappedNode
-                        .getTypeArguments()
-                        .map(nodes ->
-                                ((NodeWithTypeArguments<?>) nodes).getTypeArguments()
-                                        .orElse(new NodeList<>()))
-                        .orElse(new NodeList<>())
-                        .stream()
-                        .filter(type -> type.toString().equals(name))
-                        .findFirst()
-                        .map(matchingType ->
-                                SymbolReference.solved(
-                                        new JavaParserTypeParameter(new TypeParameter(matchingType.toString()),
-                                                typeSolver)));
-
-        if (typeArgumentsMatch.isPresent()) {
-            return typeArgumentsMatch.get();
-        }
+    Optional<SymbolReference<TypeDeclaration>> typeArgumentsMatch =
+        wrappedNode
+            .getTypeArguments()
+            .map(nodes ->
+                     ((NodeWithTypeArguments<?>) nodes).getTypeArguments()
+                                                       .orElse(new NodeList<>()))
+            .orElse(new NodeList<>())
+            .stream()
+            .filter(type -> type.toString().equals(name))
+            .findFirst()
+            .map(matchingType ->
+                     SymbolReference.solved(
+                         new JavaParserTypeParameter(new TypeParameter(matchingType.toString()),
+                                                     typeSolver)));
+
+    if (typeArgumentsMatch.isPresent()) {
+      return typeArgumentsMatch.get();
+    }
 
-        // Look into extended classes and implemented interfaces
-        for (ReferenceType ancestor : myDeclaration.getAncestors()) {
-            // look at names of extended classes and implemented interfaces (this may not be important because they are checked in CompilationUnitContext)
-            if (ancestor.getTypeDeclaration().getName().equals(name)) {
-                return SymbolReference.solved(ancestor.getTypeDeclaration());
-            }
-            // look into internal types of extended classes and implemented interfaces
-            try {
-                for (TypeDeclaration internalTypeDeclaration : ancestor.getTypeDeclaration().internalTypes()) {
-                    if (internalTypeDeclaration.getName().equals(name)) {
-                        return SymbolReference.solved(internalTypeDeclaration);
-                    }
-                }
-            } catch (UnsupportedOperationException e) {
-                // just continue using the next ancestor
-            }
+    // Look into extended classes and implemented interfaces
+    for (ReferenceType ancestor : myDeclaration.getAncestors()) {
+      // look at names of extended classes and implemented interfaces (this may not be important because they are checked in CompilationUnitContext)
+      if (ancestor.getTypeDeclaration().getName().equals(name)) {
+        return SymbolReference.solved(ancestor.getTypeDeclaration());
+      } 
+      // look into internal types of extended classes and implemented interfaces
+      try {
+        for (TypeDeclaration internalTypeDeclaration : ancestor.getTypeDeclaration().internalTypes()) {
+          if (internalTypeDeclaration.getName().equals(name)) {
+            return SymbolReference.solved(internalTypeDeclaration);
+          }
         }
-
-        return getParent().solveType(name, typeSolver);
+      } catch (UnsupportedOperationException e) {
+        // just continue using the next ancestor
+      }
     }
+    
+    return getParent().solveType(name, typeSolver);
+  }
 
-    @Override
-    public SymbolReference<? extends ValueDeclaration> solveSymbol(String name,
-                                                                   TypeSolver typeSolver) {
-        Preconditions.checkArgument(typeSolver != null);
-
-        if (myDeclaration.hasVisibleField(name)) {
-            return SymbolReference.solved(myDeclaration.getVisibleField(name));
-        }
+  @Override
+  public SymbolReference<? extends ValueDeclaration> solveSymbol(String name,
+                                                                 TypeSolver typeSolver) {
+    Preconditions.checkArgument(typeSolver != null);
 
-        return getParent().solveSymbol(name, typeSolver);
+    if (myDeclaration.hasVisibleField(name)) {
+      return SymbolReference.solved(myDeclaration.getVisibleField(name));
     }
 
+    return getParent().solveSymbol(name, typeSolver);
+  }
+
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java
index a6922018ea..d7c92b93d6 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/CompilationUnitContext.java
@@ -80,15 +80,15 @@ public SymbolReference<? extends ValueDeclaration> solveSymbol(String name, Type
         // Look among statically imported values
         if (wrappedNode.getImports() != null) {
             for (ImportDeclaration importDecl : wrappedNode.getImports()) {
-                if (importDecl.isStatic()) {
-                    if (importDecl.isAsterisk()) {
+                if(importDecl.isStatic()){
+                    if(importDecl.isAsterisk()) {
                         String qName = importDecl.getNameAsString();
                         com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration importedType = typeSolver.solveType(qName);
                         SymbolReference<? extends ValueDeclaration> ref = new SymbolSolver(typeSolver).solveSymbolInType(importedType, name);
                         if (ref.isSolved()) {
                             return ref;
                         }
-                    } else {
+                    } else{
                         String whole = importDecl.getNameAsString();
 
                         // split in field/method name and type name
@@ -226,8 +226,8 @@ private String packageName(String qName) {
     @Override
     public SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> argumentsTypes, boolean staticOnly, TypeSolver typeSolver) {
         for (ImportDeclaration importDecl : wrappedNode.getImports()) {
-            if (importDecl.isStatic()) {
-                if (importDecl.isAsterisk()) {
+            if(importDecl.isStatic()){
+                if(importDecl.isAsterisk()){
                     String importString = importDecl.getNameAsString();
 
                     if (this.wrappedNode.getPackageDeclaration().isPresent()
@@ -244,7 +244,7 @@ public SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> ar
                     if (method.isSolved()) {
                         return method;
                     }
-                } else {
+                } else{
                     String qName = importDecl.getNameAsString();
 
                     if (qName.equals(name) || qName.endsWith("." + name)) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapter.java
index 8845648e4c..65e4b5ab7e 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/JavaParserTypeDeclarationAdapter.java
@@ -69,14 +69,14 @@ public SymbolReference<TypeDeclaration> solveType(String name, TypeSolver typeSo
 
         // Look into extended classes and implemented interfaces
         for (ReferenceType ancestor : this.typeDeclaration.getAncestors()) {
-            try {
-                for (TypeDeclaration internalTypeDeclaration : ancestor.getTypeDeclaration().internalTypes()) {
-                    if (internalTypeDeclaration.getName().equals(name)) {
-                        return SymbolReference.solved(internalTypeDeclaration);
-                    }
-                }
-            } catch (UnsupportedOperationException e) {
-                // just continue using the next ancestor
+        	try {
+	            for (TypeDeclaration internalTypeDeclaration : ancestor.getTypeDeclaration().internalTypes()) {
+	                if (internalTypeDeclaration.getName().equals(name)) {
+	                    return SymbolReference.solved(internalTypeDeclaration);
+	                }
+	            }
+        	} catch (UnsupportedOperationException e) {
+	            // just continue using the next ancestor
             }
         }
 
@@ -86,12 +86,12 @@ public SymbolReference<TypeDeclaration> solveType(String name, TypeSolver typeSo
     public SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> argumentsTypes, boolean staticOnly, TypeSolver typeSolver) {
         List<MethodDeclaration> candidateMethods = typeDeclaration.getDeclaredMethods().stream()
                 .filter(m -> m.getName().equals(name))
-                .filter(m -> !staticOnly || (staticOnly && m.isStatic()))
+                .filter(m -> !staticOnly || (staticOnly &&  m.isStatic()))
                 .collect(Collectors.toList());
         // We want to avoid infinite recursion in case of Object having Object as ancestor
         if (!Object.class.getCanonicalName().equals(typeDeclaration.getQualifiedName())) {
             for (ReferenceType ancestor : typeDeclaration.getAncestors()) {
-                // Avoid recursion on self
+		// Avoid recursion on self
                 if (typeDeclaration != ancestor.getTypeDeclaration()) {
                     SymbolReference<MethodDeclaration> res = MethodResolutionLogic
                             .solveMethodInType(ancestor.getTypeDeclaration(), name, argumentsTypes, staticOnly, typeSolver);
@@ -101,7 +101,7 @@ public SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> ar
                     if (res.isSolved()) {
                         candidateMethods.add(res.getCorrespondingDeclaration());
                     }
-                }
+		}
             }
         }
         // We want to avoid infinite recursion when a class is using its own method
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java
index e7fd29ea9a..02c69ee5de 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/LambdaExprContext.java
@@ -68,7 +68,7 @@ public Optional<Value> solveSymbolAsValue(String name, TypeSolver typeSolver) {
 
                         // Get the functional method in order for us to resolve it's type arguments properly
                         Optional<MethodUsage> functionalMethodOpt = FunctionalInterfaceLogic.getFunctionalMethod(lambdaType);
-                        if (functionalMethodOpt.isPresent()) {
+                        if (functionalMethodOpt.isPresent()){
                             MethodUsage functionalMethod = functionalMethodOpt.get();
                             InferenceContext inferenceContext = new InferenceContext(MyObjectProvider.INSTANCE);
 
@@ -79,28 +79,26 @@ public Optional<Value> solveSymbolAsValue(String name, TypeSolver typeSolver) {
                             // Find the position of this lambda argument
                             boolean found = false;
                             int lambdaParamIndex;
-                            for (lambdaParamIndex = 0; lambdaParamIndex < wrappedNode.getParameters().size(); lambdaParamIndex++) {
-                                if (wrappedNode.getParameter(lambdaParamIndex).getName().getIdentifier().equals(name)) {
+                            for (lambdaParamIndex = 0; lambdaParamIndex < wrappedNode.getParameters().size(); lambdaParamIndex++){
+                                if (wrappedNode.getParameter(lambdaParamIndex).getName().getIdentifier().equals(name)){
                                     found = true;
                                     break;
                                 }
                             }
-                            if (!found) {
-                                return Optional.empty();
-                            }
+                            if (!found) { return Optional.empty(); }
 
                             // Now resolve the argument type using the inference context
                             Type argType = inferenceContext.resolve(inferenceContext.addSingle(functionalMethod.getParamType(lambdaParamIndex)));
 
                             LambdaConstraintType conType;
-                            if (argType.isWildcard()) {
+                            if (argType.isWildcard()){
                                 conType = LambdaConstraintType.bound(argType.asWildcard().getBoundedType());
                             } else {
                                 conType = LambdaConstraintType.bound(argType);
                             }
                             Value value = new Value(conType, name);
                             return Optional.of(value);
-                        } else {
+                        } else{
                             return Optional.empty();
                         }
                     } else if (getParentNode(wrappedNode) instanceof VariableDeclarator) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java
index a387cd7bac..094f29ba4c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/contexts/MethodCallExprContext.java
@@ -61,11 +61,11 @@ public MethodCallExprContext(MethodCallExpr wrappedNode, TypeSolver typeSolver)
 
     @Override
     public Optional<Type> solveGenericType(String name, TypeSolver typeSolver) {
-        if (wrappedNode.getScope().isPresent()) {
+        if(wrappedNode.getScope().isPresent()){
             Type typeOfScope = JavaParserFacade.get(typeSolver).getType(wrappedNode.getScope().get());
             Optional<Type> res = typeOfScope.asReferenceType().getGenericParameterByName(name);
             return res;
-        } else {
+        } else{
             return Optional.empty();
         }
     }
@@ -190,7 +190,7 @@ public SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> ar
                     }
                 }
                 return SymbolReference.unsolved(MethodDeclaration.class);
-            } else if (typeOfScope.isConstraint()) {
+            } else if (typeOfScope.isConstraint()){
                 return MethodResolutionLogic.solveMethodInType(typeOfScope.asConstraintType().getBound().asReferenceType().getTypeDeclaration(), name, argumentsTypes, typeSolver);
             } else {
                 return MethodResolutionLogic.solveMethodInType(typeOfScope.asReferenceType().getTypeDeclaration(), name, argumentsTypes, false, typeSolver);
@@ -237,12 +237,12 @@ private Optional<MethodUsage> solveMethodAsUsage(ReferenceType refType, String n
                 ParameterDeclaration parameter = methodUsage.getDeclaration().getParam(i);
                 Type parameterType = parameter.getType();
                 if (parameter.isVariadic()) {
-                    parameterType = parameterType.asArrayType().getComponentType();
+                	parameterType = parameterType.asArrayType().getComponentType();
                 }
                 inferTypes(argumentsTypes.get(i), parameterType, derivedValues);
             }
 
-            for (Map.Entry<TypeParameterDeclaration, Type> entry : derivedValues.entrySet()) {
+            for (Map.Entry<TypeParameterDeclaration, Type> entry : derivedValues.entrySet()){
                 methodUsage = methodUsage.replaceTypeParameter(entry.getKey(), entry.getValue());
             }
 
@@ -265,14 +265,14 @@ private void inferTypes(Type source, Type target, Map<TypeParameterDeclaration,
             return;
         }
         if (source.isReferenceType() && target.isReferenceType()) {
-            ReferenceType sourceRefType = source.asReferenceType();
-            ReferenceType targetRefType = target.asReferenceType();
+        	ReferenceType sourceRefType = source.asReferenceType();
+        	ReferenceType targetRefType = target.asReferenceType();
             if (sourceRefType.getQualifiedName().equals(targetRefType.getQualifiedName())) {
-                if (!sourceRefType.isRawType() && !targetRefType.isRawType()) {
-                    for (int i = 0; i < sourceRefType.typeParametersValues().size(); i++) {
-                        inferTypes(sourceRefType.typeParametersValues().get(i), targetRefType.typeParametersValues().get(i), mappings);
-                    }
-                }
+            	if (!sourceRefType.isRawType() && !targetRefType.isRawType()) {
+	                for (int i = 0; i < sourceRefType.typeParametersValues().size(); i++) {
+	                    inferTypes(sourceRefType.typeParametersValues().get(i), targetRefType.typeParametersValues().get(i), mappings);
+	                }
+            	}
             }
             return;
         }
@@ -284,7 +284,7 @@ private void inferTypes(Type source, Type target, Map<TypeParameterDeclaration,
             return;
         }
         if (source.isWildcard() && target.isWildcard()) {
-            if (source.asWildcard().isBounded() && target.asWildcard().isBounded()) {
+            if (source.asWildcard().isBounded() && target.asWildcard().isBounded()){
                 inferTypes(source.asWildcard().getBoundedType(), target.asWildcard().getBoundedType(), mappings);
             }
             return;
@@ -297,8 +297,8 @@ private void inferTypes(Type source, Type target, Map<TypeParameterDeclaration,
             mappings.put(target.asTypeParameter(), source);
             return;
         }
-        if (source.isArray() && target.isWildcard()) {
-            if (target.asWildcard().isBounded()) {
+        if (source.isArray() && target.isWildcard()){
+            if(target.asWildcard().isBounded()){
                 inferTypes(source, target.asWildcard().getBoundedType(), mappings);
                 return;
             }
@@ -309,18 +309,18 @@ private void inferTypes(Type source, Type target, Map<TypeParameterDeclaration,
             return;
         }
 
-        if (source.isWildcard() && target.isReferenceType()) {
-            if (source.asWildcard().isBounded()) {
+        if (source.isWildcard() && target.isReferenceType()){
+            if (source.asWildcard().isBounded()){
                 inferTypes(source.asWildcard().getBoundedType(), target, mappings);
             }
             return;
         }
-        if (source.isConstraint() && target.isReferenceType()) {
+        if (source.isConstraint() && target.isReferenceType()){
             inferTypes(source.asConstraintType().getBound(), target, mappings);
             return;
         }
 
-        if (source.isConstraint() && target.isTypeVariable()) {
+        if (source.isConstraint() && target.isTypeVariable()){
             inferTypes(source.asConstraintType().getBound(), target, mappings);
             return;
         }
@@ -344,12 +344,12 @@ private MethodUsage resolveMethodTypeParameters(MethodUsage methodUsage, List<Ty
             if (actualParamTypes.size() == methodUsage.getDeclaration().getNumberOfParams()) {
                 // the varargs parameter is an Array, so extract the inner type
                 Type expectedType =
-                        methodUsage.getDeclaration().getLastParam().getType().asArrayType().getComponentType();
+                    methodUsage.getDeclaration().getLastParam().getType().asArrayType().getComponentType();
                 // the varargs corresponding type can be either T or Array<T>
                 Type actualType =
-                        actualParamTypes.get(actualParamTypes.size() - 1).isArray() ?
-                                actualParamTypes.get(actualParamTypes.size() - 1).asArrayType().getComponentType() :
-                                actualParamTypes.get(actualParamTypes.size() - 1);
+                    actualParamTypes.get(actualParamTypes.size() - 1).isArray() ?
+                        actualParamTypes.get(actualParamTypes.size() - 1).asArrayType().getComponentType() :
+                        actualParamTypes.get(actualParamTypes.size() - 1);
                 if (!expectedType.isAssignableBy(actualType)) {
                     for (TypeParameterDeclaration tp : methodUsage.getDeclaration().getTypeParameters()) {
                         expectedType = MethodResolutionLogic.replaceTypeParam(expectedType, tp, typeSolver);
@@ -358,11 +358,11 @@ private MethodUsage resolveMethodTypeParameters(MethodUsage methodUsage, List<Ty
                 if (!expectedType.isAssignableBy(actualType)) {
                     // ok, then it needs to be wrapped
                     throw new UnsupportedOperationException(
-                            String.format("Unable to resolve the type typeParametersValues in a MethodUsage. Expected type: %s, Actual type: %s. Method Declaration: %s. MethodUsage: %s",
-                                    expectedType,
-                                    actualType,
-                                    methodUsage.getDeclaration(),
-                                    methodUsage));
+                        String.format("Unable to resolve the type typeParametersValues in a MethodUsage. Expected type: %s, Actual type: %s. Method Declaration: %s. MethodUsage: %s",
+                                      expectedType,
+                                      actualType,
+                                      methodUsage.getDeclaration(),
+                                      methodUsage));
                 }
                 // match only the varargs type
                 matchTypeParameters(expectedType, actualType, matchedTypeParameters);
@@ -372,8 +372,8 @@ private MethodUsage resolveMethodTypeParameters(MethodUsage methodUsage, List<Ty
         }
 
         int until = methodUsage.getDeclaration().hasVariadicParameter() ?
-                actualParamTypes.size() - 1 :
-                actualParamTypes.size();
+            actualParamTypes.size() - 1 :
+            actualParamTypes.size();
 
         for (int i = 0; i < until; i++) {
             Type expectedType = methodUsage.getParamType(i);
@@ -443,7 +443,7 @@ private Optional<MethodUsage> solveMethodAsUsage(Type type, String name, List<Ty
             } else {
                 throw new UnsupportedOperationException("unbounded wildcard");
             }
-        } else if (type instanceof LambdaConstraintType) {
+        } else if (type instanceof LambdaConstraintType){
             LambdaConstraintType constraintType = (LambdaConstraintType) type;
             return solveMethodAsUsage(constraintType.getBound(), name, argumentsTypes, typeSolver, invokationContext);
         } else if (type instanceof ArrayType) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java
index b3c70fb3a0..e29a42ea2a 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserAnonymousClassDeclaration.java
@@ -1,7 +1,6 @@
 package com.github.javaparser.symbolsolver.javaparsermodel.declarations;
 
 import static com.github.javaparser.symbolsolver.javaparser.Navigator.getParentNode;
-
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.expr.ObjectCreationExpr;
 import com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade;
@@ -32,173 +31,173 @@
  */
 public class JavaParserAnonymousClassDeclaration extends AbstractClassDeclaration {
 
-    private final TypeSolver typeSolver;
-    private final ObjectCreationExpr wrappedNode;
-    private final TypeDeclaration superTypeDeclaration;
-    private final String name = "Anonymous-" + UUID.randomUUID();
-
-    public JavaParserAnonymousClassDeclaration(ObjectCreationExpr wrappedNode,
-                                               TypeSolver typeSolver) {
-        this.typeSolver = typeSolver;
-        this.wrappedNode = wrappedNode;
-        superTypeDeclaration =
-                JavaParserFactory.getContext(wrappedNode.getParentNode().get(), typeSolver)
-                        .solveType(wrappedNode.getType().getName().getId(), typeSolver)
-                        .getCorrespondingDeclaration();
-    }
-
-    public TypeDeclaration getSuperTypeDeclaration() {
-        return superTypeDeclaration;
-    }
-
-    public <T extends Node> List<T> findMembersOfKind(final Class<T> memberClass) {
-        return wrappedNode
-                .getAnonymousClassBody()
-                .get()
-                .stream()
-                .filter(node -> memberClass.isAssignableFrom(node.getClass()))
-                .map(node -> (T) node)
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    protected ReferenceType object() {
-        return new ReferenceTypeImpl(typeSolver.solveType(Object.class.getCanonicalName()), typeSolver);
-    }
-
-    @Override
-    public ReferenceType getSuperClass() {
-        return new ReferenceTypeImpl(superTypeDeclaration.asReferenceType(), typeSolver);
-    }
-
-    @Override
-    public List<ReferenceType> getInterfaces() {
-        return
-                superTypeDeclaration
-                        .asReferenceType().getAncestors()
-                        .stream()
-                        .filter(type -> type.getTypeDeclaration().isInterface())
-                        .collect(Collectors.toList());
-    }
-
-    @Override
-    public List<ConstructorDeclaration> getConstructors() {
-        return
-                findMembersOfKind(com.github.javaparser.ast.body.ConstructorDeclaration.class)
-                        .stream()
-                        .map(ctor -> new JavaParserConstructorDeclaration(this, ctor, typeSolver))
-                        .collect(Collectors.toList());
-    }
-
-    @Override
-    public AccessLevel accessLevel() {
-        return AccessLevel.PRIVATE;
-    }
-
-    @Override
-    public List<ReferenceType> getAncestors() {
-        return
-                ImmutableList.
-                        <ReferenceType>builder()
-                        .add(getSuperClass())
-                        .addAll(superTypeDeclaration.asReferenceType().getAncestors())
-                        .build();
-    }
-
-    @Override
-    public List<FieldDeclaration> getAllFields() {
-
-        List<JavaParserFieldDeclaration> myFields =
-                findMembersOfKind(com.github.javaparser.ast.body.FieldDeclaration.class)
-                        .stream()
-                        .flatMap(field ->
-                                field.getVariables().stream()
-                                        .map(variable -> new JavaParserFieldDeclaration(variable,
-                                                typeSolver)))
-                        .collect(Collectors.toList());
-
-        List<FieldDeclaration> superClassFields =
-                getSuperClass().getTypeDeclaration().getAllFields();
-
-        List<FieldDeclaration> interfaceFields =
-                getInterfaces().stream()
-                        .flatMap(inteface -> inteface.getTypeDeclaration().getAllFields().stream())
-                        .collect(Collectors.toList());
-
-        return
-                ImmutableList
-                        .<FieldDeclaration>builder()
-                        .addAll(myFields)
-                        .addAll(superClassFields)
-                        .addAll(interfaceFields)
-                        .build();
-    }
-
-    @Override
-    public Set<MethodDeclaration> getDeclaredMethods() {
-        return
-                findMembersOfKind(com.github.javaparser.ast.body.MethodDeclaration.class)
-                        .stream()
-                        .map(method -> new JavaParserMethodDeclaration(method, typeSolver))
-                        .collect(Collectors.toSet());
-    }
-
-    @Override
-    public boolean isAssignableBy(Type type) {
-        return false;
-    }
-
-    @Override
-    public boolean isAssignableBy(ReferenceTypeDeclaration other) {
-        return false;
-    }
-
-    @Override
-    public boolean hasDirectlyAnnotation(String qualifiedName) {
-        return false;
-    }
-
-    @Override
-    public String getPackageName() {
-        return Helper.getPackageName(wrappedNode);
-    }
-
-    @Override
-    public String getClassName() {
-        return Helper.getClassName("", wrappedNode);
-    }
-
-    @Override
-    public String getQualifiedName() {
-        String containerName = Helper.containerName(getParentNode(wrappedNode));
-        if (containerName.isEmpty()) {
-            return getName();
-        } else {
-            return containerName + "." + getName();
-        }
-    }
-
-    @Override
-    public Set<ReferenceTypeDeclaration> internalTypes() {
-        return
-                findMembersOfKind(com.github.javaparser.ast.body.TypeDeclaration.class)
-                        .stream()
-                        .map(typeMember -> JavaParserFacade.get(typeSolver).getTypeDeclaration(typeMember))
-                        .collect(Collectors.toSet());
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public List<TypeParameterDeclaration> getTypeParameters() {
-        return Lists.newArrayList();
-    }
-
-    @Override
-    public Optional<ReferenceTypeDeclaration> containerType() {
-        throw new UnsupportedOperationException("containerType is not supported for " + this.getClass().getCanonicalName());
-    }
+  private final TypeSolver typeSolver;
+  private final ObjectCreationExpr wrappedNode;
+  private final TypeDeclaration superTypeDeclaration;
+  private final String name = "Anonymous-" + UUID.randomUUID();
+
+  public JavaParserAnonymousClassDeclaration(ObjectCreationExpr wrappedNode,
+                                             TypeSolver typeSolver) {
+    this.typeSolver = typeSolver;
+    this.wrappedNode = wrappedNode;
+    superTypeDeclaration =
+        JavaParserFactory.getContext(wrappedNode.getParentNode().get(), typeSolver)
+                         .solveType(wrappedNode.getType().getName().getId(), typeSolver)
+                         .getCorrespondingDeclaration();
+  }
+
+  public TypeDeclaration getSuperTypeDeclaration() {
+    return superTypeDeclaration;
+  }
+
+  public <T extends Node> List<T> findMembersOfKind(final Class<T> memberClass) {
+    return wrappedNode
+        .getAnonymousClassBody()
+        .get()
+        .stream()
+        .filter(node -> memberClass.isAssignableFrom(node.getClass()))
+        .map(node -> (T) node)
+        .collect(Collectors.toList());
+  }
+
+  @Override
+  protected ReferenceType object() {
+    return new ReferenceTypeImpl(typeSolver.solveType(Object.class.getCanonicalName()), typeSolver);
+  }
+
+  @Override
+  public ReferenceType getSuperClass() {
+    return new ReferenceTypeImpl(superTypeDeclaration.asReferenceType(), typeSolver);
+  }
+
+  @Override
+  public List<ReferenceType> getInterfaces() {
+    return
+        superTypeDeclaration
+            .asReferenceType().getAncestors()
+            .stream()
+            .filter(type -> type.getTypeDeclaration().isInterface())
+            .collect(Collectors.toList());
+  }
+
+  @Override
+  public List<ConstructorDeclaration> getConstructors() {
+    return
+        findMembersOfKind(com.github.javaparser.ast.body.ConstructorDeclaration.class)
+            .stream()
+            .map(ctor -> new JavaParserConstructorDeclaration(this, ctor, typeSolver))
+            .collect(Collectors.toList());
+  }
+
+  @Override
+  public AccessLevel accessLevel() {
+    return AccessLevel.PRIVATE;
+  }
+
+  @Override
+  public List<ReferenceType> getAncestors() {
+    return
+        ImmutableList.
+            <ReferenceType>builder()
+            .add(getSuperClass())
+            .addAll(superTypeDeclaration.asReferenceType().getAncestors())
+            .build();
+  }
+
+  @Override
+  public List<FieldDeclaration> getAllFields() {
+
+    List<JavaParserFieldDeclaration> myFields =
+        findMembersOfKind(com.github.javaparser.ast.body.FieldDeclaration.class)
+            .stream()
+            .flatMap(field ->
+                         field.getVariables().stream()
+                              .map(variable -> new JavaParserFieldDeclaration(variable,
+                                                                              typeSolver)))
+            .collect(Collectors.toList());
+
+    List<FieldDeclaration> superClassFields =
+        getSuperClass().getTypeDeclaration().getAllFields();
+
+    List<FieldDeclaration> interfaceFields =
+        getInterfaces().stream()
+                       .flatMap(inteface -> inteface.getTypeDeclaration().getAllFields().stream())
+                       .collect(Collectors.toList());
+
+    return
+        ImmutableList
+        .<FieldDeclaration>builder()
+        .addAll(myFields)
+        .addAll(superClassFields)
+        .addAll(interfaceFields)
+        .build();
+  }
+
+  @Override
+  public Set<MethodDeclaration> getDeclaredMethods() {
+    return
+        findMembersOfKind(com.github.javaparser.ast.body.MethodDeclaration.class)
+            .stream()
+            .map(method -> new JavaParserMethodDeclaration(method, typeSolver))
+            .collect(Collectors.toSet());
+  }
+
+  @Override
+  public boolean isAssignableBy(Type type) {
+    return false;
+  }
+
+  @Override
+  public boolean isAssignableBy(ReferenceTypeDeclaration other) {
+    return false;
+  }
+
+  @Override
+  public boolean hasDirectlyAnnotation(String qualifiedName) {
+    return false;
+  }
+
+  @Override
+  public String getPackageName() {
+    return Helper.getPackageName(wrappedNode);
+  }
+
+  @Override
+  public String getClassName() {
+    return Helper.getClassName("", wrappedNode);
+  }
+
+  @Override
+  public String getQualifiedName() {
+    String containerName = Helper.containerName(getParentNode(wrappedNode));
+    if (containerName.isEmpty()) {
+      return getName();
+    } else {
+      return containerName + "." + getName();
+    }
+  }
+
+  @Override
+  public Set<ReferenceTypeDeclaration> internalTypes() {
+    return
+        findMembersOfKind(com.github.javaparser.ast.body.TypeDeclaration.class)
+            .stream()
+            .map(typeMember -> JavaParserFacade.get(typeSolver).getTypeDeclaration(typeMember))
+            .collect(Collectors.toSet());
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  @Override
+  public List<TypeParameterDeclaration> getTypeParameters() {
+    return Lists.newArrayList();
+  }
+
+  @Override
+  public Optional<ReferenceTypeDeclaration> containerType() {
+    throw new UnsupportedOperationException("containerType is not supported for " + this.getClass().getCanonicalName());
+  }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java
index 7c199f4271..b7acdfd7c0 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserClassDeclaration.java
@@ -114,7 +114,7 @@ public List<FieldDeclaration> getAllFields() {
         }
 
         ClassDeclaration superclass = (ClassDeclaration) this.getSuperClass().getTypeDeclaration();
-        if (superclass != this)
+        if (superclass!=this)
             fields.addAll(superclass.getAllFields());
 
         getInterfaces().forEach(interf -> interf.getTypeDeclaration().getAllFields().forEach(f -> {
@@ -338,7 +338,7 @@ public Set<ReferenceTypeDeclaration> internalTypes() {
         Set<ReferenceTypeDeclaration> res = new HashSet<>();
         for (BodyDeclaration member : this.wrappedNode.getMembers()) {
             if (member instanceof com.github.javaparser.ast.body.TypeDeclaration) {
-                res.add(JavaParserFacade.get(typeSolver).getTypeDeclaration((com.github.javaparser.ast.body.TypeDeclaration) member));
+                res.add(JavaParserFacade.get(typeSolver).getTypeDeclaration((com.github.javaparser.ast.body.TypeDeclaration)member));
             }
         }
         return res;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserConstructorDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserConstructorDeclaration.java
index 8144b255ca..1c34e4c114 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserConstructorDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserConstructorDeclaration.java
@@ -69,7 +69,7 @@ public String getName() {
     public com.github.javaparser.ast.body.ConstructorDeclaration getWrappedNode() {
         return wrappedNode;
     }
-
+    
     @Override
     public AccessLevel accessLevel() {
         return Helper.toAccessLevel(wrappedNode.getModifiers());
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java
index d90bc4e185..fb858f9a46 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserEnumDeclaration.java
@@ -327,7 +327,7 @@ public Set<ReferenceTypeDeclaration> internalTypes() {
         Set<ReferenceTypeDeclaration> res = new HashSet<>();
         for (BodyDeclaration member : this.wrappedNode.getMembers()) {
             if (member instanceof com.github.javaparser.ast.body.TypeDeclaration) {
-                res.add(JavaParserFacade.get(typeSolver).getTypeDeclaration((com.github.javaparser.ast.body.TypeDeclaration) member));
+                res.add(JavaParserFacade.get(typeSolver).getTypeDeclaration((com.github.javaparser.ast.body.TypeDeclaration)member));
             }
         }
         return res;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java
index 5f8585e5c7..7c50127bb1 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserInterfaceDeclaration.java
@@ -279,7 +279,7 @@ public Set<ReferenceTypeDeclaration> internalTypes() {
         Set<ReferenceTypeDeclaration> res = new HashSet<>();
         for (BodyDeclaration member : this.wrappedNode.getMembers()) {
             if (member instanceof com.github.javaparser.ast.body.TypeDeclaration) {
-                res.add(JavaParserFacade.get(typeSolver).getTypeDeclaration((com.github.javaparser.ast.body.TypeDeclaration) member));
+                res.add(JavaParserFacade.get(typeSolver).getTypeDeclaration((com.github.javaparser.ast.body.TypeDeclaration)member));
             }
         }
         return res;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeAdapter.java
index 0634b6f9f3..97d1ab67c2 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeAdapter.java
@@ -113,7 +113,7 @@ public SymbolReference<TypeDeclaration> solveType(String name, TypeSolver typeSo
 
     public Optional<ReferenceTypeDeclaration> containerType() {
         Optional<Node> parent = wrappedNode.getParentNode();
-        return parent.isPresent() ?
+        return parent.isPresent() ? 
                 Optional.of(JavaParserFactory.toTypeDeclaration(parent.get(), typeSolver)) :
                 Optional.empty();
     }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java
index 1e0c5a956e..07559699f5 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserTypeParameter.java
@@ -119,7 +119,7 @@ public TypeParametrizable getContainer() {
         if (parentNode instanceof com.github.javaparser.ast.body.ClassOrInterfaceDeclaration) {
             com.github.javaparser.ast.body.ClassOrInterfaceDeclaration jpTypeDeclaration = (com.github.javaparser.ast.body.ClassOrInterfaceDeclaration) parentNode;
             return JavaParserFacade.get(typeSolver).getTypeDeclaration(jpTypeDeclaration);
-        } else if (parentNode instanceof com.github.javaparser.ast.body.ConstructorDeclaration) {
+        } else if (parentNode instanceof com.github.javaparser.ast.body.ConstructorDeclaration){
             com.github.javaparser.ast.body.ConstructorDeclaration jpConstructorDeclaration = (com.github.javaparser.ast.body.ConstructorDeclaration) parentNode;
             Optional<ClassOrInterfaceDeclaration> jpTypeDeclaration = jpConstructorDeclaration.getAncestorOfType(com.github.javaparser.ast.body.ClassOrInterfaceDeclaration.class);
             if (jpTypeDeclaration.isPresent()) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java
index d3b81f290a..9fb72da547 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistClassDeclaration.java
@@ -175,7 +175,7 @@ public SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> ar
         Predicate<CtMethod> staticOnlyCheck = m -> !staticOnly || (staticOnly && Modifier.isStatic(m.getModifiers()));
         for (CtMethod method : ctClass.getDeclaredMethods()) {
             boolean isSynthetic = method.getMethodInfo().getAttribute(SyntheticAttribute.tag) != null;
-            boolean isNotBridge = (method.getMethodInfo().getAccessFlags() & AccessFlag.BRIDGE) == 0;
+            boolean isNotBridge =  (method.getMethodInfo().getAccessFlags() & AccessFlag.BRIDGE) == 0;
             if (method.getName().equals(name) && !isSynthetic && isNotBridge && staticOnlyCheck.test(method)) {
                 candidates.add(new JavassistMethodDeclaration(method, typeSolver));
             }
@@ -248,7 +248,7 @@ public boolean isTypeParameter() {
 
     @Override
     public List<FieldDeclaration> getAllFields() {
-        return javassistTypeDeclarationAdapter.getDeclaredFields();
+      return javassistTypeDeclarationAdapter.getDeclaredFields();
     }
 
     @Override
@@ -339,7 +339,7 @@ public AccessLevel accessLevel() {
 
     @Override
     public List<ConstructorDeclaration> getConstructors() {
-        return javassistTypeDeclarationAdapter.getConstructors();
+      return javassistTypeDeclarationAdapter.getConstructors();
     }
 
     @Override
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java
index b4027581f7..fc16528bc7 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistFactory.java
@@ -28,57 +28,57 @@
  */
 public class JavassistFactory {
 
-    public static Type typeUsageFor(CtClass ctClazz, TypeSolver typeSolver) {
-        try {
-            if (ctClazz.isArray()) {
-                return new ArrayType(typeUsageFor(ctClazz.getComponentType(), typeSolver));
-            } else if (ctClazz.isPrimitive()) {
-                if (ctClazz.getName().equals("void")) {
-                    return VoidType.INSTANCE;
-                } else {
-                    return PrimitiveType.byName(ctClazz.getName());
-                }
-            } else {
-                if (ctClazz.isInterface()) {
-                    return new ReferenceTypeImpl(new JavassistInterfaceDeclaration(ctClazz, typeSolver),
-                            typeSolver);
-                } else if (ctClazz.isEnum()) {
-                    return new ReferenceTypeImpl(new JavassistEnumDeclaration(ctClazz, typeSolver),
-                            typeSolver);
-                } else {
-                    return new ReferenceTypeImpl(new JavassistClassDeclaration(ctClazz, typeSolver),
-                            typeSolver);
-                }
-            }
-        } catch (NotFoundException e) {
-            throw new RuntimeException(e);
+  public static Type typeUsageFor(CtClass ctClazz, TypeSolver typeSolver) {
+    try {
+      if (ctClazz.isArray()) {
+        return new ArrayType(typeUsageFor(ctClazz.getComponentType(), typeSolver));
+      } else if (ctClazz.isPrimitive()) {
+        if (ctClazz.getName().equals("void")) {
+          return VoidType.INSTANCE;
+        } else {
+          return PrimitiveType.byName(ctClazz.getName());
         }
-    }
-
-    public static ReferenceTypeDeclaration toTypeDeclaration(CtClass ctClazz, TypeSolver typeSolver) {
+      } else {
         if (ctClazz.isInterface()) {
-            return new JavassistInterfaceDeclaration(ctClazz, typeSolver);
+          return new ReferenceTypeImpl(new JavassistInterfaceDeclaration(ctClazz, typeSolver),
+              typeSolver);
         } else if (ctClazz.isEnum()) {
-            return new JavassistEnumDeclaration(ctClazz, typeSolver);
-        } else if (ctClazz.isAnnotation()) {
-            throw new UnsupportedOperationException("CtClass of annotation not yet supported");
-        } else if (ctClazz.isArray()) {
-            throw new IllegalArgumentException("This method should not be called passing an array");
+          return new ReferenceTypeImpl(new JavassistEnumDeclaration(ctClazz, typeSolver),
+              typeSolver);
         } else {
-            return new JavassistClassDeclaration(ctClazz, typeSolver);
+          return new ReferenceTypeImpl(new JavassistClassDeclaration(ctClazz, typeSolver),
+              typeSolver);
         }
+      }
+    } catch (NotFoundException e) {
+      throw new RuntimeException(e);
     }
+  }
 
-    static AccessLevel modifiersToAccessLevel(final int modifiers) {
-        if (Modifier.isPublic(modifiers)) {
-            return AccessLevel.PUBLIC;
-        } else if (Modifier.isProtected(modifiers)) {
-            return AccessLevel.PROTECTED;
-        } else if (Modifier.isPrivate(modifiers)) {
-            return AccessLevel.PRIVATE;
-        } else {
-            return AccessLevel.PACKAGE_PROTECTED;
-        }
+  public static ReferenceTypeDeclaration toTypeDeclaration(CtClass ctClazz, TypeSolver typeSolver) {
+    if (ctClazz.isInterface()) {
+      return new JavassistInterfaceDeclaration(ctClazz, typeSolver);
+    } else if (ctClazz.isEnum()) {
+      return new JavassistEnumDeclaration(ctClazz, typeSolver);
+    } else if (ctClazz.isAnnotation()) {
+      throw new UnsupportedOperationException("CtClass of annotation not yet supported");
+    } else if (ctClazz.isArray()) {
+      throw new IllegalArgumentException("This method should not be called passing an array");
+    } else {
+      return new JavassistClassDeclaration(ctClazz, typeSolver);
+    }
+  }
+
+  static AccessLevel modifiersToAccessLevel(final int modifiers) {
+    if (Modifier.isPublic(modifiers)) {
+      return AccessLevel.PUBLIC;
+    } else if (Modifier.isProtected(modifiers)) {
+      return AccessLevel.PROTECTED;
+    } else if (Modifier.isPrivate(modifiers)) {
+      return AccessLevel.PRIVATE;
+    } else {
+      return AccessLevel.PACKAGE_PROTECTED;
     }
+  }
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java
index a63139881c..9570c33d2d 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistInterfaceDeclaration.java
@@ -107,7 +107,7 @@ public SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> ar
         Predicate<CtMethod> staticOnlyCheck = m -> !staticOnly || (staticOnly && Modifier.isStatic(m.getModifiers()));
         for (CtMethod method : ctClass.getDeclaredMethods()) {
             boolean isSynthetic = method.getMethodInfo().getAttribute(SyntheticAttribute.tag) != null;
-            boolean isNotBridge = (method.getMethodInfo().getAccessFlags() & AccessFlag.BRIDGE) == 0;
+            boolean isNotBridge =  (method.getMethodInfo().getAccessFlags() & AccessFlag.BRIDGE) == 0;
             if (method.getName().equals(name) && !isSynthetic && isNotBridge && staticOnlyCheck.test(method)) {
                 candidates.add(new JavassistMethodDeclaration(method, typeSolver));
             }
@@ -146,7 +146,7 @@ public boolean isAssignableBy(Type type) {
 
     @Override
     public List<FieldDeclaration> getAllFields() {
-        return javassistTypeDeclarationAdapter.getDeclaredFields();
+      return javassistTypeDeclarationAdapter.getDeclaredFields();
     }
 
     @Override
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapter.java
index 3ae8db3a72..7ea5df0694 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistTypeDeclarationAdapter.java
@@ -29,65 +29,65 @@
  */
 public class JavassistTypeDeclarationAdapter {
 
-    private CtClass ctClass;
-    private TypeSolver typeSolver;
+  private CtClass ctClass;
+  private TypeSolver typeSolver;
 
-    public JavassistTypeDeclarationAdapter(CtClass ctClass, TypeSolver typeSolver) {
-        this.ctClass = ctClass;
-        this.typeSolver = typeSolver;
-    }
+  public JavassistTypeDeclarationAdapter(CtClass ctClass, TypeSolver typeSolver) {
+    this.ctClass = ctClass;
+    this.typeSolver = typeSolver;
+  }
 
-    public Set<MethodDeclaration> getDeclaredMethods() {
-        return Arrays.stream(ctClass.getDeclaredMethods())
-                .map(m -> new JavassistMethodDeclaration(m, typeSolver)).collect(Collectors.toSet());
-    }
+  public Set<MethodDeclaration> getDeclaredMethods() {
+    return Arrays.stream(ctClass.getDeclaredMethods())
+        .map(m -> new JavassistMethodDeclaration(m, typeSolver)).collect(Collectors.toSet());
+  }
 
-    public List<ConstructorDeclaration> getConstructors() {
-        return Arrays.stream(ctClass.getConstructors())
-                .map(m -> new JavassistConstructorDeclaration(m, typeSolver)).collect(Collectors.toList());
-    }
+  public List<ConstructorDeclaration> getConstructors() {
+    return Arrays.stream(ctClass.getConstructors())
+        .map(m -> new JavassistConstructorDeclaration(m, typeSolver)).collect(Collectors.toList());
+  }
 
-    public List<FieldDeclaration> getDeclaredFields() {
-        List<FieldDeclaration> fieldDecls = new ArrayList<>();
-        collectDeclaredFields(ctClass, fieldDecls);
-        return fieldDecls;
-    }
+  public List<FieldDeclaration> getDeclaredFields() {
+    List<FieldDeclaration> fieldDecls = new ArrayList<>();
+    collectDeclaredFields(ctClass, fieldDecls);
+    return fieldDecls;
+  }
 
-    private void collectDeclaredFields(CtClass ctClass, List<FieldDeclaration> fieldDecls) {
-        if (ctClass != null) {
-            Arrays.stream(ctClass.getDeclaredFields())
-                    .forEach(f -> fieldDecls.add(new JavassistFieldDeclaration(f, typeSolver)));
-            try {
-                collectDeclaredFields(ctClass.getSuperclass(), fieldDecls);
-            } catch (NotFoundException e) {
-                // We'll stop here
-            }
-        }
+  private void collectDeclaredFields(CtClass ctClass, List<FieldDeclaration> fieldDecls) {
+    if (ctClass != null) {
+      Arrays.stream(ctClass.getDeclaredFields())
+          .forEach(f -> fieldDecls.add(new JavassistFieldDeclaration(f, typeSolver)));
+      try {
+        collectDeclaredFields(ctClass.getSuperclass(), fieldDecls);
+      } catch (NotFoundException e) {
+        // We'll stop here
+      }
     }
+  }
 
-    public List<TypeParameterDeclaration> getTypeParameters() {
-        if (null == ctClass.getGenericSignature()) {
-            return Collections.emptyList();
-        } else {
-            try {
-                SignatureAttribute.ClassSignature classSignature =
-                        SignatureAttribute.toClassSignature(ctClass.getGenericSignature());
-                return Arrays.<SignatureAttribute.TypeParameter>stream(classSignature.getParameters())
-                        .map((tp) -> new JavassistTypeParameter(tp, JavassistFactory.toTypeDeclaration(ctClass, typeSolver), typeSolver))
-                        .collect(Collectors.toList());
-            } catch (BadBytecode badBytecode) {
-                throw new RuntimeException(badBytecode);
-            }
-        }
+  public List<TypeParameterDeclaration> getTypeParameters() {
+    if (null == ctClass.getGenericSignature()) {
+      return Collections.emptyList();
+    } else {
+      try {
+        SignatureAttribute.ClassSignature classSignature =
+            SignatureAttribute.toClassSignature(ctClass.getGenericSignature());
+        return Arrays.<SignatureAttribute.TypeParameter>stream(classSignature.getParameters())
+            .map((tp) -> new JavassistTypeParameter(tp, JavassistFactory.toTypeDeclaration(ctClass, typeSolver), typeSolver))
+            .collect(Collectors.toList());
+      } catch (BadBytecode badBytecode) {
+        throw new RuntimeException(badBytecode);
+      }
     }
+  }
 
-    public Optional<ReferenceTypeDeclaration> containerType() {
-        try {
-            return ctClass.getDeclaringClass() == null ?
-                    Optional.empty() :
-                    Optional.of(JavassistFactory.toTypeDeclaration(ctClass.getDeclaringClass(), typeSolver));
-        } catch (NotFoundException e) {
-            throw new RuntimeException(e);
-        }
+  public Optional<ReferenceTypeDeclaration> containerType() {
+    try {
+      return ctClass.getDeclaringClass() == null ?
+          Optional.empty() :
+          Optional.of(JavassistFactory.toTypeDeclaration(ctClass.getDeclaringClass(), typeSolver));
+    } catch (NotFoundException e) {
+      throw new RuntimeException(e);
     }
+  }
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java
index bad2a43493..3ab7ba0efa 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/javassistmodel/JavassistUtils.java
@@ -130,7 +130,7 @@ static Type signatureTypeToType(SignatureAttribute.Type signatureType, TypeSolve
                     internalNameToCanonicalName(typeName));
             return new ReferenceTypeImpl(typeDeclaration, typeParameters, typeSolver);
         } else if (signatureType instanceof SignatureAttribute.TypeVariable) {
-            SignatureAttribute.TypeVariable typeVariableSignature = (SignatureAttribute.TypeVariable) signatureType;
+            SignatureAttribute.TypeVariable typeVariableSignature = (SignatureAttribute.TypeVariable)signatureType;
             Optional<TypeParameterDeclaration> typeParameterDeclarationOpt = typeParametrizable.findTypeParameter(typeVariableSignature.getName());
             if (!typeParameterDeclarationOpt.isPresent()) {
                 throw new UnsolvedSymbolException("Unable to solve TypeVariable " + typeVariableSignature);
@@ -150,8 +150,8 @@ private static Type objectTypeArgumentToType(SignatureAttribute.ObjectType typeA
         String typeName = typeArgument.jvmTypeName();
         Optional<Type> type = getGenericParameterByName(typeName, typeParametrizable);
         return type.orElseGet(() -> new ReferenceTypeImpl(
-                typeSolver.solveType(internalNameToCanonicalName(typeName)),
-                typeSolver));
+            typeSolver.solveType(internalNameToCanonicalName(typeName)),
+            typeSolver));
     }
 
     private static Optional<Type> getGenericParameterByName(String typeName, TypeParametrizable typeParametrizable) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeImpl.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeImpl.java
index 5dc4ca2300..8e474fe29f 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeImpl.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/model/typesystem/ReferenceTypeImpl.java
@@ -118,7 +118,7 @@ public boolean isAssignableBy(Type other) {
                 }
             }
             return false;
-        } else if (other.isConstraint()) {
+        } else if (other.isConstraint()){
             return isAssignableBy(other.asConstraintType().getBound());
         } else if (other.isWildcard()) {
             if (this.getQualifiedName().equals(Object.class.getCanonicalName())) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassAdapter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassAdapter.java
index 9c21330a32..7ed5bccb7c 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassAdapter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassAdapter.java
@@ -180,7 +180,7 @@ public List<ConstructorDeclaration> getConstructors() {
                 .map(m -> new ReflectionConstructorDeclaration(m, typeSolver))
                 .collect(Collectors.toList());
     }
-
+    
     public Optional<ReferenceTypeDeclaration> containerType() {
         Class<?> declaringClass = clazz.getDeclaringClass();
         return declaringClass == null ?
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java
index cebb7c9e6f..c8d920e52f 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionClassDeclaration.java
@@ -135,7 +135,7 @@ public SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> ar
         List<MethodDeclaration> methods = new ArrayList<>();
         Predicate<Method> staticFilter = m -> !staticOnly || (staticOnly && Modifier.isStatic(m.getModifiers()));
         for (Method method : Arrays.stream(clazz.getDeclaredMethods()).filter((m) -> m.getName().equals(name)).filter(staticFilter)
-                .sorted(new MethodComparator()).collect(Collectors.toList())) {
+                                    .sorted(new MethodComparator()).collect(Collectors.toList())) {
             if (method.isBridge() || method.isSynthetic()) continue;
             MethodDeclaration methodDeclaration = new ReflectionMethodDeclaration(method, typeSolver);
             methods.add(methodDeclaration);
@@ -323,7 +323,7 @@ public List<ConstructorDeclaration> getConstructors() {
     public Optional<ReferenceTypeDeclaration> containerType() {
         return reflectionClassAdapter.containerType();
     }
-
+    
     @Override
     public Set<ReferenceTypeDeclaration> internalTypes() {
         return Arrays.stream(this.clazz.getDeclaredClasses())
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclaration.java
index 448cc828a4..0a150e9519 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionEnumDeclaration.java
@@ -33,159 +33,159 @@
  */
 public class ReflectionEnumDeclaration extends AbstractTypeDeclaration implements EnumDeclaration {
 
-    ///
-    /// Fields
-    ///
-
-    private Class<?> clazz;
-    private TypeSolver typeSolver;
-    private ReflectionClassAdapter reflectionClassAdapter;
-
-    ///
-    /// Constructors
-    ///
-
-    public ReflectionEnumDeclaration(Class<?> clazz, TypeSolver typeSolver) {
-        if (clazz == null) {
-            throw new IllegalArgumentException("Class should not be null");
-        }
-        if (clazz.isInterface()) {
-            throw new IllegalArgumentException("Class should not be an interface");
-        }
-        if (clazz.isPrimitive()) {
-            throw new IllegalArgumentException("Class should not represent a primitive class");
-        }
-        if (clazz.isArray()) {
-            throw new IllegalArgumentException("Class should not be an array");
+  ///
+  /// Fields
+  ///
+
+  private Class<?> clazz;
+  private TypeSolver typeSolver;
+  private ReflectionClassAdapter reflectionClassAdapter;
+
+  ///
+  /// Constructors
+  ///
+
+  public ReflectionEnumDeclaration(Class<?> clazz, TypeSolver typeSolver) {
+    if (clazz == null) {
+      throw new IllegalArgumentException("Class should not be null");
+    }
+    if (clazz.isInterface()) {
+      throw new IllegalArgumentException("Class should not be an interface");
+    }
+    if (clazz.isPrimitive()) {
+      throw new IllegalArgumentException("Class should not represent a primitive class");
+    }
+    if (clazz.isArray()) {
+      throw new IllegalArgumentException("Class should not be an array");
+    }
+    if (!clazz.isEnum()) {
+      throw new IllegalArgumentException("Class should be an enum");
+    }
+    this.clazz = clazz;
+    this.typeSolver = typeSolver;
+    this.reflectionClassAdapter = new ReflectionClassAdapter(clazz, typeSolver, this);
+  }
+
+  ///
+  /// Public methods
+  ///
+
+  @Override
+  public AccessLevel accessLevel() {
+    return ReflectionFactory.modifiersToAccessLevel(this.clazz.getModifiers());
+  }
+  
+  @Override
+  public Optional<ReferenceTypeDeclaration> containerType() {
+      return reflectionClassAdapter.containerType();
+  }
+
+  @Override
+  public String getPackageName() {
+    if (clazz.getPackage() != null) {
+      return clazz.getPackage().getName();
+    }
+    return null;
+  }
+
+  @Override
+  public String getClassName() {
+    String canonicalName = clazz.getCanonicalName();
+    if (canonicalName != null && getPackageName() != null) {
+      return canonicalName.substring(getPackageName().length() + 1, canonicalName.length());
+    }
+    return null;
+  }
+
+  @Override
+  public String getQualifiedName() {
+    return clazz.getCanonicalName();
+  }
+
+  @Override
+  public List<ReferenceType> getAncestors() {
+    return reflectionClassAdapter.getAncestors();
+  }
+
+  @Override
+  public FieldDeclaration getField(String name) {
+    return reflectionClassAdapter.getField(name);
+  }
+
+  @Override
+  public boolean hasField(String name) {
+    return reflectionClassAdapter.hasField(name);
+  }
+
+  @Override
+  public List<FieldDeclaration> getAllFields() {
+    return reflectionClassAdapter.getAllFields();
+  }
+
+  @Override
+  public Set<MethodDeclaration> getDeclaredMethods() {
+    return reflectionClassAdapter.getDeclaredMethods();
+  }
+
+  @Override
+  public boolean isAssignableBy(Type type) {
+    return reflectionClassAdapter.isAssignableBy(type);
+  }
+
+  @Override
+  public boolean isAssignableBy(ReferenceTypeDeclaration other) {
+    return isAssignableBy(new ReferenceTypeImpl(other, typeSolver));
+  }
+
+  @Override
+  public boolean hasDirectlyAnnotation(String qualifiedName) {
+    return reflectionClassAdapter.hasDirectlyAnnotation(qualifiedName);
+  }
+
+  @Override
+  public String getName() {
+    return clazz.getSimpleName();
+  }
+
+  @Override
+  public List<TypeParameterDeclaration> getTypeParameters() {
+    return reflectionClassAdapter.getTypeParameters();
+  }
+
+  public SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> parameterTypes, boolean staticOnly) {
+    return ReflectionMethodResolutionLogic.solveMethod(name, parameterTypes, staticOnly,
+            typeSolver,this, clazz);
+  }
+
+  public Optional<MethodUsage> solveMethodAsUsage(String name, List<Type> parameterTypes, TypeSolver typeSolver, Context invokationContext, List<Type> typeParameterValues) {
+    Optional<MethodUsage> res = ReflectionMethodResolutionLogic.solveMethodAsUsage(name, parameterTypes, typeSolver, invokationContext,
+            typeParameterValues, this, clazz);
+    if (res.isPresent()) {
+        // We have to replace method type typeParametersValues here
+        InferenceContext inferenceContext = new InferenceContext(MyObjectProvider.INSTANCE);
+        MethodUsage methodUsage = res.get();
+        int i = 0;
+        List<Type> parameters = new LinkedList<>();
+        for (Type actualType : parameterTypes) {
+            Type formalType = methodUsage.getParamType(i);
+            // We need to replace the class type typeParametersValues (while we derive the method ones)
+
+            parameters.add(inferenceContext.addPair(formalType, actualType));
+            i++;
         }
-        if (!clazz.isEnum()) {
-            throw new IllegalArgumentException("Class should be an enum");
-        }
-        this.clazz = clazz;
-        this.typeSolver = typeSolver;
-        this.reflectionClassAdapter = new ReflectionClassAdapter(clazz, typeSolver, this);
-    }
-
-    ///
-    /// Public methods
-    ///
-
-    @Override
-    public AccessLevel accessLevel() {
-        return ReflectionFactory.modifiersToAccessLevel(this.clazz.getModifiers());
-    }
-
-    @Override
-    public Optional<ReferenceTypeDeclaration> containerType() {
-        return reflectionClassAdapter.containerType();
-    }
-
-    @Override
-    public String getPackageName() {
-        if (clazz.getPackage() != null) {
-            return clazz.getPackage().getName();
-        }
-        return null;
-    }
-
-    @Override
-    public String getClassName() {
-        String canonicalName = clazz.getCanonicalName();
-        if (canonicalName != null && getPackageName() != null) {
-            return canonicalName.substring(getPackageName().length() + 1, canonicalName.length());
-        }
-        return null;
-    }
-
-    @Override
-    public String getQualifiedName() {
-        return clazz.getCanonicalName();
-    }
-
-    @Override
-    public List<ReferenceType> getAncestors() {
-        return reflectionClassAdapter.getAncestors();
-    }
-
-    @Override
-    public FieldDeclaration getField(String name) {
-        return reflectionClassAdapter.getField(name);
-    }
-
-    @Override
-    public boolean hasField(String name) {
-        return reflectionClassAdapter.hasField(name);
-    }
-
-    @Override
-    public List<FieldDeclaration> getAllFields() {
-        return reflectionClassAdapter.getAllFields();
-    }
-
-    @Override
-    public Set<MethodDeclaration> getDeclaredMethods() {
-        return reflectionClassAdapter.getDeclaredMethods();
-    }
-
-    @Override
-    public boolean isAssignableBy(Type type) {
-        return reflectionClassAdapter.isAssignableBy(type);
-    }
-
-    @Override
-    public boolean isAssignableBy(ReferenceTypeDeclaration other) {
-        return isAssignableBy(new ReferenceTypeImpl(other, typeSolver));
-    }
-
-    @Override
-    public boolean hasDirectlyAnnotation(String qualifiedName) {
-        return reflectionClassAdapter.hasDirectlyAnnotation(qualifiedName);
-    }
-
-    @Override
-    public String getName() {
-        return clazz.getSimpleName();
-    }
-
-    @Override
-    public List<TypeParameterDeclaration> getTypeParameters() {
-        return reflectionClassAdapter.getTypeParameters();
-    }
-
-    public SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> parameterTypes, boolean staticOnly) {
-        return ReflectionMethodResolutionLogic.solveMethod(name, parameterTypes, staticOnly,
-                typeSolver, this, clazz);
-    }
-
-    public Optional<MethodUsage> solveMethodAsUsage(String name, List<Type> parameterTypes, TypeSolver typeSolver, Context invokationContext, List<Type> typeParameterValues) {
-        Optional<MethodUsage> res = ReflectionMethodResolutionLogic.solveMethodAsUsage(name, parameterTypes, typeSolver, invokationContext,
-                typeParameterValues, this, clazz);
-        if (res.isPresent()) {
-            // We have to replace method type typeParametersValues here
-            InferenceContext inferenceContext = new InferenceContext(MyObjectProvider.INSTANCE);
-            MethodUsage methodUsage = res.get();
-            int i = 0;
-            List<Type> parameters = new LinkedList<>();
-            for (Type actualType : parameterTypes) {
-                Type formalType = methodUsage.getParamType(i);
-                // We need to replace the class type typeParametersValues (while we derive the method ones)
-
-                parameters.add(inferenceContext.addPair(formalType, actualType));
-                i++;
+        try {
+            Type returnType = inferenceContext.addSingle(methodUsage.returnType());
+            for (int j=0;j<parameters.size();j++) {
+                methodUsage = methodUsage.replaceParamType(j, inferenceContext.resolve(parameters.get(j)));
             }
-            try {
-                Type returnType = inferenceContext.addSingle(methodUsage.returnType());
-                for (int j = 0; j < parameters.size(); j++) {
-                    methodUsage = methodUsage.replaceParamType(j, inferenceContext.resolve(parameters.get(j)));
-                }
-                methodUsage = methodUsage.replaceReturnType(inferenceContext.resolve(returnType));
-                return Optional.of(methodUsage);
-            } catch (ConfilictingGenericTypesException e) {
-                return Optional.empty();
-            }
-        } else {
-            return res;
+            methodUsage = methodUsage.replaceReturnType(inferenceContext.resolve(returnType));
+            return Optional.of(methodUsage);
+        } catch (ConfilictingGenericTypesException e) {
+            return Optional.empty();
         }
+    } else {
+        return res;
     }
+}
 
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java
index db3f9f0969..44e26d4b3f 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionInterfaceDeclaration.java
@@ -96,7 +96,7 @@ public String getQualifiedName() {
     @Deprecated
     public SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> parameterTypes, boolean staticOnly) {
         return ReflectionMethodResolutionLogic.solveMethod(name, parameterTypes, staticOnly,
-                typeSolver, this, clazz);
+                typeSolver,this, clazz);
     }
 
     @Override
@@ -149,7 +149,7 @@ public Optional<MethodUsage> solveMethodAsUsage(String name, List<Type> paramete
             }
             try {
                 Type returnType = inferenceContext.addSingle(methodUsage.returnType());
-                for (int j = 0; j < parameters.size(); j++) {
+                for (int j=0;j<parameters.size();j++) {
                     methodUsage = methodUsage.replaceParamType(j, inferenceContext.resolve(parameters.get(j)));
                 }
                 methodUsage = methodUsage.replaceReturnType(inferenceContext.resolve(returnType));
@@ -270,7 +270,7 @@ public List<ReferenceType> getInterfacesExtended() {
         }
         return res;
     }
-
+    
     @Override
     public Optional<ReferenceTypeDeclaration> containerType() {
         return reflectionClassAdapter.containerType();
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java
index e8911882b6..3838bfdb52 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionMethodResolutionLogic.java
@@ -44,12 +44,11 @@ class ReflectionMethodResolutionLogic {
 
     static SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> parameterTypes, boolean staticOnly,
                                                           TypeSolver typeSolver, ReferenceTypeDeclaration scopeType,
-                                                          Class clazz) {
+                                                          Class clazz){
         List<MethodDeclaration> methods = new ArrayList<>();
         Predicate<Method> staticOnlyCheck = m -> !staticOnly || (staticOnly && Modifier.isStatic(m.getModifiers()));
         for (Method method : clazz.getMethods()) {
-            if (method.isBridge() || method.isSynthetic() || !method.getName().equals(name) || !staticOnlyCheck.test(method))
-                continue;
+            if (method.isBridge() || method.isSynthetic() || !method.getName().equals(name)|| !staticOnlyCheck.test(method)) continue;
             MethodDeclaration methodDeclaration = new ReflectionMethodDeclaration(method, typeSolver);
             methods.add(methodDeclaration);
         }
@@ -61,7 +60,7 @@ static SymbolReference<MethodDeclaration> solveMethod(String name, List<Type> pa
             }
         }
 
-        if (scopeType.getAncestors().isEmpty()) {
+        if (scopeType.getAncestors().isEmpty()){
             ReferenceTypeImpl objectClass = new ReferenceTypeImpl(new ReflectionClassDeclaration(Object.class, typeSolver), typeSolver);
             SymbolReference<MethodDeclaration> ref = MethodResolutionLogic.solveMethodInType(objectClass.getTypeDeclaration(), name, parameterTypes, staticOnly, typeSolver);
             if (ref.isSolved()) {
@@ -94,16 +93,16 @@ static Optional<MethodUsage> solveMethodAsUsage(String name, List<Type> argument
 
         }
 
-        for (ReferenceType ancestor : scopeType.getAncestors()) {
+        for(ReferenceType ancestor : scopeType.getAncestors()){
             SymbolReference<MethodDeclaration> ref = MethodResolutionLogic.solveMethodInType(ancestor.getTypeDeclaration(), name, argumentsTypes, typeSolver);
-            if (ref.isSolved()) {
+            if (ref.isSolved()){
                 MethodDeclaration correspondingDeclaration = ref.getCorrespondingDeclaration();
                 MethodUsage methodUsage = replaceParams(typeParameterValues, ancestor.getTypeDeclaration(), correspondingDeclaration);
                 methods.add(methodUsage);
             }
         }
 
-        if (scopeType.getAncestors().isEmpty()) {
+        if (scopeType.getAncestors().isEmpty()){
             ReferenceTypeImpl objectClass = new ReferenceTypeImpl(new ReflectionClassDeclaration(Object.class, typeSolver), typeSolver);
             SymbolReference<MethodDeclaration> ref = MethodResolutionLogic.solveMethodInType(objectClass.getTypeDeclaration(), name, argumentsTypes, typeSolver);
             if (ref.isSolved()) {
@@ -129,7 +128,7 @@ private static MethodUsage replaceParams(List<Type> typeParameterValues, Referen
         int i = 0;
 
         // Only replace if we have enough values provided
-        if (typeParameterValues.size() == typeParametrizable.getTypeParameters().size()) {
+        if (typeParameterValues.size() == typeParametrizable.getTypeParameters().size()){
             for (TypeParameterDeclaration tp : typeParametrizable.getTypeParameters()) {
                 methodUsage = methodUsage.replaceTypeParameter(tp, typeParameterValues.get(i));
                 i++;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTypeParameter.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTypeParameter.java
index 5e9ddc4ec6..d553b6eded 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTypeParameter.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/reflectionmodel/ReflectionTypeParameter.java
@@ -102,7 +102,7 @@ public String getContainerId() {
             return ((MethodLikeDeclaration) container).getQualifiedSignature();
         }
     }
-
+    
     @Override
     public TypeParametrizable getContainer() {
         return this.container;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/resolution/MethodResolutionLogic.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/resolution/MethodResolutionLogic.java
index 931873957e..f78dfa7c0e 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/resolution/MethodResolutionLogic.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/resolution/MethodResolutionLogic.java
@@ -90,7 +90,7 @@ private static boolean isApplicable(MethodDeclaration method, String name, List<
                 } // else it is already assignable, nothing to do
             } else {
                 if (pos > argumentsTypes.size()) {
-                    return false;
+                  return false;
                 }
                 argumentsTypes = groupVariadicParamValues(argumentsTypes, pos, method.getLastParam().getType());
             }
@@ -183,7 +183,7 @@ private static boolean isAssignableMatchTypeParametersMatchingQName(ReferenceTyp
 
             // In the case of nested parameterizations eg. List<R> <-> List<Integer>
             // we should peel off one layer and ensure R <-> Integer
-            if (expectedParam.isReferenceType() && actualParam.isReferenceType()) {
+            if (expectedParam.isReferenceType() && actualParam.isReferenceType()){
                 ReferenceType r1 = expectedParam.asReferenceType();
                 ReferenceType r2 = actualParam.asReferenceType();
 
@@ -278,7 +278,7 @@ public static boolean isApplicable(MethodUsage method, String name, List<Type> a
             List<TypeParameterDeclaration> typeParameters = method.getDeclaration().getTypeParameters();
             typeParameters.addAll(method.declaringType().getTypeParameters());
 
-            if (expectedType.describe().equals(actualType.describe())) {
+            if (expectedType.describe().equals(actualType.describe())){
                 return true;
             }
 
@@ -292,7 +292,7 @@ public static boolean isApplicable(MethodUsage method, String name, List<Type> a
                 inferTypes(argumentsTypes.get(j), parameterType, derivedValues);
             }
 
-            for (Map.Entry<TypeParameterDeclaration, Type> entry : derivedValues.entrySet()) {
+            for (Map.Entry<TypeParameterDeclaration, Type> entry : derivedValues.entrySet()){
                 TypeParameterDeclaration tp = entry.getKey();
                 expectedTypeWithInference = expectedTypeWithInference.replaceTypeVariables(tp, entry.getValue());
             }
@@ -385,26 +385,26 @@ public static SymbolReference<MethodDeclaration> findMostApplicable(List<MethodD
         }
 
         if (applicableMethods.size() > 1) {
-            List<Integer> nullParamIndexes = new ArrayList<>();
-            for (int i = 0; i < argumentsTypes.size(); i++) {
-                if (argumentsTypes.get(i).isNull()) {
-                    nullParamIndexes.add(i);
+          List<Integer> nullParamIndexes = new ArrayList<>();
+          for (int i = 0; i < argumentsTypes.size(); i++) {
+            if (argumentsTypes.get(i).isNull()) {
+              nullParamIndexes.add(i);
+            }
+          }
+          if (!nullParamIndexes.isEmpty()) {
+            // remove method with array param if a non array exists and arg is null
+            Set<MethodDeclaration> removeCandidates = new HashSet<>();
+            for (Integer nullParamIndex: nullParamIndexes) {
+              for (MethodDeclaration methDecl: applicableMethods) {
+                if (methDecl.getParam(nullParamIndex.intValue()).getType().isArray()) {
+                  removeCandidates.add(methDecl);
                 }
+              }
             }
-            if (!nullParamIndexes.isEmpty()) {
-                // remove method with array param if a non array exists and arg is null
-                Set<MethodDeclaration> removeCandidates = new HashSet<>();
-                for (Integer nullParamIndex : nullParamIndexes) {
-                    for (MethodDeclaration methDecl : applicableMethods) {
-                        if (methDecl.getParam(nullParamIndex.intValue()).getType().isArray()) {
-                            removeCandidates.add(methDecl);
-                        }
-                    }
-                }
-                if (!removeCandidates.isEmpty() && removeCandidates.size() < applicableMethods.size()) {
-                    applicableMethods.removeAll(removeCandidates);
-                }
+            if (!removeCandidates.isEmpty() && removeCandidates.size() < applicableMethods.size()) {
+              applicableMethods.removeAll(removeCandidates);
             }
+          }
         }
         if (applicableMethods.size() == 1) {
             return SymbolReference.solved(applicableMethods.get(0));
@@ -428,26 +428,26 @@ public static SymbolReference<MethodDeclaration> findMostApplicable(List<MethodD
                 }
             }
             if (possibleAmbiguity) {
-                // pick the first exact match if it exists
-                if (!isExactMatch(winningCandidate, argumentsTypes)) {
-                    if (isExactMatch(other, argumentsTypes)) {
-                        winningCandidate = other;
-                    } else {
-                        throw new MethodAmbiguityException("Ambiguous method call: cannot find a most applicable method: " + winningCandidate + ", " + other);
-                    }
+              // pick the first exact match if it exists
+              if (!isExactMatch(winningCandidate, argumentsTypes)) {
+                if (isExactMatch(other, argumentsTypes)) {
+                  winningCandidate = other;
+                } else {
+                  throw new MethodAmbiguityException("Ambiguous method call: cannot find a most applicable method: " + winningCandidate + ", " + other);
                 }
+              }
             }
             return SymbolReference.solved(winningCandidate);
         }
     }
 
     protected static boolean isExactMatch(MethodLikeDeclaration method, List<Type> argumentsTypes) {
-        for (int i = 0; i < method.getNumberOfParams(); i++) {
-            if (!method.getParam(i).getType().equals(argumentsTypes.get(i))) {
-                return false;
-            }
+      for (int i = 0; i < method.getNumberOfParams(); i++) {
+        if (!method.getParam(i).getType().equals(argumentsTypes.get(i))) {
+          return false;
         }
-        return true;
+      }
+      return true;
     }
 
     private static boolean isMoreSpecific(MethodDeclaration methodA, MethodDeclaration methodB, List<Type> argumentTypes, TypeSolver typeSolver) {
@@ -571,15 +571,15 @@ public static SymbolReference<MethodDeclaration> solveMethodInType(TypeDeclarati
         return solveMethodInType(typeDeclaration, name, argumentsTypes, false, typeSolver);
     }
 
-    /**
-     * Replace TypeDeclaration.solveMethod
-     *
-     * @param typeDeclaration
-     * @param name
-     * @param argumentsTypes
-     * @param staticOnly
-     * @return
-     */
+        /**
+         * Replace TypeDeclaration.solveMethod
+         *
+         * @param typeDeclaration
+         * @param name
+         * @param argumentsTypes
+         * @param staticOnly
+         * @return
+         */
     public static SymbolReference<MethodDeclaration> solveMethodInType(TypeDeclaration typeDeclaration,
                                                                        String name, List<Type> argumentsTypes, boolean staticOnly,
                                                                        TypeSolver typeSolver) {
@@ -602,18 +602,18 @@ public static SymbolReference<MethodDeclaration> solveMethodInType(TypeDeclarati
             return ((ReflectionClassDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
         }
         if (typeDeclaration instanceof ReflectionInterfaceDeclaration) {
-            return ((ReflectionInterfaceDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
+          return ((ReflectionInterfaceDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
         }
-        if (typeDeclaration instanceof ReflectionEnumDeclaration) {
+          if (typeDeclaration instanceof ReflectionEnumDeclaration) {
             return ((ReflectionEnumDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
         }
         if (typeDeclaration instanceof JavassistInterfaceDeclaration) {
             return ((JavassistInterfaceDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
         }
         if (typeDeclaration instanceof JavassistClassDeclaration) {
-            return ((JavassistClassDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
+          return ((JavassistClassDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
         }
-        if (typeDeclaration instanceof JavassistEnumDeclaration) {
+          if (typeDeclaration instanceof JavassistEnumDeclaration) {
             return ((JavassistEnumDeclaration) typeDeclaration).solveMethod(name, argumentsTypes, staticOnly);
         }
         throw new UnsupportedOperationException(typeDeclaration.getClass().getCanonicalName());
@@ -652,8 +652,8 @@ private static void inferTypes(Type source, Type target, Map<TypeParameterDeclar
             return;
         }
 
-        if (source.isWildcard() && target.isReferenceType()) {
-            if (source.asWildcard().isBounded()) {
+        if (source.isWildcard() && target.isReferenceType()){
+            if (source.asWildcard().isBounded()){
                 inferTypes(source.asWildcard().getBoundedType(), target, mappings);
             }
             return;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java
index 2860aca3a3..37c2e591e9 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-core/com/github/javaparser/symbolsolver/resolution/typesolvers/JavaParserTypeSolver.java
@@ -43,7 +43,7 @@ public class JavaParserTypeSolver implements TypeSolver {
 
     private Map<String, CompilationUnit> parsedFiles = new HashMap<String, CompilationUnit>();
     private Map<String, List<CompilationUnit>> parsedDirectories = new HashMap<>();
-    private Map<String, ReferenceTypeDeclaration> foundTypes = new HashMap<>();
+    private Map<String, ReferenceTypeDeclaration> foundTypes=new HashMap<>();
 
     public JavaParserTypeSolver(File srcDir) {
         this.srcDir = srcDir;
@@ -100,7 +100,7 @@ public SymbolReference<ReferenceTypeDeclaration> tryToSolveType(String name) {
         // TODO support enums
         // TODO support interfaces
         if (foundTypes.containsKey(name))
-            return SymbolReference.solved(foundTypes.get(name));
+        	return SymbolReference.solved(foundTypes.get(name));
 
         SymbolReference<ReferenceTypeDeclaration> result = tryToSolveTypeUncached(name);
         if (result.isSolved()) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-logic/com/github/javaparser/symbolsolver/logic/InferenceContext.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-logic/com/github/javaparser/symbolsolver/logic/InferenceContext.java
index 5f2873d024..c1ccc62cc6 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-logic/com/github/javaparser/symbolsolver/logic/InferenceContext.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-logic/com/github/javaparser/symbolsolver/logic/InferenceContext.java
@@ -51,6 +51,7 @@ private InferenceVariableType inferenceVariableTypeForTp(TypeParameterDeclaratio
     }
 
     /**
+     *
      * @return the actual with the inference variable inserted
      */
     public Type addPair(Type target, Type actual) {
@@ -77,7 +78,7 @@ private void registerCorrespondance(Type formalType, Type actualType) {
                     ancestors = formalTypeAsReference.getAllAncestors();
                     final String actualParamTypeQname = actualTypeAsReference.getQualifiedName();
                     List<Type> correspondingActualType = ancestors.stream().filter(a -> a.getQualifiedName().equals(actualParamTypeQname)).collect(Collectors.toList());
-                    if (correspondingActualType.isEmpty()) {
+                    if (correspondingActualType.isEmpty()){
                         throw new ConfilictingGenericTypesException(formalType, actualType);
                     }
                     correspondingFormalType = correspondingActualType;
@@ -130,20 +131,20 @@ private void registerCorrespondance(Type formalType, Type actualType) {
                 }
             }
 
-            if (actualType.isReferenceType()) {
-                if (formalType.asWildcard().isBounded()) {
+            if (actualType.isReferenceType()){
+                if (formalType.asWildcard().isBounded()){
                     registerCorrespondance(formalType.asWildcard().getBoundedType(), actualType);
                 }
             }
-        } else if (actualType instanceof InferenceVariableType) {
-            if (formalType instanceof ReferenceType) {
+        } else if (actualType instanceof InferenceVariableType){
+            if (formalType instanceof ReferenceType){
                 ((InferenceVariableType) actualType).registerEquivalentType(formalType);
-            } else if (formalType instanceof InferenceVariableType) {
+            } else if (formalType instanceof InferenceVariableType){
                 ((InferenceVariableType) actualType).registerEquivalentType(formalType);
             }
-        } else if (actualType.isConstraint()) {
+        } else if (actualType.isConstraint()){
             LambdaConstraintType constraintType = actualType.asConstraintType();
-            if (constraintType.getBound() instanceof InferenceVariableType) {
+            if (constraintType.getBound() instanceof InferenceVariableType){
                 ((InferenceVariableType) constraintType.getBound()).registerEquivalentType(formalType);
             }
         } else if (actualType.isPrimitive()) {
@@ -174,7 +175,7 @@ private Type placeInferenceVariables(Type type) {
             return new ArrayType(placeInferenceVariables(type.asArrayType().getComponentType()));
         } else if (type.isNull() || type.isPrimitive() || type.isVoid()) {
             return type;
-        } else if (type.isConstraint()) {
+        } else if (type.isConstraint()){
             return LambdaConstraintType.bound(placeInferenceVariables(type.asConstraintType().getBound()));
         } else if (type instanceof InferenceVariableType) {
             return type;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-logic/com/github/javaparser/symbolsolver/logic/InferenceVariableType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-logic/com/github/javaparser/symbolsolver/logic/InferenceVariableType.java
index 37aafbca37..632c2e2421 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-logic/com/github/javaparser/symbolsolver/logic/InferenceVariableType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-logic/com/github/javaparser/symbolsolver/logic/InferenceVariableType.java
@@ -103,7 +103,7 @@ private Set<Type> concreteEquivalentTypesAlsoIndirectly(Set<InferenceVariableTyp
         Set<Type> result = new HashSet<>();
         result.addAll(inferenceVariableType.equivalentTypes.stream().filter(t -> !t.isTypeVariable() && !(t instanceof InferenceVariableType)).collect(Collectors.toSet()));
         inferenceVariableType.equivalentTypes.stream().filter(t -> t instanceof InferenceVariableType).forEach(t -> {
-            InferenceVariableType ivt = (InferenceVariableType) t;
+            InferenceVariableType ivt = (InferenceVariableType)t;
             if (!considered.contains(ivt)) {
                 result.addAll(concreteEquivalentTypesAlsoIndirectly(considered, ivt));
             }
@@ -124,8 +124,8 @@ public Type equivalentType() {
             return concreteEquivalent.iterator().next();
         }
         Set<Type> notTypeVariables = equivalentTypes.stream()
-                .filter(t -> !t.isTypeVariable() && !hasInferenceVariables(t))
-                .collect(Collectors.toSet());
+                                                    .filter(t -> !t.isTypeVariable() && !hasInferenceVariables(t))
+                                                    .collect(Collectors.toSet());
         if (notTypeVariables.size() == 1) {
             return notTypeVariables.iterator().next();
         } else if (notTypeVariables.size() == 0 && !superTypes.isEmpty()) {
@@ -139,22 +139,22 @@ public Type equivalentType() {
         }
     }
 
-    private boolean hasInferenceVariables(Type type) {
-        if (type instanceof InferenceVariableType) {
+    private boolean hasInferenceVariables(Type type){
+        if (type instanceof InferenceVariableType){
             return true;
         }
 
-        if (type.isReferenceType()) {
+        if (type.isReferenceType()){
             ReferenceType refType = type.asReferenceType();
-            for (Type t : refType.typeParametersValues()) {
-                if (hasInferenceVariables(t)) {
+            for (Type t : refType.typeParametersValues()){
+                if (hasInferenceVariables(t)){
                     return true;
                 }
             }
             return false;
         }
 
-        if (type.isWildcard()) {
+        if (type.isWildcard()){
             Wildcard wildcardType = type.asWildcard();
             return hasInferenceVariables(wildcardType.getBoundedType());
         }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-logic/com/github/javaparser/symbolsolver/logic/ObjectProvider.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-logic/com/github/javaparser/symbolsolver/logic/ObjectProvider.java
index 152acd9c6e..e5c970b3f8 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-logic/com/github/javaparser/symbolsolver/logic/ObjectProvider.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-logic/com/github/javaparser/symbolsolver/logic/ObjectProvider.java
@@ -23,6 +23,5 @@
  */
 public interface ObjectProvider {
     ReferenceType object();
-
     ReferenceType byName(String qname);
 }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/declarations/ReferenceTypeDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/declarations/ReferenceTypeDeclaration.java
index 9875c0e21d..76ae477878 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/declarations/ReferenceTypeDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/declarations/ReferenceTypeDeclaration.java
@@ -39,12 +39,12 @@ default ReferenceTypeDeclaration asReferenceType() {
      * The list of all the ancestors of the current declaration, direct and indirect.
      * This list does not contains duplicates with the exacting same type parameters.
      */
-    default List<ReferenceType> getAllAncestors() {
+    default List<ReferenceType> getAllAncestors() {     
         List<ReferenceType> ancestors = new ArrayList<>();
         // We want to avoid infinite recursion in case of Object having Object as ancestor
-        if (!(Object.class.getCanonicalName().equals(getQualifiedName()))) {
+        if (!(Object.class.getCanonicalName().equals(getQualifiedName()))) {       
             for (ReferenceType ancestor : getAncestors()) {
-                ancestors.add(ancestor);
+                ancestors.add(ancestor);    
                 for (ReferenceType inheritedAncestor : ancestor.getAllAncestors()) {
                     if (!ancestors.contains(inheritedAncestor)) {
                         ancestors.add(inheritedAncestor);
@@ -107,7 +107,7 @@ default boolean hasVisibleField(String name) {
 
     /**
      * Return a list of all fields, either declared in this declaration or inherited.
-     * <p>
+     *
      * Note that they could refer to inherited type variables.
      */
     List<FieldDeclaration> getAllFields();
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/declarations/TypeParameterDeclaration.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/declarations/TypeParameterDeclaration.java
index ff2eec2470..6cd39d0e8d 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/declarations/TypeParameterDeclaration.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/declarations/TypeParameterDeclaration.java
@@ -69,7 +69,7 @@ public String getContainerQualifiedName() {
             public String getContainerId() {
                 return classQName;
             }
-
+            
             @Override
             public TypeParametrizable getContainer() {
                 return null;
@@ -152,7 +152,7 @@ default String getQualifiedName() {
      * The ID of the container. See TypeContainer.getId
      */
     String getContainerId();
-
+    
     /**
      * The TypeParametrizable of the container. Can be either a ReferenceTypeDeclaration or a MethodLikeDeclaration
      */
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/ArrayType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/ArrayType.java
index edd5cad2b0..421bec5a58 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/ArrayType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/ArrayType.java
@@ -86,7 +86,7 @@ public Type getComponentType() {
     public boolean isAssignableBy(Type other) {
         if (other.isArray()) {
             if (baseType.isPrimitive() && other.asArrayType().getComponentType().isPrimitive()) {
-                return baseType.equals(other.asArrayType().getComponentType());
+              return baseType.equals(other.asArrayType().getComponentType());
             }
             return baseType.isAssignableBy(other.asArrayType().getComponentType());
         } else if (other.isNull()) {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/LambdaConstraintType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/LambdaConstraintType.java
index 2853cc8743..43e1547ebe 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/LambdaConstraintType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/LambdaConstraintType.java
@@ -1,6 +1,6 @@
 package com.github.javaparser.symbolsolver.model.typesystem;
 
-public class LambdaConstraintType implements Type {
+public class LambdaConstraintType  implements Type {
     Type bound;
 
     public LambdaConstraintType(Type bound) {
@@ -26,7 +26,7 @@ public LambdaConstraintType asConstraintType() {
         return this;
     }
 
-    public static LambdaConstraintType bound(Type bound) {
+    public static LambdaConstraintType bound(Type bound){
         return new LambdaConstraintType(bound);
     }
 
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveType.java
index 7f5edb2159..c96a99fb4a 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/PrimitiveType.java
@@ -113,7 +113,7 @@ public boolean isAssignableBy(Type other) {
                 }
             }
             return false;
-        } else if (other.isConstraint()) {
+        } else if (other.isConstraint()){
             return this.isAssignableBy(other.asConstraintType().getBound());
         } else {
             return false;
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/ReferenceType.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/ReferenceType.java
index d1cb207e5f..05ff3f4a00 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/ReferenceType.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/ReferenceType.java
@@ -190,7 +190,7 @@ public Type replaceTypeVariables(TypeParameterDeclaration tpToReplace, Type repl
         }
 
         List<Type> values = result.typeParametersValues();
-        if (values.contains(tpToReplace)) {
+        if(values.contains(tpToReplace)){
             int index = values.indexOf(tpToReplace);
             values.set(index, replaced);
             return create(result.getTypeDeclaration(), values, typeSolver);
@@ -288,9 +288,9 @@ public List<Type> typeParametersValues() {
     public List<Tuple2<TypeParameterDeclaration, Type>> getTypeParametersMap() {
         List<Tuple2<TypeParameterDeclaration, Type>> typeParametersMap = new ArrayList<>();
         if (!isRawType()) {
-            for (int i = 0; i < typeDeclaration.getTypeParameters().size(); i++) {
-                typeParametersMap.add(new Tuple2<>(typeDeclaration.getTypeParameters().get(0), typeParametersValues().get(i)));
-            }
+	        for (int i = 0; i < typeDeclaration.getTypeParameters().size(); i++) {
+	            typeParametersMap.add(new Tuple2<>(typeDeclaration.getTypeParameters().get(0), typeParametersValues().get(i)));
+	        }
         }
         return typeParametersMap;
     }
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/Type.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/Type.java
index 710c85dfd3..38f490b991 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/Type.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/Type.java
@@ -76,9 +76,7 @@ default boolean isReference() {
     /**
      * Is this a lambda constraint type?
      */
-    default boolean isConstraint() {
-        return false;
-    }
+    default boolean isConstraint() { return false; }
 
     /**
      * Can this be seen as a ReferenceTypeUsage?
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/TypeVariable.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/TypeVariable.java
index 19d413b98e..c18eff6d08 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/TypeVariable.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/TypeVariable.java
@@ -74,7 +74,7 @@ public boolean isPrimitive() {
 
     @Override
     public Type replaceTypeVariables(TypeParameterDeclaration tpToBeReplaced, Type replaced, Map<TypeParameterDeclaration, Type> inferredTypes) {
-        if (tpToBeReplaced.getName().equals(this.typeParameter.getName())) {
+        if(tpToBeReplaced.getName().equals(this.typeParameter.getName())){
             inferredTypes.put(this.asTypeParameter(), replaced);
             return replaced;
         } else {
diff --git a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParametersMap.java b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParametersMap.java
index 9fe399aeed..b73dbc1671 100644
--- a/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParametersMap.java
+++ b/javaparser-symbol-solver-testing/src/test/test_sourcecode/javasymbolsolver_0_6_0/src/java-symbol-solver-model/com/github/javaparser/symbolsolver/model/typesystem/parametrization/TypeParametersMap.java
@@ -112,11 +112,11 @@ public Optional<Type> getValueBySignature(String signature) {
         }
     }
 
-    public List<String> getNames() {
+    public List<String> getNames(){
         return new ArrayList<>(nameToValue.keySet());
     }
 
-    public List<Type> getTypes() {
+    public List<Type> getTypes(){
         return new ArrayList<>(nameToValue.values());
     }
 
diff --git a/jmlparser-jml-tests/build.gradle.kts b/jmlparser-jml-tests/build.gradle.kts
new file mode 100644
index 0000000000..18b9f49212
--- /dev/null
+++ b/jmlparser-jml-tests/build.gradle.kts
@@ -0,0 +1,15 @@
+plugins {
+    id("buildlogic.java-conventions")
+}
+
+dependencies {
+    testImplementation(project(":jmlparser-core"))
+    testImplementation(project(":jmlparser-symbol-solver-core"))
+    testImplementation(project(":jmlparser-core-testing"))
+    testImplementation(project(":jmlparser-core-testing-bdd"))
+    testImplementation(project(":jmlparser-symbol-solver-testing"))
+    testImplementation(libs.bundles.testing)
+    testRuntimeOnly(libs.bundles.testing.runtime)
+}
+
+description = "io.github.jmltoolkit:jmlparser-jml-tests"
diff --git a/jmlparser-jml-tests/pom.xml b/jmlparser-jml-tests/pom.xml
index 92008ffdcd..e8cb4e63ec 100644
--- a/jmlparser-jml-tests/pom.xml
+++ b/jmlparser-jml-tests/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>jmlparser-parent</artifactId>
 		<groupId>io.github.jmltoolkit</groupId>
-		<version>3.28.0-J8.0-K10.1-SNAPSHOT</version>
+		<version>3.28.0-J8.0-K13.4</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/jmlparser-jml-tests/src/test/java/com/github/jml/FragmentTest.java b/jmlparser-jml-tests/src/test/java/com/github/jml/FragmentTest.java
index 783984cc0d..5a9a3a92ed 100644
--- a/jmlparser-jml-tests/src/test/java/com/github/jml/FragmentTest.java
+++ b/jmlparser-jml-tests/src/test/java/com/github/jml/FragmentTest.java
@@ -8,10 +8,8 @@
 import java.io.FileNotFoundException;
 import java.util.Arrays;
 import java.util.stream.Stream;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Assumptions;
-import org.junit.jupiter.api.DynamicTest;
-import org.junit.jupiter.api.TestFactory;
+
+import org.junit.jupiter.api.*;
 
 /**
  * @author Alexander Weigl
@@ -53,6 +51,11 @@ private void testClassLevel(File f) throws FileNotFoundException {
         Assertions.assertTrue(r.isSuccessful());
     }
 
+    @Test
+    void test() throws FileNotFoundException {
+        testClassLevel(new File("/home/weigl/work/javaparser/jmlparser-jml-tests/src/test/resources/fragments/decl_1153518565.txt"));
+    }
+
     private boolean ignorableMessages(String message) {
         return message.contains("model_program")
                 || message.contains("recommends")
diff --git a/pom.xml b/pom.xml
index 814bfaa4ce..0af1dd01b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 	<groupId>io.github.jmltoolkit</groupId>
 	<artifactId>jmlparser-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.28.0-J8.0-K10.1-SNAPSHOT</version>
+	<version>3.28.0-J8.0-K13.4</version>
 
 	<url>https://github.com/wadoon/jmlparser</url>
 	<inceptionYear>2021</inceptionYear>
@@ -180,9 +180,9 @@
 	</properties>
 
 	<scm>
-		<connection>scm:git:git://github.com/wadoon/jmlparser.git</connection>
-		<developerConnection>scm:git:git@github.com:wadoon/jmlparser.git</developerConnection>
-		<url>https://github.com/wadoon/jmlparser.git</url>
+		<connection>scm:git:git://github.com/jmltoolkit/jmlparser.git</connection>
+		<developerConnection>scm:git:git@github.com:jmltoolkit/jmlparser.git</developerConnection>
+		<url>https://github.com/jmltoolkit/jmlparser</url>
 		<tag>HEAD</tag>
 	</scm>
 
@@ -202,6 +202,11 @@
 			<id>gitlab-maven</id>
 			<url>https://git.key-project.org/api/v4/projects/35/packages/maven</url>
 		</snapshotRepository>
+
+		<site>
+			<id>${project.build.directory}-site</id>
+			<url>file://${project.build.outputDirectory}/s</url>
+		</site>
 	</distributionManagement>
 
 	<build>
@@ -210,13 +215,30 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<!--    <source>${java.version}</source>
-						<target>${java.version}</target> -->
 					<release>${java.version}</release>
 					<useIncrementalCompilation>false</useIncrementalCompilation>
 				</configuration>
 			</plugin>
-
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.6.2</version>
+				<executions>
+					<execution>
+						<id>enforce-maven</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<requireMavenVersion>
+									<version>3.6.3</version>
+								</requireMavenVersion>
+							</rules>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
@@ -233,7 +255,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.15.0</version>
+					<version>3.15.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -253,7 +275,7 @@
 				<plugin>
 					<groupId>org.sonatype.plugins</groupId>
 					<artifactId>nexus-staging-maven-plugin</artifactId>
-					<version>1.6.7</version>
+					<version>1.7.0</version>
 					<extensions>true</extensions>
 					<configuration>
 						<serverId>ossrh</serverId>
@@ -294,41 +316,11 @@
 						</execution>
 					</executions>
 				</plugin>
-				<!-- NEW: Plugin for publishing to Maven Central -->
-				<!--<plugin>
-					<groupId>org.sonatype.central</groupId>
-					<artifactId>central-publishing-maven-plugin</artifactId>
-					<version>0.10.0</version>
-					<extensions>true</extensions>
-					<configuration>
-						<publishingServerId>central-portal</publishingServerId>
-						<excludeArtifacts>
-							<excludeArtifact>com.github.javaparser:javaparser-core-testing</excludeArtifact>
-							<excludeArtifact>com.github.javaparser:javaparser-core-testing-bdd</excludeArtifact>
-							<excludeArtifact>com.github.javaparser:javaparser-symbol-solver-testing</excludeArtifact>
-							<excludeArtifact>com.github.javaparser:javaparser-core-metamodel-generator</excludeArtifact>
-						</excludeArtifacts>
-					</configuration>
-			</plugin>
-				<plugin>
-					<groupId>org.sonatype.central</groupId>
-					<artifactId>central-publishing-maven-plugin</artifactId>
-					<version>0.10.0</version>
-					<extensions>true</extensions>
-					<configuration>
-						<publishingServerId>central</publishingServerId>
-						 Automatic publication after validation ->
-						<autoPublish>true</autoPublish>
-						 Wait until the publication is effective ->
-						<waitUntil>published</waitUntil>
-						- Readable name to identify the deployment ->
-						<deploymentName>${project.artifactId}-${project.version}</deploymentName>
-					</configuration>
-				</plugin>-->
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>3.4.0</version>
+					<version>3.5.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -387,31 +379,51 @@
 						<failOnError>false</failOnError>
 					</configuration>
 				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-scm-publish-plugin</artifactId>
+					<version>3.1.0</version>
+					<configuration>
+						<pubScmUrl>
+							scm:git:git@github.com:jmltoolkit/jmltoolkit.github.io.git
+						</pubScmUrl>
+						<scmBranch>gh-pages</scmBranch>
+					</configuration>
+				</plugin>
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
 					<version>3.21.0</version>
 				</plugin>
+
 				<plugin>
 					<groupId>biz.aQute.bnd</groupId>
 					<artifactId>bnd-maven-plugin</artifactId>
-                    <version>7.2.1</version>
+					<version>7.2.1</version>
 				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-report-plugin</artifactId>
+					<version>3.5.5</version>
+					<configuration>
+						<aggregate>true</aggregate>
+						<!--also set this to link to generated source reports-->
+						<linkXRef>true</linkXRef>
+					</configuration>
+				</plugin>
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>3.5.5</version>
-                    <configuration>
-                        <aggregate>true</aggregate>
-                        <!--also set this to link to generated source reports-->
-                        <linkXRef>true</linkXRef>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>3.5.5</version>
+					<configuration>
+						<testFailureIgnore>true</testFailureIgnore>
+					</configuration>
 				</plugin>
+
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>exec-maven-plugin</artifactId>
@@ -425,7 +437,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>templating-maven-plugin</artifactId>
-                    <version>3.1.0</version>
+					<version>3.1.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -435,7 +447,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>versions-maven-plugin</artifactId>
-                    <version>2.21.0</version>
+					<version>2.21.0</version>
 					<configuration>
 						<generateBackupPoms>false</generateBackupPoms>
 					</configuration>
@@ -462,7 +474,7 @@
 					<groupId>com.diffplug.spotless</groupId>
 					<artifactId>spotless-maven-plugin</artifactId>
 					<!-- This is the last version with Java 8 support -->
-					<version>3.2.1</version>
+					<version>3.3.0</version>
 					<configuration>
 						<java>
 							<!-- google-java-format, but better: see https://github.com/palantir/palantir-java-format -->
@@ -486,11 +498,46 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-report-plugin</artifactId>
-				<version>3.5.5</version>
 				<configuration>
 					<aggregate>true</aggregate>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
+				<version>3.9.0</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<reportSets>
+					<reportSet>
+						<id>non-aggregate</id>
+						<configuration>
+							<!-- Specific configuration for the aggregate report -->
+							<sourcepath>${project.build.sourceDirectory}/../generated</sourcepath>
+						</configuration>
+						<reports>
+							<report>javadoc</report>
+						</reports>
+					</reportSet>
+					<reportSet>
+						<inherited>false</inherited>
+						<id>aggregate</id>
+						<configuration>
+							<!-- Specific configuration for the aggregate report -->
+							<sourcepath>${project.build.sourceDirectory}/../generated</sourcepath>
+						</configuration>
+						<reports>
+							<report>aggregate</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</reporting>
 
@@ -513,15 +560,15 @@
 				<version>33.5.0-jre</version>
 			</dependency>
 			<dependency>
-                <groupId>com.google.truth</groupId>
-                <artifactId>truth</artifactId>
-                <version>1.4.5</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
+				<groupId>com.google.truth</groupId>
+				<artifactId>truth</artifactId>
+				<version>1.4.5</version>
+				<scope>test</scope>
+			</dependency>
+			<dependency>
 				<groupId>org.checkerframework</groupId>
 				<artifactId>checker-qual</artifactId>
-                <version>3.53.1</version>
+				<version>3.53.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.hamcrest</groupId>
@@ -529,6 +576,12 @@
 				<version>3.0</version>
 				<scope>test</scope>
 			</dependency>
+			<dependency>
+				<groupId>com.google.truth</groupId>
+				<artifactId>truth</artifactId>
+				<version>1.4.5</version>
+				<scope>test</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.junit</groupId>
 				<artifactId>junit-bom</artifactId>
diff --git a/readme.md b/readme.md
index 1cf87315e6..f51f0e28ad 100644
--- a/readme.md
+++ b/readme.md
@@ -34,14 +34,14 @@ Just add the following to your maven configuration or tailor to your own depende
 <dependency>
     <groupId>org.key-project.proofjava</groupId>
     <artifactId>javaparser-symbol-solver-core</artifactId>
-    <version>3.28.0-K10.1-SNAPSHOT</version>
+    <version>3.28.0-J8.0-K13.4</version>
 </dependency>
 ```
 
 **Gradle**:
 
 ```
-implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.28.0-K10.1-SNAPSHOT'
+implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.28.0-J8.0-K13.4'
 ```
 
 Since Version 3.5.10, the JavaParser project includes the JavaSymbolSolver.
@@ -56,14 +56,14 @@ Using the dependency above will add both JavaParser and JavaSymbolSolver to your
 <dependency>
     <groupId>org.key-project.proofjava</groupId>
     <artifactId>javaparser-core</artifactId>
-    <version>3.28.0-K10.1-SNAPSHOT</version>
+    <version>3.28.0-J8.0-K13.4</version>
 </dependency>
 ```
 
 **Gradle**:
 
 ```
-implementation 'com.github.javaparser:javaparser-core:3.28.0-K10.1-SNAPSHOT'
+implementation 'com.github.javaparser:javaparser-core:3.28.0-J8.0-K13.4'
 ```
 
 ## How To Compile Sources
@@ -90,7 +90,7 @@ The `run_metamodel_generator.sh` script will rebuild the metamodel,
 which is used by the code generators which are run by `run_core_generators.sh`
 Make sure that `javaparser-core` at least compiles before you run these.
 
-**Note**: for Eclipse IDE follow the steps described in the wiki: https://github.com/javaparser/javaparser/wiki/Eclipse-Project-Setup-Guide
+**Note**: for Eclipse IDE follow the steps described in the [wiki](https://github.com/javaparser/javaparser/wiki/Eclipse-Project-Setup-Guide).
 
 
 ## Structural Changes
@@ -103,26 +103,15 @@ Make sure that `javaparser-core` at least compiles before you run these.
   For method this is already covered by the grammar.
 
 * New Statements
-    * KeyMetaConstructStatement
-    * StatementSV
-    * KeyMethodCallStatement
-    * KeyMethodBodyStatement
-    * KeyTransactionStatement
-    * KeyMergePointStatement
-    * KeyLoopScope
-    * KeyCatchAllStatement
-    * KeyExecStatement
-    * KeyMethodCallStatement
-* Expression
-    * UnaryExpression
-        * KeyGeneralEscapeExpression
-        * KeyCreateObjectSV
-        * KeyLengthReferenceSV
-    * Cast expression allows schema type variables and meta constructs.
-    * PrimaryExpression
-        * PassiveExpression
-        * KeyStaticEvaluate
-        * IsStaticMC
+    * [`KeyMetaConstruct`](javaparser-core/src/main/java/com/github/javaparser/ast/key/sv/KeyMetaConstruct.java)
+    * [`KeyMethodCallStatement`](javaparser-core/src/main/java/com/github/javaparser/ast/key/KeyMethodCallStatement.java)
+    * [`KeyMethodBodyStatement`]()
+    * [`KeyTransactionStatement`]()
+    * [`KeyMergePointStatement`]()
+    * [`KeyLoopScopeBlock`]()
+    * [`KeyCatchAllStatement`]()
+    * [`KeyExecStatement`]()
+    * [`KeyMethodCallStatement`]()
 * Primitive types
     * `\bigint`
     * `\real`
diff --git a/run_core_generators.sh b/run_core_generators.sh
deleted file mode 100755
index 2e6b066618..0000000000
--- a/run_core_generators.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-# Runs all the code generators.
-# If the node structure was changed, run_metamodel_generator.sh first!
-
-# Remember current directory
-pushd javaparser-core-generators
-
-# Generate code
-../mvnw --errors --show-version -B clean package -P run-generators -DskipTests
-
-# Go back to previous directory
-popd
-
-# Fresh code has been generated in core, so rebuild the whole thing again.
-./mvnw --errors --show-version -B clean compile -DskipTests
-if [ "$?" -ne 0 ]; then
-    exit 1
-fi
-
-# Format code to make diff more understandable
-./mvnw spotless:apply
diff --git a/run_core_metamodel_generator.sh b/run_core_metamodel_generator.sh
deleted file mode 100755
index c053209f7c..0000000000
--- a/run_core_metamodel_generator.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-# Rebuilds the metamodel based on the nodes in javaparser-core
-
-# We introspect the nodes in javaparser-core, so we need an update build of it. 
-./mvnw --errors --show-version -B clean install -DskipTests
-if [ "$?" -ne 0 ]; then
-    exit 1
-fi
-
-# Remember current directory
-pushd javaparser-core-metamodel-generator
-
-# Generate code
-../mvnw --errors --show-version -B clean package -P run-generators -DskipTests
-
-# Go back to previous directory
-popd
-
-# Fresh code has been generated in core, so rebuild the whole thing again.
-./mvnw --errors --show-version -B clean install -DskipTests
-if [ "$?" -ne 0 ]; then
-    exit 1
-fi
diff --git a/run_release_perform.sh b/run_release_perform.sh
deleted file mode 100755
index 2b5c3955df..0000000000
--- a/run_release_perform.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-## Exit script if any non-zero exit code (nb: some redundancy with checks below - may remove if exit code checks are thorough)
-set -e
-## Disallow references to non-existent environment variables
-set -u
-## Exit on invalid/bad pipes
-set -o pipefail
-
-#TODO --- Replace all mentions of Bintray
-
-echo "[JavaParser]"
-echo "[JavaParser]"
-echo "[JavaParser]: See also: http://github.com/javaparser/javaparser/wiki/Release-Process"
-echo "[JavaParser]"
-echo "[JavaParser]: ##"
-echo "[JavaParser]: ##"
-echo "[JavaParser]: ## TODO --- Replace all mentions of Bintray"
-echo "[JavaParser]: ##"
-echo "[JavaParser]: ##"
-echo "[JavaParser]"
-echo "[JavaParser]: Before running this script, ensure that your settings.xml file (~/.m/setings.xml) has been updated with your Bintray credentials."
-echo "[JavaParser]: - A template settings.xml file can be found within the dev-files directory."
-echo "[JavaParser]: - You must also be added to the JavaParser organisation on Bintray for releases to be successful."
-echo "[JavaParser]:"
-echo "[JavaParser]: Note that the git repo uses the SSH URL to pull/push -- this, therefore, requires you to have setup SSH access to your GitHub account."
-echo "[JavaParser]:"
-echo "[JavaParser]: Once the release is complete and has been uploaded to Bintray, there is still an oppotunity for it to be deleted via the Bintray website."
-echo "[JavaParser]: - To push it to Maven Central (therefore be available to users), it must be synchronised via the Bintray web UI."
-echo "[JavaParser]: - When successful, Bintray will report 'Last Sync Status: Successfully synced and closed repo.'"
-echo "[JavaParser]:"
-echo "[JavaParser]: - Note that you MUST have sonatype credentials that can be entered into the Bintray web UI to trigger the sync"
-echo "[JavaParser]:   (the same credentials used to login to http://oss.sonatype.org/ )."
-echo "[JavaParser]:"
-echo "[JavaParser]: - Note that you MUST have your sonatype account linked to the JavaParser coordinates, to trigger the sync FROM Bintray TO Sonatype/Maven Central."
-echo "[JavaParser]:   This can be done by having an existing committer open a ticket at https://issues.sonatype.org/ ."
-echo "[JavaParser]"
-echo "[JavaParser]"
-
-set -x
-
-./mvnw --errors --show-version \
-  -Darguments="-DskipTests" release:perform
-
-if [ "$?" -ne 0 ]; then
-  echo "Error when performing release:perform"
-  exit 10;
-fi
-
-set +x
diff --git a/run_release_prepare.sh b/run_release_prepare.sh
deleted file mode 100755
index e2d9d3b4a0..0000000000
--- a/run_release_prepare.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-
-echo "[JavaParser]"
-echo "[JavaParser]"
-echo "[JavaParser]: See also: http://github.com/javaparser/javaparser/wiki/Release-Process"
-echo "[JavaParser]:"
-echo "[JavaParser]: This script pulls the latest code from your default tracking branch (set automatically when using git clone)."
-echo "[JavaParser]: This script then performs the maven release:prepare."
-echo "[JavaParser]: - Note that release:prepare requires user input to define the new and next version."
-echo "[JavaParser]:"
-echo "[JavaParser]: Once the release has been prepared, several commits will have been created locally but not pushed (configured within pom.xml)."
-echo "[JavaParser]: These locally created commits (AND THE NEW TAG!) must then be manually pushed."
-echo "[JavaParser]:"
-echo "[JavaParser]: - The release prepare can undone either via release:revert -- but note that this will create new revert commits."
-echo "[JavaParser]:"
-echo "[JavaParser]: - Alternatively, it can be undone by manually deleting the tag and resetting the current branch's head."
-echo "[JavaParser]:   (e.g. git reset --hard HEAD^3 to go back three commits, or git reset --hard <SHA>)."
-echo "[JavaParser]:   You may also need to manually delete pom backup files."
-echo "[JavaParser]:"
-echo "[JavaParser]: - As a last resort, you can delete your local copy and clone the repo again."
-echo "[JavaParser]"
-echo "[JavaParser]"
-
-set -x
-
-git pull
-
-./mvnw --errors --show-version clean
-if [ "$?" -ne 0 ]; then
-  echo "Error when performing clean"
-  exit 1
-fi
-
-./mvnw --errors --show-version --batch-mode \
-  -Darguments="-DskipTests" release:prepare
-
-if [ "$?" -ne 0 ]; then
-  echo "Error when performing release:prepare"
-  exit 1
-fi
-
-set +x
-
-echo "[JavaParser]"
-echo "[JavaParser]"
-echo "[JavaParser]: Assuming the release:prepare is successful, you MUST now push the changes."
-echo "[JavaParser]: - Specifically, release:perform requires the newly created tag to have been pushed."
-echo "[JavaParser]"
-echo "[JavaParser]: This can be achieved using: \`git push --follow-tags\`."
-echo "[JavaParser]: Follow tags will push any tags associated with the current head commit."
-echo "[JavaParser]: Alternatively, you can push the tag itself using \`git push <repo-name> <tag-name>\`."
-echo "[JavaParser]"
-echo "[JavaParser]"
diff --git a/run_release_prepare_non-interactive.sh b/run_release_prepare_non-interactive.sh
deleted file mode 100755
index b7e758e8e3..0000000000
--- a/run_release_prepare_non-interactive.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/env bash
-
-## Exit script if any non-zero exit code (nb: some redundancy with checks below - may remove if exit code checks are thorough)
-set -e
-## Disallow references to non-existent environment variables
-set -u
-## Exit on invalid/bad pipes
-set -o pipefail
-
-
-echo "[JavaParser]"
-echo "[JavaParser]"
-echo "[JavaParser]: See also: http://github.com/javaparser/javaparser/wiki/Release-Process"
-echo "[JavaParser]:"
-echo "[JavaParser]: This script pulls the latest code from your default tracking branch (set automatically when using git clone)."
-echo "[JavaParser]: This script then performs the maven release:prepare."
-echo "[JavaParser]: - Note that release:prepare requires user input to define the new and next version."
-echo "[JavaParser]:"
-echo "[JavaParser]: Once the release has been prepared, several commits will have been created locally but not pushed (configured within pom.xml)."
-echo "[JavaParser]: These locally created commits (AND THE NEW TAG!) must then be manually pushed."
-echo "[JavaParser]:"
-echo "[JavaParser]: - The release prepare can undone either via release:revert -- but note that this will create new revert commits."
-echo "[JavaParser]:"
-echo "[JavaParser]: - Alternatively, it can be undone by manually deleting the tag and resetting the current branch's head."
-echo "[JavaParser]:   (e.g. git reset --hard HEAD^3 to go back three commits, or git reset --hard <SHA>)."
-echo "[JavaParser]:   You may also need to manually delete pom backup files."
-echo "[JavaParser]:"
-echo "[JavaParser]: - As a last resort, you can delete your local copy and clone the repo again."
-echo "[JavaParser]"
-echo "[JavaParser]"
-
-
-## TODO: Consider the ability to pass toggles for running tests (or not)
-## TODO: Consider the ability to pass toggles for doing a dry-run (or not)
-if [ "$#" -ne 2 ]; then
-  echo "Usage: $0 <release-version> <new-development-version>" >&2
-  echo "Example: $0 3.24.0 3.24.1-SNAPSHOT" >&2
-  exit 1
-fi
-
-## Pass arguments into readable variable names
-release_version=$1
-next_development_snapshot_version=$2
-
-## Use a standard version for the git tag of each release:
-git_tag="javaparser-parent-${release_version}"
-
-
-echo "[JavaParser]"
-echo "[JavaParser] ================================================================"
-echo "[JavaParser]: PREPARING RELEASE"
-echo "[JavaParser]:            Release Version: ${release_version}"
-echo "[JavaParser]:            Release Git Tag: ${git_tag}"
-echo "[JavaParser]:      Next Snapshot Version: ${next_development_snapshot_version} "
-echo "[JavaParser] ================================================================"
-echo "[JavaParser]"
-
-
-
-set -x
-
-
-## Start the release from a clean start
-./mvnw --errors --show-version clean
-
-if [ "$?" -ne 0 ]; then
-  echo "Error when performing clean"
-  exit 102
-fi
-
-
-## Do a non-interactive release, using values passed as script arguments
-## Note: The flag `-Darguments` is used to pass arguments to submodules
-./mvnw --errors --show-version --batch-mode \
-  -Darguments="-DskipTests" release:prepare \
-    -Dtag="${git_tag}" \
-    -DreleaseVersion="${release_version}" \
-    -DdevelopmentVersion="${next_development_snapshot_version}"
-
-if [ "$?" -ne 0 ]; then
-  echo "Error when performing release:prepare"
-  exit 103
-fi
-
-
-set +x
-
-echo "[JavaParser]"
-echo "[JavaParser]"
-echo "[JavaParser]: Assuming the release:prepare is successful, you MUST now push the changes."
-echo "[JavaParser]: - Specifically, release:perform requires the newly created tag to have been pushed."
-echo "[JavaParser]"
-echo "[JavaParser]: This can be achieved using: \`git push --follow-tags\`."
-echo "[JavaParser]: Follow tags will push any tags associated with the current head commit."
-echo "[JavaParser]: Alternatively, you can push the tag itself using \`git push <repo-name> <tag-name>\`."
-echo "[JavaParser]"
-echo "[JavaParser]"
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000000..624b259399
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,43 @@
+pluginManagement {
+    // Include 'plugins build' to define convention plugins.
+    includeBuild("build-logic")
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "jmlparser-parent"
+include(":jmlparser-jml-tests")
+include(":javaparser-key-testing")
+include(":jmlparser-core-serialization")
+include(":jmlparser-core-testing")
+include(":jmlparser-core-testing-bdd")
+include(":jmlparser-core-metamodel-generator")
+include(":jmlparser-core-generators")
+include(":jmlparser-core")
+include(":jmlparser-symbol-solver-core")
+include(":jmlparser-symbol-solver-testing")
+
+project(":jmlparser-core-serialization").projectDir = file("javaparser-core-serialization")
+project(":jmlparser-core-testing").projectDir = file("javaparser-core-testing")
+project(":jmlparser-core-testing-bdd").projectDir = file("javaparser-core-testing-bdd")
+project(":jmlparser-core-metamodel-generator").projectDir = file("javaparser-core-metamodel-generator")
+project(":jmlparser-core-generators").projectDir = file("javaparser-core-generators")
+project(":jmlparser-core").projectDir = file("javaparser-core")
+project(":jmlparser-symbol-solver-core").projectDir = file("javaparser-symbol-solver-core")
+project(":jmlparser-symbol-solver-testing").projectDir = file("javaparser-symbol-solver-testing")
+
+
+include(":tools:stat")
+include(":tools:lint")
+include(":tools:smt")
+include(":tools:prettyprinting")
+include(":tools:utils")
+include(":tools:wd")
+include(":tools:redux")
+include(":tools:xpath")
+include(":tools:cli")
+include(":tools:lsp")
+include(":tools:web")
+include(":tools:jml2java")
diff --git a/tools/.gitattributes b/tools/.gitattributes
new file mode 100644
index 0000000000..097f9f98d9
--- /dev/null
+++ b/tools/.gitattributes
@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 0000000000..1ddeda8004
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,44 @@
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
+# Ignore Gradle build output directory
+build
diff --git a/tools/LICENSE b/tools/LICENSE
new file mode 100644
index 0000000000..f288702d2f
--- /dev/null
+++ b/tools/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/tools/README.md b/tools/README.md
new file mode 100644
index 0000000000..b6faf6c350
--- /dev/null
+++ b/tools/README.md
@@ -0,0 +1,2 @@
+# jml-tools
+Tools for the processing of JML based on the jml-parser
diff --git a/tools/cli/build.gradle.kts b/tools/cli/build.gradle.kts
new file mode 100644
index 0000000000..3cf40c94d8
--- /dev/null
+++ b/tools/cli/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    id("standard-kotlin")
+}
+
+dependencies {
+    implementation(libs.clickt)
+    implementation(project(":jmlparser-core"))
+    implementation(project(":tools:wd"))
+    implementation(project(":tools:xpath"))
+    implementation(project(":tools:prettyprinting"))
+    implementation(project(":tools:lint"))
+    implementation(project(":tools:stat"))
+    implementation(project(":tools:jml2java"))
+}
diff --git a/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/J2JCommand.kt b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/J2JCommand.kt
new file mode 100644
index 0000000000..eb3a39f7b1
--- /dev/null
+++ b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/J2JCommand.kt
@@ -0,0 +1,30 @@
+package io.github.jmltoolkit.cli
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.arguments.multiple
+import com.github.ajalt.clikt.parameters.options.default
+import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.parameters.types.file
+import java.io.File
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (09.04.23)
+ */
+class J2JCommand :
+    CliktCommand("jml2java") {
+    override fun help(context: Context): String =
+        "Submit usage for a given customer and subscription, accepts one usage item"
+
+    private val outputFolder by option("-o", "--output", help = "Output folder of the Java Files")
+        .file()
+        .default(File("out"))
+
+    private val jjbmcMode by option("jjbmc", "JBMC mode")
+    private val files by argument("FILES").file().multiple()
+    override fun run() {
+        TODO("Not yet implemented")
+    }
+}
diff --git a/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/LintCommand.kt b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/LintCommand.kt
new file mode 100644
index 0000000000..2ed9945ff9
--- /dev/null
+++ b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/LintCommand.kt
@@ -0,0 +1,19 @@
+package io.github.jmltoolkit.cli
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (09.04.23)
+ */
+class LintCommand :
+    CliktCommand(name = "lint") {
+    override fun help(context: Context): String =
+        "Submit usage for a given customer and subscription, accepts one usage item"
+
+
+    override fun run() {
+        TODO("Not yet implemented")
+    }
+}
diff --git a/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/Main.kt b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/Main.kt
new file mode 100644
index 0000000000..9bcfea2e83
--- /dev/null
+++ b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/Main.kt
@@ -0,0 +1,135 @@
+package io.github.jmltoolkit.cli
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.main
+import com.github.ajalt.clikt.core.subcommands
+import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.arguments.multiple
+import com.github.ajalt.clikt.parameters.options.default
+import com.github.ajalt.clikt.parameters.options.flag
+import com.github.ajalt.clikt.parameters.options.multiple
+import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.parameters.types.file
+import com.github.ajalt.clikt.parameters.types.int
+import com.github.javaparser.JavaParser
+import com.github.javaparser.ParseResult
+import com.github.javaparser.ParserConfiguration
+import com.github.javaparser.Problem
+import com.github.javaparser.ast.CompilationUnit
+import com.github.javaparser.ast.Node
+import io.github.jmltoolkit.lint.JmlLintingConfig
+import io.github.jmltoolkit.lint.JmlLintingFacade
+import io.github.jmltoolkit.lint.LintProblem
+import java.io.File
+import java.io.FileNotFoundException
+import kotlin.jvm.optionals.getOrNull
+
+fun main(args: Array<String>) {
+    var cmd = Main().subcommands(
+        J2JCommand(), LintCommand(), PrettyPrintCommand(), XPathCommand(),
+        StatCommand(), WdCommand(),
+    )
+    cmd.main(args)
+}
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (12/31/21)
+ */
+class Main : CliktCommand() {
+
+    override fun run() {
+        TODO("Not yet implemented")
+    }
+}
+
+abstract class FileBasedCommand(name: String) : CliktCommand(name) {
+    val activeJmlKeys by option("--jml-key").multiple()
+    val verbose by option("--verbose", "-v", help = "Level of verbosity").int().default(1)
+    val disableJml by option("--disable-jml").flag()
+    val files by argument("").file().multiple()
+
+    fun lint(nodes: Collection<Node>) {
+        val lconfig: JmlLintingConfig = createLinterConfiguration()
+        val problems = JmlLintingFacade(lconfig).lint(nodes)
+        for (problem in problems) {
+            report(problem)
+        }
+    }
+
+    private fun createLinterConfiguration(): JmlLintingConfig {
+        return JmlLintingConfig()
+    }
+
+    fun parse(files: List<File>, config: ParserConfiguration): Collection<CompilationUnit> {
+        val expanded: MutableList<File> = ArrayList(files.size * 10)
+        for (f in files) {
+            if (f.isDirectory) {
+                expandDirectory(expanded, f)
+            } else {
+                expanded.add(f)
+            }
+        }
+
+        return expanded.asSequence().map { parse(it, config) }.map { reportOnError(it) }.filterNotNull().toList()
+    }
+
+    private fun reportOnError(it: ParseResult<CompilationUnit>?): CompilationUnit? {
+        if (it == null) return null
+
+        val result = it.result.getOrNull()
+        if (result != null) return result
+
+        for (problem in it.problems) {
+            report(problem)
+        }
+
+        return null
+    }
+
+
+    private fun expandDirectory(target: MutableCollection<File>, dir: File) {
+        val files = dir.listFiles()
+        if (files != null) {
+            for (file in files) {
+                if (file.isDirectory) {
+                    expandDirectory(target, file)
+                } else {
+                    if (file.name.endsWith(".java")) {
+                        target.add(file)
+                    }
+                }
+            }
+        }
+    }
+
+
+    internal fun parse(file: File, configuration: ParserConfiguration): ParseResult<CompilationUnit>? {
+        val p = JavaParser(configuration)
+        try {
+            return p.parse(file)
+        } catch (e: FileNotFoundException) {
+            report(Problem("File not found", null, e))
+            return null
+        }
+    }
+
+    internal fun createParserConfiguration(
+        activeJmlKeys: List<String> = listOf(),
+        disableJml: Boolean = false
+    ): ParserConfiguration {
+        val config = ParserConfiguration()
+        config.jmlKeys.add(activeJmlKeys)
+        config.setProcessJml(disableJml)
+        return config
+    }
+
+
+    private fun report(problem: Problem) {
+        System.out.println(problem.toString())
+    }
+
+    private fun report(problem: LintProblem) {
+        println(problem.toString())
+    }
+}
\ No newline at end of file
diff --git a/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/PrettyPrintCommand.kt b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/PrettyPrintCommand.kt
new file mode 100644
index 0000000000..b088e6aaed
--- /dev/null
+++ b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/PrettyPrintCommand.kt
@@ -0,0 +1,18 @@
+package io.github.jmltoolkit.cli
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
+import com.github.ajalt.clikt.parameters.arguments.argument
+import com.github.ajalt.clikt.parameters.arguments.multiple
+import com.github.ajalt.clikt.parameters.types.file
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (09.04.23)
+ */
+class PrettyPrintCommand : CliktCommand(name = "format") {
+    override fun help(context: Context): String = "Format the JML comments inside Java files."
+
+    private val files by argument("FILES").file().multiple()
+    override fun run() {}
+}
diff --git a/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/StatCommand.kt b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/StatCommand.kt
new file mode 100644
index 0000000000..5fa9fceadb
--- /dev/null
+++ b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/StatCommand.kt
@@ -0,0 +1,18 @@
+package io.github.jmltoolkit.cli
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (09.04.23)
+ */
+class StatCommand : CliktCommand(name = "stat") {
+    override fun help(context: Context): String {
+        return "Print statistics on JML specification"
+    }
+
+    override fun run() {
+        TODO("Not yet implemented")
+    }
+}
diff --git a/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/StatMain.kt b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/StatMain.kt
new file mode 100644
index 0000000000..ac506822de
--- /dev/null
+++ b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/StatMain.kt
@@ -0,0 +1,68 @@
+package io.github.jmltoolkit.cli
+
+import com.github.ajalt.clikt.core.Context
+import com.github.javaparser.ParserConfiguration
+import io.github.jmltoolkit.stat.ExpressionCosts
+import io.github.jmltoolkit.stat.StatVisitor
+import java.io.StringWriter
+import javax.xml.parsers.DocumentBuilderFactory
+import javax.xml.transform.OutputKeys
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (24.05.22)
+ */
+class StatMain : FileBasedCommand("stat") {
+    override fun help(context: Context): String = "Statistics for JML specification"
+
+    override fun run() {
+        val config = ParserConfiguration()
+        config.setProcessJml(true)
+        config.setKeepJmlDocs(true)
+        for (activeJmlKey in activeJmlKeys) {
+            val activeJmlKeys = activeJmlKey.split(",".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+            config.jmlKeys.add(listOf(*activeJmlKeys))
+        }
+
+        if (activeJmlKeys.isEmpty()) {
+            //config.getJmlKeys().add(new ArrayList<>());
+            config.jmlKeys.add(listOf("key"))
+            //config.getJmlKeys().add(Collections.singletonList("openjml"));
+        }
+
+
+        val builderFactory = DocumentBuilderFactory.newInstance()
+        val builder = builderFactory.newDocumentBuilder()
+        val xmlDocument = builder.newDocument()
+        val xmlRoot = xmlDocument.createElement("statistics-model")
+
+        val nodes = parse(files, config)
+        val costs = ExpressionCosts()
+        for (key in config.jmlKeys) {
+            val statVisitor = StatVisitor(xmlDocument, key, costs)
+            val e = xmlDocument.createElement("settings")
+            e.setAttribute("keys", "" + key)
+            xmlRoot.appendChild(e)
+            for (node in nodes) {
+                node.accept(statVisitor, e)
+            }
+        }
+
+        //Gson gson = new GsonBuilder().setPrettyPrinting().create();
+        //System.out.println(gson.toJson(statVisitor.getNewlines()));
+        val transformer = TransformerFactory.newInstance().newTransformer()
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes")
+        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2")
+        val result = StreamResult(StringWriter())
+        val source = DOMSource(xmlRoot)
+        transformer.transform(source, result)
+        val xmlString = result.writer.toString()
+        println(xmlString)
+    }
+
+    //val files by argument("FILES")
+    //val activeJmlKeys: List<String> by option("-k").multiple()
+}
diff --git a/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/WdCommand.kt b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/WdCommand.kt
new file mode 100644
index 0000000000..1aeca1e91c
--- /dev/null
+++ b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/WdCommand.kt
@@ -0,0 +1,31 @@
+package io.github.jmltoolkit.cli
+
+import com.github.ajalt.clikt.core.Context
+import com.github.javaparser.ParserConfiguration
+import io.github.jmltoolkit.wd.WDVisitor
+import java.util.*
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (09.04.23)
+ */
+class WdCommand : FileBasedCommand(name = "wd") {
+    override fun help(context: Context): String {
+        return "Well-definedness check for JML files."
+    }
+
+    override fun run() {
+        val config = ParserConfiguration()
+        config.setProcessJml(true)
+        config.setKeepJmlDocs(true)
+        for (activeJmlKey in activeJmlKeys) {
+            val activeJmlKeys = activeJmlKey.split(",".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+            config.jmlKeys.add(Arrays.asList(*activeJmlKeys))
+        }
+
+        if (activeJmlKeys.isEmpty()) {
+            config.jmlKeys.add(listOf("key"))
+        }
+        val wd = WDVisitor()
+    }
+}
diff --git a/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/XPathCommand.kt b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/XPathCommand.kt
new file mode 100644
index 0000000000..7cadf36444
--- /dev/null
+++ b/tools/cli/src/main/kotlin/io/github/jmltoolkit/cli/XPathCommand.kt
@@ -0,0 +1,19 @@
+package io.github.jmltoolkit.cli
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.Context
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (09.04.23)
+ */
+
+class XPathCommand : CliktCommand(name = "xpath") {
+    override fun help(context: Context): String {
+        return "Evaluate XPath queries on a set of Java/JML files."
+    }
+
+    override fun run() {
+        TODO("Not yet implemented")
+    }
+}
diff --git a/tools/examples/ihm/VerifiedIdentityHashMap.java b/tools/examples/ihm/VerifiedIdentityHashMap.java
new file mode 100644
index 0000000000..6a51dd614e
--- /dev/null
+++ b/tools/examples/ihm/VerifiedIdentityHashMap.java
@@ -0,0 +1,2181 @@
+/*
+ * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package ihm;
+
+//import sun.misc.SharedSecrets;
+
+/**
+ * This class implements the <tt>Map</tt> interface with a hash table, using
+ * reference-equality in place of object-equality when comparing keys (and
+ * values).  In other words, in an <tt>VerifiedIdentityHashMap</tt>, two keys
+ * <tt>k1</tt> and <tt>k2</tt> are considered equal if and only if
+ * <tt>(k1==k2)</tt>.  (In normal <tt>Map</tt> implementations (like
+ * <tt>HashMap</tt>) two keys <tt>k1</tt> and <tt>k2</tt> are considered equal
+ * if and only if <tt>(k1==null ? k2==null : k1.equals(k2))</tt>.)
+ *
+ * <p><b>This class is <i>not</i> a general-purpose <tt>Map</tt>
+ * implementation!  While this class implements the <tt>Map</tt> interface, it
+ * intentionally violates <tt>Map's</tt> general contract, which mandates the
+ * use of the <tt>equals</tt> method when comparing objects.  This class is
+ * designed for use only in the rare cases wherein reference-equality
+ * semantics are required.</b>
+ *
+ * <p>A typical use of this class is <i>topology-preserving object graph
+ * transformations</i>, such as serialization or deep-copying.  To perform such
+ * a transformation, a program must maintain a "node table" that keeps track
+ * of all the object references that have already been processed.  The node
+ * table must not equate distinct objects even if they happen to be equal.
+ * Another typical use of this class is to maintain <i>proxy objects</i>.  For
+ * example, a debugging facility might wish to maintain a proxy object for
+ * each object in the program being debugged.
+ *
+ * <p>This class provides all of the optional map operations, and permits
+ * <tt>null</tt> values and the <tt>null</tt> key.  This class makes no
+ * guarantees as to the order of the map; in particular, it does not guarantee
+ * that the order will remain constant over time.
+ *
+ * <p>This class provides constant-time performance for the basic
+ * operations (<tt>get</tt> and <tt>put</tt>), assuming the system
+ * identity hash function ({@link System#identityHashCode(Object)})
+ * disperses elements properly among the buckets.
+ *
+ * <p>This class has one tuning parameter (which affects performance but not
+ * semantics): <i>expected maximum size</i>.  This parameter is the maximum
+ * number of key-value mappings that the map is expected to hold.  Internally,
+ * this parameter is used to determine the number of buckets initially
+ * comprising the hash table.  The precise relationship between the expected
+ * maximum size and the number of buckets is unspecified.
+ *
+ * <p>If the size of the map (the number of key-value mappings) sufficiently
+ * exceeds the expected maximum size, the number of buckets is increased.
+ * Increasing the number of buckets ("rehashing") may be fairly expensive, so
+ * it pays to create identity hash maps with a sufficiently large expected
+ * maximum size.  On the other hand, iteration over collection views requires
+ * time proportional to the number of buckets in the hash table, so it
+ * pays not to set the expected maximum size too high if you are especially
+ * concerned with iteration performance or memory usage.
+ *
+ * <p><strong>Note that this implementation is not synchronized.</strong>
+ * If multiple threads access an identity hash map concurrently, and at
+ * least one of the threads modifies the map structurally, it <i>must</i>
+ * be synchronized externally.  (A structural modification is any operation
+ * that adds or deletes one or more mappings; merely changing the value
+ * associated with a key that an instance already contains is not a
+ * structural modification.)  This is typically accomplished by
+ * synchronizing on some object that naturally encapsulates the map.
+ * <p>
+ * If no such object exists, the map should be "wrapped" using the
+ * {@link Collections#synchronizedMap Collections.synchronizedMap}
+ * method.  This is best done at creation time, to prevent accidental
+ * unsynchronized access to the map:<pre>
+ *   Map m = Collections.synchronizedMap(new VerifiedIdentityHashMap(...));</pre>
+ *
+ * <p>The iterators returned by the <tt>iterator</tt> method of the
+ * collections returned by all of this class's "collection view
+ * methods" are <i>fail-fast</i>: if the map is structurally modified
+ * at any time after the iterator is created, in any way except
+ * through the iterator's own <tt>remove</tt> method, the iterator
+ * will throw a {@link ConcurrentModificationException}.  Thus, in the
+ * face of concurrent modification, the iterator fails quickly and
+ * cleanly, rather than risking arbitrary, non-deterministic behavior
+ * at an undetermined time in the future.
+ *
+ * <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
+ * as it is, generally speaking, impossible to make any hard guarantees in the
+ * presence of unsynchronized concurrent modification.  Fail-fast iterators
+ * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * Therefore, it would be wrong to write a program that depended on this
+ * exception for its correctness: <i>fail-fast iterators should be used only
+ * to detect bugs.</i>
+ *
+ * <p>Implementation note: This is a simple <i>linear-probe</i> hash table,
+ * as described for example in texts by Sedgewick and Knuth.  The array
+ * alternates holding keys and values.  (This has better locality for large
+ * tables than does using separate arrays.)  For many JRE implementations
+ * and operation mixes, this class will yield better performance than
+ * {@link HashMap} (which uses <i>chaining</i> rather than linear-probing).
+ *
+ * <p>This class is a member of the
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
+ * Java Collections Framework</a>.
+ *
+ * @author Doug Lea and Josh Bloch
+ * @see System#identityHashCode(Object)
+ * @see Object#hashCode()
+ * @see Collection
+ * @see Map
+ * @see HashMap
+ * @see TreeMap
+ * @since 1.4
+ */
+
+public class VerifiedIdentityHashMap
+        extends AbstractMap
+        implements Map, java.io.Serializable, Cloneable {
+
+    /*+KEY@ // JML specifically for KeY
+      @ public invariant
+      @   table != null &&
+      @   MINIMUM_CAPACITY * (\bigint)2 <= table.length  &&
+      @   MAXIMUM_CAPACITY * (\bigint)2 >= table.length;
+      @
+      @ // For all key-value pairs: if key == null, then value == null
+      @ public invariant
+      @   (\forall \bigint i;
+      @         0 <= i && i < table.length / (\bigint)2;
+      @         (table[i * 2] == null ==> table[i * 2 + 1] == null));
+      @
+      @ // Non-empty keys are unique
+      @ public invariant
+      @   (\forall \bigint i; 0 <= i && i < table.length / (\bigint)2;
+      @       (\forall \bigint j;
+      @       i <= j && j < table.length / (\bigint)2;
+      @       (table[2 * i] != null && table[2 * i] == table[2 * j]) ==> i == j));
+      @
+      @ // Size equals the number of non-empty keys in the table
+      @ public invariant
+      @   size == (\num_of \bigint i;
+      @       0 <= i < table.length / (\bigint)2;
+      @       table[2 * i] != null);
+      @
+      @ // Table length is a power of two
+      @ public invariant
+      @   (\exists \bigint i;
+      @       0 <= i < table.length;
+      @       \dl_pow(2,i) == table.length);
+      @
+      @ // Table length is always an even number
+      @ public invariant 
+      @   table.length % (\bigint)2 == 0;
+      @
+      @ // Table must have at least one empty key-element to prevent
+      @ // infinite loops when a key is not present.
+      @ public invariant
+      @   (\exists \bigint i;
+      @       0 <= i < table.length / (\bigint)2;
+      @       table[2 * i] == null);
+      @
+      @ // There are no gaps between a key's hashed index and its actual
+      @ // index (if the key is at a higher index than the hash code)
+      @ public invariant
+      @   (\forall \bigint i;
+      @       0 <= i < table.length / (\bigint)2;
+      @       table[2 * i] != null && 2 * i > \dl_genHash(table[2 * i], table.length) ==>
+      @       (\forall \bigint j;
+      @           \dl_genHash(table[2 * i], table.length) / (\bigint)2 <= j < i;
+      @           table[2 * j] != null));
+      @
+      @ // There are no gaps between a key's hashed index and its actual
+      @ // index (if the key is at a lower index than the hash code)
+      @ public invariant
+      @   (\forall \bigint i;
+      @       0 <= i < table.length / (\bigint)2;
+      @       table[2 * i] != null && 2 * i < \dl_genHash(table[2 * i], table.length) ==>
+      @       (\forall \bigint j;
+      @           \dl_genHash(table[2 * i], table.length) <= 2 * j < table.length || 0 <= 2 * j < 2 * i;
+      @           table[2 * j] != null));
+      @
+      @ // All keys and values are of type Object
+      @ public invariant
+      @   \typeof(table) == \type(Object[]);
+      @
+      @ // Field modCount is of type integer (limits: 
+      @ // Integer.MIN_VALUE and Integer.MAX_VALUE)
+      @ public invariant
+      @   \dl_inInt(modCount);
+      @
+      @*/
+    /*+OPENJML@ // JML for non-KeY tools, i.e. JJBMC
+      @ public invariant
+      @   table != null; // &&
+      @   //MINIMUM_CAPACITY * 2 <= table.length  && // is no longer valid as we set min and max to 4
+      @   //MAXIMUM_CAPACITY * 2 >= table.length;
+      @
+      @ // For all key-value pairs: if key == null, then value == null
+      @ public invariant
+      @   (\forall int i;
+      @         0 <= i && i < table.length / 2;
+      @         (table[i * 2] == null ==> table[i * 2 + 1] == null));
+      @
+      @ // Non-empty keys are unique
+      @ public invariant
+      @   (\forall int i; 0 <= i && i < table.length / 2;
+      @       (\forall int j;
+      @       i <= j && j < table.length / 2;
+      @       (table[2*i] != null && table[2*i] == table[2*j]) ==> i == j));
+      @
+//      @ // Size equals the number of non-empty keys in the table
+//      @ public invariant
+//      @   size == (\num_of int i;
+//      @       0 <= i < table.length / 2;
+//      @       table[2 * i] != null);
+//      @
+      @ // Table length is a power of two
+      @ public invariant
+      @   (table.length & (table.length - 1)) == 0;
+      @
+      @ // Table length is always an even number
+      @ public invariant 
+      @   table.length % 2 == 0;
+      @
+      @ // Table must have at least one empty key-element to prevent
+      @ // infinite loops when a key is not present.
+      @ public invariant
+      @   (\exists int i;
+      @       0 <= i < table.length / 2;
+      @       table[2*i] == null);
+      @
+      @ // There are no gaps between a key's hashed index and its actual
+      @ // index (if the key is at a higher index than the hash code)
+      @ public invariant
+      @   (\forall int i;
+      @       0 <= i < table.length / 2;
+      @       table[2*i] != null && 2*i > hash(table[2*i], table.length) ==>
+      @       (\forall int j;
+      @           hash(table[2*i], table.length) / 2 <= j < i;
+      @           table[2*j] != null));
+      @
+//      @ // There are no gaps between a key's hashed index and its actual
+//      @ // index (if the key is at a lower index than the hash code)
+//      @ public invariant
+//      @   (\forall int i;
+//      @       0 <= i < table.length / 2;
+//      @       table[2*i] != null && 2*i < hash(table[2*i], table.length) ==>
+//      @       (\forall int j;
+//      @           hash(table[2*i], table.length) <= 2*j < table.length || 0 <= 2*j < hash(table[2*i], table.length);
+//      @           table[2*j] != null));
+//      @
+//      @ // All keys and values are of type Object
+//      @ public invariant
+//      @   \typeof(table) == \type(Object[]);
+//      @
+//      @ // Field modCount is of type integer (limits: 
+//      @ // Integer.MIN_VALUE and Integer.MAX_VALUE)
+//      @ public invariant
+//      @   \dl_inInt(modCount);
+      @*/
+
+    /**
+     * The initial capacity used by the no-args constructor.
+     * MUST be a power of two.  The value 32 corresponds to the
+     * (specified) expected maximum size of 21, given a load factor
+     * of 2/3.
+     */
+    private /*@ spec_public @*/ static final int DEFAULT_CAPACITY = 32; // Original code. Disable for JJBMC
+    // private /*@ spec_public @*/ static final int DEFAULT_CAPACITY =  4; // Enable for JJBMC
+
+    /**
+     * The minimum capacity, used if a lower value is implicitly specified
+     * by either of the constructors with arguments.  The value 4 corresponds
+     * to an expected maximum size of 2, given a load factor of 2/3.
+     * MUST be a power of two.
+     */
+    private /*@ spec_public @*/ static final int MINIMUM_CAPACITY = 4;
+
+    /**
+     * The maximum capacity, used if a higher value is implicitly specified
+     * by either of the constructors with arguments.
+     * MUST be a power of two <= 1<<29.
+     * <p>
+     * In fact, the map can hold no more than MAXIMUM_CAPACITY-1 items
+     * because it has to have at least one slot with the key == null
+     * in order to avoid infinite loops in get(), put(), remove()
+     */
+    private /*@ spec_public @*/ static final int MAXIMUM_CAPACITY = 1 << 29; // Original code. Disable for JJBMC
+    // private /*@ spec_public @*/ static final int MAXIMUM_CAPACITY =  4; // Enable for JJBMC
+
+    /**
+     * The table, resized as necessary. Length MUST always be a power of two.
+     */
+    private /*@ spec_public nullable @*/ transient Object[] table;
+
+    /**
+     * The number of key-value mappings contained in this identity hash map.
+     *
+     * @serial
+     */
+    private /*@ spec_public @*/ int size;
+
+    /**
+     * The number of modifications, to support fast-fail iterators
+     */
+    private /*@ spec_public @*/ transient int modCount;
+
+    /**
+     * Value representing null keys inside tables.
+     */
+    private /*@ spec_public @*/ static final Object NULL_KEY = new Object();
+
+    /**
+     * Use NULL_KEY for key if it is null.
+     */
+    /*@ private normal_behavior
+      @   ensures key == null ==> \result == NULL_KEY;
+      @   ensures key != null ==> \result == key;
+      @*/
+    private /*@ spec_public @*/ static /*@ strictly_pure @*/ Object maskNull(/*@ nullable @*/ Object key) {
+        return (key == null ? NULL_KEY : key);
+    }
+
+    /**
+     * Returns internal representation of null key back to caller as null.
+     */
+    /*@ private normal_behavior
+      @   ensures key == NULL_KEY ==> \result == null;
+      @   ensures key != NULL_KEY ==> \result == key;
+      @*/
+    private /*@ spec_public @*/ static /*@ strictly_pure nullable @*/ Object unmaskNull(Object key) {
+        return (key == NULL_KEY ? null : key);
+    }
+
+    /**
+     * Constructs a new, empty identity hash map with a default expected
+     * maximum size (21).
+     */
+    /*+KEY@ 
+      @ private normal_behavior
+      @   ensures
+      @     table != null &&
+      @     table.length == (\bigint)2 * DEFAULT_CAPACITY &&
+      @     keySet == null &&
+      @     values == null &&
+      @     entrySet == null &&
+      @     modCount == 0 &&
+      @     size == 0 &&
+      @     (\forall \bigint i; 0 <= i && i < table.length; table[i] == null); 
+      @*/
+    /*+OPENJML@ 
+      @ private normal_behavior
+      @   ensures
+      @     table != null &&
+      @     table.length == 2 * DEFAULT_CAPACITY &&
+      @     keySet == null &&
+      @     values == null &&
+      @     entrySet == null &&
+      @     modCount == 0 &&
+      @     size == 0 &&
+      @     (\forall int i; 0 <= i && i < table.length; table[i] == null); 
+      @*/
+    public VerifiedIdentityHashMap() {
+        init(DEFAULT_CAPACITY);
+    }
+
+    /**
+     * Constructs a new, empty map with the specified expected maximum size.
+     * Putting more than the expected number of key-value mappings into
+     * the map may cause the internal data structure to grow, which may be
+     * somewhat time-consuming.
+     *
+     * @param expectedMaxSize the expected maximum size of the map
+     * @throws IllegalArgumentException if <tt>expectedMaxSize</tt> is negative
+     */
+    public VerifiedIdentityHashMap(int expectedMaxSize) {
+        if (expectedMaxSize < 0)
+            throw new IllegalArgumentException("expectedMaxSize is negative: "
+                    + expectedMaxSize);
+        init(capacity(expectedMaxSize));
+    }
+
+    /**
+     * Returns the appropriate capacity for the given expected maximum size.
+     * Returns the smallest power of two between MINIMUM_CAPACITY and
+     * MAXIMUM_CAPACITY, inclusive, that is greater than (3 *
+     * expectedMaxSize)/2, if such a number exists.  Otherwise returns
+     * MAXIMUM_CAPACITY.
+     */
+    /*+KEY@ 
+      @ private normal_behavior
+      @   requires 
+      @     expectedMaxSize > MAXIMUM_CAPACITY / (\bigint)3;
+      @   ensures
+      @     \result == MAXIMUM_CAPACITY;
+      @     
+      @ private normal_behavior
+      @   requires 
+      @     expectedMaxSize <= MAXIMUM_CAPACITY / (\bigint)3 &&
+      @     expectedMaxSize <= (\bigint)2 * MINIMUM_CAPACITY / 3;
+      @   ensures
+      @     \result == MINIMUM_CAPACITY;
+      @ 
+      @ private normal_behavior
+      @   requires 
+      @     expectedMaxSize <= MAXIMUM_CAPACITY / (\bigint)3 &&
+      @     expectedMaxSize > (\bigint)2 * MINIMUM_CAPACITY / 3;
+      @   ensures
+      @     \result <= ((\bigint)3 * expectedMaxSize) && 
+      @     (\bigint)2 * \result > ((\bigint)3 * expectedMaxSize);
+      @   ensures
+      @     (\exists \bigint i;
+      @       0 <= i < \result;
+      @       \dl_pow(2,i) == \result); // result is a power of two
+      @*/
+    /*+OPENJML@ 
+      @ private normal_behavior
+      @   requires 
+      @     expectedMaxSize > MAXIMUM_CAPACITY / 3;
+      @   ensures
+      @     \result == MAXIMUM_CAPACITY;
+      @     
+      @ private normal_behavior
+      @   requires 
+      @     expectedMaxSize <= MAXIMUM_CAPACITY / 3 &&
+      @     expectedMaxSize <= 2 * MINIMUM_CAPACITY / 3;
+      @   ensures
+      @     \result == MINIMUM_CAPACITY;
+      @ 
+      @ private normal_behavior
+      @   requires 
+      @     expectedMaxSize <= MAXIMUM_CAPACITY / 3 &&
+      @     expectedMaxSize > 2 * MINIMUM_CAPACITY / 3;
+      @   ensures
+      @     \result <= (3 * expectedMaxSize) && 
+      @     2 * \result > (3 * expectedMaxSize);
+      @   ensures
+      @     (\result & (\result - 1)) == 0; // result is a power of two
+      @*/
+    private static /*@ strictly_pure @*/ int capacity(int expectedMaxSize) {
+        // assert expectedMaxSize >= 0;
+        return
+                (expectedMaxSize > MAXIMUM_CAPACITY / 3) ? MAXIMUM_CAPACITY :
+                        (expectedMaxSize <= 2 * MINIMUM_CAPACITY / 3) ? MINIMUM_CAPACITY :
+                                Integer.highestOneBit(expectedMaxSize + (expectedMaxSize << 1));
+    }
+
+    /**
+     * Initializes object to be an empty map with the specified initial
+     * capacity, which is assumed to be a power of two between
+     * MINIMUM_CAPACITY and MAXIMUM_CAPACITY inclusive.
+     */
+    /*+KEY@ 
+      @ private normal_behavior
+      @   requires
+      @     (\exists \bigint i; 0 <= i < initCapacity; \dl_pow(2,i) == initCapacity) &&
+      @     initCapacity >= MINIMUM_CAPACITY &&
+      @     initCapacity <= MAXIMUM_CAPACITY &&
+      @     \dl_inInt(modCount);
+      @   assignable
+      @     table;
+      @   ensures
+      @     table != null &&
+      @     \typeof(table) == \type(Object[]) &&
+      @     (\forall \bigint i; 0 <= i < table.length; table[i] == null) &&
+      @     table.length == (\bigint)2 * initCapacity;
+      @*/
+    /*+OPENJML@ 
+      @ private normal_behavior
+      @   requires
+      @     (initCapacity & (initCapacity - 1)) == 0 &&
+      @     initCapacity >= MINIMUM_CAPACITY &&
+      @     initCapacity <= MAXIMUM_CAPACITY;
+      @   assignable
+      @     table;
+      @   ensures
+      @     table != null &&
+      @     (\forall int i; 0 <= i < table.length; table[i] == null) &&
+      @     table.length == 2 * initCapacity;
+      @*/
+    private /*@ helper @*/ void init(int initCapacity) {
+        // assert (initCapacity & -initCapacity) == initCapacity; // power of 2
+        // assert initCapacity >= MINIMUM_CAPACITY;
+        // assert initCapacity <= MAXIMUM_CAPACITY;
+
+        table = new Object[2 * initCapacity];
+    }
+
+    /**
+     * Constructs a new identity hash map containing the keys-value mappings
+     * in the specified map.
+     *
+     * @param m the map whose mappings are to be placed into this map
+     * @throws NullPointerException if the specified map is null
+     */
+    public VerifiedIdentityHashMap(Map m) {
+        // Allow for a bit of growth
+        this((int) ((1 + m.size()) * 1.1));
+        putAll(m);
+    }
+
+    /**
+     * Returns the number of key-value mappings in this identity hash map.
+     *
+     * @return the number of key-value mappings in this map
+     */
+    /*@ also
+      @ public normal_behavior
+      @   ensures
+      @     \result == size;
+      @*/
+    public /*@ strictly_pure @*/ int size() {
+        return size;
+    }
+
+    /**
+     * Returns <tt>true</tt> if this identity hash map contains no key-value
+     * mappings.
+     *
+     * @return <tt>true</tt> if this identity hash map contains no key-value
+     * mappings
+     */
+    /*@ also
+      @ public normal_behavior
+      @   ensures
+      @     \result <==> size == 0;
+      @*/
+    public /*@ strictly_pure @*/ boolean isEmpty() {
+        return size == 0;
+    }
+
+    /**
+     * Returns index for Object x.
+     */
+    /*+KEY@ 
+      @ private normal_behavior
+      @   ensures
+      @     (x == null ==> \result == 0) &&
+      @     \result == \dl_genHash(x, length) && 
+      @     \result % 2 == 0 &&
+      @     \result < length && 
+      @     \result >= 0;
+      @*/
+    private /*@ spec_public @*/ static /*@ strictly_pure @*/ int hash(Object x, int length) {
+        int h = System.identityHashCode(x);
+        // Multiply by -127, and left-shift to use least bit as part of hash
+        return ((h << 1) - (h << 8)) & (length - 1);
+    }
+
+    /**
+     * Circularly traverses table of size len.
+     */
+    /*@ private normal_behavior
+      @   ensures
+      @     (i + 2 < len ==> \result == i + 2) &&
+      @     (i + 2 >= len ==> \result == 0);
+      @*/
+    private static /*@ strictly_pure @*/ int nextKeyIndex(int i, int len) {
+        return (i + 2 < len ? i + 2 : 0);
+    }
+
+    /**
+     * Returns the value to which the specified key is mapped,
+     * or {@code null} if this map contains no mapping for the key.
+     *
+     * <p>More formally, if this map contains a mapping from a key
+     * {@code k} to a value {@code v} such that {@code (key == k)},
+     * then this method returns {@code v}; otherwise it returns
+     * {@code null}.  (There can be at most one such mapping.)
+     *
+     * <p>A return value of {@code null} does not <i>necessarily</i>
+     * indicate that the map contains no mapping for the key; it's also
+     * possible that the map explicitly maps the key to {@code null}.
+     * The {@link #containsKey containsKey} operation may be used to
+     * distinguish these two cases.
+     *
+     * @see #put(Object, Object)
+     */
+    /*+KEY@ 
+      @ // Key exists
+      @ also
+      @ public normal_behavior
+      @   requires
+      @     (\exists \bigint i;
+      @       0 <= i < table.length / (\bigint)2;
+      @       table[i * 2] == maskNull(key));
+      @   ensures
+      @     (\exists \bigint i;
+      @        0 <= i < table.length / (\bigint)2;
+      @        table[i * 2] == maskNull(key) && \result == table[i * 2 + 1]);
+      @      
+      @ // Key does not exist       
+      @ also
+      @ public normal_behavior
+      @   requires
+      @     !(\exists \bigint i;
+      @       0 <= i < table.length / (\bigint)2;
+      @       table[i * 2] == maskNull(key));
+      @   ensures
+      @     \result == null;
+      @*/
+    /*+OPENJML@ 
+      @ // Key exists
+      @ also
+      @ public normal_behavior
+      @   requires
+      @     (\exists int i;
+      @       0 <= i < table.length / 2;
+      @       table[i * 2] == maskNull(key));
+      @   ensures
+      @     (\exists int i;
+      @        0 <= i < table.length / 2;
+      @        table[i * 2] == maskNull(key) && \result == table[i * 2 + 1]);
+      @      
+      @ // Key does not exist       
+      @ also
+      @ public normal_behavior
+      @   requires
+      @     !(\exists int i;
+      @       0 <= i < table.length / 2;
+      @       table[i * 2] == maskNull(key));
+      @   ensures
+      @     \result == null;
+      @*/
+    public /*@ pure nullable @*/ java.lang.Object get(/*@ nullable @*/ Object key) {
+        Object k = maskNull(key);
+        Object[] tab = table;
+        int len = tab.length;
+        int i = hash(k, len);
+
+        //+KEY@ ghost \bigint hash = i;
+
+        /*+KEY@
+          @ // Index i is always an even value within the array bounds
+          @ maintaining
+          @   i >= 0 && i < len && i % (\bigint)2 == 0;
+          @
+          @ // Suppose i > hash. This can only be the case when no key k and no null is present
+          @ // at an even index of tab in the interval [hash..i-2]. 
+          @ maintaining
+          @   (i > hash) ==>
+          @   (\forall \bigint n; hash <= (2 * n) < i; tab[2 * n] != k && tab[2 * n] != null);
+          @ 
+          @ // Suppose i < hash. This can only be the case when no key k and no null is present
+          @ // at an even index of tab in the intervals [0..i-2] and [hash..len-2]. 
+          @ maintaining
+          @   (i < hash) ==>
+          @   (\forall \bigint n; hash <= (2 * n) < len; tab[2 * n] != k && tab[2 * n] != null) &&
+          @   (\forall \bigint m; 0 <= (2 * m) < i; tab[2 * m] != k && tab[2 * m] != null);
+          @   
+          @ decreasing hash > i ? hash - i : hash + len - i;
+          @ 
+          @ assignable \strictly_nothing;
+          @*/
+        while (true) {
+            Object item = tab[i];
+            if (item == k)
+                return (java.lang.Object) tab[i + 1];
+            if (item == null)
+                return null;
+            i = nextKeyIndex(i, len);
+        }
+    }
+
+    /**
+     * Tests whether the specified object reference is a key in this identity
+     * hash map.
+     *
+     * @param key possible key
+     * @return <code>true</code> if the specified object reference is a key
+     * in this map
+     * @see #containsValue(Object)
+     */
+     /*+KEY@ 
+       @ also
+       @ public normal_behavior
+       @   ensures
+       @     \result <==> (\exists \bigint j;
+       @         0 <= j < (table.length / (\bigint)2);
+       @         table[j * 2] == maskNull(key));
+       @*/
+     /*+OPENJML@ 
+       @ also
+       @ public normal_behavior
+       @   ensures
+       @     \result <==> (\exists int j;
+       @         0 <= j < (table.length / 2);
+       @         table[j * 2] == maskNull(key));
+       @*/
+    public /*@ strictly_pure @*/ boolean containsKey(/*@ nullable @*/ Object key) {
+        Object k = maskNull(key);
+        Object[] tab = table;
+        int len = tab.length;
+        int i = hash(k, len);
+
+        //+KEY@ ghost \bigint hash = i;
+        
+        /*+KEY@
+          @ // Index i is always an even value within the array bounds
+          @ maintaining 
+          @   i >= 0 && i < len && i % (\bigint)2 == 0;
+          @
+          @ // Suppose i > hash. This can only be the case when no key k and no null is present
+          @ // at an even index of tab in the interval [hash..i-2]. 
+          @ maintaining
+          @   (i > hash) ==>
+          @   (\forall \bigint n; hash <= (2 * n) < i; tab[2 * n] != k && tab[2 * n] != null);
+          @ 
+          @ // Suppose i < hash. This can only be the case when no key k and no null is present
+          @ // at an even index of tab in the intervals [0..i-2] and [hash..len-2]. 
+          @ maintaining
+          @   (i < hash) ==>
+          @   (\forall \bigint n; hash <= (2 * n) < len; tab[2 * n] != k && tab[2 * n] != null) &&
+          @   (\forall \bigint m; 0 <= (2 * m) < i; tab[2 * m] != k && tab[2 * m] != null);
+          @   
+          @ decreasing hash > i ? hash - i : hash + len - i;
+          @ 
+          @ assignable \strictly_nothing;
+          @*/
+        while (true) {
+            Object item = tab[i];
+            if (item == k)
+                return true;
+            if (item == null)
+                return false;
+            i = nextKeyIndex(i, len);
+        }
+    }
+
+    /**
+     * Tests whether the specified object reference is a value in this identity
+     * hash map.
+     *
+     * @param value value whose presence in this map is to be tested
+     * @return <tt>true</tt> if this map maps one or more keys to the
+     * specified object reference
+     * @see #containsKey(Object)
+     */
+    /*+KEY@ 
+      @ also
+      @ public normal_behavior
+      @   ensures
+      @     \result <==> (\exists \bigint j;
+      @         0 <= j < table.length / (\bigint)2;
+      @         table[j * (\bigint)2] != null && table[j * (\bigint)2 + 1] == value);
+      @*/
+    /*+OPEN_JML@ 
+      @ also
+      @ public normal_behavior
+      @   ensures
+      @     \result <==> (\exists int j;
+      @         0 <= j < table.length / 2;
+      @         table[j * 2] != null && table[j * 2 + 1] == value);
+      @*/
+    public /*@ strictly_pure @*/ boolean containsValue(/*@ nullable @*/ Object value) {
+        Object[] tab = table;
+
+        /*+KEY@
+          @ // Index i is always an odd value within the array bounds
+          @ maintaining 
+          @   i >= 1 && i <= tab.length+1 && i % (\bigint)2 == 1;
+          @
+          @ // There cannot be an odd index n < i containing the value we are looking for (unless
+          @ // the associated key is null, in which case the value is ignored). 
+          @ maintaining
+          @   (\forall \bigint n; 1 <= n < i && n % 2 == 1; tab[n - 1] != null ==> tab[n] != value);
+          @ 
+          @ decreasing tab.length + 1 - i;
+          @ 
+          @ assignable \strictly_nothing;
+          @*/
+        for (int i = 1; i < tab.length; i += 2)
+            if (tab[i] == value && tab[i - 1] != null)
+                return true;
+
+        return false;
+    }
+
+    /**
+     * Tests if the specified key-value mapping is in the map.
+     *
+     * @param key   possible key
+     * @param value possible value
+     * @return <code>true</code> if and only if the specified key-value
+     * mapping is in the map
+     */
+    /*+KEY@ 
+      @ private normal_behavior
+      @   ensures
+      @     \result <==> (\exists \bigint i;
+      @       0 <= i < table.length / (\bigint)2;
+      @       table[i * 2] == maskNull(key) && table[i * 2 + 1] == value);
+      @*/
+    /*+OPENJML@ 
+      @ private normal_behavior
+      @   ensures
+      @     \result <==> (\exists int i;
+      @       0 <= i < table.length / 2;
+      @       table[i * 2] == maskNull(key) && table[i * 2 + 1] == value);
+      @*/
+    private /*@ spec_public @*/ /*@ strictly_pure @*/ boolean containsMapping(Object key, Object value) {
+        Object k = maskNull(key);
+        Object[] tab = table;
+        int len = tab.length;
+        int i = hash(k, len);
+
+        //+KEY@ ghost \bigint hash = i;
+        
+        /*+KEY@
+          @ // Index i is always an even value within the array bounds
+          @ maintaining 
+          @   i >= 0 && i < len && i % (\bigint)2 == 0;
+          @
+          @ // Suppose i > hash. This can only be the case when no key k and no null is present
+          @ // at an even index of tab in the interval [hash..i-2]. 
+          @ maintaining
+          @   (i > hash) ==>
+          @   (\forall \bigint n; hash <= (2 * n) < i; tab[2 * n] != k && tab[2 * n] != null);
+          @ 
+          @ // Suppose i < hash. This can only be the case when no key k and no null is present
+          @ // at an even index of tab in the intervals [0..i-2] and [hash..len-2]. 
+          @ maintaining
+          @   (i < hash) ==>
+          @   (\forall \bigint n; hash <= (2 * n) < len; tab[2 * n] != k && tab[2 * n] != null) &&
+          @   (\forall \bigint m; 0 <= (2 * m) < i; tab[2 * m] != k && tab[2 * m] != null);
+          @   
+          @ decreasing hash > i ? hash - i : hash + len - i;
+          @ 
+          @ assignable \strictly_nothing;
+          @*/
+        while (true) {
+            Object item = tab[i];
+            if (item == k)
+                return tab[i + 1] == value;
+            if (item == null)
+                return false;
+            i = nextKeyIndex(i, len);
+        }
+    }
+
+    /**
+     * Associates the specified value with the specified key in this identity
+     * hash map.  If the map previously contained a mapping for the key, the
+     * old value is replaced.
+     *
+     * @param key   the key with which the specified value is to be associated
+     * @param value the value to be associated with the specified key
+     * @return the previous value associated with <tt>key</tt>, or
+     * <tt>null</tt> if there was no mapping for <tt>key</tt>.
+     * (A <tt>null</tt> return can also indicate that the map
+     * previously associated <tt>null</tt> with <tt>key</tt>.)
+     * @see Object#equals(Object)
+     * @see #get(Object)
+     * @see #containsKey(Object)
+     */
+    /*+KEY@ 
+      @ also
+      @ private exceptional_behavior
+      @   requires
+      @     size == MAXIMUM_CAPACITY - 1;
+      @   requires
+      @     // The key is not present in the table
+      @     !(\exists \bigint i;
+      @         0 <= i < table.length / (\bigint)2;
+      @         table[i * 2] == maskNull(key));
+      @   assignable
+      @     \nothing;
+      @   signals_only
+      @     IllegalStateException;
+      @   signals
+      @     (IllegalStateException e) true;
+      @ also
+      @ public normal_behavior
+      @   requires
+      @     // The key is already present in the table
+      @     (\exists \bigint i;
+      @         0 <= i < table.length / (\bigint)2;
+      @         table[i*2] == maskNull(key));
+      @   assignable
+      @     table[*];
+      @   ensures
+      @     // The new value is associated with key and
+      @     // the old value associated with key is returned
+      @     (\exists \bigint i;
+      @         0 <= i < table.length / (\bigint)2;
+      @         table[i*2] == maskNull(key) &&
+      @         \result == \old(table[i * 2 + 1]) &&
+      @         table[i * 2 + 1] == value);
+      @   ensures
+      @     // After execution, all keys are unchanged and all old values are unchanged
+      @     // except the old value that was associated with key
+      @     (\forall \bigint i;
+      @         0 <= i < \old(table.length) / (\bigint)2;
+      @         (\old(table[i * 2]) == table[i * 2]) &&
+      @         (\old(table[i * 2]) != maskNull(key) ==>
+      @             \old(table[i * 2 + 1]) == table[i * 2 + 1]));
+      @ also
+      @ public normal_behavior
+      @   requires
+      @     size < MAXIMUM_CAPACITY - 1;
+      @   requires
+      @     // The key is not present in the table
+      @     !(\exists \bigint i;
+      @         0 <= i < table.length / (\bigint)2;
+      @         table[i * 2] == maskNull(key));
+      @   assignable
+      @     size, table[*], modCount, table;
+      @   ensures
+      @     // size must be increased by 1, modCount must change, and null must be returned
+      @     size == \old(size) + 1 && modCount != \old(modCount) && \result == null;
+      @   ensures
+      @     // After execution, all old keys are still present and all old values are still present
+      @     (\forall \bigint i;
+      @         0 <= i < \old(table.length) / (\bigint)2;
+      @         (\exists \bigint j;
+      @             0 <= j < table.length / (\bigint)2;
+      @             (\old(table[i * 2]) == table[j * 2]) &&
+      @              \old(table[i * 2 + 1]) == table[j * 2 + 1]));
+      @   ensures
+      @     // After execution, the table contains the new key associated with the new value
+      @     (\exists \bigint i;
+      @         0 <= i < table.length / (\bigint)2;
+      @         table[i * 2] == maskNull(key) && table[i * 2 + 1] == value);
+      @*/
+    /*+OPENJML@ 
+      @ also
+      @ public normal_behavior
+      @   requires
+      @     // The key is already present in the table
+      @     (\exists int i;
+      @         0 <= i < table.length / 2;
+      @         table[i*2] == maskNull(key));
+      @   assignable
+      @     table[*];
+      @   ensures
+      @     // The new value is associated with key and
+      @     // the old value associated with key is returned
+      @     (\exists int i;
+      @         0 <= i < table.length / 2;
+      @         table[i*2] == maskNull(key) &&
+      @         \result == \old(table[i * 2 + 1]) &&
+      @         table[i * 2 + 1] == value);
+      @   ensures
+      @     // After execution, all keys are unchanged and all old values are unchanged
+      @     // except the old value that was associated with key
+      @     (\forall int i;
+      @         0 <= i < \old(table.length) / 2;
+      @         (\old(table[i * 2]) == table[i * 2]) &&
+      @         (\old(table[i * 2]) != maskNull(key) ==>
+      @             \old(table[i * 2 + 1]) == table[i * 2 + 1]));
+      @ also
+      @ public normal_behavior
+      @   requires
+      @     size < MAXIMUM_CAPACITY - 1;
+      @   requires
+      @     // The key is not present in the table
+      @     !(\exists int i;
+      @         0 <= i < table.length / 2;
+      @         table[i * 2] == maskNull(key));
+      @   assignable
+      @     size, table[*], modCount, table;
+      @   ensures
+      @     // size must be increased by 1, modCount must change, and null must be returned
+      @     size == \old(size) + 1 && modCount != \old(modCount) && \result == null;
+      @   ensures
+      @     // After execution, all old keys are still present and all old values are still present
+      @     (\forall int i;
+      @         0 <= i < \old(table.length) / 2;
+      @         (\exists int j;
+      @             0 <= j < table.length / 2;
+      @             (\old(table[i * 2]) == table[j * 2]) &&
+      @              \old(table[i * 2 + 1]) == table[j * 2 + 1]));
+      @   ensures
+      @     // After execution, the table contains the new key associated with the new value
+      @     (\exists int i;
+      @         0 <= i < table.length / 2;
+      @         table[i * 2] == maskNull(key) && table[i * 2 + 1] == value);
+      @*/
+    public /*@ nullable @*/ java.lang.Object put(/*@ nullable @*/ java.lang.Object key, /*@ nullable @*/ java.lang.Object value) {
+        final Object k = maskNull(key);
+
+        retryAfterResize:
+        for (; ; ) {
+            final Object[] tab = table;
+            final int len = tab.length;
+            int i = hash(k, len);
+
+            //+KEY@ ghost \bigint hash = i;
+        
+          /*+KEY@
+            @ // Index i is always an even value within the array bounds
+            @ maintaining 
+            @   tab == table && len == tab.length &&
+            @   i >= 0 && i < (len - (\bigint)1) && i % (\bigint)2 == 0;
+            @
+            @ // Suppose i > hash. This can only be the case when no key k and no null is present
+            @ // at an even index of tab in the interval [hash..i-2]. 
+            @ maintaining
+            @   (i > hash) ==>
+            @   (\forall \bigint n; hash <= (2 * n) < i; tab[2 * n] != k && tab[2 * n] != null);
+            @ 
+            @ // Suppose i < hash. This can only be the case when no key k and no null is present
+            @ // at an even index of tab in the intervals [0..i-2] and [hash..len-2]. 
+            @ maintaining
+            @   (i < hash) ==>
+            @   (\forall \bigint n; hash <= (2 * n) < len; tab[2 * n] != k && tab[2 * n] != null) &&
+            @   (\forall \bigint m; 0 <= (2 * m) < i; tab[2 * m] != k && tab[2 * m] != null);
+            @
+            @ decreasing hash > i ? hash - i : len + hash - i;
+            @
+            @ // if the loop iteration completes, the heap is unchanged 
+            @ // in case key is present, table is updated but the loop iteration terminates without
+            @ // completing because the method returns, so the assignable clause need not hold
+            @ assignable \strictly_nothing;
+            @*/
+            for (Object item; (item = tab[i]) != null;
+                 i = nextKeyIndex(i, len)) {
+                if (item == k) {
+                    java.lang.Object oldValue = (java.lang.Object) tab[i + 1];
+                    tab[i + 1] = value;
+                    return oldValue;
+                }
+            }
+
+            final int s = size + 1;
+            // Use optimized form of 3 * s.
+            // Next capacity is len, 2 * current capacity.
+            if (s + (s << 1) > len && resize(len))
+                continue retryAfterResize;
+
+            modCount++;
+            tab[i] = k;
+            tab[i + 1] = value;
+            size = s;
+            return null;
+        }
+    }
+
+    /**
+     * Resizes the table if necessary to hold given capacity.
+     *
+     * @param newCapacity the new capacity, must be a power of two.
+     * @return whether a resize did in fact take place
+     */
+    /*+KEY@ 
+      @ // Throws an exception when table.length == 2 * MAXIMUM_CAPACITY &&
+      @ // size == MAXIMUM_CAPACITY - 1.
+      @ private exceptional_behavior
+      @   requires
+      @     table.length == (\bigint)2 * MAXIMUM_CAPACITY &&
+      @     size == MAXIMUM_CAPACITY - 1;
+      @   assignable
+      @     \nothing;
+      @   signals_only
+      @     IllegalStateException;
+      @   signals
+      @     (IllegalStateException e) true;
+      @
+      @ // Nothing changes if table.length == 2 * MAXIMUM_CAPACITY &&
+      @ // size < MAXIMUM_CAPACITY - 1.
+      @ private normal_behavior
+      @   requires
+      @     table.length == (\bigint)2 * MAXIMUM_CAPACITY &&
+      @     size < MAXIMUM_CAPACITY - 1;
+      @   assignable
+      @     \strictly_nothing;
+      @   ensures
+      @     \result == false;
+      @
+      @ // Nothing changes when table.length < 2 * MAXIMUM_CAPACITY &&
+      @ // table.length >= 2 * newCapacity.
+      @ private normal_behavior
+      @   requires
+      @     table.length < (\bigint)2 * MAXIMUM_CAPACITY &&
+      @     table.length >= (\bigint)2 * newCapacity &&
+      @     newCapacity >= MINIMUM_CAPACITY &&
+      @     newCapacity <= (\bigint)2 * MAXIMUM_CAPACITY;
+      @
+      @   assignable
+      @     \strictly_nothing;
+      @
+      @   ensures
+      @     // Map is unchanged, so return false
+      @     \result == false;
+      @
+      @
+      @ // If we actually resize (table.length < 2 * MAXIMUM_CAPACITY && table.length < 2 * newCapacity)
+      @ // then rehash the table with the new length to re-establish the class invariant.
+      @ private normal_behavior
+      @   requires
+      @     table.length < (\bigint)2 * newCapacity &&
+      @     newCapacity <= MAXIMUM_CAPACITY &&
+      @     newCapacity >= MINIMUM_CAPACITY &&
+      @     (\exists \bigint i;
+      @       0 <= i < newCapacity;
+      @       \dl_pow(2,i) == newCapacity);
+      @
+      @   assignable
+      @     table, table[*];
+      @
+      @   ensures
+      @     table.length == (newCapacity * (\bigint)2);
+      @
+      @   ensures
+      @     // After execution, all old entries are still present
+      @     (\forall \bigint i;
+      @       0 <= i < \old(table.length) && i % 2 == 0;
+      @       (\exists \bigint j;
+      @         0 <= j < table.length && j % 2 == 0;
+      @         \old(table[i]) == table[j] && \old(table[i + 1]) == table[j + 1]));
+      @
+      @   ensures
+      @     // Map is changed, so return true
+      @     \result == true;
+      @
+      @   ensures
+      @     \fresh(table);
+      @
+      @   ensures 
+      @     // All entries in the new table were also present in \old(table)
+      @     (\forall \bigint n;
+      @       0 <= n < table.length / (\bigint)2;
+      @       (\exists \bigint m;
+      @         0 <= m < \old(table.length) / (\bigint)2;
+      @         table[2*n] == \old(table[2*m]) && table[2*n + 1] == \old(table[2*m + 1])));
+      @*/
+    /*+OPENJML@ 
+      @ // Nothing changes if table.length == 2 * MAXIMUM_CAPACITY &&
+      @ // size < MAXIMUM_CAPACITY - 1.
+      @ private normal_behavior
+      @   requires
+      @     table.length == 2 * MAXIMUM_CAPACITY &&
+      @     size < MAXIMUM_CAPACITY - 1;
+      @   assignable
+      @     \strictly_nothing;
+      @   ensures
+      @     \result == false;
+      @
+      @ // Nothing changes when table.length < 2 * MAXIMUM_CAPACITY &&
+      @ // table.length >= 2 * newCapacity.
+      @ private normal_behavior
+      @   requires
+      @     table.length < 2 * MAXIMUM_CAPACITY &&
+      @     table.length >= 2 * newCapacity &&
+      @     newCapacity >= MINIMUM_CAPACITY &&
+      @     newCapacity <= 2 * MAXIMUM_CAPACITY;
+      @
+      @   assignable
+      @     \strictly_nothing;
+      @
+      @   ensures
+      @     // Map is unchanged, so return false
+      @     \result == false;
+      @
+      @
+      @ // If we actually resize (table.length < 2 * MAXIMUM_CAPACITY && table.length < 2 * newCapacity)
+      @ // then rehash the table with the new length to re-establish the class invariant.
+      @ private normal_behavior
+      @   requires
+      @     table.length < 2 * newCapacity &&
+      @     newCapacity <= MAXIMUM_CAPACITY &&
+      @     newCapacity >= MINIMUM_CAPACITY &&
+      @     (\exists int i;
+      @       0 <= i < newCapacity;
+      @       (newCapacity & (newCapacity - 1)) == 0);
+      @
+      @   assignable
+      @     table, table[*];
+      @
+      @   ensures
+      @     table.length == (newCapacity * 2);
+      @
+      @   ensures
+      @     // After execution, all old entries are still present
+      @     (\forall int i;
+      @       0 <= i < \old(table.length) && i % 2 == 0;
+      @       (\exists int j;
+      @         0 <= j < table.length && j % 2 == 0;
+      @         \old(table[i]) == table[j] && \old(table[i + 1]) == table[j + 1]));
+      @
+      @   ensures
+      @     // Map is changed, so return true
+      @     \result == true;
+      @
+      @   ensures
+      @     \fresh(table);
+      @
+      @   ensures 
+      @     // All entries in the new table were also present in \old(table)
+      @     (\forall int n;
+      @       0 <= n < table.length / 2;
+      @       (\exists int m;
+      @         0 <= m < \old(table.length) / 2;
+      @         table[2*n] == \old(table[2*m]) && table[2*n + 1] == \old(table[2*m + 1])));
+      @*/
+    private boolean resize(int newCapacity)
+    // assert (newCapacity & -newCapacity) == newCapacity; // power of 2
+    {
+        int newLength = newCapacity * 2;
+
+        Object[] oldTable = table;
+        int oldLength = oldTable.length;
+        if (oldLength == 2 * MAXIMUM_CAPACITY) { // can't expand any further
+            if (size == MAXIMUM_CAPACITY - 1)
+                throw new IllegalStateException("Capacity exhausted.");
+            return false;
+        }
+        if (oldLength >= newLength)
+            return false;
+
+        Object[] newTable = new Object[newLength];
+
+        /*+KEY@
+          @ // All processed entries are copied to newTable
+          @ maintaining 
+          @   (\forall \bigint k;
+          @     0 <= k < j && k % 2 == 0;
+          @     (\exists \bigint l;
+          @         0 <= l < newTable.length && l % 2 == 0;
+          @         \old(table[k]) == newTable[l] && \old(table[k + 1]) == newTable[l + 1]));
+          @
+          @ // All (non-null) entries in newTable are also present in \old(table)
+          @ maintaining 
+          @   (\forall \bigint n;
+          @     0 <= n < newTable.length && n % 2 == 0 && newTable[n] != null;
+          @     (\exists \bigint m;
+          @         0 <= m < j && m % 2 == 0;
+          @         newTable[n] == \old(table[m]) && newTable[n + 1] == \old(table[m + 1])));
+          @
+          @ // All unprocessed entries are still untouched in old table
+          @ maintaining 
+          @   (\forall \bigint k;
+          @     j <= k < \old(table.length);
+          @     \old(table[k]) == oldTable[k]);
+          @
+          @ // The number of non-null keys in newTable equals the number of copied keys
+          @ maintaining
+          @    (\num_of \bigint i; 0 <= i < j / (\bigint)2; \old(table[2 * i]) != null)
+          @ == (\num_of \bigint i; 0 <= i < newTable.length / (\bigint)2; newTable[2 * i] != null);
+          @
+          @ // For all key-value pairs: if key == null, then value == null
+          @ maintaining
+          @   (\forall \bigint i;
+          @         0 <= i && i < newTable.length / (\bigint)2;
+          @         (newTable[i * (\bigint)2] == null ==> newTable[i * (\bigint)2 + 1] == null));
+          @
+          @ // Non-empty keys in newTable are unique
+          @ maintaining
+          @   (\forall \bigint p; 0 <= p && p < newTable.length / (\bigint)2;
+          @       (\forall \bigint q;
+          @       p <= q && q < newTable.length / (\bigint)2;
+          @       (newTable[2 * p] != null && newTable[2 * p] == newTable[2 * q]) ==> p == q));
+          @
+          @ // There are no gaps between a key's hashed index and its actual
+          @ // index (if the key is at a higher index than the hash code)
+          @ maintaining
+          @   (\forall \bigint g;
+          @       0 <= g < newTable.length / (\bigint)2;
+          @       newTable[2 * g] != null && 2 * g > \dl_genHash(newTable[2 * g], newTable.length) ==>
+          @       (\forall \bigint h;
+          @           \dl_genHash(newTable[2 * g], newTable.length) / (\bigint)2 <= h < g;
+          @           newTable[2 * h] != null));
+          @
+          @ // There are no gaps between a key's hashed index and its actual
+          @ // index (if the key is at a lower index than the hash code)
+          @ maintaining
+          @   (\forall \bigint g;
+          @       0 <= g < newTable.length / (\bigint)2;
+          @       newTable[2 * g] != null && 2 * g < \dl_genHash(newTable[2 * g], newTable.length) ==>
+          @       (\forall \bigint h;
+          @           \dl_genHash(newTable[2 * g], newTable.length) <= 2 * h < newTable.length || 0 <= 2 * h < 2 * g;
+          @           newTable[2 * h] != null));
+          @
+          @ // Table must have at least one empty key-element to prevent
+          @ // infinite loops when a key is not present.
+          @ maintaining
+          @   (\exists \bigint i;
+          @       0 <= i < newTable.length / (\bigint)2;
+          @       newTable[2*i] == null);
+          @
+          @ maintaining
+          @   j >= 0 && j <= oldLength && j % (\bigint)2 == 0;
+          @ 
+          @ assignable
+          @   table[*], newTable[*];
+          @
+          @ decreasing
+          @   oldLength - j;
+          @*/
+        for (int j = 0; j < oldLength; j += 2) {
+            Object key = oldTable[j];
+            if (key != null) {
+                Object value = oldTable[j + 1];
+                oldTable[j] = null;
+                oldTable[j + 1] = null;
+                int i = hash(key, newLength);
+
+                //+KEY@ ghost \bigint hash = i;
+                
+                /*+KEY@
+                  @ // Index i is always an even value within the array bounds
+                  @ maintaining 
+                  @   i >= 0 && i < newLength && i % (\bigint)2 == 0;
+                  @
+                  @ // There are no gaps in the segment [hash .. i)
+                  @ // (if the current index is higher than the hash)
+                  @ maintaining
+                  @   (\forall \bigint g;
+                  @       hash <= 2 * g < i;
+                  @       newTable[2 * g] != null);
+                  @
+                  @ // There are no gaps in the segment [0 .. i) and [hash .. newLength)
+                  @ // (if the current index is lower (wrap around) than the hash)
+                  @ maintaining
+                  @   (i < hash) ==>
+                  @      (\forall \bigint g;
+                  @          (0 <= 2 * g < i) || (hash <= 2 * g < newLength);
+                  @          newTable[2 * g] != null);
+                  @
+                  @ assignable
+                  @   \strictly_nothing;
+                  @
+                  @ decreasing
+                  @   hash > i ? hash - i : newLength + hash - i;
+                  @*/
+                while (newTable[i] != null)
+                    i = nextKeyIndex(i, newLength);
+                newTable[i] = key;
+                newTable[i + 1] = value;
+            }
+        }
+        table = newTable;
+        return true;
+    }
+
+    /**
+     * Copies all of the mappings from the specified map to this map.
+     * These mappings will replace any mappings that this map had for
+     * any of the keys currently in the specified map.
+     *
+     * @param m mappings to be stored in this map
+     * @throws NullPointerException if the specified map is null
+     */
+    public void putAll(Map m) {
+        int n = m.size();
+        if (n == 0)
+            return;
+        if (n > size)
+            resize(capacity(n)); // conservatively pre-expand
+
+        for (Object o : m.entrySet()) {
+            Entry e = (Entry) o;
+            put(e.getKey(), e.getValue());
+        }
+    }
+
+    /**
+     * Removes the mapping for this key from this map if present.
+     *
+     * @param key key whose mapping is to be removed from the map
+     * @return the previous value associated with <tt>key</tt>, or
+     * <tt>null</tt> if there was no mapping for <tt>key</tt>.
+     * (A <tt>null</tt> return can also indicate that the map
+     * previously associated <tt>null</tt> with <tt>key</tt>.)
+     */
+    public java.lang.Object remove(Object key) {
+        Object k = maskNull(key);
+        Object[] tab = table;
+        int len = tab.length;
+        int i = hash(k, len);
+
+        //+KEY@ ghost \bigint hash = i;
+        
+        /*+KEY@ 
+          @ loop_invariant true; // TODO: see containsKey()
+          @ decreasing len - (len + i - hash) % len;
+          @ assignable i, modCount, size, tab[*];
+          @*/
+        while (true) {
+            Object item = tab[i];
+            if (item == k) {
+                modCount++;
+                size--;
+                @SuppressWarnings("unchecked") java.lang.Object oldValue = (java.lang.Object) tab[i + 1];
+                tab[i + 1] = null;
+                tab[i] = null;
+                closeDeletion(i);
+                return oldValue;
+            }
+            if (item == null)
+                return null;
+            i = nextKeyIndex(i, len);
+        }
+    }
+
+    /**
+     * Removes the specified key-value mapping from the map if it is present.
+     *
+     * @param key   possible key
+     * @param value possible value
+     * @return <code>true</code> if and only if the specified key-value
+     * mapping was in the map
+     */
+    private boolean removeMapping(Object key, Object value) {
+        Object k = maskNull(key);
+        Object[] tab = table;
+        int len = tab.length;
+        int i = hash(k, len);
+
+        while (true) {
+            Object item = tab[i];
+            if (item == k) {
+                if (tab[i + 1] != value)
+                    return false;
+                modCount++;
+                size--;
+                tab[i] = null;
+                tab[i + 1] = null;
+                closeDeletion(i);
+                return true;
+            }
+            if (item == null)
+                return false;
+            i = nextKeyIndex(i, len);
+        }
+    }
+
+    /**
+     * Rehash all possibly-colliding entries following a
+     * deletion. This preserves the linear-probe
+     * collision properties required by get, put, etc.
+     *
+     * @param d the index of a newly empty deleted slot
+     */
+    private void closeDeletion(int d)
+    // Adapted from Knuth Section 6.4 Algorithm R
+    {
+        Object[] tab = table;
+        int len = tab.length;
+
+        // Look for items to swap into newly vacated slot
+        // starting at index immediately following deletion,
+        // and continuing until a null slot is seen, indicating
+        // the end of a run of possibly-colliding keys.
+        Object item;
+        for (int i = nextKeyIndex(d, len); (item = tab[i]) != null;
+             i = nextKeyIndex(i, len))
+        // The following test triggers if the item at slot i (which
+        // hashes to be at slot r) should take the spot vacated by d.
+        // If so, we swap it in, and then continue with d now at the
+        // newly vacated i.  This process will terminate when we hit
+        // the null slot at the end of this run.
+        // The test is messy because we are using a circular table.
+        {
+            int r = hash(item, len);
+            if ((i < r && (r <= d || d <= i)) || (r <= d && d <= i)) {
+                tab[d] = item;
+                tab[d + 1] = tab[i + 1];
+                tab[i] = null;
+                tab[i + 1] = null;
+                d = i;
+            }
+        }
+    }
+
+    /**
+     * Removes all of the mappings from this map.
+     * The map will be empty after this call returns.
+     */
+    /*+KEY@ 
+      @ also
+      @ public normal_behavior
+      @   assignable
+      @     modCount, size, table[0 .. table.length - (\bigint)1];
+      @   ensures
+      @     \old(modCount) != modCount &&
+      @     \old(table.length) == table.length &&
+      @     size == 0 &&
+      @     (\forall \bigint i;
+      @        0 <= i < table.length;
+      @        table[i] == null);
+      @*/
+    /*+OPENJML@
+      @ also
+      @ public normal_behavior
+      @   assignable
+      @     modCount, size, table[0 .. table.length - 1];
+      @   ensures
+      @     \old(modCount) != modCount &&
+      @     \old(table.length) == table.length &&
+      @     size == 0 &&
+      @     (\forall int i;
+      @        0 <= i < table.length;
+      @        table[i] == null);
+      @*/
+    public void clear() {
+        modCount++;
+        Object[] tab = table;
+
+        /*+KEY@
+          @ maintaining
+          @   0 <= i && i <= tab.length;
+          @ maintaining
+          @   (\forall \bigint j; 0 <= j < i; tab[j] == null);
+          @ decreasing
+          @   tab.length - i;
+          @ assignable
+          @   tab[0 .. tab.length - (\bigint)1];
+          @*/
+        for (int i = 0; i < tab.length; i++)
+            tab[i] = null;
+        size = 0;
+    }
+
+    /**
+     * Compares the specified object with this map for equality.  Returns
+     * <tt>true</tt> if the given object is also a map and the two maps
+     * represent identical object-reference mappings.  More formally, this
+     * map is equal to another map <tt>m</tt> if and only if
+     * <tt>this.entrySet().equals(m.entrySet())</tt>.
+     *
+     * <p><b>Owing to the reference-equality-based semantics of this map it is
+     * possible that the symmetry and transitivity requirements of the
+     * <tt>Object.equals</tt> contract may be violated if this map is compared
+     * to a normal map.  However, the <tt>Object.equals</tt> contract is
+     * guaranteed to hold among <tt>VerifiedIdentityHashMap</tt> instances.</b>
+     *
+     * @param o object to be compared for equality with this map
+     * @return <tt>true</tt> if the specified object is equal to this map
+     * @see Object#equals(Object)
+     */
+    public boolean equals(Object o) {
+        if (o == this) {
+            return true;
+        } else if (o instanceof VerifiedIdentityHashMap) {
+            VerifiedIdentityHashMap m = (VerifiedIdentityHashMap) o;
+            if (m.size() != size)
+                return false;
+
+            Object[] tab = m.table;
+            for (int i = 0; i < tab.length; i += 2) {
+                Object k = tab[i];
+                if (k != null && !containsMapping(k, tab[i + 1]))
+                    return false;
+            }
+            return true;
+        } else if (o instanceof Map) {
+            Map m = (Map) o;
+            return entrySet().equals(m.entrySet());
+        } else {
+            return false;  // o is not a Map
+        }
+    }
+
+    /**
+     * Returns the hash code value for this map.  The hash code of a map is
+     * defined to be the sum of the hash codes of each entry in the map's
+     * <tt>entrySet()</tt> view.  This ensures that <tt>m1.equals(m2)</tt>
+     * implies that <tt>m1.hashCode()==m2.hashCode()</tt> for any two
+     * <tt>VerifiedIdentityHashMap</tt> instances <tt>m1</tt> and <tt>m2</tt>, as
+     * required by the general contract of {@link Object#hashCode}.
+     *
+     * <p><b>Owing to the reference-equality-based semantics of the
+     * <tt>Map.Entry</tt> instances in the set returned by this map's
+     * <tt>entrySet</tt> method, it is possible that the contractual
+     * requirement of <tt>Object.hashCode</tt> mentioned in the previous
+     * paragraph will be violated if one of the two objects being compared is
+     * an <tt>VerifiedIdentityHashMap</tt> instance and the other is a normal map.</b>
+     *
+     * @return the hash code value for this map
+     * @see Object#equals(Object)
+     * @see #equals(Object)
+     */
+    public int hashCode() {
+        int result = 0;
+        Object[] tab = table;
+        for (int i = 0; i < tab.length; i += 2) {
+            Object key = tab[i];
+            if (key != null) {
+                Object k = unmaskNull(key);
+                result += System.identityHashCode(k) ^
+                        System.identityHashCode(tab[i + 1]);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Returns a shallow copy of this identity hash map: the keys and values
+     * themselves are not cloned.
+     *
+     * @return a shallow copy of this map
+     */
+    public Object clone() {
+        try {
+            VerifiedIdentityHashMap m = (VerifiedIdentityHashMap) super.clone();
+            m.entrySet = null;
+            m.table = table.clone();
+            return m;
+        } catch (CloneNotSupportedException e) {
+            throw new InternalError();
+        }
+    }
+
+    private abstract class IdentityHashMapIterator implements Iterator {
+        int index = (size != 0 ? 0 : table.length); // current slot.
+        int expectedModCount = modCount; // to support fast-fail
+        int lastReturnedIndex = -1;      // to allow remove()
+        boolean indexValid; // To avoid unnecessary next computation
+        Object[] traversalTable = table; // reference to main table or copy
+
+        public boolean hasNext() {
+            Object[] tab = traversalTable;
+            for (int i = index; i < tab.length; i += 2) {
+                Object key = tab[i];
+                if (key != null) {
+                    index = i;
+                    return indexValid = true;
+                }
+            }
+            index = tab.length;
+            return false;
+        }
+
+        protected int nextIndex() {
+            if (modCount != expectedModCount)
+                throw new ConcurrentModificationException();
+            if (!indexValid && !hasNext())
+                throw new NoSuchElementException();
+
+            indexValid = false;
+            lastReturnedIndex = index;
+            index += 2;
+            return lastReturnedIndex;
+        }
+
+        public void remove() {
+            if (lastReturnedIndex == -1)
+                throw new IllegalStateException();
+            if (modCount != expectedModCount)
+                throw new ConcurrentModificationException();
+
+            expectedModCount = ++modCount;
+            int deletedSlot = lastReturnedIndex;
+            lastReturnedIndex = -1;
+            // back up index to revisit new contents after deletion
+            index = deletedSlot;
+            indexValid = false;
+
+            // Removal code proceeds as in closeDeletion except that
+            // it must catch the rare case where an element already
+            // seen is swapped into a vacant slot that will be later
+            // traversed by this iterator. We cannot allow future
+            // next() calls to return it again.  The likelihood of
+            // this occurring under 2/3 load factor is very slim, but
+            // when it does happen, we must make a copy of the rest of
+            // the table to use for the rest of the traversal. Since
+            // this can only happen when we are near the end of the table,
+            // even in these rare cases, this is not very expensive in
+            // time or space.
+
+            Object[] tab = traversalTable;
+            int len = tab.length;
+
+            int d = deletedSlot;
+            Object key = tab[d];
+            tab[d] = null;        // vacate the slot
+            tab[d + 1] = null;
+
+            // If traversing a copy, remove in real table.
+            // We can skip gap-closure on copy.
+            if (tab != VerifiedIdentityHashMap.this.table) {
+                VerifiedIdentityHashMap.this.remove(key);
+                expectedModCount = modCount;
+                return;
+            }
+
+            size--;
+
+            Object item;
+            for (int i = nextKeyIndex(d, len); (item = tab[i]) != null;
+                 i = nextKeyIndex(i, len)) {
+                int r = hash(item, len);
+                // See closeDeletion for explanation of this conditional
+                if ((i < r && (r <= d || d <= i)) ||
+                        (r <= d && d <= i)) {
+
+                    // If we are about to swap an already-seen element
+                    // into a slot that may later be returned by next(),
+                    // then clone the rest of table for use in future
+                    // next() calls. It is OK that our copy will have
+                    // a gap in the "wrong" place, since it will never
+                    // be used for searching anyway.
+
+                    if (i < deletedSlot && d >= deletedSlot &&
+                            traversalTable == VerifiedIdentityHashMap.this.table) {
+                        int remaining = len - deletedSlot;
+                        Object[] newTable = new Object[remaining];
+                        System.arraycopy(tab, deletedSlot,
+                                newTable, 0, remaining);
+                        traversalTable = newTable;
+                        index = 0;
+                    }
+
+                    tab[d] = item;
+                    tab[d + 1] = tab[i + 1];
+                    tab[i] = null;
+                    tab[i + 1] = null;
+                    d = i;
+                }
+            }
+        }
+    }
+
+    private class KeyIterator extends IdentityHashMapIterator {
+        @SuppressWarnings("unchecked")
+        public java.lang.Object next() {
+            return (java.lang.Object) unmaskNull(traversalTable[nextIndex()]);
+        }
+    }
+
+    private class ValueIterator extends IdentityHashMapIterator {
+        @SuppressWarnings("unchecked")
+        public java.lang.Object next() {
+            return (java.lang.Object) traversalTable[nextIndex() + 1];
+        }
+    }
+
+    private class EntryIterator
+            extends IdentityHashMapIterator {
+        private Entry lastReturnedEntry = null;
+
+        public Map.Entry next() {
+            lastReturnedEntry = new Entry(nextIndex());
+            return lastReturnedEntry;
+        }
+
+        public void remove() {
+            lastReturnedIndex =
+                    ((null == lastReturnedEntry) ? -1 : lastReturnedEntry.index);
+            super.remove();
+            lastReturnedEntry.index = lastReturnedIndex;
+            lastReturnedEntry = null;
+        }
+
+        private class Entry implements Map.Entry {
+            private int index;
+
+            private Entry(int index) {
+                this.index = index;
+            }
+
+            @SuppressWarnings("unchecked")
+            public java.lang.Object getKey() {
+                checkIndexForEntryUse();
+                return (java.lang.Object) unmaskNull(traversalTable[index]);
+            }
+
+            @SuppressWarnings("unchecked")
+            public java.lang.Object getValue() {
+                checkIndexForEntryUse();
+                return (java.lang.Object) traversalTable[index + 1];
+            }
+
+            @SuppressWarnings("unchecked")
+            public java.lang.Object setValue(java.lang.Object value) {
+                checkIndexForEntryUse();
+                java.lang.Object oldValue = (java.lang.Object) traversalTable[index + 1];
+                traversalTable[index + 1] = value;
+                // if shadowing, force into main table
+                if (traversalTable != VerifiedIdentityHashMap.this.table)
+                    put((java.lang.Object) traversalTable[index], value);
+                return oldValue;
+            }
+
+            public boolean equals(Object o) {
+                if (index < 0)
+                    return super.equals(o);
+
+                if (!(o instanceof Map.Entry))
+                    return false;
+                Map.Entry e = (Map.Entry) o;
+                return (e.getKey() == unmaskNull(traversalTable[index]) &&
+                        e.getValue() == traversalTable[index + 1]);
+            }
+
+            public int hashCode() {
+                if (lastReturnedIndex < 0)
+                    return super.hashCode();
+
+                return (System.identityHashCode(unmaskNull(traversalTable[index])) ^
+                        System.identityHashCode(traversalTable[index + 1]));
+            }
+
+            public String toString() {
+                if (index < 0)
+                    return super.toString();
+
+                return (unmaskNull(traversalTable[index]) + "="
+                        + traversalTable[index + 1]);
+            }
+
+            private void checkIndexForEntryUse() {
+                if (index < 0)
+                    throw new IllegalStateException("Entry was removed");
+            }
+        }
+    }
+
+    // Views
+
+    /**
+     * This field is initialized to contain an instance of the entry set
+     * view the first time this view is requested.  The view is stateless,
+     * so there's no reason to create more than one.
+     */
+    private /*@ spec_public nullable @*/ transient Set entrySet = null;
+
+    /**
+     * Returns an identity-based set view of the keys contained in this map.
+     * The set is backed by the map, so changes to the map are reflected in
+     * the set, and vice-versa.  If the map is modified while an iteration
+     * over the set is in progress, the results of the iteration are
+     * undefined.  The set supports element removal, which removes the
+     * corresponding mapping from the map, via the <tt>Iterator.remove</tt>,
+     * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt>, and
+     * <tt>clear</tt> methods.  It does not support the <tt>add</tt> or
+     * <tt>addAll</tt> methods.
+     *
+     * <p><b>While the object returned by this method implements the
+     * <tt>Set</tt> interface, it does <i>not</i> obey <tt>Set's</tt> general
+     * contract.  Like its backing map, the set returned by this method
+     * defines element equality as reference-equality rather than
+     * object-equality.  This affects the behavior of its <tt>contains</tt>,
+     * <tt>remove</tt>, <tt>containsAll</tt>, <tt>equals</tt>, and
+     * <tt>hashCode</tt> methods.</b>
+     *
+     * <p><b>The <tt>equals</tt> method of the returned set returns <tt>true</tt>
+     * only if the specified object is a set containing exactly the same
+     * object references as the returned set.  The symmetry and transitivity
+     * requirements of the <tt>Object.equals</tt> contract may be violated if
+     * the set returned by this method is compared to a normal set.  However,
+     * the <tt>Object.equals</tt> contract is guaranteed to hold among sets
+     * returned by this method.</b>
+     *
+     * <p>The <tt>hashCode</tt> method of the returned set returns the sum of
+     * the <i>identity hashcodes</i> of the elements in the set, rather than
+     * the sum of their hashcodes.  This is mandated by the change in the
+     * semantics of the <tt>equals</tt> method, in order to enforce the
+     * general contract of the <tt>Object.hashCode</tt> method among sets
+     * returned by this method.
+     *
+     * @return an identity-based set view of the keys contained in this map
+     * @see Object#equals(Object)
+     * @see System#identityHashCode(Object)
+     */
+    public Set keySet() {
+        Set ks = keySet;
+        if (ks != null)
+            return ks;
+        else
+            return keySet = new KeySet();
+    }
+
+    private class KeySet extends AbstractSet {
+        public Iterator iterator() {
+            return new KeyIterator();
+        }
+
+        public int size() {
+            return size;
+        }
+
+        public boolean contains(Object o) {
+            return containsKey(o);
+        }
+
+        public boolean remove(Object o) {
+            int oldSize = size;
+            VerifiedIdentityHashMap.this.remove(o);
+            return size != oldSize;
+        }
+
+        /*
+         * Must revert from AbstractSet's impl to AbstractCollection's, as
+         * the former contains an optimization that results in incorrect
+         * behavior when c is a smaller "normal" (non-identity-based) Set.
+         */
+        public boolean removeAll(Collection c) {
+            boolean modified = false;
+            for (Iterator i = iterator(); i.hasNext(); ) {
+                if (c.contains(i.next())) {
+                    i.remove();
+                    modified = true;
+                }
+            }
+            return modified;
+        }
+
+        public void clear() {
+            VerifiedIdentityHashMap.this.clear();
+        }
+
+        public int hashCode() {
+            int result = 0;
+            for (java.lang.Object key : this)
+                result += System.identityHashCode(key);
+            return result;
+        }
+    }
+
+    /**
+     * Returns a {@link Collection} view of the values contained in this map.
+     * The collection is backed by the map, so changes to the map are
+     * reflected in the collection, and vice-versa.  If the map is
+     * modified while an iteration over the collection is in progress,
+     * the results of the iteration are undefined.  The collection
+     * supports element removal, which removes the corresponding
+     * mapping from the map, via the <tt>Iterator.remove</tt>,
+     * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
+     * <tt>retainAll</tt> and <tt>clear</tt> methods.  It does not
+     * support the <tt>add</tt> or <tt>addAll</tt> methods.
+     *
+     * <p><b>While the object returned by this method implements the
+     * <tt>Collection</tt> interface, it does <i>not</i> obey
+     * <tt>Collection's</tt> general contract.  Like its backing map,
+     * the collection returned by this method defines element equality as
+     * reference-equality rather than object-equality.  This affects the
+     * behavior of its <tt>contains</tt>, <tt>remove</tt> and
+     * <tt>containsAll</tt> methods.</b>
+     */
+    public Collection values() {
+        Collection vs = values;
+        if (vs != null)
+            return vs;
+        else
+            return values = new Values();
+    }
+
+    private class Values extends AbstractCollection {
+        public Iterator iterator() {
+            return new ValueIterator();
+        }
+
+        public int size() {
+            return size;
+        }
+
+        public boolean contains(Object o) {
+            return containsValue(o);
+        }
+
+        public boolean remove(Object o) {
+            for (Iterator i = iterator(); i.hasNext(); ) {
+                if (i.next() == o) {
+                    i.remove();
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public void clear() {
+            VerifiedIdentityHashMap.this.clear();
+        }
+    }
+
+    /**
+     * Returns a {@link Set} view of the mappings contained in this map.
+     * Each element in the returned set is a reference-equality-based
+     * <tt>Map.Entry</tt>.  The set is backed by the map, so changes
+     * to the map are reflected in the set, and vice-versa.  If the
+     * map is modified while an iteration over the set is in progress,
+     * the results of the iteration are undefined.  The set supports
+     * element removal, which removes the corresponding mapping from
+     * the map, via the <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
+     * <tt>removeAll</tt>, <tt>retainAll</tt> and <tt>clear</tt>
+     * methods.  It does not support the <tt>add</tt> or
+     * <tt>addAll</tt> methods.
+     *
+     * <p>Like the backing map, the <tt>Map.Entry</tt> objects in the set
+     * returned by this method define key and value equality as
+     * reference-equality rather than object-equality.  This affects the
+     * behavior of the <tt>equals</tt> and <tt>hashCode</tt> methods of these
+     * <tt>Map.Entry</tt> objects.  A reference-equality based <tt>Map.Entry
+     * e</tt> is equal to an object <tt>o</tt> if and only if <tt>o</tt> is a
+     * <tt>Map.Entry</tt> and <tt>e.getKey()==o.getKey() &amp;&amp;
+     * e.getValue()==o.getValue()</tt>.  To accommodate these equals
+     * semantics, the <tt>hashCode</tt> method returns
+     * <tt>System.identityHashCode(e.getKey()) ^
+     * System.identityHashCode(e.getValue())</tt>.
+     *
+     * <p><b>Owing to the reference-equality-based semantics of the
+     * <tt>Map.Entry</tt> instances in the set returned by this method,
+     * it is possible that the symmetry and transitivity requirements of
+     * the {@link Object#equals(Object)} contract may be violated if any of
+     * the entries in the set is compared to a normal map entry, or if
+     * the set returned by this method is compared to a set of normal map
+     * entries (such as would be returned by a call to this method on a normal
+     * map).  However, the <tt>Object.equals</tt> contract is guaranteed to
+     * hold among identity-based map entries, and among sets of such entries.
+     * </b>
+     *
+     * @return a set view of the identity-mappings contained in this map
+     */
+    public Set entrySet() {
+        Set es = entrySet;
+        if (es != null)
+            return es;
+        else
+            return entrySet = new EntrySet();
+    }
+
+    private class EntrySet extends AbstractSet {
+        public Iterator iterator() {
+            return new EntryIterator();
+        }
+
+        public boolean contains(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            Map.Entry entry = (Map.Entry) o;
+            return containsMapping(entry.getKey(), entry.getValue());
+        }
+
+        public boolean remove(Object o) {
+            if (!(o instanceof Map.Entry))
+                return false;
+            Map.Entry entry = (Map.Entry) o;
+            return removeMapping(entry.getKey(), entry.getValue());
+        }
+
+        public int size() {
+            return size;
+        }
+
+        public void clear() {
+            VerifiedIdentityHashMap.this.clear();
+        }
+
+        /*
+         * Must revert from AbstractSet's impl to AbstractCollection's, as
+         * the former contains an optimization that results in incorrect
+         * behavior when c is a smaller "normal" (non-identity-based) Set.
+         */
+        public boolean removeAll(Collection c) {
+            boolean modified = false;
+            for (Iterator i = iterator(); i.hasNext(); ) {
+                if (c.contains(i.next())) {
+                    i.remove();
+                    modified = true;
+                }
+            }
+            return modified;
+        }
+
+        public Object[] toArray() {
+            int size = size();
+            Object[] result = new Object[size];
+            Iterator it = iterator();
+            for (int i = 0; i < size; i++)
+                result[i] = new AbstractMap.SimpleEntry(((java.util.Map.Entry) it.next()));
+            return result;
+        }
+
+        @SuppressWarnings("unchecked")
+        public java.lang.Object[] toArray(java.lang.Object[] a) {
+            int size = size();
+            if (a.length < size)
+                a = (java.lang.Object[]) java.lang.reflect
+                        .Array.newInstance(a.getClass().getComponentType(), size);
+            Iterator it = iterator();
+            for (int i = 0; i < size; i++)
+                a[i] = (java.lang.Object) new AbstractMap.SimpleEntry(((java.util.Map.Entry) it.next()));
+            if (a.length > size)
+                a[size] = null;
+            return a;
+        }
+    }
+
+
+//    private static final long serialVersionUID = 8188218128353913216L;
+//
+//    /**
+//     * Saves the state of the <tt>VerifiedIdentityHashMap</tt> instance to a stream
+//     * (i.e., serializes it).
+//     *
+//     * @serialData The <i>size</i> of the HashMap (the number of key-value
+//     *          mappings) (<tt>int</tt>), followed by the key (Object) and
+//     *          value (Object) for each key-value mapping represented by the
+//     *          VerifiedIdentityHashMap.  The key-value mappings are emitted in no
+//     *          particular order.
+//     */
+//    private void writeObject(java.io.ObjectOutputStream s)
+//            throws java.io.IOException  {
+//        // Write out and any hidden stuff
+//        s.defaultWriteObject();
+//
+//        // Write out size (number of Mappings)
+//        s.writeInt(size);
+//
+//        // Write out keys and values (alternating)
+//        Object[] tab = table;
+//        for (int i = 0; i < tab.length; i += 2) {
+//            Object key = tab[i];
+//            if (key != null) {
+//                s.writeObject(unmaskNull(key));
+//                s.writeObject(tab[i + 1]);
+//            }
+//        }
+//    }
+
+//    /**
+//     * Reconstitutes the <tt>VerifiedIdentityHashMap</tt> instance from a stream (i.e.,
+//     * deserializes it).
+//     */
+//    private void readObject(java.io.ObjectInputStream s)
+//            throws java.io.IOException, ClassNotFoundException  {
+//        // Read in any hidden stuff
+//        s.defaultReadObject();
+//
+//        // Read in size (number of Mappings)
+//        int size = s.readInt();
+//        if (size < 0)
+//            throw new java.io.StreamCorruptedException
+//                    ("Illegal mappings count: " + size);
+//        int cap = capacity(size);
+//        SharedSecrets.getJavaOISAccess().checkArray(s, Object[].class, cap);
+//        init(cap);
+//
+//        // Read the keys and values, and put the mappings in the table
+//        for (int i=0; i<size; i++) {
+//            @SuppressWarnings("unchecked")
+//            K key = (K) s.readObject();
+//            @SuppressWarnings("unchecked")
+//            V value = (V) s.readObject();
+//            putForCreate(key, value);
+//        }
+//    }
+
+//    /**
+//     * The put method for readObject.  It does not resize the table,
+//     * update modCount, etc.
+//     */
+//    private void putForCreate(K key, V value)
+//            throws java.io.StreamCorruptedException
+//    {
+//        Object k = maskNull(key);
+//        Object[] tab = table;
+//        int len = tab.length;
+//        int i = hash(k, len);
+//
+//        Object item;
+//        while ( (item = tab[i]) != null) {
+//            if (item == k)
+//                throw new java.io.StreamCorruptedException();
+//            i = nextKeyIndex(i, len);
+//        }
+//        tab[i] = k;
+//        tab[i + 1] = value;
+//    }
+}
\ No newline at end of file
diff --git a/tools/jml2java/build.gradle.kts b/tools/jml2java/build.gradle.kts
new file mode 100644
index 0000000000..d64762589a
--- /dev/null
+++ b/tools/jml2java/build.gradle.kts
@@ -0,0 +1,9 @@
+plugins {
+    id("standard-kotlin")
+}
+
+dependencies {
+    api(project(":tools:utils"))
+    testImplementation(kotlin("serialization"))
+    testImplementation(libs.snakeyaml)
+}
diff --git a/tools/jml2java/src/main/kotlin/io/github/jmltoolkit/jml2java/Jml2JavaFacade.kt b/tools/jml2java/src/main/kotlin/io/github/jmltoolkit/jml2java/Jml2JavaFacade.kt
new file mode 100644
index 0000000000..99287352dc
--- /dev/null
+++ b/tools/jml2java/src/main/kotlin/io/github/jmltoolkit/jml2java/Jml2JavaFacade.kt
@@ -0,0 +1,55 @@
+package io.github.jmltoolkit.jml2java
+
+import com.github.javaparser.ast.Jmlish
+import com.github.javaparser.ast.expr.BinaryExpr
+import com.github.javaparser.ast.expr.Expression
+import com.github.javaparser.ast.stmt.BlockStmt
+import com.github.javaparser.ast.stmt.ForStmt
+import com.github.javaparser.utils.Pair
+import java.util.*
+
+/**
+ * Transformation of JML expressions into equivalent Java code.
+ *
+ * @author Alexander Weigl
+ * @version 1 (04.10.22)
+ */
+object Jml2JavaFacade {
+    fun translate(expression: Expression?): Pair<BlockStmt, Expression?> {
+        val j2jt = Jml2JavaTranslator()
+        val result = BlockStmt()
+        val e = j2jt.accept(expression, result)
+        return Pair(result, e)
+    }
+
+    fun embeddLoopInvariant(stmt: ForStmt?): BlockStmt? {
+        return null
+    }
+
+    fun containsJmlExpression(expression: Expression?): Boolean {
+        val search = Stack<Expression?>()
+        search.add(expression)
+
+        while (!search.isEmpty()) {
+            val e = search.pop()
+            if (e is Jmlish) {
+                return true
+            }
+
+            if (e is BinaryExpr) {
+                if (e.operator == BinaryExpr.Operator.IMPLICATION) return true
+                if (e.operator == BinaryExpr.Operator.RIMPLICATION) return true
+                if (e.operator == BinaryExpr.Operator.EQUIVALENCE) return true
+                if (e.operator == BinaryExpr.Operator.SUB_LOCK) return true
+                if (e.operator == BinaryExpr.Operator.SUB_LOCKE) return true
+                if (e.operator == BinaryExpr.Operator.SUBTYPE) return true
+                if (e.operator == BinaryExpr.Operator.RANGE) return true
+            }
+
+            for (childNode in e!!.childNodes) {
+                if (childNode is Expression) search.add(childNode)
+            }
+        }
+        return false
+    }
+}
diff --git a/tools/jml2java/src/main/kotlin/io/github/jmltoolkit/jml2java/Jml2JavaTranslator.kt b/tools/jml2java/src/main/kotlin/io/github/jmltoolkit/jml2java/Jml2JavaTranslator.kt
new file mode 100644
index 0000000000..c0f2ba8b5d
--- /dev/null
+++ b/tools/jml2java/src/main/kotlin/io/github/jmltoolkit/jml2java/Jml2JavaTranslator.kt
@@ -0,0 +1,388 @@
+package io.github.jmltoolkit.jml2java
+
+import com.github.javaparser.ast.Modifier
+import com.github.javaparser.ast.body.Parameter
+import com.github.javaparser.ast.body.VariableDeclarator
+import com.github.javaparser.ast.expr.*
+import com.github.javaparser.ast.jml.expr.JmlLetExpr
+import com.github.javaparser.ast.jml.expr.JmlMultiCompareExpr
+import com.github.javaparser.ast.jml.expr.JmlQuantifiedExpr
+import com.github.javaparser.ast.stmt.*
+import com.github.javaparser.ast.type.PrimitiveType
+import com.github.javaparser.ast.type.VarType
+import com.github.javaparser.ast.visitor.GenericVisitorAdapter
+import com.github.javaparser.resolution.types.ResolvedType
+import io.github.jmltoolkit.utils.JMLUtils
+import io.github.jmltoolkit.utils.Pattern
+import java.util.concurrent.atomic.AtomicInteger
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (04.10.22)
+ */
+class Jml2JavaTranslator {
+    private val counter = AtomicInteger()
+
+    fun accept(e: Expression?, arg: BlockStmt): Expression? {
+        if (Jml2JavaFacade.containsJmlExpression(e)) {
+            return e!!.accept(Jml2JavaVisitor(), arg)
+        }
+        return e // createAssignmentAndAdd(e, arg);
+    }
+
+    private fun createAssignmentAndAdd(e: Expression, arg: BlockStmt): Expression {
+        arg.addAndGetStatement(createAssignmentFor(e))
+        return NameExpr(targetForAssignment)
+    }
+
+    private fun createAssignmentFor(e: Expression): Statement {
+        val decl = VariableDeclarationExpr(
+            VariableDeclarator(
+                VarType(),
+                newTargetForAssignment(), e
+            )
+        )
+        decl.addModifier(Modifier.DefaultKeyword.FINAL)
+        return ExpressionStmt(decl)
+    }
+
+    private val targetForAssignment: SimpleName
+        get() = SimpleName("_gen_" + counter.get())
+
+    private fun newTargetForAssignment(): SimpleName {
+        counter.getAndIncrement()
+        return targetForAssignment
+    }
+
+    fun findPredicate(n: JmlQuantifiedExpr): Expression {
+        return n.expressions[n.expressions.size - 1]
+    }
+
+    fun findUpperBound(n: JmlQuantifiedExpr, variable: String): Expression? {
+        if (n.expressions.size == 3) return n.expressions[1]
+
+        val e = findBound(n)
+
+        if (e is JmlMultiCompareExpr) {
+            if (e.expressions.size == 3 &&
+                (e.expressions[1] as? NameExpr)?.nameAsString == variable
+            ) {
+                if (e.operators[0] == BinaryExpr.Operator.LESS_EQUALS) return e.expressions[0]
+                if (e.operators[0] == BinaryExpr.Operator.LESS) return BinaryExpr(
+                    e.expressions[0],
+                    IntegerLiteralExpr("1"),
+                    BinaryExpr.Operator.PLUS
+                )
+                throw IllegalStateException()
+            }
+        }
+
+        val ph: Expression = NameExpr("_")
+        run {
+            val be = BinaryExpr(NameExpr(variable), ph, BinaryExpr.Operator.GREATER_EQUALS)
+            val pattern = Pattern(be)
+            pattern.addPlaceholder(ph, "min")
+            val result = pattern.find(n)
+            if (result != null) return result["min"] as Expression?
+        }
+
+        run {
+            val be = BinaryExpr(NameExpr(variable), ph, BinaryExpr.Operator.GREATER)
+            val pattern = Pattern(be)
+            pattern.addPlaceholder(ph, "min")
+            val result = pattern.find(n)
+            if (result != null) return BinaryExpr(
+                result["min"] as Expression?,
+                IntegerLiteralExpr("1"),
+                BinaryExpr.Operator.PLUS
+            )
+        }
+
+        run {
+            val be = BinaryExpr(ph, NameExpr(variable), BinaryExpr.Operator.LESS_EQUALS)
+            val pattern = Pattern(be)
+            pattern.addPlaceholder(ph, "min")
+            val result = pattern.find(n)
+            if (result != null) return result["min"] as Expression?
+        }
+
+        run {
+            val be = BinaryExpr(ph, NameExpr(variable), BinaryExpr.Operator.LESS)
+            val pattern = Pattern(be)
+            pattern.addPlaceholder(ph, "min")
+            val result = pattern.find(n)
+            if (result != null) return BinaryExpr(
+                result["min"] as Expression?,
+                IntegerLiteralExpr("1"),
+                BinaryExpr.Operator.PLUS
+            )
+        }
+
+        return null
+    }
+
+    private inner class Jml2JavaVisitor : GenericVisitorAdapter<Expression, BlockStmt>() {
+        override fun visit(n: JmlQuantifiedExpr, arg: BlockStmt): Expression {
+            if (n.binder === JmlQuantifiedExpr.JmlDefaultBinder.FORALL) return visitForall(n, arg)
+            if (n.binder === JmlQuantifiedExpr.JmlDefaultBinder.EXISTS) return visitExists(n, arg)
+
+            throw IllegalArgumentException("Unsupport quantifier " + n.binder)
+        }
+
+        private fun visitForall(n: JmlQuantifiedExpr, arg: BlockStmt): Expression {
+            assert(n.variables.size == 1)
+            val rvalue = newSymbol("result_")
+            val highVar = newSymbol("high_")
+            val predVar = newSymbol("pred_")
+
+            arg.addAndGetStatement(
+                ExpressionStmt(
+                    VariableDeclarationExpr(
+                        VariableDeclarator(
+                            PrimitiveType(PrimitiveType.Primitive.BOOLEAN),
+                            rvalue, BooleanLiteralExpr(true)
+                        )
+                    )
+                )
+            )
+
+            val variable: Parameter = n.variables[0]
+            val lowCode = Jml2JavaFacade.translate(findLowerBound(n, variable.nameAsString))
+            arg.addAndGetStatement(
+                ExpressionStmt(
+                    VariableDeclarationExpr(
+                        VariableDeclarator(
+                            variable.type.clone(), variable.nameAsString
+                        )
+                    )
+                )
+            )
+            lowCode.a!!.addAndGetStatement(
+                ExpressionStmt(
+                    AssignExpr(
+                        NameExpr(variable.nameAsString), lowCode.b,
+                        AssignExpr.Operator.ASSIGN
+                    )
+                )
+            )
+            arg.addAndGetStatement(lowCode.a)
+
+            val highCode = Jml2JavaFacade.translate(findUpperBound(n, variable.nameAsString))
+            arg.addAndGetStatement(
+                ExpressionStmt(
+                    VariableDeclarationExpr(
+                        VariableDeclarator(
+                            variable.type.clone(), highVar
+                        )
+                    )
+                )
+            )
+            highCode.a!!.addAndGetStatement(
+                ExpressionStmt(
+                    AssignExpr(
+                        NameExpr(highVar), highCode.b,
+                        AssignExpr.Operator.ASSIGN
+                    )
+                )
+            )
+            arg.addAndGetStatement(highCode.a!!.clone())
+
+            val predCode = Jml2JavaFacade.translate(findPredicate(n))
+
+            val whileStmt = arg.addAndGetStatement(WhileStmt())
+            val lessThanExpr = BinaryExpr(
+                NameExpr(variable.nameAsString),
+                NameExpr(highVar), BinaryExpr.Operator.LESS
+            )
+            whileStmt.setCondition(
+                BinaryExpr(lessThanExpr, NameExpr(rvalue), BinaryExpr.Operator.AND)
+            )
+            val body = BlockStmt()
+
+            body.addAndGetStatement(
+                ExpressionStmt(
+                    VariableDeclarationExpr(
+                        VariableDeclarator(PrimitiveType(PrimitiveType.Primitive.BOOLEAN), predVar)
+                    )
+                )
+            )
+            predCode.a!!.addAndGetStatement(
+                ExpressionStmt(
+                    AssignExpr(
+                        NameExpr(predVar), predCode.b,
+                        AssignExpr.Operator.ASSIGN
+                    )
+                )
+            )
+            body.addAndGetStatement(predCode.a)
+
+            val assignPred = ExpressionStmt(
+                AssignExpr(
+                    NameExpr(rvalue),
+                    BooleanLiteralExpr(true), AssignExpr.Operator.ASSIGN
+                )
+            )
+            body.addAndGetStatement(
+                IfStmt(NameExpr(predVar), assignPred, null)
+            )
+            body.addAndGetStatement(highCode.a!!.clone())
+
+            whileStmt.setBody(body)
+            return NameExpr(rvalue)
+        }
+
+        private fun newSymbol(prefix: String): String {
+            return prefix + counter.getAndIncrement()
+        }
+
+        private fun visitExists(n: JmlQuantifiedExpr, arg: BlockStmt): Expression {
+            return UnaryExpr(visitForall(n, arg), UnaryExpr.Operator.LOGICAL_COMPLEMENT)
+        }
+
+
+        override fun visit(n: JmlLetExpr, arg: BlockStmt): Expression {
+            val inner = BlockStmt()
+            val target = newTargetForAssignment()
+            val type: ResolvedType = n.body.calculateResolvedType()
+            arg.addAndGetStatement<ExpressionStmt>(
+                ExpressionStmt(
+                    VariableDeclarationExpr(
+                        JMLUtils.resolvedType2Type(type),
+                        target.asString()
+                    )
+                )
+            )
+            inner.addAndGetStatement(ExpressionStmt(n.variables))
+            val e = accept(n.body, inner)
+            arg.addAndGetStatement(inner)
+            inner.addAndGetStatement(AssignExpr(NameExpr(target.asString()), e, AssignExpr.Operator.ASSIGN))
+            return NameExpr(target.asString())
+        }
+
+        override fun visit(n: BinaryExpr, arg: BlockStmt): Expression {
+            val left = accept(n.left, arg)
+            val right = accept(n.right, arg)
+            return when (n.operator) {
+                BinaryExpr.Operator.IMPLICATION -> BinaryExpr(
+                    UnaryExpr(
+                        EnclosedExpr(left),
+                        UnaryExpr.Operator.LOGICAL_COMPLEMENT
+                    ),
+                    right,
+                    BinaryExpr.Operator.OR
+                )
+
+                BinaryExpr.Operator.RIMPLICATION -> BinaryExpr(
+                    left,
+                    UnaryExpr(
+                        EnclosedExpr(right),
+                        UnaryExpr.Operator.LOGICAL_COMPLEMENT
+                    ),
+                    BinaryExpr.Operator.OR
+                )
+
+                BinaryExpr.Operator.EQUIVALENCE -> BinaryExpr(
+                    left,
+                    right,
+                    BinaryExpr.Operator.EQUALS
+                )
+
+                BinaryExpr.Operator.SUBTYPE, BinaryExpr.Operator.SUB_LOCK, BinaryExpr.Operator.SUB_LOCKE -> throw IllegalArgumentException(
+                    "Unsupported operators."
+                )
+
+                else -> createAssignmentAndAdd(
+                    BinaryExpr(left, right, n.operator),
+                    arg
+                )
+            }
+        }
+
+        override fun visit(n: ArrayAccessExpr, arg: BlockStmt): Expression {
+            return super.visit(n, arg)
+        }
+
+        override fun visit(n: ArrayCreationExpr, arg: BlockStmt): Expression {
+            return super.visit(n, arg)
+        }
+
+        override fun visit(n: ArrayInitializerExpr, arg: BlockStmt): Expression {
+            return super.visit(n, arg)
+        }
+
+        override fun visit(n: AssignExpr, arg: BlockStmt): Expression {
+            return super.visit(n, arg)
+        }
+    }
+
+    companion object {
+        fun findBound(n: JmlQuantifiedExpr): Expression {
+            if (n.expressions.size == 2) return n.expressions[0]
+            else
+                if (n.expressions.size == 1 && n.expressions.first() is BinaryExpr)
+                    return n.expressions.first()
+            throw IllegalArgumentException("Could not determine bound.")
+        }
+
+        fun findLowerBound(n: JmlQuantifiedExpr, variable: String): Expression? {
+            if (n.expressions.size == 3) return n.expressions[0]
+
+            val e = findBound(n)
+
+            if (e is JmlMultiCompareExpr) {
+                if (e.expressions.size == 3 &&
+                    (e.expressions[1] as? NameExpr)?.nameAsString == variable
+                ) {
+                    if (e.operators[0] == BinaryExpr.Operator.LESS_EQUALS) return e.expressions[0]
+                    if (e.operators[0] == BinaryExpr.Operator.LESS) return BinaryExpr(
+                        e.expressions[0], IntegerLiteralExpr("1"), BinaryExpr.Operator.PLUS
+                    )
+                    throw IllegalStateException()
+                }
+            }
+
+            val ph: Expression = NameExpr("_")
+            run {
+                val be = BinaryExpr(NameExpr(variable), ph, BinaryExpr.Operator.GREATER_EQUALS)
+                val pattern = Pattern(be)
+                pattern.addPlaceholder(ph, "min")
+                val result = pattern.find(n)
+                if (result != null) return result["min"] as Expression?
+            }
+
+            run {
+                val be = BinaryExpr(NameExpr(variable), ph, BinaryExpr.Operator.GREATER)
+                val pattern = Pattern(be)
+                pattern.addPlaceholder(ph, "min")
+                val result = pattern.find(n)
+                if (result != null) return BinaryExpr(
+                    result["min"] as Expression?,
+                    IntegerLiteralExpr("1"),
+                    BinaryExpr.Operator.PLUS
+                )
+            }
+
+            run {
+                val be = BinaryExpr(ph, NameExpr(variable), BinaryExpr.Operator.LESS_EQUALS)
+                val pattern = Pattern(be)
+                pattern.addPlaceholder(ph, "min")
+                val result = pattern.find(n)
+                if (result != null) return result["min"] as Expression?
+            }
+
+            run {
+                val be = BinaryExpr(ph, NameExpr(variable), BinaryExpr.Operator.LESS)
+                val pattern = Pattern(be)
+                pattern.addPlaceholder(ph, "min")
+                val result = pattern.find(n)
+                if (result != null) return BinaryExpr(
+                    result["min"] as Expression?,
+                    IntegerLiteralExpr("1"),
+                    BinaryExpr.Operator.PLUS
+                )
+            }
+
+            return null
+        }
+    }
+}
diff --git a/tools/jml2java/src/main/kotlin/io/github/jmltoolkit/jml2java/package-info.kt b/tools/jml2java/src/main/kotlin/io/github/jmltoolkit/jml2java/package-info.kt
new file mode 100644
index 0000000000..15bf014fc1
--- /dev/null
+++ b/tools/jml2java/src/main/kotlin/io/github/jmltoolkit/jml2java/package-info.kt
@@ -0,0 +1,9 @@
+/**
+ * Transformation of JML expressions into equivalent Java code.
+ *
+ * @author Alexander Weigl
+ * @version 1 (04.10.22)
+ * @see jml2java.Jml2JavaTranslator
+ */
+package io.github.jmltoolkit.jml2java
+
diff --git a/tools/jml2java/src/test/kotlin/io/github/jmltoolkit/jml2java/Jml2JavaTests.kt b/tools/jml2java/src/test/kotlin/io/github/jmltoolkit/jml2java/Jml2JavaTests.kt
new file mode 100644
index 0000000000..95ba1021bd
--- /dev/null
+++ b/tools/jml2java/src/test/kotlin/io/github/jmltoolkit/jml2java/Jml2JavaTests.kt
@@ -0,0 +1,62 @@
+package io.github.jmltoolkit.jml2java
+
+import com.github.javaparser.ParseResult
+import com.github.javaparser.Problem
+import com.github.javaparser.ast.expr.Expression
+import com.github.javaparser.printer.DefaultPrettyPrinter
+import com.google.common.truth.Truth
+import io.github.jmltoolkit.utils.TestWithJavaParser
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.DynamicTest
+import org.junit.jupiter.api.TestFactory
+import org.yaml.snakeyaml.Yaml
+import java.io.IOException
+import java.util.function.Consumer
+import java.util.stream.Stream
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (04.10.22)
+ */
+class Jml2JavaTests : TestWithJavaParser() {
+    @TestFactory
+    @Throws(IOException::class)
+    fun j2jTranslation(): Stream<DynamicTest> {
+        javaClass.getResourceAsStream("/expr.yaml").use { inputStream ->
+            val yaml = Yaml()
+            val obj: List<Map<String, Any>> = yaml.load(inputStream)
+            return obj.stream().map { m: Map<String, Any> ->
+                val a = m["expr"] as String
+                val result = m["result"] as String?
+                DynamicTest.dynamicTest(a) {
+                    if (result != null) jml2JavaTranslation(a, result)
+                }
+            }
+        }
+    }
+
+    private fun jml2JavaTranslation(
+        input: String?,
+        expected: String,
+    ) {
+        val e: ParseResult<Expression> = parser.parseJmlExpression(input)
+        if (!e.isSuccessful) {
+            e.problems.forEach(Consumer { x: Problem? -> System.err.println(x) })
+            Assertions.fail<Any>("Error during parsing")
+        }
+        val expr = e.result.get()
+        expr.setParentNode(parent)
+        val actual = Jml2JavaFacade.translate(expr)
+
+        val dpp = DefaultPrettyPrinter()
+        val sblock = dpp.print(actual.a)
+        val sexpr = dpp.print(actual.b)
+        Truth
+            .assertThat(trimAllWs("$sblock $sexpr"))
+            .isEqualTo(trimAllWs(expected))
+    }
+
+    companion object {
+        private fun trimAllWs(expected: String): String = expected.replace("\\s+".toRegex(), " ").trim { it <= ' ' }
+    }
+}
diff --git a/tools/jml2java/src/test/kotlin/io/github/jmltoolkit/jml2java/Jml2JavaTranslatorTest.kt b/tools/jml2java/src/test/kotlin/io/github/jmltoolkit/jml2java/Jml2JavaTranslatorTest.kt
new file mode 100644
index 0000000000..d6cfa5b879
--- /dev/null
+++ b/tools/jml2java/src/test/kotlin/io/github/jmltoolkit/jml2java/Jml2JavaTranslatorTest.kt
@@ -0,0 +1,59 @@
+package io.github.jmltoolkit.jml2java
+
+import com.github.javaparser.ast.jml.expr.JmlQuantifiedExpr
+import com.google.common.truth.Truth
+import org.junit.jupiter.api.Test
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (11.10.22)
+ */
+internal class Jml2JavaTranslatorTest {
+    @Test
+    fun test() {
+        val n1: JmlQuantifiedExpr =
+            com.github.javaparser.StaticJavaParser.parseJmlExpression("(\\forall int x; 0 <= x < a.length; x%2==0)")
+        val bound = Jml2JavaTranslator.findLowerBound(n1, "x")
+        Truth.assertThat(bound.toString()).isEqualTo("0")
+    }
+
+    @Test
+    fun test2() {
+        val n1: JmlQuantifiedExpr =
+            com.github.javaparser.StaticJavaParser.parseJmlExpression("(\\forall int x; 5 < x < a.length; x%2==0)")
+        val bound = Jml2JavaTranslator.findLowerBound(n1, "x")
+        Truth.assertThat(bound.toString()).isEqualTo("5 + 1")
+    }
+
+    @Test
+    fun test3() {
+        val n1: JmlQuantifiedExpr =
+            com.github.javaparser.StaticJavaParser.parseJmlExpression("(\\forall int x; 2+1 < x < a.length; x%2==0)")
+        val bound = Jml2JavaTranslator.findLowerBound(n1, "x")
+        Truth.assertThat(bound.toString()).isEqualTo("2 + 1 + 1")
+    }
+
+    @Test
+    fun test6() {
+        val n1: JmlQuantifiedExpr =
+            com.github.javaparser.StaticJavaParser.parseJmlExpression("(\\forall int y; 2+1 < y < a.length; y%2==0)")
+        val bound = Jml2JavaTranslator.findLowerBound(n1, "y")
+        Truth.assertThat(bound.toString()).isEqualTo("2 + 1 + 1")
+    }
+
+    @Test
+    fun test4() {
+        val n1: JmlQuantifiedExpr =
+            com.github.javaparser.StaticJavaParser.parseJmlExpression("(\\forall int x; 0 < x && x < a.length; x%2==0)")
+        val bound = Jml2JavaTranslator.findLowerBound(n1, "x")
+        Truth.assertThat(bound.toString()).isEqualTo("0 + 1")
+    }
+
+    @Test
+    fun test5() {
+        val n1: JmlQuantifiedExpr =
+            com.github.javaparser.StaticJavaParser.parseJmlExpression("(\\forall int x; 0 <= x && x < a.length; x%2==0)")
+        val bound = Jml2JavaTranslator.findLowerBound(n1, "x")
+        Truth.assertThat(bound.toString()).isEqualTo("0")
+    }
+}
\ No newline at end of file
diff --git a/tools/jml2java/src/test/kotlin/io/github/jmltoolkit/jml2java/PatternTest.kt b/tools/jml2java/src/test/kotlin/io/github/jmltoolkit/jml2java/PatternTest.kt
new file mode 100644
index 0000000000..88149ab856
--- /dev/null
+++ b/tools/jml2java/src/test/kotlin/io/github/jmltoolkit/jml2java/PatternTest.kt
@@ -0,0 +1,25 @@
+package io.github.jmltoolkit.jml2java
+
+import io.github.jmltoolkit.utils.Pattern
+import org.junit.jupiter.api.Test
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (11.10.22)
+ */
+internal class PatternTest {
+    @Test
+    fun matchIf() {
+        val cond = com.github.javaparser.ast.expr.NameExpr("_")
+        val then = com.github.javaparser.ast.stmt.ExpressionStmt()
+        val other = com.github.javaparser.ast.stmt.ExpressionStmt()
+        val ifPattern = Pattern(com.github.javaparser.ast.stmt.IfStmt(cond, then, other))
+        ifPattern.addPlaceholder(cond, "c")
+        ifPattern.addPlaceholder(then, "t")
+        ifPattern.addPlaceholder(other, "o")
+
+        val candidate = com.github.javaparser.StaticJavaParser.parseStatement("if(a<b+1) print(a); else print(b);")
+        val result1 = ifPattern.match(candidate)
+        println(result1)
+    }
+}
\ No newline at end of file
diff --git a/tools/jml2java/src/test/resources/Test.java b/tools/jml2java/src/test/resources/Test.java
new file mode 100644
index 0000000000..019b6b7d2e
--- /dev/null
+++ b/tools/jml2java/src/test/resources/Test.java
@@ -0,0 +1,5 @@
+public class Test {
+    Test self = new Test();
+    Object a, b;
+    int[] ary;
+}
\ No newline at end of file
diff --git a/tools/jml2java/src/test/resources/expr.yaml b/tools/jml2java/src/test/resources/expr.yaml
new file mode 100644
index 0000000000..1467539a6b
--- /dev/null
+++ b/tools/jml2java/src/test/resources/expr.yaml
@@ -0,0 +1,81 @@
+- expr: |
+    true
+  result: |
+    { } true
+- expr: |
+    2 + 3
+  result: |
+    { } 2 + 3
+
+
+- expr: |
+    !(a != null && b != null) ==> a == b
+  result: |
+    { } !(!(a != null && b != null)) || a == b
+
+- expr: |
+    a != null && b != null ==> a == b
+  result: |
+    { } !(a != null && b != null) || a == b
+
+- expr: |
+    ary[2] == 2
+  result: |
+    { } ary[2] == 2
+
+- expr: |
+    (\forall int i; 0<=i<ary.length; ary[i] == i)
+  result: |
+    { boolean result_0 = true; 
+      int i; { i = 0; } 
+      int high_1; { high_1 = 0; } 
+      while (i < high_1 && result_0) { 
+        boolean pred_2; { pred_2 = ary[i] == i; } 
+        if (pred_2) result_0 = true; 
+        { high_1 = 0; } 
+      } 
+    } 
+    result_0
+
+- expr: |
+    this.self.self.ary[0] == 1
+  result: |
+    { } this.self.self.ary[0] == 1
+
+- expr: |
+    this.self.self.ary[0] == 1
+  result: |
+    { } this.self.self.ary[0] == 1
+
+- expr: |
+    (new int[] {1,2,3}).length == 3
+  result: |
+    { } (new int[] { 1, 2, 3 }).length == 3
+
+- expr: |
+    (new int[3]).length == 3
+  result: |
+    { } (new int[3]).length == 3
+
+- expr: |
+    (new int[3][2]).length == 3
+  result: |
+    { } (new int[3][2]).length == 3
+
+- expr: |
+    (\let int[][] x = { {1}, {2} }; x.length ) == 2
+  result: |
+    { 
+      int _gen_1; 
+      { 
+        int[][] x = { { 1 }, { 2 } }; 
+        _gen_1 = x.length; 
+      } 
+      final var _gen_2 = _gen_1 == 2; 
+    } 
+    _gen_2
+
+- expr: |
+    (\let int x = 5; x)
+  resultInt: |
+    (let ((x 5)) x)
diff --git a/tools/lint/build.gradle.kts b/tools/lint/build.gradle.kts
new file mode 100644
index 0000000000..c638d70786
--- /dev/null
+++ b/tools/lint/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    id("standard-kotlin")
+}
+
+dependencies {
+    api(project(":jmlparser-symbol-solver-core"))
+    api(libs.gson)
+    implementation(libs.logback)
+    implementation("se.bjurr.violations:violations-lib:1.160.4")
+    testImplementation(project(":tools:utils"))
+}
diff --git a/tools/lint/gen.py b/tools/lint/gen.py
new file mode 100644
index 0000000000..630eea590e
--- /dev/null
+++ b/tools/lint/gen.py
@@ -0,0 +1,67 @@
+import json
+from pprint import pprint
+
+with open("src/sarif-schema-2.1.0.json") as fh:
+    schema = json.load(fh)
+
+visited_defs = set()
+
+def enqueue(ref):
+    if ref not in visited_defs:
+        queue_classes.append((ref, schema['definitions'][ref]))
+        visited_defs.add(ref)
+
+
+def type(prop):
+    t = prop.get('type', None)
+    if t == 'string':
+        return 'String'
+    if t == 'integer':
+        return 'Int'
+    if t == ['string', 'null']:
+        return 'String?'
+    if t == 'array' or (t and 'array' in t):
+        t = prop['items'].get('$ref', None)
+        if t:
+            t = t[14:]
+            enqueue(t)
+        else:
+            t = prop['items'].get('type', t)
+
+        return f"MutableList<{t}>"
+
+    ref = prop.get('$ref', None)
+    if ref:
+        ref = ref[14:]
+        enqueue(ref)
+        return ref
+
+    return "type unsupported"
+
+
+#        prefix = '?' if 'null' in t else ''
+
+
+def get_props(obj):
+    s = []
+    for (k, v) in obj['properties'].items():
+        if k.startswith('$'): continue
+        s.append(f"/** {v['description']} */ \n var {k} : {type(v)}")
+    return ',\n'.join(s)
+
+
+queue_classes = [("Sarif", schema)]
+
+
+def make_class(name, obj):
+    print(f"""
+    /** 
+     * {obj['description']}
+     */
+    data class {name}({get_props(obj)})
+    """)
+
+
+while queue_classes:
+    (name, c) = queue_classes.pop()
+    make_class(name, c)
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/JmlLintingConfig.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/JmlLintingConfig.kt
new file mode 100644
index 0000000000..5808af23ef
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/JmlLintingConfig.kt
@@ -0,0 +1,12 @@
+package io.github.jmltoolkit.lint
+
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (12/29/21)
+ */
+data class JmlLintingConfig(val checkNameClashes: Boolean = true, val checkMissingNames: Boolean = true) {
+    fun isDisabled(lintRule: LintRule): Boolean {
+        return false
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/JmlLintingFacade.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/JmlLintingFacade.kt
new file mode 100644
index 0000000000..e14bcbf359
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/JmlLintingFacade.kt
@@ -0,0 +1,75 @@
+package io.github.jmltoolkit.lint
+
+import com.github.javaparser.ast.Node
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import se.bjurr.violations.lib.model.generated.sarif.*
+import java.util.*
+import java.util.function.Consumer
+import kotlin.Exception
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (12/29/21)
+ */
+class JmlLintingFacade(private val config: JmlLintingConfig) {
+    val linters: List<LintRule> = getLinter(config)
+
+    private val sarifTool: Tool
+        get() = Tool().withDriver(
+            ToolComponent().withVersion(VERSION).withName(NAME)
+                .withShortDescription(MultiformatMessageString().withText("Linting for the Java Modeling Language"))
+                .withRules(linters.map { ReportingDescriptor().withName(it.javaClass.getName()) }.toSet())
+        )
+
+
+    fun lint(reporter: LintProblemReporter, nodes: Collection<Node>) {
+        for (it in nodes) {
+            for (linter in linters) {
+                try {
+                    linter.accept(it, reporter, config)
+                } catch (e: Exception) {
+                    LOGGER.error("Error in linter: {}", linter.javaClass.getName(), e)
+                }
+            }
+        }
+    }
+
+    fun lint(nodes: Collection<Node>): Collection<LintProblem> {
+        val problems: ArrayList<LintProblem> = ArrayList<LintProblem>(1024)
+        val collector: Consumer<LintProblem> = Consumer<LintProblem> { e: LintProblem -> problems.add(e) }
+        lint(LintProblemReporter(collector), nodes)
+        problems.sortWith(Comparator.comparing { it.location!!.toRange().get().begin })
+        return problems
+    }
+
+    fun asSarif(problems: Collection<LintProblem>): SarifSchema {
+        val results = problems.map { it: LintProblem -> this.asSarif(it) }
+        val runs: List<Run> = listOf(Run().withTool(sarifTool).withResults(results))
+        return SarifSchema()
+            .withVersion("2.1.0")
+            .withRuns(runs)
+    }
+
+    private fun asSarif(it: LintProblem): Result {
+        return Result().withRuleId(it.ruleId).withKind(it.category).withLevel(it.level)
+            .withLocations(listOf(Location())).withMessage(Message().withText(it.message))
+    }
+
+    companion object {
+        private val LOGGER: Logger = LoggerFactory.getLogger(JmlLintingFacade::class.java)
+        private val VERSION: String = JmlLintingFacade::class.java.getPackage().implementationVersion ?: "n/a"
+        private const val NAME = "JML-lint"
+
+        private fun getLinter(config: JmlLintingConfig): List<LintRule> {
+            val loader: ServiceLoader<LintRule> = ServiceLoader.load(LintRule::class.java)
+            val validators: MutableList<LintRule> = ArrayList<LintRule>(64)
+            for (lintRule in loader) {
+                if (!config.isDisabled(lintRule)) {
+                    validators.add(lintRule)
+                }
+            }
+            return validators
+        }
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/LintProblem.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/LintProblem.kt
new file mode 100644
index 0000000000..d3c220770b
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/LintProblem.kt
@@ -0,0 +1,21 @@
+package io.github.jmltoolkit.lint
+
+import com.github.javaparser.TokenRange
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.22)
+ */
+data class LintProblem(
+    val level: String,
+    val message: String,
+    val location: TokenRange?,
+    val cause: Throwable?,
+    val category: String?,
+    val ruleId: String
+) {
+    constructor(level: String, message: String, location: TokenRange?, ruleId: String) : this(
+        level, message, location,
+        null, null, ruleId
+    )
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/LintProblemReporter.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/LintProblemReporter.kt
new file mode 100644
index 0000000000..82a7dedece
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/LintProblemReporter.kt
@@ -0,0 +1,40 @@
+package io.github.jmltoolkit.lint
+
+import com.github.javaparser.TokenRange
+import com.github.javaparser.ast.nodeTypes.NodeWithTokenRange
+import java.util.function.Consumer
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.22)
+ */
+class LintProblemReporter(private val problemConsumer: Consumer<LintProblem>) {
+
+    fun warn(node: NodeWithTokenRange<*>, category: String?, ruleId: String, message: String, vararg args: Any?) {
+        report(LintRule.WARN, node.tokenRange.orElse(null), category, ruleId, message, args)
+    }
+
+    fun hint(node: NodeWithTokenRange<*>, category: String?, ruleId: String, message: String, vararg args: Any?) {
+        report(LintRule.HINT, node.tokenRange.orElse(null), category, ruleId, message, args)
+    }
+
+    fun error(node: NodeWithTokenRange<*>, category: String?, ruleId: String, message: String, vararg args: Any?) {
+        report(LintRule.ERROR, node.tokenRange.orElse(null), category, ruleId, message, args)
+    }
+
+    fun report(
+        level: String,
+        range: TokenRange?,
+        category: String?,
+        ruleId: String,
+        message: String,
+        vararg args: Any?
+    ) {
+        problemConsumer.accept(LintProblem(level, message.format(args), range, null, category, ruleId))
+    }
+
+    fun report(lintProblem: LintProblem) {
+        problemConsumer.accept(lintProblem)
+    }
+}
+
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/LintRule.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/LintRule.kt
new file mode 100644
index 0000000000..b15c5ebf07
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/LintRule.kt
@@ -0,0 +1,17 @@
+package io.github.jmltoolkit.lint
+
+import com.github.javaparser.ast.Node
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (12/29/21)
+ */
+interface LintRule {
+    fun accept(node: Node, problemReporter: LintProblemReporter, config: JmlLintingConfig)
+
+    companion object {
+        const val HINT: String = "HINT"
+        const val WARN: String = "WARN"
+        const val ERROR: String = "ERROR"
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/LintRuleVisitor.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/LintRuleVisitor.kt
new file mode 100644
index 0000000000..c83088cf0e
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/LintRuleVisitor.kt
@@ -0,0 +1,23 @@
+package io.github.jmltoolkit.lint
+
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.visitor.VoidVisitorAdapter
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.22)
+ */
+abstract class LintRuleVisitor : VoidVisitorAdapter<LintProblemReporter>(), LintRule {
+    /**
+     * A validator that uses a visitor for validation.
+     * This class is the visitor too.
+     * Implement the "visit" methods you want to use for validation.
+     */
+    override fun accept(node: Node, problemReporter: LintProblemReporter, config: JmlLintingConfig) {
+        reset()
+        node.accept(this, problemReporter)
+    }
+
+    protected open fun reset() {
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/AllowedJmlClauses.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/AllowedJmlClauses.kt
new file mode 100644
index 0000000000..d991bee7a9
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/AllowedJmlClauses.kt
@@ -0,0 +1,222 @@
+package com.github.jmlparser.lint.rules
+
+import com.github.javaparser.ast.NodeList
+import com.github.javaparser.ast.body.MethodDeclaration
+import com.github.javaparser.ast.jml.NodeWithContracts
+import com.github.javaparser.ast.jml.clauses.ContractType
+import com.github.javaparser.ast.jml.clauses.JmlClause
+import com.github.javaparser.ast.jml.clauses.JmlClauseKind
+import com.github.javaparser.ast.jml.clauses.JmlClauseKind.*
+import com.github.javaparser.ast.jml.clauses.JmlContract
+import com.github.javaparser.ast.stmt.*
+import io.github.jmltoolkit.lint.LintProblemReporter
+import io.github.jmltoolkit.lint.LintRuleVisitor
+import java.util.*
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (13.10.22)
+ */
+class AllowedJmlClauses : LintRuleVisitor() {
+    private val LOOP_INVARIANT_CLAUSES: EnumSet<JmlClauseKind> = EnumSet.of<JmlClauseKind>(
+        DECREASES,
+        MODIFIES,
+        MODIFIABLE,
+        ASSIGNABLE,
+        ACCESSIBLE,
+        MAINTAINING,
+        MAINTAINING_REDUNDANTLY,
+        DECREASING,
+        DECREASES_REDUNDANTLY,
+        LOOP_INVARIANT,
+        LOOP_INVARIANT_FREE,
+        LOOP_INVARIANT_REDUNDANTLY
+    )
+
+    private val LOOP_CONTRACT_CLAUSES: EnumSet<JmlClauseKind> = EnumSet.of<JmlClauseKind>(
+        ENSURES,
+        ENSURES_FREE,
+        ENSURES_REDUNDANTLY,
+        REQUIRES,
+        REQUIRES_FREE,
+        REQUIRES_REDUNDANTLY,
+        DECREASES,
+        MODIFIES,
+        MODIFIABLE,
+        ASSIGNABLE,
+        ACCESSIBLE,
+        PRE,
+        POST,
+        PRE_REDUNDANTLY,
+        POST_REDUNDANTLY,
+        MAINTAINING,
+        MAINTAINING_REDUNDANTLY,
+        DECREASING,
+        DECREASES_REDUNDANTLY,
+        LOOP_INVARIANT,
+        LOOP_INVARIANT_FREE,
+        LOOP_INVARIANT_REDUNDANTLY,
+        MEASURED_BY,
+        RETURNS,
+        RETURNS_REDUNDANTLY,
+        BREAKS,
+        BREAKS_REDUNDANTLY,
+        CONTINUES,
+        CONTINUES_REDUNDANTLY,
+        OLD,
+        FORALL,
+        SIGNALS,
+        SIGNALS_REDUNDANTLY,
+        SIGNALS_ONLY,
+        WHEN,
+        WORKING_SPACE,
+        WORKING_SPACE_REDUNDANTLY,
+        CAPTURES,
+        CAPTURES_REDUNDANTLY,
+        INITIALLY,
+        INVARIANT_REDUNDANTLY,
+        INVARIANT,
+        ASSIGNABLE_REDUNDANTLY,
+        MODIFIABLE_REDUNDANTLY,
+        MODIFIES_REDUNDANTLY,
+        CALLABLE,
+        CALLABLE_REDUNDANTLY,
+        DIVERGES,
+        DIVERGES_REDUNDANTLY,
+        DURATION,
+        DURATION_REDUNDANTLY
+    )
+
+    private val BLOCK_CONTRACT_CLAUSES: EnumSet<JmlClauseKind> = EnumSet.of<JmlClauseKind>(
+        ENSURES,
+        ENSURES_FREE,
+        ENSURES_REDUNDANTLY,
+        REQUIRES,
+        REQUIRES_FREE,
+        REQUIRES_REDUNDANTLY,
+        DECREASES,
+        MODIFIES,
+        MODIFIABLE,
+        ASSIGNABLE,
+        ACCESSIBLE,
+        PRE,
+        POST,
+        PRE_REDUNDANTLY,
+        POST_REDUNDANTLY,
+        MAINTAINING,
+        MAINTAINING_REDUNDANTLY,
+        DECREASING,
+        DECREASES_REDUNDANTLY,
+        LOOP_INVARIANT,
+        LOOP_INVARIANT_FREE,
+        LOOP_INVARIANT_REDUNDANTLY,
+        MEASURED_BY,
+        RETURNS,
+        RETURNS_REDUNDANTLY,
+        BREAKS,
+        BREAKS_REDUNDANTLY,
+        CONTINUES,
+        CONTINUES_REDUNDANTLY,
+        OLD,
+        FORALL,
+        SIGNALS,
+        SIGNALS_REDUNDANTLY,
+        SIGNALS_ONLY,
+        WHEN,
+        WORKING_SPACE,
+        WORKING_SPACE_REDUNDANTLY,
+        CAPTURES,
+        CAPTURES_REDUNDANTLY,
+        INITIALLY,
+        INVARIANT_REDUNDANTLY,
+        INVARIANT,
+        ASSIGNABLE_REDUNDANTLY,
+        MODIFIABLE_REDUNDANTLY,
+        MODIFIES_REDUNDANTLY,
+        CALLABLE,
+        CALLABLE_REDUNDANTLY,
+        DIVERGES,
+        DIVERGES_REDUNDANTLY,
+        DURATION,
+        DURATION_REDUNDANTLY
+    )
+
+    private val currentlyAllowed: Set<JmlClauseKind> = HashSet<JmlClauseKind>()
+
+    override fun visit(n: JmlContract, arg: LintProblemReporter) {
+        val a: Optional<NodeWithContracts<*>> = n.findAncestor(NodeWithContracts::class.java)
+        if (a.isPresent) {
+            val owner: NodeWithContracts<*> = a.get()
+            if (owner is ForEachStmt
+                || owner is ForStmt
+                || owner is WhileStmt
+                || owner is DoStmt
+            ) {
+                if (n.type === ContractType.LOOP_INV) checkClauses(
+                    arg,
+                    n.clauses,
+                    LOOP_INVARIANT_CLAUSES,
+                    "loop_invariant"
+                )
+                else checkClauses(arg, n.clauses, LOOP_CONTRACT_CLAUSES, "loop")
+            } else if (owner is MethodDeclaration) {
+                checkClauses(arg, n.clauses, METHOD_CONTRACT_CLAUSES, "method")
+            } else if (owner is BlockStmt) {
+                checkClauses(arg, n.clauses, BLOCK_CONTRACT_CLAUSES, "block")
+            }
+        }
+    }
+
+    private fun checkClauses(
+        arg: LintProblemReporter, clauses: NodeList<JmlClause>,
+        allowed: EnumSet<JmlClauseKind>, type: String
+    ) {
+        for (clause in clauses) {
+            if (!allowed.contains(clause.kind)) {
+                arg.warn(clause, "", "", "%s clause not allowed in a %s contract", clause.kind, type)
+            }
+        }
+    }
+
+    companion object {
+        val METHOD_CONTRACT_CLAUSES: EnumSet<JmlClauseKind> = EnumSet.of<JmlClauseKind>(
+            ENSURES,
+            ENSURES_FREE,
+            ENSURES_REDUNDANTLY,
+            REQUIRES,
+            REQUIRES_FREE,
+            REQUIRES_REDUNDANTLY,
+            DECREASES,
+            MODIFIES,
+            MODIFIABLE,
+            ASSIGNABLE,
+            ACCESSIBLE,
+            PRE,
+            POST,
+            PRE_REDUNDANTLY,
+            POST_REDUNDANTLY,
+            DECREASING,
+            DECREASES_REDUNDANTLY,
+            MEASURED_BY,
+            OLD,
+            FORALL,
+            SIGNALS,
+            SIGNALS_REDUNDANTLY,
+            SIGNALS_ONLY,
+            WHEN,
+            WORKING_SPACE,
+            WORKING_SPACE_REDUNDANTLY,
+            CAPTURES,
+            CAPTURES_REDUNDANTLY,
+            ASSIGNABLE_REDUNDANTLY,
+            MODIFIABLE_REDUNDANTLY,
+            MODIFIES_REDUNDANTLY,
+            CALLABLE,
+            CALLABLE_REDUNDANTLY,
+            DIVERGES,
+            DIVERGES_REDUNDANTLY,
+            DURATION,
+            DURATION_REDUNDANTLY
+        )
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/AssignableValidator.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/AssignableValidator.kt
new file mode 100644
index 0000000000..4615e2a5ae
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/AssignableValidator.kt
@@ -0,0 +1,50 @@
+package io.github.jmltoolkit.lint.rules
+
+import com.github.javaparser.ast.body.FieldDeclaration
+import com.github.javaparser.ast.jml.clauses.JmlClauseKind
+import com.github.javaparser.ast.jml.clauses.JmlMultiExprClause
+import io.github.jmltoolkit.lint.LintProblemReporter
+import io.github.jmltoolkit.lint.LintRuleVisitor
+import kotlin.jvm.optionals.getOrNull
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (12/29/21)
+ */
+class AssignableValidator : LintRuleVisitor() {
+    override fun visit(n: JmlMultiExprClause, arg: LintProblemReporter) {
+        if (n.kind === JmlClauseKind.ASSIGNABLE ||
+            n.kind === JmlClauseKind.ASSIGNABLE_REDUNDANTLY
+        ) {
+            checkFinalFieldsInAssignableClause(n, arg)
+        }
+    }
+
+    private fun checkFinalFieldsInAssignableClause(n: JmlMultiExprClause, arg: LintProblemReporter) {
+        for (e in n.expression) {
+            if (e.isNameExpr) {
+                if (e.asNameExpr().nameAsString.equals("this")) {
+                    arg.error(e, "", "", "This reference is not re-assignable!")
+                    continue
+                }
+                val value = e.asNameExpr().resolve()
+                if (value.isEnumConstant) {
+                    arg.error(e, "", "", "Enum constants are not re-assignable!")
+                } else if (value.isField) {
+                    val ast = value.asField().toAst().getOrNull()
+                    if (ast is FieldDeclaration && ast.isFinal) {
+                        arg.error(e, "", "", "This variable is final, so cannot be assigned")
+                    }
+                }
+            } else if (e.isArrayAccessExpr) {
+                //TODO weigl check for array-ness of name expr
+                val rtype = e.asArrayAccessExpr().name.calculateResolvedType()
+                if (!rtype.isArray) {
+                    arg.error(e, "", "", "Array access to non-array. Calculated type is %s", rtype.describe())
+                }
+            } else {
+                arg.error(e, "", "", "Strange expression type found: %s", e.metaModel.typeName)
+            }
+        }
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/ContextSensitiveForbiddenFunctionsValidator.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/ContextSensitiveForbiddenFunctionsValidator.kt
new file mode 100644
index 0000000000..ce6f127b26
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/ContextSensitiveForbiddenFunctionsValidator.kt
@@ -0,0 +1,42 @@
+package com.github.jmlparser.lint.rules
+
+import com.github.javaparser.ast.jml.clauses.JmlClauseKind
+import com.github.javaparser.ast.jml.clauses.JmlContract
+import io.github.jmltoolkit.lint.LintProblemReporter
+import io.github.jmltoolkit.lint.LintRuleVisitor
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (12/29/21)
+ */
+class ContextSensitiveForbiddenFunctionsValidator : LintRuleVisitor() {
+    private var signalsOnlyCounter = 0
+
+    override fun visit(n: JmlContract, arg: LintProblemReporter) {
+        signalsOnlyCounter = 0
+        reportMultipleSignalsOnlyClauses(n, arg)
+    }
+
+    private fun reportMultipleSignalsOnlyClauses(n: JmlContract, arg: LintProblemReporter) {
+        for (clause in n.clauses) {
+            if (clause.kind === JmlClauseKind.SIGNALS_ONLY) signalsOnlyCounter++
+
+            if (signalsOnlyCounter > 1) {
+                arg.warn(clause, "", "", MULTIPLE_SIGNALS_ONLY)
+            }
+        }
+
+        for (subContract in n.subContracts) {
+            reportMultipleSignalsOnlyClauses(subContract, arg)
+        }
+    }
+
+    companion object {
+        const val MULTIPLE_SIGNALS_ONLY: String = "Use a single signals_only clause to avoid confusion"
+        const val NOT_SPECIFIED_REDUNDANT: String =
+            "This clause containing \\not_specified is redundant because you already specified it"
+        const val BACKSLASH_RESULT_NOT_ALLOWED: String = "You can only use \\result in an ensures clause"
+        const val OLD_EXPR_NOT_ALLOWED: String =
+            "You can only use an \\old() expressions in ensures and signals clauses, assert and assume statements, and in loop invariants"
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/JavaContainsJmlConstruct.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/JavaContainsJmlConstruct.kt
new file mode 100644
index 0000000000..f1b995a2ac
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/JavaContainsJmlConstruct.kt
@@ -0,0 +1,31 @@
+package io.github.jmltoolkit.lint.rules
+
+import com.github.javaparser.ast.Jmlish
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.jml.clauses.JmlContract
+import com.github.javaparser.ast.jml.stmt.JmlStatement
+import com.github.javaparser.ast.validator.ProblemReporter
+import java.util.function.Predicate
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (19.02.22)
+ */
+class JavaContainsJmlConstruct : com.github.javaparser.ast.validator.Validator {
+    override fun accept(node: Node, problemReporter: ProblemReporter) {
+        accept(node, false, problemReporter)
+    }
+
+    private fun accept(current: Node, inJml: Boolean, problemReporter: ProblemReporter) {
+        val openJml: Predicate<Node> = Predicate<Node> { it: Node? -> it is JmlStatement || it is JmlContract}
+
+        if (!inJml && (current is Jmlish) && !openJml.test(current)) {
+            problemReporter.report(current, "Jml construct used in Java part")
+            return
+        }
+
+        for (it in current.childNodes) {
+            accept(it, inJml || openJml.test(current), problemReporter)
+        }
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/JmlJavaNameClashes.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/JmlJavaNameClashes.kt
new file mode 100644
index 0000000000..127f7031a5
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/JmlJavaNameClashes.kt
@@ -0,0 +1,7 @@
+package com.github.jmlparser.lint.rules
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (19.02.22)
+ */
+class JmlJavaNameClashes
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/JmlNameClashWithJava.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/JmlNameClashWithJava.kt
new file mode 100644
index 0000000000..b649cd09fd
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/JmlNameClashWithJava.kt
@@ -0,0 +1,47 @@
+package io.github.jmltoolkit.lint.rules
+
+import com.github.javaparser.ast.jml.clauses.JmlForallClause
+import com.github.javaparser.ast.jml.clauses.JmlSignalsClause
+import com.github.javaparser.ast.jml.clauses.JmlSimpleExprClause
+import com.github.javaparser.jml.JmlUtility
+import io.github.jmltoolkit.lint.LintProblemReporter
+import io.github.jmltoolkit.lint.LintRule
+import io.github.jmltoolkit.lint.LintRuleVisitor
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (12/29/21)
+ */
+class JmlNameClashWithJava : LintRuleVisitor() {
+    override fun visit(n: JmlSignalsClause, arg: LintProblemReporter) {
+        val rtype= n.parameter.type.resolve()
+        val exception= JmlUtility.resolveException(n)
+        if (exception.isAssignableBy(rtype)) {
+            arg.report(NOT_AN_EXCEPTION_CLASS.create(n))
+        }
+        super.visit(n, arg)
+    }
+
+
+    override fun visit(n: JmlForallClause, arg: LintProblemReporter?) {
+        super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlSimpleExprClause, arg: LintProblemReporter?) {
+        super.visit(n, arg)
+    }
+
+    companion object {
+        val NOT_AN_EXCEPTION_CLASS
+                : LintProblemMeta = LintProblemMeta("JML-1", "This is not an exception class", LintRule.ERROR)
+
+        const val PUT_IN_THROWS_CLAUSE: String =
+            "This exception (or a superclass or subclass of it) should be mentioned in the throws clause of this method"
+
+        const val CLASS_REFERENCE_NOT_FOUND: String = "This class could not be resolved, did you forget to import it?"
+
+
+        const val NOT_A_TYPE_NAME: String = "This is not the name of a primitive type or a class"
+        const val NO_ARRAY: String = "This is not an array"
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/LintProblemMeta.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/LintProblemMeta.kt
new file mode 100644
index 0000000000..975047d481
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/LintProblemMeta.kt
@@ -0,0 +1,16 @@
+package io.github.jmltoolkit.lint.rules
+
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.nodeTypes.NodeWithTokenRange
+import io.github.jmltoolkit.lint.LintProblem
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (21.10.22)
+ */
+@JvmRecord
+data class LintProblemMeta(val id: String, val message: String, val level: String) {
+    fun create(n: NodeWithTokenRange<Node?>): LintProblem {
+        return LintProblem(level, message, n.tokenRange.orElse(null), null, id, "")
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/LocationSetValidator.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/LocationSetValidator.kt
new file mode 100644
index 0000000000..ee330e38d8
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/LocationSetValidator.kt
@@ -0,0 +1,13 @@
+package io.github.jmltoolkit.lint.rules
+
+import io.github.jmltoolkit.lint.LintRuleVisitor
+
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (12/29/21)
+ */
+object LocationSetValidator : LintRuleVisitor() {
+    const val ASSIGNABLE_ARRAY_ONLY: String = "You can only use '[*]' on arrays"
+    const val ASSIGNABLE_CLASS_ONLY: String = "You can only use '.*' on classes and interfaces"
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/MethodBodyHasNoContract.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/MethodBodyHasNoContract.kt
new file mode 100644
index 0000000000..474ffa73e7
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/MethodBodyHasNoContract.kt
@@ -0,0 +1,14 @@
+package io.github.jmltoolkit.lint.rules
+
+import com.github.javaparser.ast.body.MethodDeclaration
+import com.github.javaparser.ast.validator.ProblemReporter
+import com.github.javaparser.ast.validator.VisitorValidator
+
+class MethodBodyHasNoContract : VisitorValidator() {
+    override fun visit(n: MethodDeclaration, arg: ProblemReporter) {
+        if (n.body.isPresent && !n.body.get().contracts.isEmpty()) {
+            arg.report(n, "Body of method has a block contract.")
+        }
+        super.visit(n, arg)
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/OverridingLocalNamesInGhost.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/OverridingLocalNamesInGhost.kt
new file mode 100644
index 0000000000..0d631734cc
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/OverridingLocalNamesInGhost.kt
@@ -0,0 +1,40 @@
+package io.github.jmltoolkit.lint.rules
+
+import com.github.javaparser.ast.expr.VariableDeclarationExpr
+import com.github.javaparser.ast.jml.stmt.JmlGhostStmt
+import com.github.javaparser.resolution.declarations.ResolvedValueDeclaration
+import io.github.jmltoolkit.lint.LintProblemReporter
+import io.github.jmltoolkit.lint.LintRuleVisitor
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (14.10.22)
+ */
+class OverridingLocalNamesInGhost : LintRuleVisitor() {
+    private var inGhost = false
+
+    override fun reset() {
+        inGhost = false
+    }
+
+    override fun visit(n: JmlGhostStmt, arg: LintProblemReporter) {
+        inGhost = true
+        super.visit(n, arg)
+        inGhost = false
+    }
+
+    override fun visit(n: VariableDeclarationExpr, arg: LintProblemReporter) {
+        if (inGhost) {
+            val s: JmlGhostStmt = n.findAncestor(JmlGhostStmt::class.java).get()
+            for (variable in n.variables) {
+                val name = variable.nameAsExpression
+                name.setParentNode(s)
+                val value = s.symbolResolver.resolveDeclaration(name, ResolvedValueDeclaration::class.java)
+                name.setParentNode(null)
+                if (value != null) {
+                    arg.error(variable, "", "", "Variable %s already declared in Java.", variable.nameAsString)
+                }
+            }
+        }
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/PurityValidator.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/PurityValidator.kt
new file mode 100644
index 0000000000..9540bbfe46
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/PurityValidator.kt
@@ -0,0 +1,91 @@
+package com.github.jmlparser.lint.rules
+
+import com.github.javaparser.ast.Modifier
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.expr.AssignExpr
+import com.github.javaparser.ast.expr.MethodCallExpr
+import com.github.javaparser.ast.expr.UnaryExpr
+import com.github.javaparser.ast.jml.body.JmlClassExprDeclaration
+import com.github.javaparser.ast.jml.clauses.JmlSimpleExprClause
+import com.github.javaparser.ast.jml.stmt.JmlExpressionStmt
+import com.github.javaparser.ast.nodeTypes.NodeWithModifiers
+import com.github.javaparser.ast.visitor.VoidVisitorAdapter
+import io.github.jmltoolkit.lint.LintProblemReporter
+import io.github.jmltoolkit.lint.LintRuleVisitor
+import kotlin.jvm.optionals.getOrNull
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (12/29/21)
+ */
+class PurityValidator : LintRuleVisitor() {
+    override fun visit(n: JmlSimpleExprClause, arg: LintProblemReporter) {
+        val r = PurityVisitor()
+        n.expression.accept(r, null)
+        if (r.reason != null) {
+            arg.error(r.reason!!, "", "", "Expression in JML clause must be pure." + r.text)
+        }
+    }
+
+
+    override fun visit(n: JmlClassExprDeclaration, arg: LintProblemReporter) {
+        val r = PurityVisitor()
+        n.invariant.accept(r, null)
+        if (r.reason != null) {
+            arg.error(r.reason!!, "", "", "Expression in JML invariant clause must be pure." + r.text)
+        }
+    }
+
+    override fun visit(n: JmlExpressionStmt, arg: LintProblemReporter) {
+        val r = PurityVisitor()
+        n.expression.accept(r, null)
+        if (r.reason != null) {
+            arg.error(r.reason!!, "", "", "Expression in JML statements must be pure." + r.text)
+        }
+    }
+
+
+    private class PurityVisitor : VoidVisitorAdapter<Void?>() {
+        var reason: Node? = null
+        var text: String? = null
+
+        override fun visit(n: AssignExpr, arg: Void?) {
+            reason = n
+        }
+
+        override fun visit(n: UnaryExpr, arg: Void?) {
+            when (n.operator) {
+                UnaryExpr.Operator.POSTFIX_DECREMENT, UnaryExpr.Operator.POSTFIX_INCREMENT -> {
+                    reason = n
+                    text = "Postfix de-/increment operator found."
+                }
+
+                UnaryExpr.Operator.PREFIX_INCREMENT, UnaryExpr.Operator.PREFIX_DECREMENT -> {
+                    reason = n
+                    text = "Prefix de-/increment operator found"
+                }
+
+                else -> n.expression.accept(this, arg)
+            }
+        }
+
+        override fun visit(n: MethodCallExpr, arg: Void?) {
+            val r = n.resolve().toAst().getOrNull()
+            val mods = r as? NodeWithModifiers<*>
+
+            if (mods?.hasModifier(Modifier.DefaultKeyword.JML_PURE) == true
+                || mods?.hasModifier(Modifier.DefaultKeyword.JML_STRICTLY_PURE) == true
+            ) {
+                super.visit(n, arg)
+            } else {
+                reason = n
+                text = METHOD_NOT_PURE
+            }
+        }
+    }
+
+    companion object {
+        const val METHOD_NOT_PURE: String = "JML expressions should be pure and this method might not be pure"
+        const val ASSIGNMENT_NOT_PURE: String = "JML expressions should be pure and assignments are not pure"
+    }
+}
diff --git a/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/ResultVarCheck.kt b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/ResultVarCheck.kt
new file mode 100644
index 0000000000..ea87d61b83
--- /dev/null
+++ b/tools/lint/src/main/kotlin/io/github/jmltoolkit/lint/rules/ResultVarCheck.kt
@@ -0,0 +1,46 @@
+package io.github.jmltoolkit.lint.rules
+
+import com.github.javaparser.ast.body.MethodDeclaration
+import com.github.javaparser.ast.expr.NameExpr
+import com.github.javaparser.ast.jml.clauses.*
+import io.github.jmltoolkit.lint.LintProblemReporter
+import io.github.jmltoolkit.lint.LintRuleVisitor
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (14.10.22)
+ */
+class ResultVarCheck : LintRuleVisitor() {
+    private var inMethodWithNonVoidReturnType = false
+    private var inPostCondition = false
+
+    override fun reset() {
+        inPostCondition = false
+    }
+
+    override fun visit(n: MethodDeclaration, arg: LintProblemReporter) {
+        inMethodWithNonVoidReturnType = !n.type.isVoidType
+        n.contracts.forEach { v -> v.accept(this, arg) }
+        inMethodWithNonVoidReturnType = false
+        n.body.ifPresent { l -> l.accept(this, arg) }
+    }
+
+    override fun visit(n: JmlSimpleExprClause, arg: LintProblemReporter?) {
+        inPostCondition =
+            n.kind === JmlClauseKind.ENSURES || n.kind === JmlClauseKind.ENSURES_FREE || n.kind === JmlClauseKind.ENSURES_REDUNDANTLY || n.kind === JmlClauseKind.POST || n.kind === JmlClauseKind.POST_REDUNDANTLY
+        super.visit(n, arg)
+        inPostCondition = false
+    }
+
+    override fun visit(n: NameExpr, arg: LintProblemReporter) {
+        if (n.nameAsString.equals("\\result")) {
+            if (!inPostCondition) arg.error(n, "", "", "Use of \\result in non-post-conditional clause.")
+            if (!inMethodWithNonVoidReturnType) arg.error(n, "", "", NO_METHOD_RESULT)
+        }
+    }
+
+    companion object {
+        const val NO_METHOD_RESULT: String =
+            "Cannot use \\result here, as this method / constructor does not return anything"
+    }
+}
diff --git a/tools/lint/src/main/resources/META-INF/services/com.github.jmlparser.lint.LintRule b/tools/lint/src/main/resources/META-INF/services/com.github.jmlparser.lint.LintRule
new file mode 100644
index 0000000000..dbcb1c680e
--- /dev/null
+++ b/tools/lint/src/main/resources/META-INF/services/com.github.jmlparser.lint.LintRule
@@ -0,0 +1,9 @@
+com.github.jmlparser.lint.rules.JmlNameClashWithJava
+com.github.jmlparser.lint.rules.AssignableValidator
+com.github.jmlparser.lint.rules.ContextSensitiveForbiddenFunctionsValidator
+com.github.jmlparser.lint.rules.JmlNameClashWithJava
+com.github.jmlparser.lint.rules.LocationSetValidator
+com.github.jmlparser.lint.rules.PurityValidator
+com.github.jmlparser.lint.rules.OverridingLocalNamesInGhost
+com.github.jmlparser.lint.rules.AllowedJmlClauses
+io.github.jmltoolkit.lint.rules.ResultVarCheck
diff --git a/tools/lint/src/sarif-schema-2.1.0.json b/tools/lint/src/sarif-schema-2.1.0.json
new file mode 100644
index 0000000000..f9c54b8a6c
--- /dev/null
+++ b/tools/lint/src/sarif-schema-2.1.0.json
@@ -0,0 +1,3389 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Static Analysis Results Format (SARIF) Version 2.1.0 JSON Schema",
+  "id": "https://docs.oasis-open.org/sarif/sarif/v2.1.0/errata01/os/schemas/sarif-schema-2.1.0.json",
+  "description": "Static Analysis Results Format (SARIF) Version 2.1.0 JSON Schema: a standard format for the output of static analysis tools.",
+  "additionalProperties": false,
+  "type": "object",
+  "properties": {
+
+    "$schema": {
+      "description": "The URI of the JSON schema corresponding to the version.",
+      "type": "string",
+      "format": "uri"
+    },
+
+    "version": {
+      "description": "The SARIF format version of this log file.",
+      "enum": [ "2.1.0" ],
+      "type": "string"
+    },
+
+    "runs": {
+      "description": "The set of runs contained in this log file.",
+      "type": [ "array", "null" ],
+      "minItems": 0,
+      "uniqueItems": false,
+      "items": {
+        "$ref": "#/definitions/run"
+      }
+    },
+
+    "inlineExternalProperties": {
+      "description": "References to external property files that share data between runs.",
+      "type": "array",
+      "minItems": 0,
+      "uniqueItems": true,
+      "items": {
+        "$ref": "#/definitions/externalProperties"
+      }
+    },
+
+    "properties": {
+      "description": "Key/value pairs that provide additional information about the log file.",
+      "$ref": "#/definitions/propertyBag"
+    }
+  },
+
+  "required": [ "version", "runs" ],
+
+  "definitions": {
+
+    "address": {
+      "description": "A physical or virtual address, or a range of addresses, in an 'addressable region' (memory or a binary file).",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "absoluteAddress": {
+          "description": "The address expressed as a byte offset from the start of the addressable region.",
+          "type": "integer",
+          "minimum": -1,
+          "default": -1
+
+        },
+
+        "relativeAddress": {
+          "description": "The address expressed as a byte offset from the absolute address of the top-most parent object.",
+          "type": "integer"
+
+        },
+
+        "length": {
+          "description": "The number of bytes in this range of addresses.",
+          "type": "integer"
+        },
+
+        "kind": {
+          "description": "An open-ended string that identifies the address kind. 'data', 'function', 'header','instruction', 'module', 'page', 'section', 'segment', 'stack', 'stackFrame', 'table' are well-known values.",
+          "type": "string"
+        },
+
+        "name": {
+          "description": "A name that is associated with the address, e.g., '.text'.",
+          "type": "string"
+        },
+
+        "fullyQualifiedName": {
+          "description": "A human-readable fully qualified name that is associated with the address.",
+          "type": "string"
+        },
+
+        "offsetFromParent": {
+          "description": "The byte offset of this address from the absolute or relative address of the parent object.",
+          "type": "integer"
+        },
+
+        "index": {
+          "description": "The index within run.addresses of the cached object for this address.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "parentIndex": {
+          "description": "The index within run.addresses of the parent object.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the address.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "artifact": {
+      "description": "A single artifact. In some cases, this artifact might be nested within another artifact.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "description": {
+          "description": "A short description of the artifact.",
+          "$ref": "#/definitions/message"
+        },
+
+        "location": {
+          "description": "The location of the artifact.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "parentIndex": {
+          "description": "Identifies the index of the immediate parent of the artifact, if this artifact is nested.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "offset": {
+          "description": "The offset in bytes of the artifact within its containing artifact.",
+          "type": "integer",
+          "minimum": 0
+        },
+
+        "length": {
+          "description": "The length of the artifact in bytes.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "roles": {
+          "description": "The role or roles played by the artifact in the analysis.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "enum": [
+              "analysisTarget",
+              "attachment",
+              "responseFile",
+              "resultFile",
+              "standardStream",
+              "tracedFile",
+              "unmodified",
+              "modified",
+              "added",
+              "deleted",
+              "renamed",
+              "uncontrolled",
+              "driver",
+              "extension",
+              "translation",
+              "taxonomy",
+              "policy",
+              "referencedOnCommandLine",
+              "memoryContents",
+              "directory",
+              "userSpecifiedConfiguration",
+              "toolSpecifiedConfiguration",
+              "debugOutputFile"
+            ],
+            "type": "string"
+          }
+        },
+
+        "mimeType": {
+          "description": "The MIME type (RFC 2045) of the artifact.",
+          "type": "string",
+          "pattern": "[^/]+/.+"
+        },
+
+        "contents": {
+          "description": "The contents of the artifact.",
+          "$ref": "#/definitions/artifactContent"
+        },
+
+        "encoding": {
+          "description": "Specifies the encoding for an artifact object that refers to a text file.",
+          "type": "string"
+        },
+
+        "sourceLanguage": {
+          "description": "Specifies the source language for any artifact object that refers to a text file that contains source code.",
+          "type": "string"
+        },
+
+        "hashes": {
+          "description": "A dictionary, each of whose keys is the name of a hash function and each of whose values is the hashed value of the artifact produced by the specified hash function.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+
+        "lastModifiedTimeUtc": {
+          "description": "The Coordinated Universal Time (UTC) date and time at which the artifact was most recently modified. See \"Date/time properties\" in the SARIF spec for the required format.",
+          "type": "string",
+          "format": "date-time"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the artifact.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "artifactChange": {
+      "description": "A change to a single artifact.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "artifactLocation": {
+          "description": "The location of the artifact to change.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "replacements": {
+          "description": "An array of replacement objects, each of which represents the replacement of a single region in a single artifact specified by 'artifactLocation'.",
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": false,
+          "items": {
+            "$ref": "#/definitions/replacement"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the change.",
+          "$ref": "#/definitions/propertyBag"
+        }
+
+      },
+
+      "required": [ "artifactLocation", "replacements" ]
+    },
+
+    "artifactContent": {
+      "description": "Represents the contents of an artifact.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "text": {
+          "description": "UTF-8-encoded content from a text artifact.",
+          "type": "string"
+        },
+
+        "binary": {
+          "description": "MIME Base64-encoded content from a binary artifact, or from a text artifact in its original encoding.",
+          "type": "string"
+        },
+
+        "rendered": {
+          "description": "An alternate rendered representation of the artifact (e.g., a decompiled representation of a binary region).",
+          "$ref": "#/definitions/multiformatMessageString"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the artifact content.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "artifactLocation": {
+      "description": "Specifies the location of an artifact.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "uri": {
+          "description": "A string containing a valid relative or absolute URI.",
+          "type": "string",
+          "format": "uri-reference"
+        },
+
+        "uriBaseId": {
+          "description": "A string which indirectly specifies the absolute URI with respect to which a relative URI in the \"uri\" property is interpreted.",
+          "type": "string"
+        },
+
+        "index": {
+          "description": "The index within the run artifacts array of the artifact object associated with the artifact location.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "description": {
+          "description": "A short description of the artifact location.",
+          "$ref": "#/definitions/message"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the artifact location.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "attachment": {
+      "description": "An artifact relevant to a result.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "description": {
+          "description": "A message describing the role played by the attachment.",
+          "$ref": "#/definitions/message"
+        },
+
+        "artifactLocation": {
+          "description": "The location of the attachment.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "regions": {
+          "description": "An array of regions of interest within the attachment.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/region"
+          }
+        },
+
+        "rectangles": {
+          "description": "An array of rectangles specifying areas of interest within the image.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/rectangle"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the attachment.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "required": [ "artifactLocation" ]
+    },
+
+    "codeFlow": {
+      "description": "A set of threadFlows which together describe a pattern of code execution relevant to detecting a result.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "message": {
+          "description": "A message relevant to the code flow.",
+          "$ref": "#/definitions/message"
+        },
+
+        "threadFlows": {
+          "description": "An array of one or more unique threadFlow objects, each of which describes the progress of a program through a thread of execution.",
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": false,
+          "items": {
+            "$ref": "#/definitions/threadFlow"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the code flow.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "required": [ "threadFlows" ]
+    },
+
+    "configurationOverride": {
+      "description": "Information about how a specific rule or notification was reconfigured at runtime.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "configuration": {
+          "description": "Specifies how the rule or notification was configured during the scan.",
+          "$ref": "#/definitions/reportingConfiguration"
+        },
+
+        "descriptor": {
+          "description": "A reference used to locate the descriptor whose configuration was overridden.",
+          "$ref": "#/definitions/reportingDescriptorReference"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the configuration override.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "required": [ "configuration", "descriptor" ]
+    },
+
+    "conversion": {
+      "description": "Describes how a converter transformed the output of a static analysis tool from the analysis tool's native output format into the SARIF format.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "tool": {
+          "description": "A tool object that describes the converter.",
+          "$ref": "#/definitions/tool"
+        },
+
+        "invocation": {
+          "description": "An invocation object that describes the invocation of the converter.",
+          "$ref": "#/definitions/invocation"
+        },
+
+        "analysisToolLogFiles": {
+          "description": "The locations of the analysis tool's per-run log files.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/artifactLocation"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the conversion.",
+          "$ref": "#/definitions/propertyBag"
+        }
+
+      },
+
+      "required": [ "tool" ]
+    },
+
+    "edge": {
+      "description": "Represents a directed edge in a graph.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "id": {
+          "description": "A string that uniquely identifies the edge within its graph.",
+          "type": "string"
+        },
+
+        "label": {
+          "description": "A short description of the edge.",
+          "$ref": "#/definitions/message"
+        },
+
+        "sourceNodeId": {
+          "description": "Identifies the source node (the node at which the edge starts).",
+          "type": "string"
+        },
+
+        "targetNodeId": {
+          "description": "Identifies the target node (the node at which the edge ends).",
+          "type": "string"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the edge.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "required": [ "id", "sourceNodeId", "targetNodeId" ]
+    },
+
+    "edgeTraversal": {
+      "description": "Represents the traversal of a single edge during a graph traversal.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "edgeId": {
+          "description": "Identifies the edge being traversed.",
+          "type": "string"
+        },
+
+        "message": {
+          "description": "A message to display to the user as the edge is traversed.",
+          "$ref": "#/definitions/message"
+        },
+
+        "finalState": {
+          "description": "The values of relevant expressions after the edge has been traversed.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/multiformatMessageString"
+          }
+        },
+
+        "stepOverEdgeCount": {
+          "description": "The number of edge traversals necessary to return from a nested graph.",
+          "type": "integer",
+          "minimum": 0
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the edge traversal.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "required": [ "edgeId" ]
+    },
+
+    "exception": {
+      "description": "Describes a runtime exception encountered during the execution of an analysis tool.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "kind": {
+          "type": "string",
+          "description": "A string that identifies the kind of exception, for example, the fully qualified type name of an object that was thrown, or the symbolic name of a signal."
+        },
+
+        "message": {
+          "description": "A message that describes the exception.",
+          "type": "string"
+        },
+
+        "stack": {
+          "description": "The sequence of function calls leading to the exception.",
+          "$ref": "#/definitions/stack"
+        },
+
+        "innerExceptions": {
+          "description": "An array of exception objects each of which is considered a cause of this exception.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/exception"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the exception.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "externalProperties": {
+      "description": "The top-level element of an external property file.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "schema": {
+          "description": "The URI of the JSON schema corresponding to the version of the external property file format.",
+          "type": "string",
+          "format": "uri"
+        },
+
+        "version": {
+          "description": "The SARIF format version of this external properties object.",
+          "enum": [ "2.1.0" ],
+          "type": "string"
+        },
+
+        "guid": {
+          "description": "A stable, unique identifier for this external properties object, in the form of a GUID.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "runGuid": {
+          "description": "A stable, unique identifier for the run associated with this external properties object, in the form of a GUID.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "conversion": {
+          "description": "A conversion object that will be merged with a separate run.",
+          "$ref": "#/definitions/conversion"
+        },
+
+        "graphs": {
+          "description": "An array of graph objects that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "default": [],
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/definitions/graph"
+          }
+        },
+
+        "externalizedProperties": {
+          "description": "Key/value pairs that provide additional information that will be merged with a separate run.",
+          "$ref": "#/definitions/propertyBag"
+        },
+
+        "artifacts": {
+          "description": "An array of artifact objects that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/definitions/artifact"
+          }
+        },
+
+        "invocations": {
+          "description": "Describes the invocation of the analysis tool that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/invocation"
+          }
+        },
+
+        "logicalLocations": {
+          "description": "An array of logical locations such as namespaces, types or functions that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/logicalLocation"
+          }
+        },
+
+        "threadFlowLocations": {
+          "description": "An array of threadFlowLocation objects that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/threadFlowLocation"
+          }
+        },
+
+        "results": {
+          "description": "An array of result objects that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/result"
+          }
+        },
+
+        "taxonomies": {
+          "description": "Tool taxonomies that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/toolComponent"
+          }
+        },
+
+        "driver": {
+          "description": "The analysis tool object that will be merged with a separate run.",
+          "$ref": "#/definitions/toolComponent"
+        },
+
+        "extensions": {
+          "description": "Tool extensions that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/toolComponent"
+          }
+        },
+
+        "policies": {
+          "description": "Tool policies that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/toolComponent"
+          }
+        },
+
+        "translations": {
+          "description": "Tool translations that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/toolComponent"
+          }
+        },
+
+        "addresses": {
+          "description": "Addresses that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/address"
+          }
+        },
+
+        "webRequests": {
+          "description": "Requests that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/webRequest"
+          }
+        },
+
+        "webResponses": {
+          "description": "Responses that will be merged with a separate run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/webResponse"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the external properties.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "externalPropertyFileReference": {
+      "description": "Contains information that enables a SARIF consumer to locate the external property file that contains the value of an externalized property associated with the run.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "location": {
+          "description": "The location of the external property file.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "guid": {
+          "description": "A stable, unique identifier for the external property file in the form of a GUID.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "itemCount": {
+          "description": "A non-negative integer specifying the number of items contained in the external property file.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the external property file.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "anyOf": [
+        { "required": [ "location" ] },
+        { "required": [ "guid" ] }
+      ]
+    },
+
+    "externalPropertyFileReferences": {
+      "description": "References to external property files that should be inlined with the content of a root log file.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "conversion": {
+          "description": "An external property file containing a run.conversion object to be merged with the root log file.",
+          "$ref": "#/definitions/externalPropertyFileReference"
+        },
+
+        "graphs": {
+          "description": "An array of external property files containing a run.graphs object to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "externalizedProperties": {
+          "description": "An external property file containing a run.properties object to be merged with the root log file.",
+          "$ref": "#/definitions/externalPropertyFileReference"
+        },
+
+        "artifacts": {
+          "description": "An array of external property files containing run.artifacts arrays to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "invocations": {
+          "description": "An array of external property files containing run.invocations arrays to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "logicalLocations": {
+          "description": "An array of external property files containing run.logicalLocations arrays to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "threadFlowLocations": {
+          "description": "An array of external property files containing run.threadFlowLocations arrays to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "results": {
+          "description": "An array of external property files containing run.results arrays to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "taxonomies": {
+          "description": "An array of external property files containing run.taxonomies arrays to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "addresses": {
+          "description": "An array of external property files containing run.addresses arrays to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "driver": {
+          "description": "An external property file containing a run.driver object to be merged with the root log file.",
+          "$ref": "#/definitions/externalPropertyFileReference"
+        },
+
+        "extensions": {
+          "description": "An array of external property files containing run.extensions arrays to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "policies": {
+          "description": "An array of external property files containing run.policies arrays to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "translations": {
+          "description": "An array of external property files containing run.translations arrays to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "webRequests": {
+          "description": "An array of external property files containing run.requests arrays to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "webResponses": {
+          "description": "An array of external property files containing run.responses arrays to be merged with the root log file.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/externalPropertyFileReference"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the external property files.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "fix": {
+      "description": "A proposed fix for the problem represented by a result object. A fix specifies a set of artifacts to modify. For each artifact, it specifies a set of bytes to remove, and provides a set of new bytes to replace them.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "description": {
+          "description": "A message that describes the proposed fix, enabling viewers to present the proposed change to an end user.",
+          "$ref": "#/definitions/message"
+        },
+
+        "artifactChanges": {
+          "description": "One or more artifact changes that comprise a fix for a result.",
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/definitions/artifactChange"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the fix.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "required": [ "artifactChanges" ]
+    },
+
+    "graph": {
+      "description": "A network of nodes and directed edges that describes some aspect of the structure of the code (for example, a call graph).",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "description": {
+          "description": "A description of the graph.",
+          "$ref": "#/definitions/message"
+        },
+
+        "nodes": {
+          "description": "An array of node objects representing the nodes of the graph.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/node"
+          }
+        },
+
+        "edges": {
+          "description": "An array of edge objects representing the edges of the graph.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/edge"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the graph.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "graphTraversal": {
+      "description": "Represents a path through a graph.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "runGraphIndex": {
+          "description": "The index within the run.graphs to be associated with the result.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "resultGraphIndex": {
+          "description": "The index within the result.graphs to be associated with the result.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "description": {
+          "description": "A description of this graph traversal.",
+          "$ref": "#/definitions/message"
+        },
+
+        "initialState": {
+          "description": "Values of relevant expressions at the start of the graph traversal that may change during graph traversal.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/multiformatMessageString"
+          }
+        },
+
+        "immutableState": {
+          "description": "Values of relevant expressions at the start of the graph traversal that remain constant for the graph traversal.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/multiformatMessageString"
+          }
+        },
+
+        "edgeTraversals": {
+          "description": "The sequences of edges traversed by this graph traversal.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/edgeTraversal"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the graph traversal.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "oneOf": [
+        { "required": [ "runGraphIndex" ] },
+        { "required": [ "resultGraphIndex" ] }
+      ]
+    },
+
+    "invocation": {
+      "description": "The runtime environment of the analysis tool run.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "commandLine": {
+          "description": "The command line used to invoke the tool.",
+          "type": "string"
+        },
+
+        "arguments": {
+          "description": "An array of strings, containing in order the command line arguments passed to the tool from the operating system.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "items": {
+            "type": "string"
+          }
+        },
+
+        "responseFiles": {
+          "description": "The locations of any response files specified on the tool's command line.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/definitions/artifactLocation"
+          }
+        },
+
+        "startTimeUtc": {
+          "description": "The Coordinated Universal Time (UTC) date and time at which the invocation started. See \"Date/time properties\" in the SARIF spec for the required format.",
+          "type": "string",
+          "format": "date-time"
+        },
+
+        "endTimeUtc": {
+          "description": "The Coordinated Universal Time (UTC) date and time at which the invocation ended. See \"Date/time properties\" in the SARIF spec for the required format.",
+          "type": "string",
+          "format": "date-time"
+        },
+
+        "exitCode": {
+          "description": "The process exit code.",
+          "type": "integer"
+        },
+
+        "ruleConfigurationOverrides": {
+          "description": "An array of configurationOverride objects that describe rules related runtime overrides.",
+          "type": "array",
+          "minItems": 0,
+          "default": [],
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/definitions/configurationOverride"
+          }
+        },
+
+        "notificationConfigurationOverrides": {
+          "description": "An array of configurationOverride objects that describe notifications related runtime overrides.",
+          "type": "array",
+          "minItems": 0,
+          "default": [],
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/definitions/configurationOverride"
+          }
+        },
+
+        "toolExecutionNotifications": {
+          "description": "A list of runtime conditions detected by the tool during the analysis.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/notification"
+          }
+        },
+
+        "toolConfigurationNotifications": {
+          "description": "A list of conditions detected by the tool that are relevant to the tool's configuration.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/notification"
+          }
+        },
+
+        "exitCodeDescription": {
+          "description": "The reason for the process exit.",
+          "type": "string"
+        },
+
+        "exitSignalName": {
+          "description": "The name of the signal that caused the process to exit.",
+          "type": "string"
+        },
+
+        "exitSignalNumber": {
+          "description": "The numeric value of the signal that caused the process to exit.",
+          "type": "integer"
+        },
+
+        "processStartFailureMessage": {
+          "description": "The reason given by the operating system that the process failed to start.",
+          "type": "string"
+        },
+
+        "executionSuccessful": {
+          "description": "Specifies whether the tool's execution completed successfully.",
+          "type": "boolean"
+        },
+
+        "machine": {
+          "description": "The machine on which the invocation occurred.",
+          "type": "string"
+        },
+
+        "account": {
+          "description": "The account under which the invocation occurred.",
+          "type": "string"
+        },
+
+        "processId": {
+          "description": "The id of the process in which the invocation occurred.",
+          "type": "integer"
+        },
+
+        "executableLocation": {
+          "description": "An absolute URI specifying the location of the executable that was invoked.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "workingDirectory": {
+          "description": "The working directory for the invocation.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "environmentVariables": {
+          "description": "The environment variables associated with the analysis tool process, expressed as key/value pairs.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+
+        "stdin": {
+          "description": "A file containing the standard input stream to the process that was invoked.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "stdout": {
+          "description": "A file containing the standard output stream from the process that was invoked.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "stderr": {
+          "description": "A file containing the standard error stream from the process that was invoked.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "stdoutStderr": {
+          "description": "A file containing the interleaved standard output and standard error stream from the process that was invoked.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the invocation.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "required": [ "executionSuccessful" ]
+    },
+
+    "location": {
+      "description": "A location within a programming artifact.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "id": {
+          "description": "Value that distinguishes this location from all other locations within a single result object.",
+          "type": "integer",
+          "minimum": -1,
+          "default": -1
+        },
+
+        "physicalLocation": {
+          "description": "Identifies the artifact and region.",
+          "$ref": "#/definitions/physicalLocation"
+        },
+
+        "logicalLocations": {
+          "description": "The logical locations associated with the result.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/logicalLocation"
+          }
+        },
+
+        "message": {
+          "description": "A message relevant to the location.",
+          "$ref": "#/definitions/message"
+        },
+
+        "annotations": {
+          "description": "A set of regions relevant to the location.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/region"
+          }
+        },
+
+        "relationships": {
+          "description": "An array of objects that describe relationships between this location and others.",
+          "type": "array",
+          "default": [],
+          "minItems": 0,
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/definitions/locationRelationship"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the location.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "locationRelationship": {
+      "description": "Information about the relation of one location to another.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "target": {
+          "description": "A reference to the related location.",
+          "type": "integer",
+          "minimum": 0
+        },
+
+        "kinds": {
+          "description": "A set of distinct strings that categorize the relationship. Well-known kinds include 'includes', 'isIncludedBy' and 'relevant'.",
+          "type": "array",
+          "default": [ "relevant" ],
+          "uniqueItems": true,
+          "items": {
+            "type": "string"
+          }
+        },
+
+        "description": {
+          "description": "A description of the location relationship.",
+          "$ref": "#/definitions/message"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the location relationship.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "required": [ "target" ]
+    },
+
+    "logicalLocation": {
+      "description": "A logical location of a construct that produced a result.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "name": {
+          "description": "Identifies the construct in which the result occurred. For example, this property might contain the name of a class or a method.",
+          "type": "string"
+        },
+
+        "index": {
+          "description": "The index within the logical locations array.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "fullyQualifiedName": {
+          "description": "The human-readable fully qualified name of the logical location.",
+          "type": "string"
+        },
+
+        "decoratedName": {
+          "description": "The machine-readable name for the logical location, such as a mangled function name provided by a C++ compiler that encodes calling convention, return type and other details along with the function name.",
+          "type": "string"
+        },
+
+        "parentIndex": {
+          "description": "Identifies the index of the immediate parent of the construct in which the result was detected. For example, this property might point to a logical location that represents the namespace that holds a type.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "kind": {
+          "description": "The type of construct this logical location component refers to. Should be one of 'function', 'member', 'module', 'namespace', 'parameter', 'resource', 'returnType', 'type', 'variable', 'object', 'array', 'property', 'value', 'element', 'text', 'attribute', 'comment', 'declaration', 'dtd' or 'processingInstruction', if any of those accurately describe the construct.",
+          "type": "string"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the logical location.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "message": {
+      "description": "Encapsulates a message intended to be read by the end user.",
+      "type": "object",
+      "additionalProperties": false,
+
+      "properties": {
+
+        "text": {
+          "description": "A plain text message string.",
+          "type": "string"
+        },
+
+        "markdown": {
+          "description": "A Markdown message string.",
+          "type": "string"
+        },
+
+        "id": {
+          "description": "The identifier for this message.",
+          "type": "string"
+        },
+
+        "arguments": {
+          "description": "An array of strings to substitute into the message string.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the message.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "anyOf": [
+        { "required": [ "text" ] },
+        { "required": [ "id" ] }
+      ]
+    },
+
+    "multiformatMessageString": {
+      "description": "A message string or message format string rendered in multiple formats.",
+      "type": "object",
+      "additionalProperties": false,
+
+      "properties": {
+
+        "text": {
+          "description": "A plain text message string or format string.",
+          "type": "string"
+        },
+
+        "markdown": {
+          "description": "A Markdown message string or format string.",
+          "type": "string"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the message.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "required": [ "text" ]
+    },
+
+    "node": {
+      "description": "Represents a node in a graph.",
+      "type": "object",
+      "additionalProperties": false,
+
+      "properties": {
+
+        "id": {
+          "description": "A string that uniquely identifies the node within its graph.",
+          "type": "string"
+        },
+
+        "label": {
+          "description": "A short description of the node.",
+          "$ref": "#/definitions/message"
+        },
+
+        "location": {
+          "description": "A code location associated with the node.",
+          "$ref": "#/definitions/location"
+        },
+
+        "children": {
+          "description": "Array of child nodes.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/node"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the node.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "required": [ "id" ]
+    },
+
+    "notification": {
+      "description": "Describes a condition relevant to the tool itself, as opposed to being relevant to a target being analyzed by the tool.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "locations": {
+          "description": "The locations relevant to this notification.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/location"
+          }
+        },
+
+        "message": {
+          "description": "A message that describes the condition that was encountered.",
+          "$ref": "#/definitions/message"
+        },
+
+        "level": {
+          "description": "A value specifying the severity level of the notification.",
+          "default": "warning",
+          "enum": [ "none", "note", "warning", "error" ],
+          "type": "string"
+        },
+
+        "threadId": {
+          "description": "The thread identifier of the code that generated the notification.",
+          "type": "integer"
+        },
+
+        "timeUtc": {
+          "description": "The Coordinated Universal Time (UTC) date and time at which the analysis tool generated the notification.",
+          "type": "string",
+          "format": "date-time"
+        },
+
+        "exception": {
+          "description": "The runtime exception, if any, relevant to this notification.",
+          "$ref": "#/definitions/exception"
+        },
+
+        "descriptor": {
+          "description": "A reference used to locate the descriptor relevant to this notification.",
+          "$ref": "#/definitions/reportingDescriptorReference"
+        },
+
+        "associatedRule": {
+          "description": "A reference used to locate the rule descriptor associated with this notification.",
+          "$ref": "#/definitions/reportingDescriptorReference"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the notification.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "required": [ "message" ]
+    },
+
+    "physicalLocation": {
+      "description": "A physical location relevant to a result. Specifies a reference to a programming artifact together with a range of bytes or characters within that artifact.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "address": {
+          "description": "The address of the location.",
+          "$ref": "#/definitions/address"
+        },
+
+        "artifactLocation": {
+          "description": "The location of the artifact.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "region": {
+          "description": "Specifies a portion of the artifact.",
+          "$ref": "#/definitions/region"
+        },
+
+        "contextRegion": {
+          "description": "Specifies a portion of the artifact that encloses the region. Allows a viewer to display additional context around the region.",
+          "$ref": "#/definitions/region"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the physical location.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "anyOf": [
+        {
+          "required": [ "address" ]
+        },
+        {
+          "required": [ "artifactLocation" ]
+        }
+      ]
+    },
+
+    "propertyBag": {
+      "description": "Key/value pairs that provide additional information about the object.",
+      "type": "object",
+      "additionalProperties": true,
+      "properties": {
+        "tags": {
+
+          "description": "A set of distinct strings that provide additional information.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+
+    "rectangle": {
+      "description": "An area within an image.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "top": {
+          "description": "The Y coordinate of the top edge of the rectangle, measured in the image's natural units.",
+          "type": "number"
+        },
+
+        "left": {
+          "description": "The X coordinate of the left edge of the rectangle, measured in the image's natural units.",
+          "type": "number"
+        },
+
+        "bottom": {
+          "description": "The Y coordinate of the bottom edge of the rectangle, measured in the image's natural units.",
+          "type": "number"
+        },
+
+        "right": {
+          "description": "The X coordinate of the right edge of the rectangle, measured in the image's natural units.",
+          "type": "number"
+        },
+
+        "message": {
+          "description": "A message relevant to the rectangle.",
+          "$ref": "#/definitions/message"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the rectangle.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "region": {
+      "description": "A region within an artifact where a result was detected.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "startLine": {
+          "description": "The line number of the first character in the region.",
+          "type": "integer",
+          "minimum": 1
+        },
+
+        "startColumn": {
+          "description": "The column number of the first character in the region.",
+          "type": "integer",
+          "minimum": 1
+        },
+
+        "endLine": {
+          "description": "The line number of the last character in the region.",
+          "type": "integer",
+          "minimum": 1
+        },
+
+        "endColumn": {
+          "description": "The column number of the character following the end of the region.",
+          "type": "integer",
+          "minimum": 1
+        },
+
+        "charOffset": {
+          "description": "The zero-based offset from the beginning of the artifact of the first character in the region.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "charLength": {
+          "description": "The length of the region in characters.",
+          "type": "integer",
+          "minimum": 0
+        },
+
+        "byteOffset": {
+          "description": "The zero-based offset from the beginning of the artifact of the first byte in the region.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "byteLength": {
+          "description": "The length of the region in bytes.",
+          "type": "integer",
+          "minimum": 0
+        },
+
+        "snippet": {
+          "description": "The portion of the artifact contents within the specified region.",
+          "$ref": "#/definitions/artifactContent"
+        },
+
+        "message": {
+          "description": "A message relevant to the region.",
+          "$ref": "#/definitions/message"
+        },
+
+        "sourceLanguage": {
+          "description": "Specifies the source language, if any, of the portion of the artifact specified by the region object.",
+          "type": "string"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the region.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "anyOf": [
+        { "required": [ "startLine" ] },
+        { "required": [ "charOffset" ] },
+        { "required": [ "byteOffset" ] }
+      ]
+    },
+
+    "replacement": {
+      "description": "The replacement of a single region of an artifact.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "deletedRegion": {
+          "description": "The region of the artifact to delete.",
+          "$ref": "#/definitions/region"
+        },
+
+        "insertedContent": {
+          "description": "The content to insert at the location specified by the 'deletedRegion' property.",
+          "$ref": "#/definitions/artifactContent"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the replacement.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "required": [ "deletedRegion" ]
+    },
+
+    "reportingDescriptor": {
+      "description": "Metadata that describes a specific report produced by the tool, as part of the analysis it provides or its runtime reporting.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "id": {
+          "description": "A stable, opaque identifier for the report.",
+          "type": "string"
+        },
+
+        "deprecatedIds": {
+          "description": "An array of stable, opaque identifiers by which this report was known in some previous version of the analysis tool.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "items": {
+            "type": "string"
+          }
+        },
+
+        "guid": {
+          "description": "A unique identifier for the reporting descriptor in the form of a GUID.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "deprecatedGuids": {
+          "description": "An array of unique identifies in the form of a GUID by which this report was known in some previous version of the analysis tool.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "items": {
+            "type": "string",
+            "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+          }
+        },
+
+        "name": {
+          "description": "A report identifier that is understandable to an end user.",
+          "type": "string"
+        },
+
+        "deprecatedNames": {
+          "description": "An array of readable identifiers by which this report was known in some previous version of the analysis tool.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "items": {
+            "type": "string"
+          }
+        },
+
+        "shortDescription": {
+          "description": "A concise description of the report. Should be a single sentence that is understandable when visible space is limited to a single line of text.",
+          "$ref": "#/definitions/multiformatMessageString"
+        },
+
+        "fullDescription": {
+          "description": "A description of the report. Should, as far as possible, provide details sufficient to enable resolution of any problem indicated by the result.",
+          "$ref": "#/definitions/multiformatMessageString"
+        },
+
+        "messageStrings": {
+          "description": "A set of name/value pairs with arbitrary names. Each value is a multiformatMessageString object, which holds message strings in plain text and (optionally) Markdown format. The strings can include placeholders, which can be used to construct a message in combination with an arbitrary number of additional string arguments.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/multiformatMessageString"
+          }
+        },
+
+        "defaultConfiguration": {
+          "description": "Default reporting configuration information.",
+          "$ref": "#/definitions/reportingConfiguration"
+        },
+
+        "helpUri": {
+          "description": "A URI where the primary documentation for the report can be found.",
+          "type": "string",
+          "format": "uri"
+        },
+
+        "help": {
+          "description": "Provides the primary documentation for the report, useful when there is no online documentation.",
+          "$ref": "#/definitions/multiformatMessageString"
+        },
+
+        "relationships": {
+          "description": "An array of objects that describe relationships between this reporting descriptor and others.",
+          "type": "array",
+          "default": [],
+          "minItems": 0,
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/definitions/reportingDescriptorRelationship"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the report.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "required": [ "id" ]
+    },
+
+    "reportingConfiguration": {
+      "description": "Information about a rule or notification that can be configured at runtime.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "enabled": {
+          "description": "Specifies whether the report may be produced during the scan.",
+          "type": "boolean",
+          "default": true
+        },
+
+        "level": {
+          "description": "Specifies the failure level for the report.",
+          "default": "warning",
+          "enum": [ "none", "note", "warning", "error" ],
+          "type": "string"
+        },
+
+        "rank": {
+          "description": "Specifies the relative priority of the report. Used for analysis output only.",
+          "type": "number",
+          "default": -1.0,
+          "minimum": -1.0,
+          "maximum": 100.0
+        },
+
+        "parameters": {
+          "description": "Contains configuration information specific to a report.",
+          "$ref": "#/definitions/propertyBag"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the reporting configuration.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "reportingDescriptorReference": {
+      "description": "Information about how to locate a relevant reporting descriptor.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "id": {
+          "description": "The id of the descriptor.",
+          "type": "string"
+        },
+
+        "index": {
+          "description": "The index into an array of descriptors in toolComponent.ruleDescriptors, toolComponent.notificationDescriptors, or toolComponent.taxonomyDescriptors, depending on context.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "guid": {
+          "description": "A guid that uniquely identifies the descriptor.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "toolComponent": {
+          "description": "A reference used to locate the toolComponent associated with the descriptor.",
+          "$ref": "#/definitions/toolComponentReference"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the reporting descriptor reference.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "anyOf": [
+        { "required": [ "index" ] },
+        { "required": [ "guid" ] },
+        { "required": [ "id" ] }
+      ]
+    },
+
+    "reportingDescriptorRelationship": {
+      "description": "Information about the relation of one reporting descriptor to another.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "target": {
+          "description": "A reference to the related reporting descriptor.",
+          "$ref": "#/definitions/reportingDescriptorReference"
+        },
+
+        "kinds": {
+          "description": "A set of distinct strings that categorize the relationship. Well-known kinds include 'canPrecede', 'canFollow', 'willPrecede', 'willFollow', 'superset', 'subset', 'equal', 'disjoint', 'relevant', and 'incomparable'.",
+          "type": "array",
+          "default": [ "relevant" ],
+          "uniqueItems": true,
+          "items": {
+            "type": "string"
+          }
+        },
+
+        "description": {
+          "description": "A description of the reporting descriptor relationship.",
+          "$ref": "#/definitions/message"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the reporting descriptor reference.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "required": [ "target" ]
+    },
+
+    "result": {
+      "description": "A result produced by an analysis tool.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "ruleId": {
+          "description": "The stable, unique identifier of the rule, if any, to which this result is relevant.",
+          "type": "string"
+        },
+
+        "ruleIndex": {
+          "description": "The index within the tool component rules array of the rule object associated with this result.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "rule": {
+          "description": "A reference used to locate the rule descriptor relevant to this result.",
+          "$ref": "#/definitions/reportingDescriptorReference"
+        },
+
+        "kind": {
+          "description": "A value that categorizes results by evaluation state.",
+          "default": "fail",
+          "enum": [ "notApplicable", "pass", "fail", "review", "open", "informational" ],
+          "type": "string"
+        },
+
+        "level": {
+          "description": "A value specifying the severity level of the result.",
+          "default": "warning",
+          "enum": [ "none", "note", "warning", "error" ],
+          "type": "string"
+        },
+
+        "message": {
+          "description": "A message that describes the result. The first sentence of the message only will be displayed when visible space is limited.",
+          "$ref": "#/definitions/message"
+        },
+
+        "analysisTarget": {
+          "description": "Identifies the artifact that the analysis tool was instructed to scan. This need not be the same as the artifact where the result actually occurred.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "locations": {
+          "description": "The set of locations where the result was detected. Specify only one location unless the problem indicated by the result can only be corrected by making a change at every specified location.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/location"
+          }
+        },
+
+        "guid": {
+          "description": "A stable, unique identifier for the result in the form of a GUID.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "correlationGuid": {
+          "description": "A stable, unique identifier for the equivalence class of logically identical results to which this result belongs, in the form of a GUID.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "occurrenceCount": {
+          "description": "A positive integer specifying the number of times this logically unique result was observed in this run.",
+          "type": "integer",
+          "minimum": 1
+        },
+
+        "partialFingerprints": {
+          "description": "A set of strings that contribute to the stable, unique identity of the result.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+
+        "fingerprints": {
+          "description": "A set of strings each of which individually defines a stable, unique identity for the result.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+
+        "stacks": {
+          "description": "An array of 'stack' objects relevant to the result.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/stack"
+          }
+        },
+
+        "codeFlows": {
+          "description": "An array of 'codeFlow' objects relevant to the result.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/codeFlow"
+          }
+        },
+
+        "graphs": {
+          "description": "An array of zero or more unique graph objects associated with the result.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/graph"
+          }
+        },
+
+        "graphTraversals": {
+          "description": "An array of one or more unique 'graphTraversal' objects.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/graphTraversal"
+          }
+        },
+
+        "relatedLocations": {
+          "description": "A set of locations relevant to this result.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/location"
+          }
+        },
+
+        "suppressions": {
+          "description": "A set of suppressions relevant to this result.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/definitions/suppression"
+          }
+        },
+
+        "baselineState": {
+          "description": "The state of a result relative to a baseline of a previous run.",
+          "enum": [
+            "new",
+            "unchanged",
+            "updated",
+            "absent"
+          ],
+          "type": "string"
+        },
+
+        "rank": {
+          "description": "A number representing the priority or importance of the result.",
+          "type": "number",
+          "default": -1.0,
+          "minimum": -1.0,
+          "maximum": 100.0
+        },
+
+        "attachments": {
+          "description": "A set of artifacts relevant to the result.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/attachment"
+          }
+        },
+
+        "hostedViewerUri": {
+          "description": "An absolute URI at which the result can be viewed.",
+          "type": "string",
+          "format": "uri"
+        },
+
+        "workItemUris": {
+          "description": "The URIs of the work items associated with this result.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "items": {
+            "type": "string",
+            "format": "uri"
+          }
+        },
+
+        "provenance": {
+          "description": "Information about how and when the result was detected.",
+          "$ref": "#/definitions/resultProvenance"
+        },
+
+        "fixes": {
+          "description": "An array of 'fix' objects, each of which represents a proposed fix to the problem indicated by the result.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/fix"
+          }
+        },
+
+        "taxa": {
+          "description": "An array of references to taxonomy reporting descriptors that are applicable to the result.",
+          "type": "array",
+          "default": [],
+          "minItems": 0,
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/definitions/reportingDescriptorReference"
+          }
+        },
+
+        "webRequest": {
+          "description": "A web request associated with this result.",
+          "$ref": "#/definitions/webRequest"
+        },
+
+        "webResponse": {
+          "description": "A web response associated with this result.",
+          "$ref": "#/definitions/webResponse"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the result.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "required": [ "message" ]
+    },
+
+    "resultProvenance": {
+      "description": "Contains information about how and when a result was detected.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "firstDetectionTimeUtc": {
+          "description": "The Coordinated Universal Time (UTC) date and time at which the result was first detected. See \"Date/time properties\" in the SARIF spec for the required format.",
+          "type": "string",
+          "format": "date-time"
+        },
+
+        "lastDetectionTimeUtc": {
+          "description": "The Coordinated Universal Time (UTC) date and time at which the result was most recently detected. See \"Date/time properties\" in the SARIF spec for the required format.",
+          "type": "string",
+          "format": "date-time"
+        },
+
+        "firstDetectionRunGuid": {
+          "description": "A GUID-valued string equal to the automationDetails.guid property of the run in which the result was first detected.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "lastDetectionRunGuid": {
+          "description": "A GUID-valued string equal to the automationDetails.guid property of the run in which the result was most recently detected.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "invocationIndex": {
+          "description": "The index within the run.invocations array of the invocation object which describes the tool invocation that detected the result.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "conversionSources": {
+          "description": "An array of physicalLocation objects which specify the portions of an analysis tool's output that a converter transformed into the result.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/physicalLocation"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the result.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "run": {
+      "description": "Describes a single run of an analysis tool, and contains the reported output of that run.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "tool": {
+          "description": "Information about the tool or tool pipeline that generated the results in this run. A run can only contain results produced by a single tool or tool pipeline. A run can aggregate results from multiple log files, as long as context around the tool run (tool command-line arguments and the like) is identical for all aggregated files.",
+          "$ref": "#/definitions/tool"
+        },
+
+        "invocations": {
+          "description": "Describes the invocation of the analysis tool.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/invocation"
+          }
+        },
+
+        "conversion": {
+          "description": "A conversion object that describes how a converter transformed an analysis tool's native reporting format into the SARIF format.",
+          "$ref": "#/definitions/conversion"
+        },
+
+        "language": {
+          "description": "The language of the messages emitted into the log file during this run (expressed as an ISO 639-1 two-letter lowercase culture code) and an optional region (expressed as an ISO 3166-1 two-letter uppercase subculture code associated with a country or region). The casing is recommended but not required (in order for this data to conform to RFC5646).",
+          "type": "string",
+          "default": "en-US",
+          "pattern": "^[a-zA-Z]{2}(-[a-zA-Z]{2})?$"
+        },
+
+        "versionControlProvenance": {
+          "description": "Specifies the revision in version control of the artifacts that were scanned.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/versionControlDetails"
+          }
+        },
+
+        "originalUriBaseIds": {
+          "description": "The artifact location specified by each uriBaseId symbol on the machine where the tool originally ran.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/artifactLocation"
+          }
+        },
+
+        "artifacts": {
+          "description": "An array of artifact objects relevant to the run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/definitions/artifact"
+          }
+        },
+
+        "logicalLocations": {
+          "description": "An array of logical locations such as namespaces, types or functions.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/logicalLocation"
+          }
+        },
+
+        "graphs": {
+          "description": "An array of zero or more unique graph objects associated with the run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/graph"
+          }
+        },
+
+        "results": {
+          "description": "The set of results contained in an SARIF log. The results array can be omitted when a run is solely exporting rules metadata. It must be present (but may be empty) if a log file represents an actual scan.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "items": {
+            "$ref": "#/definitions/result"
+          }
+        },
+
+        "automationDetails": {
+          "description": "Automation details that describe this run.",
+          "$ref": "#/definitions/runAutomationDetails"
+        },
+
+        "runAggregates": {
+          "description": "Automation details that describe the aggregate of runs to which this run belongs.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/runAutomationDetails"
+          }
+        },
+
+        "baselineGuid": {
+          "description": "The 'guid' property of a previous SARIF 'run' that comprises the baseline that was used to compute result 'baselineState' properties for the run.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "redactionTokens": {
+          "description": "An array of strings used to replace sensitive information in a redaction-aware property.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        },
+
+        "defaultEncoding": {
+          "description": "Specifies the default encoding for any artifact object that refers to a text file.",
+          "type": "string"
+        },
+
+        "defaultSourceLanguage": {
+          "description": "Specifies the default source language for any artifact object that refers to a text file that contains source code.",
+          "type": "string"
+        },
+
+        "newlineSequences": {
+          "description": "An ordered list of character sequences that were treated as line breaks when computing region information for the run.",
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": true,
+          "default": [ "\r\n", "\n" ],
+          "items": {
+            "type": "string"
+          }
+        },
+
+        "columnKind": {
+          "description": "Specifies the unit in which the tool measures columns.",
+          "enum": [ "utf16CodeUnits", "unicodeCodePoints" ],
+          "type": "string"
+        },
+
+        "externalPropertyFileReferences": {
+          "description": "References to external property files that should be inlined with the content of a root log file.",
+          "$ref": "#/definitions/externalPropertyFileReferences"
+        },
+
+        "threadFlowLocations": {
+          "description": "An array of threadFlowLocation objects cached at run level.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/threadFlowLocation"
+          }
+        },
+
+        "taxonomies": {
+          "description": "An array of toolComponent objects relevant to a taxonomy in which results are categorized.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/toolComponent"
+          }
+        },
+
+        "addresses": {
+          "description": "Addresses associated with this run instance, if any.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/address"
+          }
+        },
+
+        "translations": {
+          "description": "The set of available translations of the localized data provided by the tool.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/toolComponent"
+          }
+        },
+
+        "policies": {
+          "description": "Contains configurations that may potentially override both reportingDescriptor.defaultConfiguration (the tool's default severities) and invocation.configurationOverrides (severities established at run-time from the command line).",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/toolComponent"
+          }
+        },
+
+        "webRequests": {
+          "description": "An array of request objects cached at run level.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/webRequest"
+          }
+        },
+
+        "webResponses": {
+          "description": "An array of response objects cached at run level.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/webResponse"
+          }
+        },
+
+        "specialLocations": {
+          "description": "A specialLocations object that defines locations of special significance to SARIF consumers.",
+          "$ref": "#/definitions/specialLocations"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the run.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "required": [ "tool" ]
+    },
+
+    "runAutomationDetails": {
+      "description": "Information that describes a run's identity and role within an engineering system process.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "description": {
+          "description": "A description of the identity and role played within the engineering system by this object's containing run object.",
+          "$ref": "#/definitions/message"
+        },
+
+        "id": {
+          "description": "A hierarchical string that uniquely identifies this object's containing run object.",
+          "type": "string"
+        },
+
+        "guid": {
+          "description": "A stable, unique identifier for this object's containing run object in the form of a GUID.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "correlationGuid": {
+          "description": "A stable, unique identifier for the equivalence class of runs to which this object's containing run object belongs in the form of a GUID.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the run automation details.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "specialLocations": {
+      "description": "Defines locations of special significance to SARIF consumers.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "displayBase": {
+          "description": "Provides a suggestion to SARIF consumers to display file paths relative to the specified location.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the special locations.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "stack": {
+      "description": "A call stack that is relevant to a result.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "message": {
+          "description": "A message relevant to this call stack.",
+          "$ref": "#/definitions/message"
+        },
+
+        "frames": {
+          "description": "An array of stack frames that represents a sequence of calls, rendered in reverse chronological order, that comprise the call stack.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "items": {
+            "$ref": "#/definitions/stackFrame"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the stack.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "required": [ "frames" ]
+    },
+
+    "stackFrame": {
+      "description": "A function call within a stack trace.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "location": {
+          "description": "The location to which this stack frame refers.",
+          "$ref": "#/definitions/location"
+        },
+
+        "module": {
+          "description": "The name of the module that contains the code of this stack frame.",
+          "type": "string"
+        },
+
+        "threadId": {
+          "description": "The thread identifier of the stack frame.",
+          "type": "integer"
+        },
+
+        "parameters": {
+          "description": "The parameters of the call that is executing.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": false,
+          "default": [],
+          "items": {
+            "type": "string",
+            "default": []
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the stack frame.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "suppression": {
+      "description": "A suppression that is relevant to a result.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "guid": {
+          "description": "A stable, unique identifier for the suprression in the form of a GUID.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "kind": {
+          "description": "A string that indicates where the suppression is persisted.",
+          "enum": [
+            "inSource",
+            "external"
+          ],
+          "type": "string"
+        },
+
+        "status": {
+          "description": "A string that indicates the review status of the suppression.",
+          "enum": [
+            "accepted",
+            "underReview",
+            "rejected"
+          ],
+          "type": "string"
+        },
+
+        "justification": {
+          "description": "A string representing the justification for the suppression.",
+          "type": "string"
+        },
+
+        "location": {
+          "description": "Identifies the location associated with the suppression.",
+          "$ref": "#/definitions/location"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the suppression.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "required": [ "kind" ]
+    },
+
+    "threadFlow": {
+      "description": "Describes a sequence of code locations that specify a path through a single thread of execution such as an operating system or fiber.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "id": {
+          "description": "An string that uniquely identifies the threadFlow within the codeFlow in which it occurs.",
+          "type": "string"
+        },
+
+        "message": {
+          "description": "A message relevant to the thread flow.",
+          "$ref": "#/definitions/message"
+        },
+
+
+        "initialState": {
+          "description": "Values of relevant expressions at the start of the thread flow that may change during thread flow execution.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/multiformatMessageString"
+          }
+        },
+
+        "immutableState": {
+          "description": "Values of relevant expressions at the start of the thread flow that remain constant.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/multiformatMessageString"
+          }
+        },
+
+        "locations": {
+          "description": "A temporally ordered array of 'threadFlowLocation' objects, each of which describes a location visited by the tool while producing the result.",
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": false,
+          "items": {
+            "$ref": "#/definitions/threadFlowLocation"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the thread flow.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "required": [ "locations" ]
+    },
+
+    "threadFlowLocation": {
+      "description": "A location visited by an analysis tool while simulating or monitoring the execution of a program.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "index": {
+          "description": "The index within the run threadFlowLocations array.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "location": {
+          "description": "The code location.",
+          "$ref": "#/definitions/location"
+        },
+
+        "stack": {
+          "description": "The call stack leading to this location.",
+          "$ref": "#/definitions/stack"
+        },
+
+        "kinds": {
+          "description": "A set of distinct strings that categorize the thread flow location. Well-known kinds include 'acquire', 'release', 'enter', 'exit', 'call', 'return', 'branch', 'implicit', 'false', 'true', 'caution', 'danger', 'unknown', 'unreachable', 'taint', 'function', 'handler', 'lock', 'memory', 'resource', 'scope' and 'value'.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "type": "string"
+          }
+        },
+
+        "taxa": {
+          "description": "An array of references to rule or taxonomy reporting descriptors that are applicable to the thread flow location.",
+          "type": "array",
+          "default": [],
+          "minItems": 0,
+          "uniqueItems": true,
+          "items": {
+            "$ref": "#/definitions/reportingDescriptorReference"
+          }
+        },
+
+        "module": {
+          "description": "The name of the module that contains the code that is executing.",
+          "type": "string"
+        },
+
+        "state": {
+          "description": "A dictionary, each of whose keys specifies a variable or expression, the associated value of which represents the variable or expression value. For an annotation of kind 'continuation', for example, this dictionary might hold the current assumed values of a set of global variables.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/multiformatMessageString"
+          }
+        },
+
+        "nestingLevel": {
+          "description": "An integer representing a containment hierarchy within the thread flow.",
+          "type": "integer",
+          "minimum": 0
+        },
+
+        "executionOrder": {
+          "description": "An integer representing the temporal order in which execution reached this location.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "executionTimeUtc": {
+          "description": "The Coordinated Universal Time (UTC) date and time at which this location was executed.",
+          "type": "string",
+          "format": "date-time"
+        },
+
+        "importance": {
+          "description": "Specifies the importance of this location in understanding the code flow in which it occurs. The order from most to least important is \"essential\", \"important\", \"unimportant\". Default: \"important\".",
+          "enum": [ "important", "essential", "unimportant" ],
+          "default": "important",
+          "type": "string"
+        },
+
+        "webRequest": {
+          "description": "A web request associated with this thread flow location.",
+          "$ref": "#/definitions/webRequest"
+        },
+
+        "webResponse": {
+          "description": "A web response associated with this thread flow location.",
+          "$ref": "#/definitions/webResponse"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the threadflow location.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "tool": {
+      "description": "The analysis tool that was run.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "driver": {
+          "description": "The analysis tool that was run.",
+          "$ref": "#/definitions/toolComponent"
+        },
+
+        "extensions": {
+          "description": "Tool extensions that contributed to or reconfigured the analysis tool that was run.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/toolComponent"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the tool.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "required": [ "driver" ]
+    },
+
+    "toolComponent": {
+      "description": "A component, such as a plug-in or the driver, of the analysis tool that was run.",
+      "additionalProperties": false,
+      "type": "object",
+      "properties": {
+
+        "guid": {
+          "description": "A unique identifier for the tool component in the form of a GUID.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "name": {
+          "description": "The name of the tool component.",
+          "type": "string"
+        },
+
+        "organization": {
+          "description": "The organization or company that produced the tool component.",
+          "type": "string"
+        },
+
+        "product": {
+          "description": "A product suite to which the tool component belongs.",
+          "type": "string"
+        },
+
+        "productSuite": {
+          "description": "A localizable string containing the name of the suite of products to which the tool component belongs.",
+          "type": "string"
+        },
+
+        "shortDescription": {
+          "description": "A brief description of the tool component.",
+          "$ref": "#/definitions/multiformatMessageString"
+        },
+
+        "fullDescription": {
+          "description": "A comprehensive description of the tool component.",
+          "$ref": "#/definitions/multiformatMessageString"
+        },
+
+        "fullName": {
+          "description": "The name of the tool component along with its version and any other useful identifying information, such as its locale.",
+          "type": "string"
+        },
+
+        "version": {
+          "description": "The tool component version, in whatever format the component natively provides.",
+          "type": "string"
+        },
+
+        "semanticVersion": {
+          "description": "The tool component version in the format specified by Semantic Versioning 2.0.",
+          "type": "string"
+        },
+
+        "dottedQuadFileVersion": {
+          "description": "The binary version of the tool component's primary executable file expressed as four non-negative integers separated by a period (for operating systems that express file versions in this way).",
+          "type": "string",
+          "pattern": "[0-9]+(\\.[0-9]+){3}"
+        },
+
+        "releaseDateUtc": {
+          "description": "A string specifying the UTC date (and optionally, the time) of the component's release.",
+          "type": "string"
+        },
+
+        "downloadUri": {
+          "description": "The absolute URI from which the tool component can be downloaded.",
+          "type": "string",
+          "format": "uri"
+        },
+
+        "informationUri": {
+          "description": "The absolute URI at which information about this version of the tool component can be found.",
+          "type": "string",
+          "format": "uri"
+        },
+
+        "globalMessageStrings": {
+          "description": "A dictionary, each of whose keys is a resource identifier and each of whose values is a multiformatMessageString object, which holds message strings in plain text and (optionally) Markdown format. The strings can include placeholders, which can be used to construct a message in combination with an arbitrary number of additional string arguments.",
+          "type": "object",
+          "additionalProperties": {
+            "$ref": "#/definitions/multiformatMessageString"
+          }
+        },
+
+        "notifications": {
+          "description": "An array of reportingDescriptor objects relevant to the notifications related to the configuration and runtime execution of the tool component.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/reportingDescriptor"
+          }
+        },
+
+        "rules": {
+          "description": "An array of reportingDescriptor objects relevant to the analysis performed by the tool component.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/reportingDescriptor"
+          }
+        },
+
+        "taxa": {
+          "description": "An array of reportingDescriptor objects relevant to the definitions of both standalone and tool-defined taxonomies.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/reportingDescriptor"
+          }
+        },
+
+        "locations": {
+          "description": "An array of the artifactLocation objects associated with the tool component.",
+          "type": "array",
+          "minItems": 0,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/artifactLocation"
+          }
+        },
+
+        "language": {
+          "description": "The language of the messages emitted into the log file during this run (expressed as an ISO 639-1 two-letter lowercase language code) and an optional region (expressed as an ISO 3166-1 two-letter uppercase subculture code associated with a country or region). The casing is recommended but not required (in order for this data to conform to RFC5646).",
+          "type": "string",
+          "default": "en-US",
+          "pattern": "^[a-zA-Z]{2}(-[a-zA-Z]{2})?$"
+        },
+
+        "contents": {
+          "description": "The kinds of data contained in this object.",
+          "type": "array",
+          "uniqueItems": true,
+          "default": [ "localizedData", "nonLocalizedData" ],
+          "items": {
+            "enum": [
+              "localizedData",
+              "nonLocalizedData"
+            ],
+            "type": "string"
+          }
+        },
+
+        "isComprehensive": {
+          "description": "Specifies whether this object contains a complete definition of the localizable and/or non-localizable data for this component, as opposed to including only data that is relevant to the results persisted to this log file.",
+          "type": "boolean",
+          "default": false
+        },
+
+        "localizedDataSemanticVersion": {
+          "description": "The semantic version of the localized strings defined in this component; maintained by components that provide translations.",
+          "type": "string"
+        },
+
+        "minimumRequiredLocalizedDataSemanticVersion": {
+          "description": "The minimum value of localizedDataSemanticVersion required in translations consumed by this component; used by components that consume translations.",
+          "type": "string"
+        },
+
+        "associatedComponent": {
+          "description": "The component which is strongly associated with this component. For a translation, this refers to the component which has been translated. For an extension, this is the driver that provides the extension's plugin model.",
+          "$ref": "#/definitions/toolComponentReference"
+        },
+
+        "translationMetadata": {
+          "description": "Translation metadata, required for a translation, not populated by other component types.",
+          "$ref": "#/definitions/translationMetadata"
+        },
+
+        "supportedTaxonomies": {
+          "description": "An array of toolComponentReference objects to declare the taxonomies supported by the tool component.",
+          "type": "array",
+          "minItems": 0,
+          "uniqueItems": true,
+          "default": [],
+          "items": {
+            "$ref": "#/definitions/toolComponentReference"
+          }
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the tool component.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "required": [ "name" ]
+    },
+
+    "toolComponentReference": {
+      "description": "Identifies a particular toolComponent object, either the driver or an extension.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "name": {
+          "description": "The 'name' property of the referenced toolComponent.",
+          "type": "string"
+        },
+
+        "index": {
+          "description": "An index into the referenced toolComponent in tool.extensions.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "guid": {
+          "description": "The 'guid' property of the referenced toolComponent.",
+          "type": "string",
+          "pattern": "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the toolComponentReference.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "translationMetadata": {
+      "description": "Provides additional metadata related to translation.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "name": {
+          "description": "The name associated with the translation metadata.",
+          "type": "string"
+        },
+
+        "fullName": {
+          "description": "The full name associated with the translation metadata.",
+          "type": "string"
+        },
+
+        "shortDescription": {
+          "description": "A brief description of the translation metadata.",
+          "$ref": "#/definitions/multiformatMessageString"
+        },
+
+        "fullDescription": {
+          "description": "A comprehensive description of the translation metadata.",
+          "$ref": "#/definitions/multiformatMessageString"
+        },
+
+        "downloadUri": {
+          "description": "The absolute URI from which the translation metadata can be downloaded.",
+          "type": "string",
+          "format": "uri"
+        },
+
+        "informationUri": {
+          "description": "The absolute URI from which information related to the translation metadata can be downloaded.",
+          "type": "string",
+          "format": "uri"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the translation metadata.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+      "required": [ "name" ]
+    },
+
+    "versionControlDetails": {
+      "description": "Specifies the information necessary to retrieve a desired revision from a version control system.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "repositoryUri": {
+          "description": "The absolute URI of the repository.",
+          "type": "string",
+          "format": "uri"
+        },
+
+        "revisionId": {
+          "description": "A string that uniquely and permanently identifies the revision within the repository.",
+          "type": "string"
+        },
+
+        "branch": {
+          "description": "The name of a branch containing the revision.",
+          "type": "string"
+        },
+
+        "revisionTag": {
+          "description": "A tag that has been applied to the revision.",
+          "type": "string"
+        },
+
+        "asOfTimeUtc": {
+          "description": "A Coordinated Universal Time (UTC) date and time that can be used to synchronize an enlistment to the state of the repository at that time.",
+          "type": "string",
+          "format": "date-time"
+        },
+
+        "mappedTo": {
+          "description": "The location in the local file system to which the root of the repository was mapped at the time of the analysis.",
+          "$ref": "#/definitions/artifactLocation"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the version control details.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      },
+
+      "required": [ "repositoryUri" ]
+    },
+
+    "webRequest": {
+      "description": "Describes an HTTP request.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "index": {
+          "description": "The index within the run.webRequests array of the request object associated with this result.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+
+        },
+
+        "protocol": {
+          "description": "The request protocol. Example: 'http'.",
+          "type": "string"
+        },
+
+        "version": {
+          "description": "The request version. Example: '1.1'.",
+          "type": "string"
+        },
+
+        "target": {
+          "description": "The target of the request.",
+          "type": "string"
+        },
+
+        "method": {
+          "description": "The HTTP method. Well-known values are 'GET', 'PUT', 'POST', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT'.",
+          "type": "string"
+        },
+
+        "headers": {
+          "description": "The request headers.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+
+        "parameters": {
+          "description": "The request parameters.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+
+        "body": {
+          "description": "The body of the request.",
+          "$ref": "#/definitions/artifactContent"
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the request.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    },
+
+    "webResponse": {
+      "description": "Describes the response to an HTTP request.",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+
+        "index": {
+          "description": "The index within the run.webResponses array of the response object associated with this result.",
+          "type": "integer",
+          "default": -1,
+          "minimum": -1
+        },
+
+        "protocol": {
+          "description": "The response protocol. Example: 'http'.",
+          "type": "string"
+        },
+
+        "version": {
+          "description": "The response version. Example: '1.1'.",
+          "type": "string"
+        },
+
+        "statusCode": {
+          "description": "The response status code. Example: 451.",
+          "type": "integer"
+        },
+
+        "reasonPhrase": {
+          "description": "The response reason. Example: 'Not found'.",
+          "type": "string"
+        },
+
+        "headers": {
+          "description": "The response headers.",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+
+        "body": {
+          "description": "The body of the response.",
+          "$ref": "#/definitions/artifactContent"
+        },
+
+        "noResponseReceived": {
+          "description": "Specifies whether a response was received from the server.",
+          "type": "boolean",
+          "default": false
+        },
+
+        "properties": {
+          "description": "Key/value pairs that provide additional information about the response.",
+          "$ref": "#/definitions/propertyBag"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tools/lint/src/test/kotlin/LinterTest.kt b/tools/lint/src/test/kotlin/LinterTest.kt
new file mode 100644
index 0000000000..cd0f8ae9b2
--- /dev/null
+++ b/tools/lint/src/test/kotlin/LinterTest.kt
@@ -0,0 +1,22 @@
+import io.github.jmltoolkit.lint.JmlLintingConfig
+import io.github.jmltoolkit.lint.JmlLintingFacade
+import io.github.jmltoolkit.utils.TestWithJavaParser
+import org.junit.jupiter.api.Assumptions
+import org.junit.jupiter.api.Test
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (14.10.22)
+ */
+internal class LinterTest : TestWithJavaParser() {
+    @Test
+    fun everythingWrong() {
+        val result = parser.parse(javaClass.getResourceAsStream("EverythingWrong.java"))
+        Assumptions.assumeTrue(result.isSuccessful)
+        val actual = JmlLintingFacade(JmlLintingConfig()).lint(listOf(result.result.get()))
+
+        for (lintProblem in actual) {
+            println(lintProblem)
+        }
+    }
+}
diff --git a/tools/lint/src/test/resources/EverythingWrong.java b/tools/lint/src/test/resources/EverythingWrong.java
new file mode 100644
index 0000000000..19d082fe5b
--- /dev/null
+++ b/tools/lint/src/test/resources/EverythingWrong.java
@@ -0,0 +1,30 @@
+public class EverythingWrong {
+    public void foo(int x) {
+        //@ghost int x = 0;
+    }
+
+    /*@ ensures \result>0; */
+    public void bar(int x) {
+    }
+
+    /*@ requires \result>0; */
+    public int bar(int x) {
+        return 0;
+    }
+
+    /*@ requires x++; ensures x=2; */
+    public int baf(int x) {
+        return 0;
+    }
+
+    public void bar(int x) {
+        /*@ ensures true; requires true; */
+        while (true) ;
+    }
+
+    public final int x;
+
+    /*@ assignable x; */
+    public void bear() {
+    }
+}
\ No newline at end of file
diff --git a/tools/lint/src/test/resources/Test.java b/tools/lint/src/test/resources/Test.java
new file mode 100644
index 0000000000..0b8bc08599
--- /dev/null
+++ b/tools/lint/src/test/resources/Test.java
@@ -0,0 +1,2 @@
+public class Test {
+}
\ No newline at end of file
diff --git a/tools/lsp/build.gradle.kts b/tools/lsp/build.gradle.kts
new file mode 100644
index 0000000000..4720457ae2
--- /dev/null
+++ b/tools/lsp/build.gradle.kts
@@ -0,0 +1,43 @@
+plugins {
+    id("standard-kotlin")
+    kotlin("plugin.serialization") version libs.versions.kotlin.get()
+    id("com.gradleup.shadow") version "9.3.2"
+    id("application")
+}
+
+version = "1.0-SNAPSHOT"
+
+dependencies {
+    api(project(":jmlparser-symbol-solver-core"))
+
+    testImplementation(kotlin("test"))
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.10.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0")
+    //implementation(kotlin("serialization"))
+    implementation(kotlin("serialization"))
+    runtimeOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0")
+
+    implementation(project(":tools:utils"))
+    implementation(project(":tools:smt"))
+    implementation(project(":tools:wd"))
+    implementation(project(":tools:stat"))
+    implementation(project(":tools:redux"))
+    implementation(project(":tools:lint"))
+    implementation(project(":tools:jml2java"))
+
+    implementation("org.tinylog:tinylog-api-kotlin:2.7.0")
+    implementation("org.tinylog:tinylog-api:2.8.0-M1")
+    implementation("org.tinylog:tinylog-impl:2.7.0")
+
+    implementation("org.eclipse.lsp4j:org.eclipse.lsp4j:1.0.0")
+
+    implementation(libs.clickt)
+
+    implementation("org.key-project:key.core:2.12.3")
+    implementation("org.key-project:key.ui:2.12.3")
+}
+
+application {
+    mainClass = "io.github.jmltoolkit.lsp.Main"
+}
\ No newline at end of file
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/CodeActionCollector.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/CodeActionCollector.kt
new file mode 100644
index 0000000000..796865fae5
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/CodeActionCollector.kt
@@ -0,0 +1,64 @@
+package io.github.jmltoolkit.lsp
+
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.expr.Expression
+import com.github.javaparser.ast.jml.body.JmlClassExprDeclaration
+import com.github.javaparser.ast.jml.clauses.JmlSignalsClause
+import com.github.javaparser.ast.jml.clauses.JmlSimpleExprClause
+import com.github.javaparser.ast.jml.expr.JmlQuantifiedExpr
+import com.github.javaparser.ast.jml.expr.JmlQuantifiedExpr.JmlDefaultBinder
+import com.github.javaparser.ast.jml.stmt.JmlExpressionStmt
+import org.eclipse.lsp4j.CodeAction
+import org.eclipse.lsp4j.CodeActionContext
+import org.eclipse.lsp4j.Command
+import org.eclipse.lsp4j.jsonrpc.messages.Either
+import kotlin.jvm.optionals.getOrNull
+
+/**
+ * This visitor gathers actions, that can be executed on nodes within the given range.
+ */
+class CodeActionCollector(val context: CodeActionContext?, private val range: com.github.javaparser.Range) :
+    ResultingVisitor<MutableList<Either<Command, CodeAction>>>() {
+    override val result = arrayListOf<Either<Command, CodeAction>>()
+    fun add(x: Command) = result.add(Either.forLeft(x))
+    fun add(x: CodeAction) = result.add(Either.forRight(x))
+
+    override fun visit(n: JmlExpressionStmt, arg: Unit?) {
+        if (n.kind != JmlExpressionStmt.JmlStmtKind.SET && n.kind != JmlExpressionStmt.JmlStmtKind.HENCE_BY) {
+            addWelldefinedCheck(n.expression)
+        }
+        super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlSimpleExprClause, arg: Unit?) {
+        addWelldefinedCheck(n.expression)
+    }
+
+    override fun visit(n: JmlSignalsClause, arg: Unit?) {
+        addWelldefinedCheck(n.expression)
+        super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlClassExprDeclaration, arg: Unit?) {
+        addWelldefinedCheck(n.invariant)
+        super.visit(n, arg)
+    }
+
+    private fun addWelldefinedCheck(n: Expression): Boolean {
+        /*if (inRange(n)) {
+            return add(WellDefinednessCheck.createCodeAction(n))
+        }*/
+        return false
+    }
+
+    private fun inRange(n: Node): Boolean {
+        return n.range.getOrNull()?.contains(range) ?: false
+    }
+
+    override fun visit(n: JmlQuantifiedExpr, arg: Unit?) {
+        if (n.binder == JmlDefaultBinder.FORALL || n.binder == JmlDefaultBinder.EXISTS) {
+            val ca = CodeAction("Add boundary")
+            add(ca)
+        }
+    }
+}
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/CodeLensCollector.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/CodeLensCollector.kt
new file mode 100644
index 0000000000..9db39b59e4
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/CodeLensCollector.kt
@@ -0,0 +1,20 @@
+package io.github.jmltoolkit.lsp
+
+import com.github.javaparser.ast.jml.clauses.ContractType
+import com.github.javaparser.ast.jml.clauses.JmlContract
+import io.github.jmltoolkit.lsp.actions.VerifyAgainstParent
+import org.eclipse.lsp4j.CodeLens
+import org.eclipse.lsp4j.Command
+
+/**
+ * Runs through the AST and collect code lens actions.
+ */
+class CodeLensCollector : ResultingVisitor<MutableList<out CodeLens>>() {
+    override val result = arrayListOf<CodeLens>()
+
+    override fun visit(n: JmlContract, arg: Unit?) {
+        if (n.type == ContractType.METHOD) {
+            //result.add(VerifyAgainstParent.createCodeLens(n))
+        }
+    }
+}
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/JmlLanguageServer.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/JmlLanguageServer.kt
new file mode 100644
index 0000000000..dc03fc8863
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/JmlLanguageServer.kt
@@ -0,0 +1,90 @@
+package io.github.jmltoolkit.lsp
+
+import io.github.jmltoolkit.lsp.actions.LspAction
+import io.github.jmltoolkit.lsp.highlighting.LEGEND
+import org.eclipse.lsp4j.*
+import org.eclipse.lsp4j.jsonrpc.messages.Either
+import org.eclipse.lsp4j.services.*
+import java.util.*
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.ForkJoinPool
+import kotlin.system.exitProcess
+
+
+class JmlLanguageServer : LanguageServer, LanguageClientAware {
+    internal val executorService: ExecutorService = ForkJoinPool.commonPool()
+    internal val jmlTextDocumentService by lazy { JmlTextDocumentService(this) }
+    internal val jmlWorkspaceService by lazy { JmlWorkspaceService(this) }
+
+    internal lateinit var client: LanguageClient
+    internal var capabilities: ClientCapabilities? = null
+    internal lateinit var workspaceFolders: List<WorkspaceFolder>
+    internal val jmlNotebookDocumentServices by lazy { JmlNotebookDocumentServices() }
+
+    internal val config = ProjectDefinitionService()
+
+    internal val actions by lazy {
+        ServiceLoader.load(LspAction::class.java).toList()
+    }
+
+    override fun initialize(params: InitializeParams): CompletableFuture<InitializeResult> {
+        workspaceFolders = params.workspaceFolders
+        capabilities = params.capabilities
+
+        config.update(workspaceFolders.map { Uri(it.uri) })
+
+        return CompletableFuture.supplyAsync {
+            val capabilities = ServerCapabilities()
+            capabilities.setTextDocumentSync(TextDocumentSyncKind.Full)
+            capabilities.diagnosticProvider = DiagnosticRegistrationOptions(true, false)
+            capabilities.setDocumentSymbolProvider(true)
+            capabilities.setWorkspaceSymbolProvider(true)
+
+            capabilities.setDeclarationProvider(DeclarationRegistrationOptions("JML"))
+
+            // capabilities.signatureHelpProvider = SignatureHelpOptions()
+            capabilities.setHoverProvider(true)
+
+            // capabilities.codeLensProvider = CodeLensOptions(false)
+            capabilities.setSelectionRangeProvider(true)
+
+            //capabilities.setDefinitionProvider(true)
+            //capabilities.setDocumentHighlightProvider(true)
+            //capabilities.completionProvider = CompletionOptions(true, null)
+
+            capabilities.semanticTokensProvider = SemanticTokensWithRegistrationOptions(
+                LEGEND, SemanticTokensServerFull(false), false,
+                listOf(
+                    DocumentFilter("java", "file", Either.forLeft("*.java")),
+                    DocumentFilter("key", "file", Either.forLeft("*.key")),
+                )
+            )
+
+            // capabilities.setCodeActionProvider(CodeActionOptions(listOf("validity")))
+            // capabilities.executeCommandProvider = ExecuteCommandOptions(actions.map { it.id })
+
+            return@supplyAsync InitializeResult(capabilities)
+        }
+    }
+
+    override fun shutdown(): CompletableFuture<Any> {
+        executorService.shutdownNow()
+        return CompletableFuture.completedFuture("finish")
+    }
+
+    override fun exit() {
+        shutdown()
+        exitProcess(0)
+    }
+
+    override fun getNotebookDocumentService(): NotebookDocumentService = jmlNotebookDocumentServices
+
+    override fun getTextDocumentService(): TextDocumentService = jmlTextDocumentService
+
+    override fun getWorkspaceService(): WorkspaceService = jmlWorkspaceService
+
+    override fun connect(client: LanguageClient) {
+        this.client = client
+    }
+}
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/JmlNotebookDocumentServices.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/JmlNotebookDocumentServices.kt
new file mode 100644
index 0000000000..81dee33593
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/JmlNotebookDocumentServices.kt
@@ -0,0 +1,18 @@
+package io.github.jmltoolkit.lsp
+
+import org.eclipse.lsp4j.DidChangeNotebookDocumentParams
+import org.eclipse.lsp4j.DidCloseNotebookDocumentParams
+import org.eclipse.lsp4j.DidOpenNotebookDocumentParams
+import org.eclipse.lsp4j.DidSaveNotebookDocumentParams
+import org.eclipse.lsp4j.services.NotebookDocumentService
+
+class JmlNotebookDocumentServices : NotebookDocumentService {
+    override fun didOpen(params: DidOpenNotebookDocumentParams?) {}
+
+    override fun didChange(params: DidChangeNotebookDocumentParams?) {}
+
+    override fun didSave(params: DidSaveNotebookDocumentParams?) {}
+
+    override fun didClose(params: DidCloseNotebookDocumentParams?) {}
+
+}
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/JmlTextDocumentService.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/JmlTextDocumentService.kt
new file mode 100644
index 0000000000..15d66f7ca6
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/JmlTextDocumentService.kt
@@ -0,0 +1,542 @@
+package io.github.jmltoolkit.lsp
+
+import com.github.javaparser.JavaParser
+import com.github.javaparser.ParseResult
+import com.github.javaparser.ParserConfiguration
+import com.github.javaparser.ast.CompilationUnit
+import com.github.javaparser.ast.Jmlish
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.expr.NameExpr
+import com.github.javaparser.resolution.TypeSolver
+import com.github.javaparser.resolution.declarations.AssociableToAST
+import com.github.javaparser.symbolsolver.JavaSymbolSolver
+import com.github.javaparser.symbolsolver.resolution.typesolvers.ClassLoaderTypeSolver
+import com.github.javaparser.symbolsolver.resolution.typesolvers.CombinedTypeSolver
+import com.github.javaparser.symbolsolver.resolution.typesolvers.JavaParserTypeSolver
+import com.google.common.hash.Hashing.crc32
+import io.github.jmltoolkit.lint.JmlLintingConfig
+import io.github.jmltoolkit.lint.JmlLintingFacade
+import io.github.jmltoolkit.lsp.highlighting.JmlDocumentHighlighter
+import io.github.jmltoolkit.lsp.highlighting.KeyDocumentHighlighter
+import io.github.jmltoolkit.lsp.hover.JmlDocumentationIndex
+import io.github.jmltoolkit.lsp.symbols.JmlCatchSymbols
+import io.github.jmltoolkit.lsp.symbols.KeyCatchSymbols
+import org.eclipse.lsp4j.*
+import org.eclipse.lsp4j.jsonrpc.messages.Either
+import org.eclipse.lsp4j.services.TextDocumentService
+import org.tinylog.kotlin.Logger
+import java.io.File
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.util.*
+import java.util.concurrent.CompletableFuture
+import kotlin.io.path.readText
+
+
+private val Node?.parentalSelectionRange: SelectionRange?
+    get() = when {
+        this == null -> null
+        !this.parentNode.isPresent -> SelectionRange(asRange, null)
+        else -> SelectionRange(asRange, parentNode.get().parentalSelectionRange)
+    }
+
+
+class AstRepository(val server: JmlLanguageServer) {
+    private val sourceFolders = Collections.synchronizedList(arrayListOf<Path>())
+
+    val config: ParserConfiguration = ParserConfiguration()
+
+    val inParsing: MutableMap<Uri, CompletableFuture<ParseResult<CompilationUnit>>> =
+        Collections.synchronizedMap(mutableMapOf<Uri, CompletableFuture<ParseResult<CompilationUnit>>>())
+    val cached: MutableMap<Uri, ParseResult<CompilationUnit>> =
+        Collections.synchronizedMap(mutableMapOf<Uri, ParseResult<CompilationUnit>>())
+    val version: MutableMap<Uri, Long> = Collections.synchronizedMap(mutableMapOf<Uri, Long>())
+
+    val typeSolver: TypeSolver
+        get() {
+            synchronized(sourceFolders) {
+                val elements: MutableList<TypeSolver> =
+                    sourceFolders.asSequence().map { JavaParserTypeSolver(it) }.toMutableList()
+                val classLoaderTypeSolver = ClassLoaderTypeSolver(ClassLoader.getSystemClassLoader())
+                elements.add(0, classLoaderTypeSolver)
+                return CombinedTypeSolver(elements)
+            }
+        }
+
+    val symbolSolver: JavaSymbolSolver
+        get() = JavaSymbolSolver(typeSolver)
+
+    init {
+        config.setSymbolResolver(symbolSolver)
+        config.isProcessJml = true
+    }
+
+    fun createJavaParser() = JavaParser(config)
+
+    private fun isUpToDate(uri: Uri, content: String): Boolean {
+        if (uri !in cached) return false
+        return uri in version && crc32(content) == version[uri]
+    }
+
+    fun crc32(content: String) = crc32().hashBytes(content.toByteArray()).asLong()
+
+    private fun parseSync(path: Uri): ParseResult<CompilationUnit> {
+        val jp = createJavaParser()
+        val content = path.path.readText()
+        if (isUpToDate(path, content)) {
+            return cached[path]!!
+        }
+        val result = jp.parse(content)
+        result.result.ifPresent {
+            it.setStorage(path.path, jp.parserConfiguration.characterEncoding)
+            addSourceFolder(it.storage.get().sourceRoot)
+        }
+        announceResult(path, result)
+        return result
+    }
+
+    private fun parse(path: Uri): CompletableFuture<ParseResult<CompilationUnit>> {
+        val future = CompletableFuture.supplyAsync { parseSync(path) }
+        synchronized(inParsing) {
+            inParsing[path] = future
+        }
+        return future
+    }
+
+    private fun announceResult(path: Uri, result: ParseResult<CompilationUnit>) {
+        synchronized(cached) {
+            synchronized(inParsing) {
+                inParsing.remove(path)
+            }
+            cached[path] = result
+            if (result.isSuccessful && result.result.isPresent) {
+                server.client.showMessage(MessageParams(MessageType.Log, "$path parsed"))
+            } else {
+                /*
+                val diagnostics = result.problems.map {
+                    if (it.cause.isPresent)
+                        Logger.error("Found exception in errors: {}", it.cause.get())
+                    val jml.lsp.actions.LspAction = Diagnostic(it.location.asRange, it.verboseMessage, DiagnosticSeverity.Error, "jmlparser")
+                    jml.lsp.actions.LspAction
+                }
+                server.client.publishDiagnostics(
+                    PublishDiagnosticsParams(path.value, diagnostics)
+                )
+                */
+            }
+        }
+    }
+
+    private fun getSourcePath(cu: CompilationUnit): Path? =
+        cu.storage.map { it.sourceRoot }.orElse(null)
+
+
+    fun addSourceFolder(folder: Path) {
+        if (folder !in sourceFolders) {
+            sourceFolders.add(folder)
+            updateTypeSolver()
+        }
+    }
+
+    fun updateTypeSolver() {
+        val copy = synchronized(cached) { cached.toMap() }
+        val solver = symbolSolver
+        for (value in copy.values) {
+            value.result.ifPresent { it.setData(Node.SYMBOL_RESOLVER_KEY, solver) }
+        }
+    }
+
+    fun getDiagnostics(path: Uri): CompletableFuture<MutableList<Diagnostic>> =
+        get(path).thenApply { result ->
+            if (result.isSuccessful)
+                JmlLintingFacade(JmlLintingConfig()).lint(listOf(result.result.get())).map {
+                    Diagnostic(it.location.asRange, it.message, DiagnosticSeverity.Error, "jml-lint")
+                }.toMutableList()
+            else
+                result.problems.map {
+                    Diagnostic(it.location.asRange, it.verboseMessage, DiagnosticSeverity.Error, "jmlparser")
+                }.toMutableList()
+        }
+
+    fun get(path: Uri): CompletableFuture<ParseResult<CompilationUnit>> {
+        synchronized(inParsing) {
+            inParsing[path]?.let { return it }
+        }
+        return parse(path)
+    }
+}
+
+/**
+ * Represents URIs send from the client. These are different than Java URI class!
+ * Incoming URIs have full protocol specifiers: `file://<path with root>`.
+ */
+@JvmInline
+value class Uri(val value: String) {
+    val isKeyFile: Boolean
+        get() = file.extension == "key"
+
+    val localFilePath: String
+        get() = value.removePrefix("file://")
+    val path: Path
+        get() = Paths.get(localFilePath)
+    val file: File
+        get() = File(localFilePath)
+}
+
+class JmlTextDocumentService(private val server: JmlLanguageServer) : TextDocumentService {
+    val repo = AstRepository(server)
+
+    val jmlDocumentHighlighter = JmlDocumentHighlighter()
+    val keyDocumentHighlighter = KeyDocumentHighlighter()
+    val highlighters = listOf(jmlDocumentHighlighter, keyDocumentHighlighter)
+
+    override fun didOpen(params: DidOpenTextDocumentParams) {
+        Logger.info("didOpen: {}", params)
+        Logger.info(params.textDocument.languageId)
+        if (params.textDocument.languageId != "text/java")
+            return
+    }
+
+    override fun didChange(params: DidChangeTextDocumentParams) {
+        Logger.info("didChange: {}", params)
+    }
+
+    override fun didClose(params: DidCloseTextDocumentParams) {
+        Logger.info("didClose: {}", params)
+    }
+
+    override fun didSave(params: DidSaveTextDocumentParams) {
+        Logger.info("didSave: {}", params)
+    }
+
+    override fun completion(position: CompletionParams?): CompletableFuture<Either<MutableList<CompletionItem>, CompletionList>> {
+        return super.completion(position)
+    }
+
+    override fun resolveCompletionItem(unresolved: CompletionItem?): CompletableFuture<CompletionItem> {
+        return super.resolveCompletionItem(unresolved)
+    }
+
+    override fun hover(params: HoverParams): CompletableFuture<Hover?> {
+        return repo.get(Uri(params.textDocument.uri))
+            .thenApplyAsync {
+                val symbol = findSymbol(params.position, it)
+                if (symbol == null)
+                    findKeyword(params, it)
+                else
+                    Hover(
+                        MarkupContent(
+                            "markdown",
+                            "Hover message for name: ${symbol.nameAsString}"
+                        )
+                    )
+            }
+    }
+
+    private fun findKeyword(params: HoverParams, cu: ParseResult<CompilationUnit>): Hover? {
+        val node = findTopMostJmlishNode(params.position, cu)
+        if (node != null) {
+            val tokenRange = node.tokenRange.get()
+            val pos = params.position.asPosition
+            val javaToken = tokenRange.find { it.range.get().contains(pos) }
+            return javaToken?.text?.let { retrieveDocumentation(it) }
+        }
+        return null
+    }
+
+
+    private val jmlDocumentationIndex by lazy { JmlDocumentationIndex() }
+
+    private fun retrieveDocumentation(tokenText: String): Hover? =
+        jmlDocumentationIndex.get(tokenText)
+            ?.let { text -> Hover(MarkupContent("markdown", text)) }
+
+    override fun signatureHelp(params: SignatureHelpParams): CompletableFuture<SignatureHelp> {
+        /*val path = Uri(params.textDocument.uri)
+        val pos = params.position
+        val active =
+            params.context.activeSignatureHelp.signatures[params.context.activeSignatureHelp.activeSignature]
+         */
+        return CompletableFuture.supplyAsync {
+            SignatureHelp()
+        }
+    }
+
+    override fun declaration(params: DeclarationParams)
+            : CompletableFuture<Either<MutableList<out Location>, MutableList<out LocationLink>>> {
+        val uri = Uri(params.textDocument.uri)
+        return repo.get(uri)
+            .thenApplyAsync { findSymbol(params.position, it) }
+            .thenApplyAsync { resolveSymbolInDocument(it) }
+    }
+
+    private fun resolveSymbolInDocument(nameExpr: NameExpr?)
+            : Either<MutableList<out Location>, MutableList<out LocationLink>> {
+        if (nameExpr != null) {
+            val r = nameExpr.resolve()
+            if (r is AssociableToAST && r.toAst().isPresent) {
+                val ast = r.toAst().get()
+                val targetUri = "file://${ast.findCompilationUnit().get().storage.get().path.toFile()}"
+                val targetRange = ast.asRange
+                val targetSelectionRange = targetRange
+                // TODO be more specific dependening targeted type
+                return Either.forRight(arrayListOf(LocationLink(targetUri, targetRange, targetSelectionRange)))
+            }
+        }
+        return Either.forLeft(arrayListOf())
+    }
+
+    private fun findSymbol(position: Position, it: ParseResult<CompilationUnit>): NameExpr? {
+        if (!it.isSuccessful) return null
+        val p = position.toJavaParser()
+        val queue: Queue<Node> = LinkedList()
+        queue.add(it.result.get())
+        while (queue.isNotEmpty()) {
+            val n = queue.poll()
+            if (n.range.get().contains(p) && n is NameExpr)
+                return n
+            queue.addAll(n.childNodes)
+        }
+        return null
+    }
+
+    private fun findSymbolByRange(position: Position, it: ParseResult<CompilationUnit>): NameExpr? {
+        if (!it.result.isPresent) return null
+        var current: Node = it.result.get()
+        val pos = position.toJavaParser()
+
+        next@ while (current.range.get().contains(pos)) {
+            if (current is NameExpr)
+                return current
+
+            for (child in current.childNodes) {
+                if (child.range.get().contains(pos)) {
+                    current = child
+                    continue@next
+                }
+            }
+        }
+        return null
+    }
+
+    override fun definition(params: DefinitionParams?): CompletableFuture<Either<MutableList<out Location>, MutableList<out LocationLink>>> {
+        return super.definition(params)
+    }
+
+    override fun typeDefinition(params: TypeDefinitionParams?): CompletableFuture<Either<MutableList<out Location>, MutableList<out LocationLink>>> {
+        return super.typeDefinition(params)
+    }
+
+    override fun implementation(params: ImplementationParams?): CompletableFuture<Either<MutableList<out Location>, MutableList<out LocationLink>>> {
+        return super.implementation(params)
+    }
+
+    override fun references(params: ReferenceParams?): CompletableFuture<MutableList<out Location>> {
+        return super.references(params)
+    }
+
+    override fun documentSymbol(params: DocumentSymbolParams): CompletableFuture<MutableList<Either<SymbolInformation, DocumentSymbol>>> {
+        Logger.info("params: {}", params)
+        val uri = Uri(params.textDocument.uri)
+        return if (uri.isKeyFile)
+            CompletableFuture.supplyAsync { KeyCatchSymbols(uri).run() }
+        else
+            repo.get(uri).thenApply {
+                Logger.info("Parse: {}", it)
+                if (!it.result.isPresent) mutableListOf()
+                else resolveSymbol(it.result.get())
+            }
+    }
+
+    private fun resolveSymbol(compilationUnit: CompilationUnit)
+            : MutableList<Either<SymbolInformation, DocumentSymbol>> {
+        Logger.info("Resolve symbols for compiluation unit: {}", compilationUnit.storage.get().path)
+        val visitor = JmlCatchSymbols()
+        val a = compilationUnit.accept(visitor, null) ?: arrayListOf()
+        Logger.info("Symbols caught: {}", a.size)
+        val b = a.map { Either.forRight<SymbolInformation, DocumentSymbol>(it) }
+        return b.toMutableList()
+    }
+
+    override fun codeAction(params: CodeActionParams): CompletableFuture<MutableList<Either<Command, CodeAction>>> {
+        Logger.info("codeAction: {}", params)
+
+        return repo.get(Uri(params.textDocument.uri))
+            .applyOn(CodeActionCollector(params.context, params.range.asRange), arrayListOf())
+    }
+
+    override fun resolveCodeAction(unresolved: CodeAction?): CompletableFuture<CodeAction> {
+        return super.resolveCodeAction(unresolved)
+    }
+
+    override fun codeLens(params: CodeLensParams): CompletableFuture<MutableList<out CodeLens>> {
+        Logger.info("codeLens: {}", params)
+        return repo.get(Uri(params.textDocument.uri)).applyOn(CodeLensCollector(), arrayListOf())
+    }
+
+    override fun resolveCodeLens(unresolved: CodeLens): CompletableFuture<CodeLens> {
+        Logger.info("codeLens: {}", unresolved)
+        return CompletableFuture.completedFuture(CodeLens())
+    }
+
+    override fun formatting(params: DocumentFormattingParams?): CompletableFuture<MutableList<out TextEdit>> {
+        return super.formatting(params)
+    }
+
+    override fun rangeFormatting(params: DocumentRangeFormattingParams?): CompletableFuture<MutableList<out TextEdit>> {
+        return super.rangeFormatting(params)
+    }
+
+    override fun onTypeFormatting(params: DocumentOnTypeFormattingParams?): CompletableFuture<MutableList<out TextEdit>> {
+        return super.onTypeFormatting(params)
+    }
+
+    override fun rename(params: RenameParams?): CompletableFuture<WorkspaceEdit> {
+        return super.rename(params)
+    }
+
+    override fun linkedEditingRange(params: LinkedEditingRangeParams?): CompletableFuture<LinkedEditingRanges> {
+        return super.linkedEditingRange(params)
+    }
+
+    override fun willSave(params: WillSaveTextDocumentParams?) {
+        super.willSave(params)
+    }
+
+    override fun willSaveWaitUntil(params: WillSaveTextDocumentParams?): CompletableFuture<MutableList<TextEdit>> {
+        return super.willSaveWaitUntil(params)
+    }
+
+    override fun documentLink(params: DocumentLinkParams?): CompletableFuture<MutableList<DocumentLink>> {
+        return super.documentLink(params)
+    }
+
+    override fun documentLinkResolve(params: DocumentLink?): CompletableFuture<DocumentLink> {
+        return super.documentLinkResolve(params)
+    }
+
+    override fun documentColor(params: DocumentColorParams?): CompletableFuture<MutableList<ColorInformation>> {
+        return super.documentColor(params)
+    }
+
+    override fun colorPresentation(params: ColorPresentationParams?): CompletableFuture<MutableList<ColorPresentation>> {
+        return super.colorPresentation(params)
+    }
+
+    override fun foldingRange(params: FoldingRangeRequestParams?): CompletableFuture<MutableList<FoldingRange>> {
+        return super.foldingRange(params)
+    }
+
+    override fun prepareTypeHierarchy(params: TypeHierarchyPrepareParams?): CompletableFuture<MutableList<TypeHierarchyItem>> {
+        return super.prepareTypeHierarchy(params)
+    }
+
+    override fun typeHierarchySupertypes(params: TypeHierarchySupertypesParams?): CompletableFuture<MutableList<TypeHierarchyItem>> {
+        return super.typeHierarchySupertypes(params)
+    }
+
+    override fun typeHierarchySubtypes(params: TypeHierarchySubtypesParams?): CompletableFuture<MutableList<TypeHierarchyItem>> {
+        return super.typeHierarchySubtypes(params)
+    }
+
+    override fun prepareCallHierarchy(params: CallHierarchyPrepareParams?): CompletableFuture<MutableList<CallHierarchyItem>> {
+        return super.prepareCallHierarchy(params)
+    }
+
+    override fun callHierarchyIncomingCalls(params: CallHierarchyIncomingCallsParams?): CompletableFuture<MutableList<CallHierarchyIncomingCall>> {
+        return super.callHierarchyIncomingCalls(params)
+    }
+
+    override fun callHierarchyOutgoingCalls(params: CallHierarchyOutgoingCallsParams?): CompletableFuture<MutableList<CallHierarchyOutgoingCall>> {
+        return super.callHierarchyOutgoingCalls(params)
+    }
+
+    private fun findTopMostJmlishNode(position: Position, cu: ParseResult<CompilationUnit>): Node? =
+        findNode(position, cu) {
+            it is Jmlish
+        }
+
+
+    private fun findNode(
+        position: Position,
+        it: ParseResult<CompilationUnit>,
+        pred: (Node) -> Boolean = { it.childNodes.isEmpty() }
+    ): Node? {
+        if (!it.isSuccessful) return null
+        val p = position.toJavaParser()
+        val queue: Queue<Node> = LinkedList()
+        queue.add(it.result.get())
+        while (queue.isNotEmpty()) {
+            val n = queue.poll()
+            if (n.range.get().contains(p) && pred(n))
+                return n
+            queue.addAll(n.childNodes)
+        }
+        return null
+    }
+
+    override fun selectionRange(params: SelectionRangeParams): CompletableFuture<MutableList<SelectionRange>> =
+        repo.get(Uri(params.textDocument.uri))
+            .thenApplyAsync { it ->
+                val nodes = params.positions.map { p -> findNode(p, it) }
+                nodes.mapNotNull { it.parentalSelectionRange }
+                    .toMutableList()
+            }
+
+    override fun semanticTokensFull(params: SemanticTokensParams): CompletableFuture<SemanticTokens> =
+        CompletableFuture.supplyAsync {
+            val doc = Uri(params.textDocument.uri)
+            val text = doc.file.readText()
+            when (doc.file.extension) {
+                "java" -> jmlDocumentHighlighter.analyzeJmlToken(text)
+                "key" -> keyDocumentHighlighter.analyzeJmlToken(text)
+                else -> SemanticTokens()
+            }
+        }
+
+    override fun semanticTokensFullDelta(params: SemanticTokensDeltaParams?): CompletableFuture<Either<SemanticTokens, SemanticTokensDelta>> {
+        return super.semanticTokensFullDelta(params)
+    }
+
+    override fun semanticTokensRange(params: SemanticTokensRangeParams?): CompletableFuture<SemanticTokens> {
+        return super.semanticTokensRange(params)
+    }
+
+    override fun moniker(params: MonikerParams?): CompletableFuture<MutableList<Moniker>> {
+        return super.moniker(params)
+    }
+
+    override fun inlayHint(params: InlayHintParams?): CompletableFuture<MutableList<InlayHint>> {
+        return super.inlayHint(params)
+    }
+
+    override fun resolveInlayHint(unresolved: InlayHint?): CompletableFuture<InlayHint> {
+        return super.resolveInlayHint(unresolved)
+    }
+
+    override fun inlineValue(params: InlineValueParams?): CompletableFuture<MutableList<InlineValue>> {
+        return super.inlineValue(params)
+    }
+
+    override fun diagnostic(params: DocumentDiagnosticParams): CompletableFuture<DocumentDiagnosticReport> {
+        Logger.info("diagnostic: {}", params)
+        val path = Uri(params.textDocument.uri)
+        return repo.getDiagnostics(path).thenApply {
+            Logger.info("Found errors: {}", it)
+            DocumentDiagnosticReport(RelatedFullDocumentDiagnosticReport(it))
+        }
+    }
+}
+
+private fun Position.toJavaParser() = com.github.javaparser.Position(line, character)
+
+private fun <T> CompletableFuture<ParseResult<CompilationUnit>>.applyOn(collector: ResultingVisitor<T>, default: T)
+        : CompletableFuture<T> = this.thenApplyAsync {
+    if (it.result.isPresent) {
+        it.result.get().accept(collector, null)
+        val r = collector.result
+        Logger.info("Result: {}", r)
+        r
+    } else
+        default
+}
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/JmlWorkspaceService.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/JmlWorkspaceService.kt
new file mode 100644
index 0000000000..c5a2260348
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/JmlWorkspaceService.kt
@@ -0,0 +1,64 @@
+package io.github.jmltoolkit.lsp
+
+import org.eclipse.lsp4j.*
+import org.eclipse.lsp4j.jsonrpc.messages.Either
+import org.eclipse.lsp4j.services.WorkspaceService
+import org.tinylog.kotlin.Logger
+import java.util.concurrent.CompletableFuture
+
+class JmlWorkspaceService(val jmlLanguageServer: JmlLanguageServer) : WorkspaceService {
+    override fun didChangeConfiguration(params: DidChangeConfigurationParams) {
+        Logger.info("didChangeConfiguration {}", params)
+    }
+
+    override fun didChangeWatchedFiles(params: DidChangeWatchedFilesParams) {
+        Logger.info("didChangeWatchedFiles {}", params)
+    }
+
+    override fun executeCommand(params: ExecuteCommandParams): CompletableFuture<Any> {
+        Logger.info("executeCommand {}", params)
+        return jmlLanguageServer.actions.find { it.id == params.command }
+            ?.execute(jmlLanguageServer, params.arguments)
+            ?: CompletableFuture.completedFuture("")
+    }
+
+    override fun symbol(params: WorkspaceSymbolParams?): CompletableFuture<Either<MutableList<out SymbolInformation>, MutableList<out WorkspaceSymbol>>> {
+        return super.symbol(params)
+    }
+
+    override fun resolveWorkspaceSymbol(workspaceSymbol: WorkspaceSymbol?): CompletableFuture<WorkspaceSymbol> {
+        return super.resolveWorkspaceSymbol(workspaceSymbol)
+    }
+
+    override fun didChangeWorkspaceFolders(params: DidChangeWorkspaceFoldersParams?) {
+        super.didChangeWorkspaceFolders(params)
+    }
+
+    override fun willCreateFiles(params: CreateFilesParams?): CompletableFuture<WorkspaceEdit> {
+        return super.willCreateFiles(params)
+    }
+
+    override fun didCreateFiles(params: CreateFilesParams?) {
+        super.didCreateFiles(params)
+    }
+
+    override fun willRenameFiles(params: RenameFilesParams?): CompletableFuture<WorkspaceEdit> {
+        return super.willRenameFiles(params)
+    }
+
+    override fun didRenameFiles(params: RenameFilesParams?) {
+        super.didRenameFiles(params)
+    }
+
+    override fun willDeleteFiles(params: DeleteFilesParams?): CompletableFuture<WorkspaceEdit> {
+        return super.willDeleteFiles(params)
+    }
+
+    override fun didDeleteFiles(params: DeleteFilesParams?) {
+        super.didDeleteFiles(params)
+    }
+
+    override fun diagnostic(params: WorkspaceDiagnosticParams?): CompletableFuture<WorkspaceDiagnosticReport> {
+        return super.diagnostic(params)
+    }
+}
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/ProjectDefinitionService.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/ProjectDefinitionService.kt
new file mode 100644
index 0000000000..d841b9eb95
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/ProjectDefinitionService.kt
@@ -0,0 +1,77 @@
+package io.github.jmltoolkit.lsp
+
+import io.github.jmltoolkit.lsp.project.Project
+import io.github.jmltoolkit.lsp.project.ProjectDefinition
+import java.nio.file.Path
+import java.nio.file.StandardWatchEventKinds
+import java.nio.file.WatchService
+
+class ProjectDefinitionService {
+    private var rootFolders: List<Path> = listOf()
+    private var configFiles: List<Path> = listOf()
+
+    private var config: MutableMap<Path, ProjectDefinition> = hashMapOf()
+
+    private var backgroundThread: Thread? = null
+
+    fun get(path: Path): ProjectDefinition? {
+        var cp: Path? = path
+        while (cp != null && cp != cp.root && cp !in configFiles) {
+            cp = cp.parent
+        }
+
+        synchronized(config) {
+            return config[path]
+        }
+    }
+
+    fun update(workspaceFolders: List<Uri>) {
+        removeWatchers()
+        synchronized(config) {
+            rootFolders = workspaceFolders.map { it.path }
+            configFiles = rootFolders.map { Project.create(it) }
+            config = configFiles.associateWith { Project.read(it) }.toMutableMap()
+        }
+        newWatchers()
+    }
+
+    private fun removeWatchers() {
+        backgroundThread?.interrupt()
+    }
+
+    private fun newWatchers() {
+        val fs = rootFolders.firstOrNull()?.fileSystem
+        if (fs != null) {
+            val ws = fs.newWatchService()
+            configFiles.map {
+                it.parent.register(ws, StandardWatchEventKinds.ENTRY_MODIFY)
+            }
+            backgroundThread = Thread(Watcher(ws)).also { it.start() }
+        }
+    }
+
+    private fun updateConfig(configPath: Path) {
+        synchronized(config) {
+            config[configPath] = Project.read(configPath)
+        }
+    }
+
+
+    inner class Watcher(
+        private var ws: WatchService
+    ) : Runnable {
+        override fun run() {
+            ws.use {
+                while (!Thread.interrupted()) {
+                    ws.poll()?.let { key ->
+                        for (pollEvent in key.pollEvents()) {
+                            val configPath = pollEvent.context() as Path
+                            updateConfig(configPath)
+                        }
+                        key.reset()
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/ResultingVisitor.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/ResultingVisitor.kt
new file mode 100644
index 0000000000..16dcfd48d1
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/ResultingVisitor.kt
@@ -0,0 +1,12 @@
+package io.github.jmltoolkit.lsp
+
+import com.github.javaparser.ast.visitor.VoidVisitorAdapter
+
+/**
+ * Defines a visitor which produces a result of type `T`.
+ * @author Alexander Weigl
+ * @version 1 (20.07.22)
+ */
+abstract class ResultingVisitor<T> : VoidVisitorAdapter<Unit?>() {
+    abstract val result: T
+}
\ No newline at end of file
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/SmtRunner.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/SmtRunner.kt
new file mode 100644
index 0000000000..f1c393ef66
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/SmtRunner.kt
@@ -0,0 +1,47 @@
+package io.github.jmltoolkit.lsp
+
+import java.io.File
+import java.util.concurrent.CompletableFuture
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (12.10.22)
+ */
+data class SmtResult(val out: String, val err: String, val exitCode: Int)
+class SmtRunner(val z3Path: String) {
+    constructor() : this(findZ3())
+
+    fun retrieveVersion(): CompletableFuture<SmtResult> =
+        CompletableFuture.supplyAsync {
+            // z3 --version
+            run("--version")
+        }
+
+    private fun run(vararg args: String): SmtResult {
+        val seq = args.toMutableList()
+        seq.add(0, z3Path)
+        val process = ProcessBuilder(seq)
+            .start()
+        process.waitFor()
+        return SmtResult(
+            process.inputReader().readText(),
+            process.errorReader().readText(),
+            process.exitValue()
+        )
+    }
+
+    fun executeSmt(smt: File): CompletableFuture<SmtResult> =
+        CompletableFuture.supplyAsync {
+            run("--smt2", smt.absolutePath)
+        }
+
+    fun executeSmt(smt: String): CompletableFuture<SmtResult> =
+        CompletableFuture.supplyAsync {
+            val f = File.createTempFile("jml-lsp", ".smt2")
+            f.writeText(smt)
+            f
+        }.thenApply { executeSmt(it).get() }
+}
+
+private fun findZ3() = "z3"
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/actions/LspAction.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/actions/LspAction.kt
new file mode 100644
index 0000000000..e9a55b8d55
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/actions/LspAction.kt
@@ -0,0 +1,23 @@
+package io.github.jmltoolkit.lsp.actions
+
+import com.github.javaparser.ast.Node
+import io.github.jmltoolkit.lsp.JmlLanguageServer
+import org.eclipse.lsp4j.CodeLens
+import org.eclipse.lsp4j.Command
+import java.util.concurrent.CompletableFuture
+
+/**
+ * This class encapsulates both the execution of an action on the ast, and the metadata.
+ * @author Alexander Weigl
+ * @version 1 (16.10.22)
+ */
+interface LspAction<T : Node> {
+    val id: String
+    val title: String
+
+    fun command(args: List<Any>? = null): Command = Command(title, id, args)
+
+    fun execute(server: JmlLanguageServer, value: List<Any>): CompletableFuture<Any>
+
+    fun createCodeLens(node: T): CodeLens
+}
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/actions/VerifyAgainstParent.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/actions/VerifyAgainstParent.kt
new file mode 100644
index 0000000000..1b261743ba
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/actions/VerifyAgainstParent.kt
@@ -0,0 +1,31 @@
+package io.github.jmltoolkit.lsp.actions
+
+import com.github.javaparser.ast.jml.clauses.JmlContract
+import com.google.common.cache.CacheBuilder
+import io.github.jmltoolkit.lsp.JmlLanguageServer
+import io.github.jmltoolkit.lsp.asRange
+import org.eclipse.lsp4j.CodeLens
+import org.eclipse.lsp4j.MessageParams
+import org.eclipse.lsp4j.MessageType
+import java.util.concurrent.CompletableFuture
+
+object VerifyAgainstParent : LspAction<JmlContract> {
+    override val id: String = "jml.verify.liskov"
+    override val title: String = "Verify against parent"
+
+    private val cache = CacheBuilder.newBuilder().softValues().build<Int, JmlContract>()
+
+    override fun execute(server: JmlLanguageServer, value: List<Any>): CompletableFuture<Any> {
+        cache.getIfPresent(value.first())?.let {
+            server.client.showMessage(
+                MessageParams(MessageType.Warning, "Prove is not implemented yet.")
+            )
+        }
+        return CompletableFuture.completedFuture("")
+    }
+
+    override fun createCodeLens(node: JmlContract): CodeLens {
+        cache.put(node.hashCode(), node)
+        return CodeLens(node.asRange, command(listOf(node.hashCode())), null)
+    }
+}
\ No newline at end of file
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/actions/WellDefinednessCheck.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/actions/WellDefinednessCheck.kt
new file mode 100644
index 0000000000..1b47ba1ed2
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/actions/WellDefinednessCheck.kt
@@ -0,0 +1,30 @@
+package io.github.jmltoolkit.lsp.actions
+
+import com.github.javaparser.ast.expr.Expression
+import io.github.jmltoolkit.lsp.JmlLanguageServer
+import io.github.jmltoolkit.lsp.asRange
+import org.eclipse.lsp4j.*
+import java.util.concurrent.CompletableFuture
+
+object WellDefinednessCheck : LspAction<Expression> {
+    override val id: String
+        get() = "jml.welldefinedness-check"
+    override val title: String
+        get() = "Check expression for well-definedness"
+
+    override fun execute(server: JmlLanguageServer, value: List<Any>): CompletableFuture<Any> {
+        println("WellDefinednessCheck.execute server = [${server}], value = [${value}]")
+        return CompletableFuture.completedFuture(null)
+    }
+
+    fun createCommand(node: Expression): Command = command(listOf(node.hashCode()))
+
+    override fun createCodeLens(node: Expression): CodeLens = TODO() // CodeLens(node.asRange, command(), null)
+    fun createCodeAction(n: Expression): CodeAction =
+        CodeAction(title).also {
+            it.command = command()
+            it.kind = CodeActionKind.QuickFix
+        }
+}
+
+//    val ca = Command("WD-check", "jml.welldefinedCheck", listOf(r))
\ No newline at end of file
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/conversion.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/conversion.kt
new file mode 100644
index 0000000000..a0d2693d92
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/conversion.kt
@@ -0,0 +1,60 @@
+package io.github.jmltoolkit.lsp
+
+import com.github.javaparser.JavaToken
+import com.github.javaparser.TokenRange
+import com.github.javaparser.ast.Node
+import org.eclipse.lsp4j.Position
+import org.eclipse.lsp4j.Range
+import java.util.*
+import kotlin.jvm.optionals.getOrNull
+
+
+val com.github.javaparser.Position.asPosition: Position
+    get() = Position(line - 1, column - 1)
+
+val Optional<TokenRange>.asRange: Range
+    get() =
+        if (isPresent) {
+            val r = get().toRange().get()
+            r.asRange
+        } else {
+            Range(Position(-1, -1), Position(-1, 0))
+        }
+
+fun Optional<com.github.javaparser.Range>.asRange(): Range =
+    if (isPresent) {
+        this.get().asRange
+    } else {
+        Range()
+    }
+
+val com.github.javaparser.Range.asRange: Range
+    get() = Range(begin.asPosition, end.withColumn(end.column + 1).asPosition)
+
+val Node.asRange: Range
+    get() = range.asRange()
+
+val Range.asRange: com.github.javaparser.Range
+    get() = com.github.javaparser.Range(start.asPosition, end.asPosition)
+
+val Position?.toPosition: com.github.javaparser.Position?
+    get() = this?.asPosition
+val Position.asPosition: com.github.javaparser.Position
+    get() = com.github.javaparser.Position(this.line + 1, this.character + 1)
+
+
+private val JavaToken.asStartPosition: Position?
+    get() = this.range.getOrNull()?.asStartPosition
+
+
+val com.github.javaparser.Range.asStartPosition: Position
+    get() = this.begin.asPosition
+
+val com.github.javaparser.Range.asEndPosition: Position
+    get() = this.end.asPosition
+
+val JavaToken.asEndPosition: Position?
+    get() = this.range.getOrNull()?.asEndPosition
+
+val TokenRange?.asRange: Range?
+    get() = this?.let { Range(begin.asStartPosition, end.asEndPosition) }
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/highlighting/DocumentHighlighter.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/highlighting/DocumentHighlighter.kt
new file mode 100644
index 0000000000..f003dfcfcc
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/highlighting/DocumentHighlighter.kt
@@ -0,0 +1,76 @@
+package io.github.jmltoolkit.lsp.highlighting
+
+import com.github.javaparser.Token
+import org.eclipse.lsp4j.*
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (04.02.24)
+ */
+
+interface DocumentHighlighter {
+    fun analyzeJmlToken(text: String): SemanticTokens
+}
+
+enum class SupportedTokenTypes(val kind: String) {
+    COMMENT(SemanticTokenTypes.Comment),
+    VARIABLE(SemanticTokenTypes.Variable),
+    KEYWORD(SemanticTokenTypes.Keyword),
+    STRING(SemanticTokenTypes.String),
+    NUMBER(SemanticTokenTypes.Number),
+    MODIFIER(SemanticTokenTypes.Modifier),
+}
+
+enum class SupportedTokenModifier(val kind: String) {
+    DECLARATION(SemanticTokenModifiers.Declaration),
+    DOCUMENTATION(SemanticTokenModifiers.Documentation),
+    DEPRECATED(SemanticTokenModifiers.Deprecated),
+    STATIC(SemanticTokenModifiers.Static),
+}
+
+private val Token.asRange: Range
+    get() = Range(Position(beginLine, beginColumn), Position(endLine, endColumn))
+
+val tokenTypes = SupportedTokenTypes.entries.map { it.kind }
+val tokenModifiers = SupportedTokenModifier.entries.map { it.kind }
+val LEGEND: SemanticTokensLegend = SemanticTokensLegend(tokenTypes, tokenModifiers)
+
+
+/*
+    There are different ways how the position of a token can be expressed in a file.
+    Absolute positions or relative positions. The protocol for the token format relative uses
+    relative positions, because most tokens remain stable relative to each other when edits
+    are made in a file. This simplifies the computation of a delta if a server supports it.
+    So each token is represented using 5 integers. A specific token i in the file consists
+    of the following array indices:
+
+    at index 5*i - deltaLine: token line number, relative to the previous token
+    at index 5*i+1 - deltaStart: token start character, relative to the previous token (relative to 0 or the previous
+    token’s start if they are on the same line)
+    at index 5*i+2 - length: the length of the token.
+    at index 5*i+3 - tokenType: will be looked up in SemanticTokensLegend.tokenTypes. We currently ask that tokenType < 65536.
+    at index 5*i+4 - tokenModifiers: each set bit will be looked up in SemanticTokensLegend.tokenModifiers
+ */
+data class SemanticTokensBuilder(val data: ArrayList<Int> = ArrayList(4096)) {
+    private var lastLineStart = 0
+    private var lastColumnStart = 0
+    fun add(tok: Token, tokenType: Int, modifiers: Int) {
+        add(tok.beginLine, tok.beginColumn, tok.image.length, tokenType, modifiers)
+    }
+
+    fun add(beginLine: Int, beginColumn: Int, length: Int, tokenType: Int, modifiers: Int) {
+        data.ensureCapacity(data.size + 5)
+        if (beginLine != lastLineStart)
+            lastColumnStart = 0
+
+        data.add(beginLine - lastLineStart)
+        data.add(beginColumn - lastColumnStart)
+        data.add(length)
+        data.add(tokenType)
+        data.add(modifiers)
+
+        lastLineStart = beginLine
+        lastColumnStart = beginColumn
+    }
+}
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/highlighting/JmlDocumentHighlighter.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/highlighting/JmlDocumentHighlighter.kt
new file mode 100644
index 0000000000..f9ab0b646d
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/highlighting/JmlDocumentHighlighter.kt
@@ -0,0 +1,63 @@
+package io.github.jmltoolkit.lsp.highlighting
+
+import com.github.javaparser.*
+import com.github.javaparser.GeneratedJavaParserConstants.EOF
+import com.github.javaparser.jml.JmlDocSanitizer
+import org.eclipse.lsp4j.SemanticTokens
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (13.01.24)
+ */
+class JmlDocumentHighlighter : DocumentHighlighter {
+    private fun analyzeJmlToken(result: SemanticTokensBuilder, tokens: MutableList<Token>) {
+        val sanitizer = JmlDocSanitizer(setOf())
+        val text = sanitizer.asString(tokens, true)
+        val lexer = GeneratedJavaParserTokenManager(
+            SimpleCharStream(Providers.provider(text)),
+            GeneratedJavaParserConstants.JML_MULTI_CONTRACT
+        )
+
+        do {
+            val token = lexer.nextToken
+            val tokenType = tokenType(token)
+            if (tokenType != null)
+                result.add(token, tokenType, tokenModifier(token))
+        } while (token.kind != EOF)
+    }
+
+    private fun tokenType(token: Token): Int? {
+        val cat = TokenTypes.getCategory(token.kind)
+        return when (cat) {
+            JavaToken.Category.COMMENT -> SupportedTokenTypes.COMMENT.ordinal
+            JavaToken.Category.IDENTIFIER -> SupportedTokenTypes.VARIABLE.ordinal
+            JavaToken.Category.KEYWORD -> SupportedTokenTypes.KEYWORD.ordinal
+            JavaToken.Category.LITERAL -> SupportedTokenTypes.NUMBER.ordinal
+            else -> null
+        }
+    }
+
+    private fun tokenModifier(token: Token): Int = when (token.kind) {
+        else -> 0
+    }
+
+    override fun analyzeJmlToken(text: String): SemanticTokens {
+        val provider = Providers.provider(text)
+        val lexer = GeneratedJavaParserTokenManager(SimpleCharStream(provider))
+        val result = SemanticTokensBuilder()
+        var token = lexer.nextToken
+        val bag = mutableListOf<Token>()
+        while (token != null && token.kind != EOF) {
+            when (token.kind) {
+                GeneratedJavaParserConstants.JML_LINE_COMMENT,
+                GeneratedJavaParserConstants.JML_BLOCK_COMMENT -> {
+                    bag.add(token)
+                }
+            }
+            token = lexer.nextToken
+        }
+        analyzeJmlToken(result, bag)
+        return SemanticTokens(result.data)
+    }
+}
\ No newline at end of file
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/highlighting/KeyDocumentHighlighter.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/highlighting/KeyDocumentHighlighter.kt
new file mode 100644
index 0000000000..e8fa8b050a
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/highlighting/KeyDocumentHighlighter.kt
@@ -0,0 +1,88 @@
+package io.github.jmltoolkit.lsp.highlighting
+
+import de.uka.ilkd.key.nparser.KeYLexer
+import de.uka.ilkd.key.nparser.ParsingFacade
+import org.antlr.v4.runtime.CharStreams
+import org.antlr.v4.runtime.Token
+import org.eclipse.lsp4j.SemanticTokens
+
+class KeyDocumentHighlighter : DocumentHighlighter {
+    override fun analyzeJmlToken(text: String): SemanticTokens {
+        val lexer = ParsingFacade.createLexer(CharStreams.fromString(text))
+        val tb = SemanticTokensBuilder()
+        do {
+            val token = lexer.nextToken()
+            if (token.type == KeYLexer.EOF) {
+                break
+            }
+            tokenType(token)?.let { tt ->
+                tb.add(token.line, token.charPositionInLine, token.text.length, tt, tokenModifier(token))
+            }
+        } while (token.type == KeYLexer.EOF)
+        return SemanticTokens(tb.data)
+    }
+
+    private fun tokenType(token: Token): Int? {
+        return when (token.type) {
+            KeYLexer.COMMENT -> SupportedTokenTypes.COMMENT.ordinal
+            KeYLexer.VARIABLE -> SupportedTokenTypes.VARIABLE.ordinal
+            KeYLexer.VARCOND,
+            KeYLexer.IF,
+            KeYLexer.IFEX,
+            KeYLexer.RULES,
+            KeYLexer.AXIOMS,
+            KeYLexer.ABSTRACT,
+            KeYLexer.ASSIGN,
+            KeYLexer.ASSUMES,
+            KeYLexer.ADD,
+            KeYLexer.FIND,
+            KeYLexer.FINAL,
+            KeYLexer.ANTECEDENTPOLARITY,
+            KeYLexer.SUCCEDENTPOLARITY,
+            KeYLexer.UPDATE,
+            KeYLexer.UNIQUE,
+            KeYLexer.FUNCTIONS,
+            KeYLexer.PREDICATES,
+            KeYLexer.SORTS,
+            KeYLexer.HASSORT,
+            KeYLexer.HAS_INVARIANT,
+            KeYLexer.AT,
+            KeYLexer.THEN,
+            KeYLexer.TERM,
+            KeYLexer.DIFFERENT,
+            KeYLexer.CONTRACTS,
+            KeYLexer.CONTAINERTYPE,
+            KeYLexer.ENUM_CONST,
+            KeYLexer.IS_LABELED,
+            KeYLexer.IS_ABSTRACT_OR_INTERFACE,
+            KeYLexer.ISCONSTANT,
+            KeYLexer.ONEOF,
+            KeYLexer.OPTIONSDECL,
+            KeYLexer.WITHOPTIONS,
+            KeYLexer.MODALITYB,
+            KeYLexer.MORE,
+            KeYLexer.MODALITY,
+            KeYLexer.MODIFIABLE,
+            KeYLexer.APPLY_UPDATE_ON_RIGID,
+            KeYLexer.ADDRULES,
+            -> SupportedTokenTypes.KEYWORD.ordinal
+
+            KeYLexer.BIN_LITERAL,
+            KeYLexer.HEX_LITERAL,
+            KeYLexer.INT_LITERAL,
+            KeYLexer.CHAR_LITERAL,
+            KeYLexer.REAL_LITERAL,
+            KeYLexer.DOUBLE_LITERAL,
+            KeYLexer.FLOAT_LITERAL,
+            KeYLexer.STRING_LITERAL,
+            KeYLexer.QUOTED_STRING_LITERAL,
+            -> SupportedTokenTypes.NUMBER.ordinal
+            else -> null
+        }
+    }
+
+    private fun tokenModifier(token: Token): Int = when (token.type) {
+        else -> 0
+    }
+
+}
\ No newline at end of file
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/hover/JmlDocumentationIndex.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/hover/JmlDocumentationIndex.kt
new file mode 100644
index 0000000000..d5602f0f6c
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/hover/JmlDocumentationIndex.kt
@@ -0,0 +1,31 @@
+package io.github.jmltoolkit.lsp.hover
+
+class JmlDocumentationIndex {
+    private val index by lazy {
+        val map = mutableMapOf<String, String>()
+        val lines = javaClass.getResourceAsStream("/doc.md")
+            ?.bufferedReader()?.readLines()
+            ?: error("Could not load /doc/index.properties")
+
+        var keys = setOf<String>()
+        val builder = StringBuilder()
+        for (line in lines) {
+            if (line.startsWith("%keywords")) {
+                keys = line.substringAfter(' ').splitToSequence(' ').toSet()
+            } else {
+                if (line.startsWith("-----")) {
+                    val s = builder.toString().intern()
+                    for (key in keys) {
+                        map[key] = s
+                    }
+                    builder.clear()
+                } else {
+                    builder.appendLine(line)
+                }
+            }
+        }
+        map
+    }
+
+    fun get(entry: String) = index[entry]
+}
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/linter/LinterHelper.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/linter/LinterHelper.kt
new file mode 100644
index 0000000000..50b2c5e628
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/linter/LinterHelper.kt
@@ -0,0 +1,42 @@
+package io.github.jmltoolkit.lsp.linter
+
+import com.github.javaparser.ast.Node
+import io.github.jmltoolkit.lint.JmlLintingConfig
+import io.github.jmltoolkit.lint.JmlLintingFacade
+import io.github.jmltoolkit.lint.LintProblem
+import io.github.jmltoolkit.lint.LintProblemReporter
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (21.10.22)
+ */
+object LinterHelper {
+    private val config = JmlLintingConfig()
+    private val linters = JmlLintingFacade(config).linters
+
+    private val loadedFolders = mutableSetOf<String>()
+
+    /*private fun enableFolder(folder: String) {
+        if (folder !in loadedFolders) {
+            loadedFolders.add(folder)
+            val loader = GroovyClassLoader(javaClass.classLoader)
+            File(folder).walkTopDown().forEach {
+                val clazz = loader.parseClass(it)
+                if (clazz.isInstance(LintRule::class.java)) {
+                    val instance = clazz.newInstance()
+                    linters.add(instance as LintRule?)
+                }
+            }
+        }
+    }*/
+
+    fun lint(n: List<Node>): List<LintProblem> {
+        val result = arrayListOf<LintProblem>()
+        val reporter = LintProblemReporter(result::add)
+        for (rule in linters) {
+            n.forEach { rule.accept(it, reporter, config) }
+        }
+        return result
+    }
+}
\ No newline at end of file
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/main.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/main.kt
new file mode 100644
index 0000000000..8dd1bd6ade
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/main.kt
@@ -0,0 +1,74 @@
+package io.github.jmltoolkit.lsp
+
+import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.core.main
+import com.github.ajalt.clikt.parameters.options.default
+import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.parameters.types.int
+import org.eclipse.lsp4j.launch.LSPLauncher
+import org.eclipse.lsp4j.services.LanguageClient
+import org.tinylog.Logger
+import java.io.InputStream
+import java.io.OutputStream
+import java.net.InetAddress
+import java.net.ServerSocket
+import java.net.Socket
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (10.07.22)
+ */
+object Main {
+    @JvmStatic
+    fun main(args: Array<String>) {
+        JmlLspCommand().main(args)
+    }
+}
+
+class JmlLspCommand : CliktCommand() {
+    private val mode by option("--mode", "-m").default("client")
+    private val port by option("--port", "-p").int()
+
+    override fun run() {
+        try {
+            when (mode) {
+                "server" -> runAsServer()
+                "client" -> runAsClient()
+                "local" -> launchLanguageServer(System.`in`, System.out)
+                else -> require(false) { "Wrong mode given" }
+            }
+        } catch (e: Exception) {
+            Logger.error(e)
+        }
+    }
+
+    private fun runAsClient() {
+        require(port != null)
+        val socket = Socket("localhost", port!!)
+        launchLanguageServer(socket.getInputStream(), socket.getOutputStream())
+    }
+
+    private fun launchLanguageServer(input: InputStream, output: OutputStream) {
+        val server = JmlLanguageServer()
+        val launcher = LSPLauncher.createServerLauncher(server, input, output)
+        val client: LanguageClient = launcher.remoteProxy
+        server.connect(client)
+        launcher.startListening()
+    }
+
+    private fun runAsServer() {
+        require(port != null)
+        while (true) {
+            try {
+                ServerSocket(port!!, 1, InetAddress.getLoopbackAddress()).use { serverSocket ->
+                    Logger.info("Listening on {}", serverSocket.localSocketAddress)
+                    val socket = serverSocket.accept()
+                    launchLanguageServer(socket.getInputStream(), socket.getOutputStream())
+                }
+            } catch (e: Exception) {
+                Logger.error(e)
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/project/Project.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/project/Project.kt
new file mode 100644
index 0000000000..f2a09f913e
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/project/Project.kt
@@ -0,0 +1,55 @@
+package io.github.jmltoolkit.lsp.project
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import java.nio.file.Files
+import java.nio.file.Path
+import kotlin.io.path.exists
+import kotlin.io.path.readText
+import kotlin.io.path.writeText
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (04.02.24)
+ */
+object Project {
+    private const val FILENAME = "jmlproject.json"
+
+    @OptIn(ExperimentalSerializationApi::class)
+    private val json = Json {
+        prettyPrint = true
+        this.isLenient = true
+        this.encodeDefaults = true
+        this.allowStructuredMapKeys = true
+        this.allowTrailingComma = true
+        this.coerceInputValues = true
+        this.ignoreUnknownKeys = true
+    }
+
+    fun save(path: Path, pd: ProjectDefinition): Path {
+        val string = json.encodeToString(pd)
+        path.writeText(string)
+        return path
+    }
+
+    fun read(path: Path): ProjectDefinition =
+        json.decodeFromString<ProjectDefinition>(path.readText())
+
+    fun create(path: Path): Path =
+        path.resolve(FILENAME).let {
+            if (!it.exists()) save(it, ProjectDefinition())
+            it
+        }
+
+
+    tailrec fun find(path: Path): Path? {
+        val candidate = path.resolve(FILENAME)
+        return if (Files.exists(candidate)) {
+            candidate
+        } else {
+            find(path.parent)
+        }
+    }
+}
\ No newline at end of file
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/project/ProjectDefinition.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/project/ProjectDefinition.kt
new file mode 100644
index 0000000000..f8630de1d1
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/project/ProjectDefinition.kt
@@ -0,0 +1,25 @@
+package io.github.jmltoolkit.lsp.project
+
+import io.github.jmltoolkit.lsp.actions.VerifyAgainstParent
+import io.github.jmltoolkit.lsp.actions.WellDefinednessCheck
+import kotlinx.serialization.Serializable
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (04.02.24)
+ */
+@Serializable
+data class ProjectDefinition(
+    var enabledKeys: Set<String> = setOf(),
+    var usedKeys: Set<Set<String>> = setOf(),
+    var sourcePaths: List<SourcePath> = listOf(),
+    var disabledLinter: Set<String> = setOf(),
+    var disabledCodeActions: Set<String> = setOf(
+        VerifyAgainstParent.id,
+        WellDefinednessCheck.id,
+    ),
+)
+
+@Serializable
+data class SourcePath(var path: String, var dependsOn: List<String> = listOf())
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/symbols/JmlCatchSymbols.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/symbols/JmlCatchSymbols.kt
new file mode 100644
index 0000000000..2990d54ec4
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/symbols/JmlCatchSymbols.kt
@@ -0,0 +1,224 @@
+package io.github.jmltoolkit.lsp.symbols
+
+import com.github.javaparser.ast.CompilationUnit
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.NodeList
+import com.github.javaparser.ast.body.*
+import com.github.javaparser.ast.expr.VariableDeclarationExpr
+import com.github.javaparser.ast.jml.body.*
+import com.github.javaparser.ast.jml.clauses.*
+import com.github.javaparser.ast.modules.ModuleDeclaration
+import com.github.javaparser.ast.visitor.GenericVisitorAdapter
+import io.github.jmltoolkit.lsp.asRange
+import org.eclipse.lsp4j.DocumentSymbol
+import org.eclipse.lsp4j.SymbolKind
+import java.util.*
+
+/**
+ * Runs through an AST and gathers symbols within JML annotations.
+ *
+ * @author Alexander Weigl
+ */
+class JmlCatchSymbols : GenericVisitorAdapter<MutableList<DocumentSymbol>?, Unit?>() {
+    override fun visit(n: CompilationUnit, arg: Unit?): MutableList<DocumentSymbol> {
+        val children = acceptAll(n.types)
+        return arrayListOf(
+            DocumentSymbol(
+                n.storage.get().fileName,
+                SymbolKind.File,
+                n.asRange, n.primaryType.map { it.name.asRange }.orElse(n.asRange), "", children
+            )
+        )
+    }
+
+    override fun visit(n: AnnotationDeclaration, arg: Unit?): MutableList<DocumentSymbol> {
+        val children = acceptAll(n.members)
+        return arrayListOf(
+            DocumentSymbol(
+                n.nameAsString,
+                SymbolKind.Interface,
+                n.asRange, n.name.asRange, "", children
+            )
+        )
+    }
+
+    override fun visit(n: AnnotationMemberDeclaration, arg: Unit?): MutableList<DocumentSymbol> {
+        return arrayListOf(
+            DocumentSymbol(
+                n.nameAsString,
+                SymbolKind.Field,
+                n.asRange, n.name.asRange, ""
+            )
+        )
+    }
+
+    override fun visit(n: ClassOrInterfaceDeclaration, arg: Unit?): MutableList<DocumentSymbol> {
+        val children = acceptAll(n.members)
+        return arrayListOf(
+            DocumentSymbol(
+                n.nameAsString,
+                if (n.isInterface) SymbolKind.Interface else SymbolKind.Class,
+                n.asRange, n.name.asRange, "", children
+            )
+        )
+    }
+
+    private fun acceptAll(members: NodeList<*>?): MutableList<DocumentSymbol> {
+        if (members == null) return arrayListOf()
+        return members.flatMap { it.accept(this, null) ?: arrayListOf() }.toMutableList()
+    }
+
+    private fun <T : Node> acceptAllo(members: Optional<NodeList<T>>?): MutableList<DocumentSymbol> =
+        acceptAll(members?.orElse(null))
+
+    override fun visit(n: ConstructorDeclaration, arg: Unit?): MutableList<DocumentSymbol> {
+        val children = acceptAll(n.contracts)
+        return arrayListOf(
+            DocumentSymbol(
+                n.nameAsString,
+                SymbolKind.Constructor,
+                n.asRange, n.name.asRange, "", children
+            )
+        )
+    }
+
+
+    override fun visit(n: EnumConstantDeclaration, arg: Unit?): MutableList<DocumentSymbol> {
+        return arrayListOf(
+            DocumentSymbol(
+                n.nameAsString,
+                SymbolKind.EnumMember,
+                n.asRange, n.name.asRange,
+            )
+        )
+    }
+
+    override fun visit(n: EnumDeclaration, arg: Unit?): MutableList<DocumentSymbol> {
+        val children = acceptAll(n.members)
+        return arrayListOf(
+            DocumentSymbol(
+                n.nameAsString,
+                SymbolKind.Enum,
+                n.asRange, n.name.asRange, "", children
+            )
+        )
+    }
+
+    override fun visit(n: FieldDeclaration, arg: Unit?): MutableList<DocumentSymbol> {
+        return n.variables.map {
+            DocumentSymbol(
+                it.nameAsString,
+                SymbolKind.Field,
+                it.asRange, it.name.asRange, it.typeAsString, arrayListOf()
+            )
+        }.toMutableList()
+    }
+
+    override fun visit(n: MethodDeclaration, arg: Unit?): MutableList<DocumentSymbol> {
+        val children = acceptAll(n.contracts)
+        return arrayListOf(
+            DocumentSymbol(
+                n.nameAsString,
+                SymbolKind.Method,
+                n.asRange, n.name.asRange, "", children
+            )
+        )
+    }
+
+    override fun visit(n: JmlMethodDeclaration, arg: Unit?): MutableList<DocumentSymbol>? {
+        return n.methodDeclaration.accept(this, arg)
+    }
+
+    override fun visit(n: VariableDeclarationExpr?, arg: Unit?): MutableList<DocumentSymbol>? {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: ModuleDeclaration, arg: Unit?): MutableList<DocumentSymbol> {
+        return arrayListOf(
+            DocumentSymbol(
+                n.nameAsString,
+                SymbolKind.Module,
+                n.asRange, n.name.asRange, "", arrayListOf()
+            )
+        )
+    }
+
+    override fun visit(n: JmlContract, arg: Unit?): MutableList<DocumentSymbol> {
+        val children = acceptAll(n.subContracts) + acceptAll(n.clauses)
+        return arrayListOf(
+            DocumentSymbol(
+                n.name.map { it.asString() }.orElse(n.behavior.asString()),
+                SymbolKind.Key,
+                n.asRange, n.asRange, "${n.jmlTags}", children
+            )
+        )
+    }
+
+    override fun visit(n: JmlRepresentsDeclaration?, arg: Unit?): MutableList<DocumentSymbol> {
+        return arrayListOf()//return super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlFieldDeclaration, arg: Unit?): MutableList<DocumentSymbol> {
+        val decl = n.decl
+        return decl.variables.map { v ->
+            DocumentSymbol(
+                v.nameAsString,
+                SymbolKind.Property,
+                n.asRange, n.asRange, "Jml model method: activated with ${n.jmlTags}", listOf()
+            )
+        }.toMutableList()
+
+    }
+
+    override fun visit(n: JmlClassAccessibleDeclaration, arg: Unit?): MutableList<DocumentSymbol> {
+        return arrayListOf() //super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlClassExprDeclaration, arg: Unit?): MutableList<DocumentSymbol> {
+        return arrayListOf(
+            DocumentSymbol(
+                n.name.map { it.asString() }.orElse("anon invariant"),
+                SymbolKind.Property,
+                n.asRange, n.asRange, "Jml class invariant", listOf()
+            )
+        )
+    }
+
+    override fun visit(n: JmlSimpleExprClause, arg: Unit?): MutableList<DocumentSymbol> {
+        return arrayListOf(
+            DocumentSymbol(
+                n.name.map { "$it : ${n.kind}" }.orElse("Clause ${n.kind}"),
+                SymbolKind.EnumMember,
+                n.asRange, n.asRange, "Jml clause", listOf()
+            )
+        )
+    }
+
+    override fun visit(n: JmlSignalsClause?, arg: Unit?): MutableList<DocumentSymbol>? {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlSignalsOnlyClause?, arg: Unit?): MutableList<DocumentSymbol>? {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlCallableClause?, arg: Unit?): MutableList<DocumentSymbol>? {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlForallClause?, arg: Unit?): MutableList<DocumentSymbol>? {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlConditionalClause?, arg: Unit?): MutableList<DocumentSymbol>? {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlOldClause?, arg: Unit?): MutableList<DocumentSymbol>? {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlMultiExprClause?, arg: Unit?): MutableList<DocumentSymbol>? {
+        return super.visit(n, arg)
+    }
+}
diff --git a/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/symbols/KeyCatchSymbols.kt b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/symbols/KeyCatchSymbols.kt
new file mode 100644
index 0000000000..bff3551353
--- /dev/null
+++ b/tools/lsp/src/main/kotlin/io/github/jmltoolkit/lsp/symbols/KeyCatchSymbols.kt
@@ -0,0 +1,90 @@
+package io.github.jmltoolkit.lsp.symbols
+
+import de.uka.ilkd.key.nparser.KeYParser
+import de.uka.ilkd.key.nparser.KeYParserBaseVisitor
+import de.uka.ilkd.key.nparser.ParsingFacade
+import io.github.jmltoolkit.lsp.Uri
+import org.antlr.v4.runtime.ParserRuleContext
+import org.antlr.v4.runtime.Token
+import org.antlr.v4.runtime.tree.ParseTree
+import org.eclipse.lsp4j.*
+import org.eclipse.lsp4j.jsonrpc.messages.Either
+
+private val Token.asRange: Range
+    get() = Range(asStartPosition, asStopPosition)
+private val Token.asStopPosition: Position
+    get() = Position(line, charPositionInLine + startIndex - stopIndex)
+private val Token.asStartPosition: Position
+    get() = Position(line, charPositionInLine)
+private val ParserRuleContext.asRange: Range
+    get() = Range(start.asStartPosition, stop.asStopPosition)
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (04.02.24)
+ */
+class KeyCatchSymbols(private val uri: Uri) {
+    fun run(): MutableList<Either<SymbolInformation, DocumentSymbol>> {
+        val file = ParsingFacade.parseFile(uri.path)
+        val ctx = ParsingFacade.getParseRuleContext(file)
+        val v = Visitor()
+        val l = ctx.accept(v)
+        return l.map { Either.forRight<SymbolInformation, DocumentSymbol>(it) }.toMutableList()
+    }
+
+    private class Visitor : KeYParserBaseVisitor<List<DocumentSymbol>>() {
+        override fun visitFile(ctx: KeYParser.FileContext): List<DocumentSymbol> = acceptAll(ctx.children)
+        @JvmName("acceptAllPt")
+        private fun acceptAll(children: List<ParseTree>): List<DocumentSymbol> =
+            children.mapNotNull { it as? ParserRuleContext }
+                .flatMap { it.accept(this) }.toMutableList()
+
+        private fun acceptAll(children: List<ParserRuleContext>): MutableList<DocumentSymbol> =
+            children.flatMap { it.accept(this) }.toMutableList()
+
+        override fun visitDecls(ctx: KeYParser.DeclsContext): List<DocumentSymbol> = acceptAll(ctx.children)
+
+        override fun visitSort_decls(ctx: KeYParser.Sort_declsContext) = listOf(
+            DocumentSymbol(
+                "Sorts", SymbolKind.Namespace, ctx.asRange,
+                Range(),
+                null,
+                acceptAll(ctx.one_sort_decl())
+            )
+        )
+
+        override fun visitOne_sort_decl(ctx: KeYParser.One_sort_declContext): List<DocumentSymbol> =
+            ctx.sortIds.simple_ident_dots().flatMap {
+                symbol(it.text, SymbolKind.Class, it.asRange, it.asRange, ctx.doc?.text)
+            }
+
+        private fun symbol(
+            name: String,
+            kind: SymbolKind,
+            range: Range,
+            selectionRange: Range,
+            detail: String? = null,
+            children: MutableList<DocumentSymbol>? = null
+        ): List<DocumentSymbol> = listOf(
+            DocumentSymbol(name, kind, range, selectionRange, detail, children)
+        )
+
+
+        override fun visitPreferences(ctx: KeYParser.PreferencesContext): List<DocumentSymbol> =
+            symbol("Preferences", SymbolKind.String, ctx.KEYSETTINGS().symbol.asRange, ctx.asRange, ctx.text)
+
+
+        override fun visitFunc_decls(ctx: KeYParser.Func_declsContext) = symbol(
+            "Functions", SymbolKind.Function,
+            ctx.start.asRange, Range(), null,
+            acceptAll(ctx.func_decl())
+        )
+
+        override fun visitRulesOrAxioms(ctx: KeYParser.RulesOrAxiomsContext) = symbol(
+            (if (ctx.RULES() != null) "Rules" else "Axioms") + " ${ctx.choices.text}",
+            SymbolKind.Namespace, ctx.start.asRange, ctx.asRange, ctx.doc?.text,
+            acceptAll(ctx.taclet())
+        )
+    }
+}
\ No newline at end of file
diff --git a/tools/lsp/src/main/resources/META-INF/services/io.github.jmltoolkit.lsp.actions.LspAction b/tools/lsp/src/main/resources/META-INF/services/io.github.jmltoolkit.lsp.actions.LspAction
new file mode 100644
index 0000000000..2762d1d9cc
--- /dev/null
+++ b/tools/lsp/src/main/resources/META-INF/services/io.github.jmltoolkit.lsp.actions.LspAction
@@ -0,0 +1,2 @@
+io.github.jmltoolkit.lsp.actions.VerifyAgainstParent
+io.github.jmltoolkit.lsp.actions.WellDefinednessCheck
\ No newline at end of file
diff --git a/tools/lsp/src/main/resources/doc.md b/tools/lsp/src/main/resources/doc.md
new file mode 100644
index 0000000000..df376c93a4
--- /dev/null
+++ b/tools/lsp/src/main/resources/doc.md
@@ -0,0 +1,271 @@
+%keywords continue_behavior continue_behaviour exceptional_behavior return_behavior normal_behavior model_behavior
+
+## Behavior
+
+----- 
+%keywords post ensures ensures_free ensures_redundantly
+
+## post conditions
+
+* `ensures`
+* `pre`
+
+allowed suffixes `_free` and `_redundantly`.
+
+-----
+%keywords pre requires requires_free requires_redundantly
+
+## pre condition
+
+`requires` and `pre` clause form the pre-condition of a method, a loop or a code block.
+
+```java 
+//@ requires <jml-expression> ; 
+```
+
+Both can occur with a `_redundantly` prefix. In KeY `requires_free` is also valid.
+
+-----
+%keywords non_null_by_default nullable_by_default nullable
+
+## Null modifiers
+
+`non_null_by_default`, `nullable_by_default`, `@NonNullByDefault`, `@NullableByDefault`
+
+The `non_null_by_default` and `nullable_by_default` modifiers or, equivalently, the `@NonNullByDefault` and
+`@NullableByDefault` Java annotations, specify the default nullity declaration within the class. Nullness is described
+in \S\ref{TODO`. The default applies to all typenames in declarations and in expressions (e.g. cast expressions), and
+recursively to any nested or inner
+classes that do not have default nullity declarations of their own.
+
+These default nullity modifiers are not inherited by derived classes.
+
+A class cannot be modified by both modifiers at once. If a class has no nullity modifier, it uses the nullity modifier
+of the enclosing class; the default for a top-level class is
+`non_null_by_default`. This top-level default may be altered by tools.
+
+-----
+%keywords pure @Pure
+
+## Purity of functions
+
+Specifying that a class is `pure` means that each method and nested class within the class is specified as pure.
+The `pure` modifier on a class is not inherited by derived classes, though `pure` modifiers on methods are.
+
+There is no modifier to disable an enclosing `pure` specification.
+
+
+-----
+
+\subsection{`@Options``
+The `@Options` modifier takes as argument either a String literal or an array of String
+literals (with the syntax `@Options({\emph{s1 ...``)`) with each literal being just like a command-line argument,
+that is beginning with one or two hyphens and possibly containing
+an `=` character with a value.
+These command-line options are applied to the processing (e.g., ESC or RAC) of each method within the class. The options may be augmented or disabled by corresponding `
+@Options` modifiers on nested methods or classes. In effect, the options that apply to a given class are the
+concatenation of the options given for each enclosing class, from the outermost in.
+
+An Options modifier is not inherited by derived classes.
+
+Not all command-line options can be applied to an individual method or class.
+
+
+
+
+
+-----
+`invariant clause``
+\label{invariant-clause`
+Grammar:\\
+\begin{grammar`
+\gntd{invariant-clause` \gis \gterm{invariant`  \gnt{opt-name` \gnt{predicate` \gterm{;`
+\end{grammar`
+
+\jmlxtodo{TODO`
+
+\jmlxtodo{visibility modifiers? `
+
+-----
+`constraint clause``
+\label{consstraint-clause`
+Grammar:\\
+\begin{grammar`
+\gntd{constraint-clause` \gis \gterm{constraint`  \gnt{opt-name` \gnt{predicate` \gterm{;`
+\end{grammar`
+
+Type information: The \gnt{predicate` has boolean type and is evaluated in the post-state.
+
+An `constraint` clause for a type is equivalent to an additional postcondition for each
+non-constructor method of the type, as if an additional `ensures` clause (with the predicate stated by the `constraint`
+clause) were added to every behavior of each method in the type.
+like an `ensures` clause, an `initially` clause is evaluated in the post-state.
+
+`Constraint` clauses are used only by methods of the class in which the clause appears. The clause is not ``
+inherited" by derived classes.
+
+\jmlxtodo{visibility modifiers? `
+
+-----
+`initially clause``
+\label{initially-clause`
+Grammar:\\
+\begin{grammar`
+\gntd{initially-clause` \gis \gterm{initially`  \gnt{opt-name` \gnt{predicate` \gterm{;`
+\end{grammar`
+
+Type information: The \gnt{predicate` has boolean type and is evaluated in the post-state.
+
+\jmlxtodo{visibility modifiers? `
+
+An `initially` clause for a type is equivalent to an additional postcondition for each
+constructor of the type, as if an additional `ensures` clause (with the predicate stated by the `initially` clause) is
+added to every behavior of each constructor in the type.
+like an `ensures` clause, an `initially` clause were evaluated in the post-state.
+
+`Constraint` clauses are used only by methods of the class in which the clause appears. The clause is not ``
+inherited" by derived classes.
+
+A typical use of a `constraint` clause is to require some condition about the fields of a class to hold between
+the pre- and post-states of every method of the class. For example, \\
+\centerline{`constraint count >= \bs old{count`;``\\
+states that the field `count` never decreases when methods of the class are called.
+
+-----
+%keywords ghost
+
+## `ghost` fields
+
+A ghost field declaration has the same syntax as a Java declaration except that it contains the
+`ghost` modifier and is in a JML annotation. It declares a field that is visible only in
+specifications. Runtime-assertion-checking compilers would compile a ghost field like a normal
+Java field.
+
+The type of a ghost field may be any JML or Java type.
+
+-----
+%keyword model
+
+## `model` fields
+
+A ghost field declaration has the same syntax as a Java declaration except that it contains the
+`model` modifier and is in a JML annotation. However, a model field is not a ``real" field in the sense that it is not compiled into an executable representation of its containing class, even for RAC compilation. Rather a model field designates some abstract property of its containing class. The value of that property may be completely uninterpreted, determined only by the constraints imposed by various other specifications. Alternately, the value of a model field may be given directly by a `represents`
+clause.
+
+A model field is also implicitly a
+\emph{datagroup` in that it designates a set of memory locations (store-refs), given by various `in` and `maps`
+clauses.
+
+-----
+`represents clause``
+Grammar:\\
+\begin{grammar`
+\gntd{represents-clause` \gis \glb \gterm{static` \grb
+\gnt{represents-keyword` \gnt{ident` \\
+\gindentb \glp \gterm{=` \gnt{jml-expression` \gterm{;`\\
+\gindentb \gbar \gterm{\bs such_that` \gnt{predicate` \gterm{;` \\
+\gindentb \grp \\
+\gntd{represents-keyword` \gis \gterm{represents` \gbar \gterm{represents_redundantly`
+\end{grammar`
+
+Type information:
+\begin{itemize`[noitemsep]
+\item The identifier named in the represents clause must be a model field declared in or inherited by the class containing
+the represents clause.
+\item the \gnt{jml-expression` in the first form must have a type assignable to the type of
+the given field (that is, \emph{ident` `==` \emph{expr` must be type-correct).
+\item the \gnt{predicate` in the second form must be a \gnt{jml-expression` with boolean type
+\item A represents-clause can be declared as static. In a static represents clause, only static elements can be referenced both in the left-hand side and the right-hand side. In addition, a static represents clause must be declared in the type where the model field on the left-hand side is declared.
+\item A non-static represents clause must not have a static model field in its left-hand side.
+\end{itemize`
+
+The first form of a represents clause is called a functional abstraction. This form defines the value of the given
+identifier in a visible state as the value of the expression that follows the =. The represents clause for field
+\emph{f` with expression \emph{e` in class \emph{C` is equivalent to assuming\\
+\centerline{`forall non_null C c; c.f == e_c``
+where $e_c$ is `e` with `c` replacing `this`.
+
+The second form (with `\such_that`) is called a relational abstraction. This form constrains the value of the identifier
+in a visible state to satisfy the given predicate.
+
+A represents clause does not take a visibility modifier. In essence, its visibility is that of
+the field whose representation is is defining. However, there is no restriction on the
+visibility of names on the right-hand-side. For example, the representation of a public model field may be an expression
+containing private concrete fields.
+
+Note that represents clauses can be recursive. That is, a represents clause may name a field on its right hand side that
+is the same as the field being represented (named on the left hand side). It is the specifier's responsibility to make
+sure such definitions are well-defined. But such recursive represents clauses can be useful when dealing with recursive
+datatypes \cite{Mueller-Poetzsch-Heffter-Leavens03`.
+
+-----
+%keywords model
+
+## `model methods` and `model classes`
+
+----- 
+%keywords axiom
+
+## axiom-clause
+
+```
+axiom-clause:  'axiom' [name ':'] predicate ';'
+```
+
+Type information: The `predicate` has boolean type. An axiom must be a state-independent formula.
+
+Axioms always have public visibility.
+
+Axioms are assumptions introduced into the proof. An axiom must be a state-independent formula. Typically it might express a property of a mathematical type that is too difficult for an
+automated tool to prove. As assumptions, axioms are a soundness risk for verification, unless they are separately proved.
+
+-----
+%keyword readable-if-clause writeable-if-clause
+
+## readable if clause and writable if clause
+
+```
+\gntd{readable-if-clause` \gis \gterm{readable` \gnt{ident` \gterm{if` \gnt{jml-expression` ';' \\
+\gntd{writable-if-clause` \gis 'writable ident \gterm{if` \gnt{jml-expression` ';'
+```
+
+Type information:
+\begin{itemize`[noitemsep]
+\item the \gnt{ident` must name a field (possibly inherited) visible in the class containing the clause
+\item the \gnt{jml-expression` must have boolean type
+\item Any name used on the right-hand-side must be visible in any context in which the given \gnt{ident` is visible.
+\end{itemize`
+
+The `readable-if` clause states a condition that must be true at any program point at which the given field is read.
+
+The `writable-if` clause states a condition that must be true at any program point at which the given field is
+written.
+
+
+-----
+%keywords monitor_for
+
+## `monitors_for` clause
+
+```bnf
+monitors-for-clause: 
+    monitors_for ident '=' jml-expression ... term ';'
+```
+
+Type information:
+\begin{itemize`[noitemsep]
+\item the \gnt{ident` must name a field (possibly inherited) visible in the class containing the clause
+\item the \gnt{jml-expression`s must evaluate to a (possibly null) reference
+\end{itemize`
+
+A monitors-for-clause such as `monitors_for f = e1, e2;` specifies a relationship between the field, `f`, and a set of
+objects, denoted by a specification expression list `e1, e2`. The meaning of this declaration is that all of the (
+non-null) objects in the list, in this example, the objects denoted by `e1` and `e2`, must be locked at the program
+point at
+which the given field (f in the example) is read or written.
+
+Note that the righthand-side of the monitors-for-clause is not just a list of memory locations, but is in fact a list of
+expressions, where each expression evaluates to a reference to an object.
+
+The monitors-for-clause is adapted from ESC/Java.
+
diff --git a/tools/lsp/src/test/kotlin/tests.kt b/tools/lsp/src/test/kotlin/tests.kt
new file mode 100644
index 0000000000..53fd4aa289
--- /dev/null
+++ b/tools/lsp/src/test/kotlin/tests.kt
@@ -0,0 +1,225 @@
+import com.google.common.truth.Truth
+import io.github.jmltoolkit.lsp.hover.JmlDocumentationIndex
+import io.github.jmltoolkit.lsp.JmlLanguageServer
+import io.github.jmltoolkit.lsp.Uri
+import org.eclipse.lsp4j.*
+import org.eclipse.lsp4j.services.LanguageClient
+import org.junit.jupiter.api.DynamicTest
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestFactory
+import java.io.File
+import java.util.concurrent.CompletableFuture
+import kotlin.test.assertTrue
+
+private val File.toUri: String
+    get() = "file://${absolutePath}"
+
+
+val workspace = File("workspace")
+val languageServer = JmlLanguageServer().also {
+    val params = InitializeParams()
+    val workspaceFolder = WorkspaceFolder(workspace.toUri, "Test Bed")
+    params.workspaceFolders = arrayListOf(workspaceFolder)
+    it.connect(EmptyLanguageClient())
+    it.initialize(params).get()
+}
+
+val docService = languageServer.textDocumentService
+
+class EmptyLanguageClient : LanguageClient {
+    override fun telemetryEvent(`object`: Any?) {
+    }
+
+    override fun publishDiagnostics(diagnostics: PublishDiagnosticsParams?) {
+    }
+
+    override fun showMessage(messageParams: MessageParams?) {
+    }
+
+    override fun showMessageRequest(requestParams: ShowMessageRequestParams?): CompletableFuture<MessageActionItem> {
+        return CompletableFuture.completedFuture(MessageActionItem("Test!"))
+    }
+
+    override fun logMessage(message: MessageParams?) {
+    }
+}
+
+class HoverTest {
+
+    @Test
+    fun docIndex() {
+        val idx = JmlDocumentationIndex()
+        val mbtext = idx.get("model_behavior")
+        val btext = idx.get("behavior")
+        Truth.assertThat(mbtext).isEqualTo(btext)
+    }
+
+    @Test
+    fun test1() {
+        val file = TextDocumentIdentifier(File(workspace, "Example.java").toUri)
+        val params = HoverParams(file, Position(12, 10)) // requires
+        val resp = docService.hover(params).get()
+        println(resp.range)
+        println(resp.contents.right.value)
+    }
+}
+
+class CodeActionTests {
+    @Test
+    fun test1() {
+        val file = TextDocumentIdentifier(File(workspace, "Example.java").toUri)
+        val params = CodeActionParams(
+            file, Range(Position(6, 35), Position(6, 35)),
+            CodeActionContext(listOf(), null)
+        )
+        val resp = docService.codeAction(params).get()
+        println(resp)
+        with(Truth.assertThat(resp)) {
+            isNotNull()
+            isNotEmpty()
+        }
+    }
+}
+
+class FileDiagnosticTests {
+    @Test
+    fun test1() {
+        val file = TextDocumentIdentifier(File(workspace, "Errors.java").toUri)
+        val params = DocumentDiagnosticParams(file)
+        val resp = docService.diagnostic(params).get()
+        resp.left.items.forEach {
+            println(it.message)
+        }
+    }
+}
+
+class DeclarationTests {
+    @Test
+    fun test1() {
+        val file = TextDocumentIdentifier(File(workspace, "Declarations.java").toUri)
+        val variableInClause = DeclarationParams(file, Position(5, 16))
+        val variableInAssert = DeclarationParams(file, Position(10, 18))
+        val forall = DeclarationParams(file, Position(7, 16))
+
+        val result0 = docService.declaration(forall).get()
+        println(result0)
+
+        //val result1 = docService.declaration(variableInClause).get()
+        //val result2 = docService.declaration(variableInAssert).get()
+
+    }
+}
+
+class HighlighterTest {
+    data class Entry(
+        val line: Int,
+        val column: Int,
+        val len: Int,
+        val type: Int,
+        val modifiers: Int
+    ) {
+        constructor(pos: Int, data: List<Int>) : this(
+            data[pos],
+            data[pos + 1],
+            data[pos + 2],
+            data[pos + 3],
+            data[pos + 4]
+        )
+    }
+
+    @Test
+    fun test1() {
+        val file = TextDocumentIdentifier(File(workspace, "Declarations.java").toUri)
+        val res = docService.semanticTokensFull(SemanticTokensParams(file)).get()
+
+        assertTrue { res.data.size % 5 == 0 }
+        val entries = mutableListOf<Entry>()
+        for (i in 0 until res.data.size / 5) {
+            val entry = Entry(5 * i, res.data)
+            assertTrue { entry.column >= 0 }
+            assertTrue { entry.line >= 0 }
+            assertTrue { entry.len >= 1 }
+            assertTrue { entry.type >= 0 }
+            entries.add(entry)
+        }
+
+        var line = -1
+        var column = 0
+        val text = Uri(file.uri).file.readText().split("\n")
+
+        for (entry in entries) {
+            line += entry.line
+            if (entry.line != 0) column = entry.column
+            else column += entry.column
+            val image = text[line].substring(column - 1, column - 1 + entry.len)
+            println(image)
+        }
+
+
+        /*
+            at index 5*i - deltaLine: token line number, relative to the previous token
+            at index 5*i+1 - deltaStart: token start character, relative to the previous token (relative to 0 or the previous
+                token’s start if they are on the same line)
+            at index 5*i+2 - length: the length of the token.
+            at index 5*i+3 - tokenType: will be looked up in SemanticTokensLegend.tokenTypes. We currently ask that tokenType < 65536.
+            at index 5*i+4 - tokenModifiers: each set bit will be looked up in SemanticTokensLegend.tokenModifiers
+         */
+
+    }
+}
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (20.07.22)
+ */
+class DocumentSymbolTests {
+    private fun testDocumentSymbols(javaFile: File, symbolsTruth: File) {
+        val params = DocumentSymbolParams(TextDocumentIdentifier(javaFile.toUri))
+        val result = docService.documentSymbol(params).get()
+        val sb = toCsv(result.map { it.right }, javaFile.name)
+        Truth.assertThat(sb.toString())
+            .isEqualTo(symbolsTruth.readText())
+    }
+
+    @TestFactory
+    fun documentSymbols(): List<DynamicTest> {
+        println(workspace.absoluteFile)
+
+        return workspace.absoluteFile.walkTopDown().asSequence()
+            .filter {
+                File("$it.symbols").exists()
+            }
+            .filter { it.name.endsWith(".java") }
+            .map { file ->
+                DynamicTest.dynamicTest(file.name) {
+                    testDocumentSymbols(file, File("$file.symbols"))
+                }
+            }
+            .toList()
+    }
+
+    private fun toCsv(
+        result: List<DocumentSymbol>,
+        file: String,
+        sb: StringBuilder = StringBuilder(),
+        depth: Int = 0,
+    ): StringBuilder {
+        for (right in result) {
+            sb.append(">".repeat(depth))
+                .append(" ")
+                .append(right.name)
+                .append("\t")
+                .append(right.kind)
+                .append("\t")
+                .append(file)
+                .append(":")
+                .append(right.selectionRange.start.line + 1)
+                .append(":")
+                .append(right.selectionRange.start.character + 1)
+                .append("\n")
+            toCsv(right.children, file, sb, depth + 1)
+        }
+        return sb
+    }
+}
\ No newline at end of file
diff --git a/tools/lsp/workspace/Declarations.java b/tools/lsp/workspace/Declarations.java
new file mode 100644
index 0000000000..926a426b56
--- /dev/null
+++ b/tools/lsp/workspace/Declarations.java
@@ -0,0 +1,12 @@
+public class Declarations {
+    //@ public model int abc;
+
+    /*@
+      ensures abc == 9;
+      forall int local;
+      requires local != 0;
+     */
+    public void foo() {
+        //@assert abc == 0;
+    }
+}
diff --git a/tools/lsp/workspace/Errors.java b/tools/lsp/workspace/Errors.java
new file mode 100644
index 0000000000..ab5ec4dd57
--- /dev/null
+++ b/tools/lsp/workspace/Errors.java
@@ -0,0 +1,38 @@
+class EverythingWrong {
+    public void foo(int x) {
+        //@ghost int x = 0;
+    }
+
+    /*@ ensures \result>0; */
+    public void bar(int x) {}
+
+    /*@ requires \result>0; */
+    public int bar(int x) { return 0;}
+
+    /*@ requires x++; ensures x=2; */
+    public int baf(int x) { return 0;}
+
+    public void bar(int x) {
+        /*@ ensures true; requires true; */
+        while(true);
+    }
+
+    public final int x;
+    /*@ assignable x; */
+    public void bear() {}
+
+
+    /*@
+    public normal_behavior 
+    ensures true;
+    {|
+        also 
+            requires a<0;
+        also
+            requires a>0;
+        also 
+            requires a==0; 
+    |}
+    */
+    public void bbbbb() {}
+}
\ No newline at end of file
diff --git a/tools/lsp/workspace/Example.java b/tools/lsp/workspace/Example.java
new file mode 100644
index 0000000000..5c3273937b
--- /dev/null
+++ b/tools/lsp/workspace/Example.java
@@ -0,0 +1,18 @@
+//-*- jml-keys: openjml
+
+public class Example {
+    /*+key@ public invariant 2*a == invariant;*/    
+    /*+openjml@ public invariant stupid_name : 2*a == invariant;*/
+    /*@ public invariant 2*a == invariant;*/    
+
+    public int foo = 2;
+
+    /*@
+    model_behavior
+    requires req1 : true;
+    ensures true;
+    assignable \nothing;
+    public model int bar(int a);
+    */
+}
+ 
\ No newline at end of file
diff --git a/tools/lsp/workspace/Example.java.symbols b/tools/lsp/workspace/Example.java.symbols
new file mode 100644
index 0000000000..9638f4a46a
--- /dev/null
+++ b/tools/lsp/workspace/Example.java.symbols
@@ -0,0 +1,8 @@
+ Example.java	File	Example.java:3:14
+> Example	Class	Example.java:3:14
+>> anon invariant	Property	Example.java:6:9
+>> foo	Field	Example.java:8:16
+>> bar	Method	Example.java:15:22
+>>> model_behavior	Key	Example.java:11:5
+>>>> req1 : REQUIRES	EnumMember	Example.java:12:5
+>>>> Clause ENSURES	EnumMember	Example.java:13:5
diff --git a/tools/lsp/workspace/jmlproject.json b/tools/lsp/workspace/jmlproject.json
new file mode 100644
index 0000000000..3275c27f9c
--- /dev/null
+++ b/tools/lsp/workspace/jmlproject.json
@@ -0,0 +1,10 @@
+{
+    "enabledKeys": [],
+    "usedKeys": [],
+    "sourcePaths": [],
+    "disabledLinter": [],
+    "disabledCodeActions": [
+        "jml.verify.liskov",
+        "jml.welldefinedness-check"
+    ]
+}
\ No newline at end of file
diff --git a/tools/prettyprinting/build.gradle.kts b/tools/prettyprinting/build.gradle.kts
new file mode 100644
index 0000000000..2e90047b4a
--- /dev/null
+++ b/tools/prettyprinting/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    id("standard-kotlin")
+}
+dependencies {
+    implementation(project(":tools:utils"))
+    implementation("com.google.googlejavaformat:google-java-format:1.35.0")
+}
diff --git a/tools/prettyprinting/src/main/kotlin/JmlFmt.kt b/tools/prettyprinting/src/main/kotlin/JmlFmt.kt
new file mode 100644
index 0000000000..b8d530d2d5
--- /dev/null
+++ b/tools/prettyprinting/src/main/kotlin/JmlFmt.kt
@@ -0,0 +1,122 @@
+import com.google.common.base.CharMatcher
+import com.google.common.base.Strings
+import com.google.common.collect.ImmutableList
+import com.google.common.collect.Range
+import com.google.googlejavaformat.*
+import com.google.googlejavaformat.java.*
+import java.util.*
+import java.util.regex.Pattern
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (30.06.24)
+ */
+class JmlFmt {
+    fun pp(x: String): String? {
+        val input = JavaInput(x)
+        val output = JavaOutput("\n", input, JmlCommentsHelper("\n", JavaFormatterOptions.defaultOptions()))
+        val builder = OpsBuilder(input, output)
+        builder.drain()
+        val ops = builder.build()
+        val doc = DocBuilder().withOps(ops).build()
+        doc.computeBreaks(output.commentsHelper, 80, Doc.State(+0, 0))
+        doc.write(output)
+        output.flush()
+        return output.getLine(0)
+    }
+}
+
+class JmlCommentsHelper(
+    private val lineSeparator: String,
+    private val options: JavaFormatterOptions
+) : CommentsHelper {
+    private val javaCommentsHelper = JavaCommentsHelper(lineSeparator, options)
+
+    override fun rewrite(tok: Input.Tok, maxWidth: Int, column0: Int): String {
+        if (tok.isComment && tok.originalText.startsWith("/*@")) {
+            var text = tok.originalText
+            //TODO
+            return text
+        } else {
+            return javaCommentsHelper.rewrite(tok, maxWidth, column0)
+        }
+    }
+
+    // For non-javadoc-shaped block comments, shift the entire block to the correct
+    // column, but do not adjust relative indentation.
+    private fun preserveIndentation(lines: List<String>, column0: Int): String {
+        val builder = StringBuilder()
+
+        // find the leftmost non-whitespace character in all trailing lines
+        var startCol = -1
+        for (i in 1 until lines.size) {
+            val lineIdx = CharMatcher.whitespace().negate().indexIn(lines[i])
+            if (lineIdx >= 0 && (startCol == -1 || lineIdx < startCol)) {
+                startCol = lineIdx
+            }
+        }
+
+        // output the first line at the current column
+        builder.append(lines[0])
+
+        // output all trailing lines with plausible indentation
+        for (i in 1 until lines.size) {
+            builder.append(lineSeparator).append(Strings.repeat(" ", column0))
+            // check that startCol is valid index, e.g. for blank lines
+            if (lines[i].length >= startCol) {
+                builder.append(lines[i].substring(startCol))
+            } else {
+                builder.append(lines[i])
+            }
+        }
+        return builder.toString()
+    }
+
+    // Wraps and re-indents line comments.
+    private fun indentLineComments(lines: List<String>, column0: Int): String {
+        var lines = lines
+        //lines = wrapLineComments(lines, column0)
+        val builder = StringBuilder()
+        builder.append(lines[0].trim { it <= ' ' })
+        val indentString = Strings.repeat(" ", column0)
+        for (i in 1 until lines.size) {
+            builder.append(lineSeparator).append(indentString).append(lines[i].trim { it <= ' ' })
+        }
+        return builder.toString()
+    }
+
+    // Preserve special `//noinspection` and `//$NON-NLS-x$` comments used by IDEs, which cannot
+    // contain leading spaces.
+    val LINE_COMMENT_MISSING_SPACE_PREFIX: Pattern =
+        Pattern.compile("^(//+)(?!noinspection|\\\$NON-NLS-\\d+\\$)[^\\s/]")
+
+    // Remove leading whitespace (trailing was already removed), and re-indent.
+    // Add a +1 indent before '*', and add the '*' if necessary.
+    private fun indentJavadoc(lines: List<String>, column0: Int): String {
+        val builder = StringBuilder()
+        builder.append(lines[0].trim { it <= ' ' })
+        val indent = column0 + 1
+        val indentString = Strings.repeat(" ", indent)
+        for (i in 1 until lines.size) {
+            builder.append(lineSeparator).append(indentString)
+            val line = lines[i].trim { it <= ' ' }
+            if (!line.startsWith("*")) {
+                builder.append("* ")
+            }
+            builder.append(line)
+        }
+        return builder.toString()
+    }
+
+    // Returns true if the comment looks like javadoc
+    private fun javadocShaped(lines: List<String>): Boolean {
+        val it = lines.iterator()
+        if (!it.hasNext()) {
+            return false
+        }
+        val first = it.next().trim { it <= ' ' }
+        // if it's actually javadoc, we're done
+        return first.startsWith("/*@") //TODO
+    }
+}
\ No newline at end of file
diff --git a/tools/prettyprinting/src/main/kotlin/mlpp/FeatureExtractor.kt b/tools/prettyprinting/src/main/kotlin/mlpp/FeatureExtractor.kt
new file mode 100644
index 0000000000..290c725150
--- /dev/null
+++ b/tools/prettyprinting/src/main/kotlin/mlpp/FeatureExtractor.kt
@@ -0,0 +1,132 @@
+package mlpp
+
+import com.github.javaparser.JavaParser
+import com.github.javaparser.JavaToken
+import com.github.javaparser.ParserConfiguration
+import com.github.javaparser.TokenRange
+import com.github.javaparser.ast.Node
+import io.github.jmltoolkit.utils.Helper.findAllJmlContainers
+import java.io.IOException
+import java.io.PrintWriter
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (07.04.23)
+ */
+class FeatureExtractor {
+    private val parser: JavaParser
+    internal val out = PrintWriter("features.csv")
+
+    init {
+        val config = ParserConfiguration()
+        config.setProcessJml(true)
+        parser = JavaParser(config)
+    }
+
+    @Throws(IOException::class)
+    fun extract(path: Path?) {
+        val cu = parser.parse(path)
+        if (cu.isSuccessful) {
+            val nodes = findAllJmlContainers(cu.result.get())
+
+            extractN(nodes)
+        }
+    }
+
+    private fun extractN(nodes: List<Node>) {
+        for (node in nodes) {
+            val tokenRange = node.tokenRange
+            tokenRange.ifPresent { javaTokens: TokenRange -> extract(javaTokens.begin, javaTokens.end) }
+        }
+    }
+
+    private fun extract(begin: JavaToken, end: JavaToken) {
+        var cur: JavaToken? = begin
+        val seq = ArrayList<JavaToken>(1024)
+        while (cur != null && cur !== end) {
+            if (!cur.category.isWhitespaceOrComment) {
+                seq.add(cur)
+            }
+            cur = cur.nextToken.orElse(null)
+        }
+        extract(seq)
+    }
+
+    private fun extract(seq: List<JavaToken>) {
+        val iter = FillNull(seq.iterator())
+        var prev2: JavaToken? = null
+        var prev1: JavaToken? = null
+        var cur: JavaToken? = iter.next()
+        var next: JavaToken? = iter.next()
+        while (cur != null) {
+            val tokenid0 = getKind(cur)
+            val tokenid1 = getKind(prev1)
+            val tokenid2 = getKind(prev2)
+            val tokenidn = getKind(next)
+
+            val widthleft = 120 - cur.range.get().end.column
+
+            val lineident = 0
+
+            val followedByNewline = next != null && cur.range.get().end.line != next.range.get().begin.line
+            val followedByIndent = next?.range?.get()?.begin?.column ?: 0
+
+
+            out.format(
+                "%d\t%d\t%d\t%d\t%d\t%d\t%s\t%d\n",
+                tokenid0,
+                tokenid1,
+                tokenid2,
+                tokenidn,
+                widthleft,
+                lineident,
+                followedByNewline,
+                followedByIndent
+            )
+
+            prev2 = prev1
+            prev1 = cur
+            cur = next
+            next = if (next == null) null else iter.next()
+        }
+    }
+
+    internal fun printHead() {
+        out.format("tokenid0\ttokenid1\ttokenid2\ttokenidn\twidthleft\tlineident\tfollowed_by_newline\tfollowed_by_indent\n")
+    }
+}
+
+private class FillNull(private val iter: Iterator<JavaToken>) : Iterator<JavaToken?> {
+    override fun hasNext(): Boolean {
+        return iter.hasNext()
+    }
+
+    override fun next(): JavaToken? {
+        if (iter.hasNext()) return iter.next()
+        return null
+    }
+}
+
+private fun getKind(cur: JavaToken?): Int {
+    if (cur == null) return -1
+    return cur.kind
+}
+
+@Throws(IOException::class)
+fun main(args: Array<String>) {
+    val e = FeatureExtractor()
+    e.printHead()
+    for (arg in args) {
+        Files.walk(Paths.get(arg)).forEach { it: Path? ->
+            try {
+                e.extract(it)
+            } catch (ex: IOException) {
+                ex.printStackTrace()
+            }
+        }
+    }
+    e.out.flush()
+}
diff --git a/tools/redux/build.gradle.kts b/tools/redux/build.gradle.kts
new file mode 100644
index 0000000000..abac6b958e
--- /dev/null
+++ b/tools/redux/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    id("standard-kotlin")
+}
+
+dependencies {
+    implementation(project(":tools:utils"))
+}
diff --git a/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/AddForeachCountVariable.kt b/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/AddForeachCountVariable.kt
new file mode 100644
index 0000000000..00413bb479
--- /dev/null
+++ b/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/AddForeachCountVariable.kt
@@ -0,0 +1,52 @@
+package io.github.jmltoolkit.redux
+
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.NodeList
+import com.github.javaparser.ast.expr.NameExpr
+import com.github.javaparser.ast.expr.SimpleName
+import com.github.javaparser.ast.expr.UnaryExpr
+import com.github.javaparser.ast.expr.VariableDeclarationExpr
+import com.github.javaparser.ast.jml.stmt.JmlGhostStmt
+import com.github.javaparser.ast.stmt.BlockStmt
+import com.github.javaparser.ast.stmt.ExpressionStmt
+import com.github.javaparser.ast.stmt.ForEachStmt
+import com.github.javaparser.ast.type.PrimitiveType
+import io.github.jmltoolkit.utils.Helper
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (08.02.22)
+ */
+class AddForeachCountVariable : Transformer {
+    override fun apply(a: Node): Node {
+        return Helper.findAndApply(ForEachStmt::class.java, a) { forEachStmt: ForEachStmt ->
+            addCountVariableInForeach(
+                forEachStmt
+            )
+        }
+    }
+
+    companion object {
+        const val VARIABLE_NAME_COUNT: String = "\\count"
+
+        fun addCountVariableInForeach(forEachStmt: ForEachStmt): BlockStmt {
+            val stmt = BlockStmt()
+            forEachStmt.replace(stmt)
+            val vdecl = VariableDeclarationExpr(PrimitiveType.intType(), VARIABLE_NAME_COUNT)
+            val decl = JmlGhostStmt(NodeList<SimpleName>(), ExpressionStmt(vdecl))
+            stmt.addStatement(decl)
+            stmt.addStatement(forEachStmt)
+            val loopBody = forEachStmt.body
+            val increment = UnaryExpr(NameExpr(VARIABLE_NAME_COUNT), UnaryExpr.Operator.PREFIX_INCREMENT)
+            if (loopBody.isBlockStmt) {
+                (loopBody as BlockStmt).addStatement(0, increment)
+            } else {
+                val newLoopBody = BlockStmt()
+                loopBody.replace(newLoopBody)
+                newLoopBody.addStatement(increment)
+                newLoopBody.addStatement(loopBody)
+            }
+            return stmt
+        }
+    }
+}
diff --git a/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/LambdaReplacer.kt b/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/LambdaReplacer.kt
new file mode 100644
index 0000000000..e5831f6d7a
--- /dev/null
+++ b/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/LambdaReplacer.kt
@@ -0,0 +1,159 @@
+package io.github.jmltoolkit.redux
+
+
+import com.github.javaparser.Position
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.NodeList
+import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration
+import com.github.javaparser.ast.body.MethodDeclaration
+import com.github.javaparser.ast.body.TypeDeclaration
+import com.github.javaparser.ast.expr.LambdaExpr
+import com.github.javaparser.ast.expr.ObjectCreationExpr
+import com.github.javaparser.ast.stmt.BlockStmt
+import com.github.javaparser.ast.stmt.ExpressionStmt
+import com.github.javaparser.ast.stmt.Statement
+import com.github.javaparser.ast.type.ClassOrInterfaceType
+import com.github.javaparser.utils.Pair
+import io.github.jmltoolkit.utils.Helper
+
+/**
+ * Replaces lambda expression by an internal named class.
+ *
+ *
+ * Code was donated by Carsten Czisky @ciskar
+ */
+class LambdaReplacer(private val nameGenerator: NameGenerator) : Transformer {
+    override fun apply(a: Node): Node {
+        return Helper.findAndApply(LambdaExpr::class.java, a) { expr: LambdaExpr -> this.rewriteLambda(expr) }
+    }
+
+    private fun rewriteLambda(expr: LambdaExpr): Node {
+        val enclosingType = expr.getParentNodeOfType(
+            TypeDeclaration::class.java
+        )
+        check(!enclosingType.isEmpty) { "LambdaExpr is not enclosed in a type declaration" }
+        val decl = liftToInnerClass(expr)
+        enclosingType.get().addMember(decl)
+        return instantiate(decl)
+    }
+
+
+    private fun instantiate(decl: ClassOrInterfaceDeclaration): ObjectCreationExpr {
+        val type = ClassOrInterfaceType(null, decl.nameAsString)
+        return ObjectCreationExpr(null, type, NodeList())
+    }
+
+    private fun liftToInnerClass(lambdaExpr: LambdaExpr): ClassOrInterfaceDeclaration {
+        val sai = findSingleAbstractInterface(lambdaExpr)
+        val interfazeName = sai.a
+        val method = sai.b
+        val name = nameGenerator.generate("__GENERATED_", lambdaExpr.range.orElse(null).begin)
+        val it = ClassOrInterfaceDeclaration(NodeList(), false, name)
+        it.addImplementedType(interfazeName)
+        it.addMember(method)
+        return it
+    }
+
+    private fun findSingleAbstractInterface(lambdaExpr: LambdaExpr): Pair<String, MethodDeclaration> {
+        val type = assignToType(lambdaExpr)
+        return if (type == null) {
+            inferDefaultAbstractInterface(lambdaExpr)
+        } else {
+            Pair(
+                type.nameAsString,
+                MethodDeclaration()
+            )
+        }
+    }
+
+    private fun inferDefaultAbstractInterface(lambdaExpr: LambdaExpr): Pair<String, MethodDeclaration> {
+        var interfaze = ""
+        val md = MethodDeclaration()
+
+        val body = lambdaExpr.body
+        var returnType: String? = null
+
+        if (body is BlockStmt) {
+            val last: Statement? = body.statements.lastOrNull()
+            returnType = last?.let { it: Statement -> it.asReturnStmt().expression() }
+                ?.calculateResolvedType()?.toString()
+        }
+
+        if (body is ExpressionStmt) {
+            returnType = body.expression.calculateResolvedType().toString()
+        }
+
+
+        when (lambdaExpr.parameters.size) {
+            0 -> {
+                if (returnType == null) {
+                    interfaze = "Runnable"
+                    md.setName("run")
+                } else {
+                    interfaze = "java.util.function.Supplier<\$returnType>"
+                    md.setName("accept")
+                }
+            }
+
+            1 -> {
+                val firstParam = lambdaExpr.parameters.firstOrNull()?.typeAsString
+                if (returnType == null) {
+                    interfaze = "java.util.function.Consumer<$firstParam>"
+                    md.setName("get")
+                } else {
+                    interfaze = "java.util.function.Function<$firstParam, $returnType>"
+                    md.setName("invoke")
+                }
+            }
+
+            2 -> {
+                val firstParam = lambdaExpr.parameters.first()?.typeAsString
+                val secondParam = lambdaExpr.parameters[1].typeAsString
+                if (returnType == null) {
+                    interfaze = "java.util.function.BiConsumer<$firstParam,$secondParam>"
+                    md.setName("get")
+                } else {
+                    interfaze = "java.util.function.BiFunction<$firstParam, $secondParam, $returnType>"
+                    md.setName("invoke")
+                }
+            }
+
+            else -> throw IllegalStateException("ASM could not be infered")
+        }
+        //TODO md.type = returnType
+        for (parameter in lambdaExpr.parameters) {
+            md.addParameter(parameter.clone())
+        }
+        return Pair(interfaze, md)
+    }
+
+    private fun assignToType(lambdaExpr: LambdaExpr): ClassOrInterfaceType? {
+        val type = lambdaExpr.calculateResolvedType()
+        println("TEST: \$type")
+        return null //TODO
+    }
+}
+
+/**
+ * generates names guaranteeing uniqueness in generated names by onw instance of NameGenerator
+ */
+class NameGenerator {
+    private val generatedNames: MutableSet<String> = HashSet()
+
+    fun generate(prefix: String, pos: Position?): String {
+        return generate(prefix, pos, null)
+    }
+
+    private fun generate(prefix: String, pos: Position?, counter: Int?): String {
+        val line = pos?.line
+        var newName = prefix + "L" + line
+        if (counter != null) {
+            newName += "_$counter"
+        }
+        if (generatedNames.contains(newName)) {
+            return generate(prefix, pos, if (counter != null) counter + 1 else 0)
+        }
+        generatedNames.add(newName)
+        return newName
+    }
+}
diff --git a/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/ReduxConfig.kt b/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/ReduxConfig.kt
new file mode 100644
index 0000000000..bf60ccc8fc
--- /dev/null
+++ b/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/ReduxConfig.kt
@@ -0,0 +1,25 @@
+package io.github.jmltoolkit.redux
+
+
+/**
+ * Configuration for the Redux transformation pipeline.
+ */
+class ReduxConfig {
+    private val disabled: MutableSet<String> = HashSet()
+
+    fun enable(clazz: Class<*>) {
+        disabled.remove(clazz.toString())
+    }
+
+    fun disable(clazz: Class<*>) {
+        disabled.add(clazz.toString())
+    }
+
+    fun getDisabled(): Set<String> {
+        return disabled
+    }
+
+    fun isEnabled(clazz: String): Boolean {
+        return !disabled.contains(clazz)
+    }
+}
\ No newline at end of file
diff --git a/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/ReduxFacade.kt b/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/ReduxFacade.kt
new file mode 100644
index 0000000000..8bbc0bc757
--- /dev/null
+++ b/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/ReduxFacade.kt
@@ -0,0 +1,36 @@
+package io.github.jmltoolkit.redux
+
+
+import com.github.javaparser.ast.Node
+import java.util.*
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (12/29/21)
+ */
+class ReduxFacade(private val config: ReduxConfig) {
+    private val transformers: MutableList<Transformer> = ArrayList()
+
+    constructor(config: ReduxConfig, transformers: List<Transformer>) : this(config) {
+        this.transformers.addAll(transformers)
+    }
+
+    fun apply(nodes: List<Node>): List<Node?> {
+        val n: MutableList<Node?> = ArrayList(nodes.size)
+        for (node in nodes) {
+            var new = node
+            for (transformer in transformers) {
+                new = transformer.apply(new)
+            }
+            n.add(new)
+        }
+        return n
+    }
+
+    companion object {
+        fun create(config: ReduxConfig): ReduxFacade {
+            val sl = ServiceLoader.load(Transformer::class.java)
+            return ReduxFacade(config, sl.filter { config.isEnabled(it.javaClass.name) })
+        }
+    }
+}
diff --git a/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/Transformer.kt b/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/Transformer.kt
new file mode 100644
index 0000000000..6642a65f5a
--- /dev/null
+++ b/tools/redux/src/main/kotlin/io/github/jmltoolkit/redux/Transformer.kt
@@ -0,0 +1,12 @@
+package io.github.jmltoolkit.redux
+
+
+import com.github.javaparser.ast.Node
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (11.02.23)
+ */
+interface Transformer {
+    fun apply(a: Node): Node
+}
diff --git a/tools/redux/src/test/resources/lambda/Test.java b/tools/redux/src/test/resources/lambda/Test.java
new file mode 100644
index 0000000000..33ae9006dc
--- /dev/null
+++ b/tools/redux/src/test/resources/lambda/Test.java
@@ -0,0 +1,24 @@
+class A {
+    private final int test;
+
+    public A() {
+        this.test = 1;
+    }
+
+    void m(int i) {
+        int outer = 10;
+        make(a -> {
+            MyFunctionalInterface g = (x) -> test * 2 + x;
+            return test + g.apply(a) * 2;
+        });
+    }
+
+    void make(MyFunctionalInterface f) {
+        f.apply(10);
+    }
+
+    @java.lang.FunctionalInterface
+    interface MyFunctionalInterface {
+        public int apply(int i);
+    }
+}
diff --git a/tools/redux/src/test/resources/lambda/TestGeneric.java b/tools/redux/src/test/resources/lambda/TestGeneric.java
new file mode 100644
index 0000000000..bacbe73ace
--- /dev/null
+++ b/tools/redux/src/test/resources/lambda/TestGeneric.java
@@ -0,0 +1,26 @@
+class A {
+    private final int test;
+
+    public A() {
+        this.test = 1;
+    }
+
+    void m(int i) {
+        int outer = 10;
+        make(a -> {
+            MyFunctionalInterface<Integer> g = (x) -> (test * 2 + x) > 0;
+
+            return g.apply(a) && a > 2;
+        });
+    }
+
+    void make(MyFunctionalInterface<Integer> f) {
+        f.apply(10);
+    }
+
+    @java.lang.FunctionalInterface
+    interface MyFunctionalInterface<T> {
+
+        public boolean apply(T i);
+    }
+}
diff --git a/tools/redux/src/test/resources/lambda/TestPredicateInline.java b/tools/redux/src/test/resources/lambda/TestPredicateInline.java
new file mode 100644
index 0000000000..86726069bc
--- /dev/null
+++ b/tools/redux/src/test/resources/lambda/TestPredicateInline.java
@@ -0,0 +1,49 @@
+import java.util.Objects;
+
+class A {
+    private final int test;
+
+    public A() {
+        this.test = 1;
+    }
+
+    void m(int i) {
+        int outer = 10;
+        Predicate<Integer> tester = (a) -> a > 10;
+        tester.test(outer);
+    }
+
+
+    @FunctionalInterface
+    public interface Predicate<T> {
+        boolean test(T var1);
+
+        default Predicate<T> and(Predicate<? super T> var1) {
+            Objects.requireNonNull(var1);
+            return (var2) -> {
+                return this.test(var2) && var1.test(var2);
+            };
+        }
+
+        default Predicate<T> negate() {
+            return (var1) -> {
+                return !this.test(var1);
+            };
+        }
+
+        default Predicate<T> or(Predicate<? super T> var1) {
+            Objects.requireNonNull(var1);
+            return (var2) -> {
+                return this.test(var2) || var1.test(var2);
+            };
+        }
+
+        static <T> Predicate<T> isEqual(Object var0) {
+            return null == var0 ? Objects::isNull : (var1) -> {
+                return var0.equals(var1);
+            };
+        }
+
+    }
+
+}
diff --git a/tools/smt/build.gradle.kts b/tools/smt/build.gradle.kts
new file mode 100644
index 0000000000..04c6703c66
--- /dev/null
+++ b/tools/smt/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    id("standard-kotlin")
+}
+
+dependencies {
+    //implementation(libs)
+    implementation(project(":tools:utils"))
+
+
+    testImplementation(libs.snakeyaml)
+}
diff --git a/tools/smt/preamble.smt2 b/tools/smt/preamble.smt2
new file mode 100644
index 0000000000..910f44c356
--- /dev/null
+++ b/tools/smt/preamble.smt2
@@ -0,0 +1,62 @@
+(set-option :produce-unsat-cores true)
+(set-option :produce-models true)
+(set-logic ALL)
+
+(declare-sort T 0)
+(declare-sort U 0)
+
+(declare-fun instanceof (U T) Bool)
+(declare-fun exactinstanceof (U T) Bool)
+(declare-fun subtype (T T) Bool)
+(declare-fun typeof (U) T)
+
+(assert (forall ((t1 T)) (subtype t1 t1)))
+(assert (forall ((t1 T) (t2 T)) (! (=> (and (subtype t1 t2) (subtype t2 t1)) (= t1 t2)) :pattern ((subtype t1 t2) (subtype t2 t1)))))
+(assert (forall ((t1 T) (t2 T) (t3 T)) (! (=> (and (subtype t1 t2) (subtype t2 t3)) (subtype t1 t3)) :pattern ((subtype t1 t2) (subtype t2 t3)))))
+(assert (forall ((u U) (t T)) (! (= (instanceof u t) (subtype (typeof u) t)) :pattern ((instanceof u t)))))
+(assert (forall ((u U) (t T)) (! (= (exactinstanceof u t) (= (typeof u) t)) :pattern ((exactinstanceof u t)))))
+
+;; Integer
+(declare-fun u2i (U) Int)
+(declare-fun i2u (Int) U)
+(declare-const sort_int T)
+
+(assert (forall ((i Int)) (= (u2i (i2u i)) i)))
+(assert (forall ((x U)) (! (=> (= (typeof x) sort_int)  (= (i2u (u2i x)) x)) :pattern ((typeof x)))))
+(assert (forall ((t T)) (! (=> (subtype t sort_int) (= t sort_int)) :pattern ((subtype t sort_int)))))
+; (assert (forall ((x U)) (! (=> (instanceof x sort_int)  (= (typeof x ) sort_int)) :pattern ((instanceof x sort_int)))))
+(assert (forall ((i Int)) (! (= (typeof (i2u i)) sort_int) :pattern ((i2u i)))))
+
+(declare-fun u2b (U) Bool)
+(declare-fun b2u (Bool) U)
+(declare-const sort_boolean T)
+
+(assert (instanceof (b2u true) sort_boolean))
+(assert (instanceof (b2u false) sort_boolean))
+(assert (forall ((b Bool)) (= (u2b (b2u b)) b)))
+; This seems to improve Z3 performance: Needs investigation (probably triggers above)
+(assert (not (u2b (b2u false))))
+(assert (forall ((u U)) (! (=> (= (typeof u) sort_boolean) (or (= u (b2u true)) (= u (b2u false)))) :pattern ((typeof u)))))
+(assert (forall ((x U)) (! (=> (instanceof x sort_boolean)  (= (typeof x ) sort_boolean)) :pattern ((instanceof x sort_boolean)))))
+
+(declare-fun cast (U T) U)
+(assert (forall ((x U) (t T)) (! (subtype (typeof (cast x t)) t) :pattern ((cast x t)))))
+(assert (forall ((x U) (t T)) (! (=> (subtype (typeof x) t) (= (cast x t) x)) :pattern ((cast x t)))))
+
+
+(declare-fun u2f (U) Float32)
+(declare-fun f2u (Float32) U)
+;(declare-const sort_float T)
+
+(declare-fun u2d (U) Float64)
+(declare-fun d2u (Float64) U)
+;(declare-const sort_double T)
+(assert (forall ((f Float32)) (= (u2f (f2u f)) f)))
+(assert (forall ((x U)) (=> (= (typeof x) sort_float) (= (f2u (u2f x)) x))))
+(assert (forall ((x U)) (=> (instanceof x sort_float) (= (typeof x ) sort_float))))
+(assert (forall ((f Float32)) (= (typeof (f2u f)) sort_float)))
+
+(assert (forall ((d Float64)) (= (u2d (d2u d)) d)))
+(assert (forall ((x U)) (=> (= (typeof x) sort_double) (= (d2u (u2d x)) x))))
+(assert (forall ((x U)) (=> (instanceof x sort_double) (= (typeof x ) sort_double))))
+(assert (forall ((d Float64)) (= (typeof (d2u d)) sort_double)))
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/ArithmeticTranslator.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/ArithmeticTranslator.kt
new file mode 100644
index 0000000000..9810958d1f
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/ArithmeticTranslator.kt
@@ -0,0 +1,45 @@
+package io.github.jmltoolkit.smt
+
+import com.github.javaparser.ast.NodeList
+import com.github.javaparser.ast.body.Parameter
+import com.github.javaparser.ast.expr.*
+import com.github.javaparser.resolution.types.ResolvedType
+import io.github.jmltoolkit.smt.model.SExpr
+import io.github.jmltoolkit.smt.model.SmtType
+import java.math.BigInteger
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (01.07.22)
+ */
+interface ArithmeticTranslator {
+    fun binary(operator: BinaryExpr.Operator, left: SExpr, right: SExpr): SExpr
+
+    fun makeChar(n: CharLiteralExpr): SExpr
+
+    fun unary(operator: UnaryExpr.Operator, accept: SExpr): SExpr
+
+    fun makeLong(n: LongLiteralExpr): SExpr
+
+    fun makeInt(n: IntegerLiteralExpr): SExpr
+
+    fun makeInt(i: BigInteger): SExpr
+
+    fun makeIntVar(): SExpr
+
+    fun getVariable(variables: NodeList<Parameter>): List<SExpr> {
+        return variables.map { getVariable(it) }
+    }
+
+    fun getVariable(jmlBoundVariable: Parameter): SExpr
+
+    fun makeBoolean(value: Boolean): SExpr
+
+    fun getType(asPrimitive: ResolvedType): SmtType
+
+    fun arrayLength(obj: SExpr): SExpr
+
+    fun makeInt(i: Long): SExpr
+
+    fun makeVar(rtype: ResolvedType): SExpr
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/BitVectorArithmeticTranslator.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/BitVectorArithmeticTranslator.kt
new file mode 100644
index 0000000000..1f80b8dcfc
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/BitVectorArithmeticTranslator.kt
@@ -0,0 +1,133 @@
+package io.github.jmltoolkit.smt
+
+import com.github.javaparser.ast.body.Parameter
+import com.github.javaparser.ast.expr.*
+import com.github.javaparser.ast.expr.BinaryExpr.Operator.*
+import com.github.javaparser.ast.expr.UnaryExpr.Operator.*
+import com.github.javaparser.resolution.types.ResolvedArrayType
+import com.github.javaparser.resolution.types.ResolvedPrimitiveType
+import com.github.javaparser.resolution.types.ResolvedPrimitiveType.*
+import com.github.javaparser.resolution.types.ResolvedType
+import io.github.jmltoolkit.smt.model.SExpr
+import io.github.jmltoolkit.smt.model.SmtType
+import java.math.BigInteger
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (01.07.22)
+ */
+open class BitVectorArithmeticTranslator(val smtLog: SmtQuery) : ArithmeticTranslator {
+    var cnt: Int = 0
+
+    override fun binary(operator: BinaryExpr.Operator, left: SExpr, right: SExpr): SExpr =
+        when (operator) {
+            IMPLICATION -> term.impl(left, right)
+            SUBTYPE -> error("")
+            RANGE -> error("")
+            SUB_LOCK -> error("")
+            SUB_LOCKE -> error("")
+            RIMPLICATION -> term.impl(right, left)
+            EQUIVALENCE -> term.equiv(left, right)
+            ANTIVALENCE -> term.not(term.equiv(left, right))
+            OR -> term.or(left, right)
+            AND -> term.and(left, right)
+            BINARY_OR -> term.bor(left, right)
+            BINARY_AND -> term.band(left, right)
+            XOR -> term.xor(left, right)
+            EQUALS -> term.equality(left, right)
+            NOT_EQUALS -> term.not(term.equality(left, right))
+            LESS -> term.lessThan(left, right)
+            GREATER -> term.greaterThan(left, right)
+            LESS_EQUALS -> term.lessOrEquals(left, right, true)
+            GREATER_EQUALS -> term.greaterOrEquals(left, right, true)
+            LEFT_SHIFT -> term.shiftLeft(left, right)
+            SIGNED_RIGHT_SHIFT -> term.shiftRight(left, right, true)
+            UNSIGNED_RIGHT_SHIFT -> term.shiftRight(left, right, true)
+            BinaryExpr.Operator.PLUS -> term.add(left, right)
+            BinaryExpr.Operator.MINUS -> term.subtract(left, right)
+            MULTIPLY -> term.multiply(left, right)
+            DIVIDE -> term.divide(left, right, true)
+            REMAINDER -> term.modulo(left, right, true)
+        }
+
+    override fun makeChar(n: CharLiteralExpr): SExpr {
+        return term.makeBitvector(16, n.value!![0].code.toLong())
+    }
+
+    override fun unary(operator: UnaryExpr.Operator, accept: SExpr) =
+        when (operator) {
+            UnaryExpr.Operator.PLUS, POSTFIX_INCREMENT, POSTFIX_DECREMENT -> accept
+            UnaryExpr.Operator.MINUS -> term.negate(accept)
+            PREFIX_INCREMENT -> term.add(accept, term.makeBitvector(32, 1))
+            PREFIX_DECREMENT -> term.subtract(accept, term.makeBitvector(32, 1))
+            LOGICAL_COMPLEMENT -> term.not(accept)
+            BITWISE_COMPLEMENT -> term.not(accept)
+        }
+
+    override fun makeLong(n: LongLiteralExpr) = term.makeBitvector(64, n.value.toBigInteger())
+
+    override fun makeInt(n: IntegerLiteralExpr) = term.makeBitvector(32, n.asNumber().toLong())
+
+    override fun makeInt(i: BigInteger) = term.makeBitvector(32, i)
+
+    override fun makeIntVar(): SExpr {
+        val name = "__RAND_" + (++cnt)
+        smtLog.declareConst(name, SmtType.BV32)
+        return term.symbol(name)
+    }
+
+    override fun getVariable(jmlBoundVariable: Parameter): SExpr {
+        val rType = jmlBoundVariable.type.resolve()
+        return term.list(null, SmtType.BOOL, jmlBoundVariable.nameAsString, term.type(getType(rType)))
+    }
+
+    override fun makeBoolean(value: Boolean) = term.makeBoolean(value)
+
+    override fun getType(asPrimitive: ResolvedType): SmtType {
+        if (asPrimitive.isPrimitive) {
+            val rType: ResolvedPrimitiveType = asPrimitive.asPrimitive()
+            return getPrimitiveType(rType)
+        }
+
+        if (asPrimitive.isArray) {
+            val aType: ResolvedArrayType = asPrimitive.asArrayType()
+            val cType: SmtType = getType(aType.componentType)
+            val intType: SmtType = getType(INT)
+            return SmtType.Array(intType, cType)
+        }
+
+        if (asPrimitive.isReferenceType) {
+            return SmtType.JAVA_OBJECT
+        }
+
+        throw RuntimeException("Unsupported type")
+    }
+
+    override fun arrayLength(obj: SExpr): SExpr {
+        return term.list(INT, SmtType.BV32, term.symbol("bv\$length"), obj)
+    }
+
+    override fun makeInt(i: Long): SExpr {
+        return makeInt(BigInteger.valueOf(i))
+    }
+
+    override fun makeVar(rtype: ResolvedType): SExpr {
+        TODO("Not yet implemented")
+    }
+
+    open fun getPrimitiveType(rType: ResolvedPrimitiveType) =
+        when (rType) {
+            BOOLEAN -> SmtType.BOOL
+            BYTE -> SmtType.BV8
+            SHORT -> SmtType.BV16
+            CHAR -> SmtType.BV16
+            INT -> SmtType.BV32
+            LONG -> SmtType.BV64
+            FLOAT -> SmtType.FP32
+            DOUBLE -> SmtType.FP64
+        }
+
+    companion object {
+        private val term: SmtTermFactory = SmtTermFactory
+    }
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/IntArithmeticTranslator.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/IntArithmeticTranslator.kt
new file mode 100644
index 0000000000..e4e7f4e2f0
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/IntArithmeticTranslator.kt
@@ -0,0 +1,48 @@
+package io.github.jmltoolkit.smt
+
+import com.github.javaparser.ast.expr.CharLiteralExpr
+import com.github.javaparser.ast.expr.IntegerLiteralExpr
+import com.github.javaparser.ast.expr.LongLiteralExpr
+import com.github.javaparser.resolution.types.ResolvedPrimitiveType
+import io.github.jmltoolkit.smt.model.SExpr
+import io.github.jmltoolkit.smt.model.SmtType
+import java.math.BigInteger
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (07.08.22)
+ */
+class IntArithmeticTranslator(smtLog: SmtQuery) : BitVectorArithmeticTranslator((smtLog)) {
+    private val term: SmtTermFactory = SmtTermFactory
+
+    override fun makeChar(n: CharLiteralExpr): SExpr {
+        return term.makeInt("" + n.asChar().code)
+    }
+
+    override fun makeLong(n: LongLiteralExpr): SExpr {
+        return term.makeInt("" + n.value)
+    }
+
+    override fun makeInt(n: IntegerLiteralExpr): SExpr {
+        return term.makeInt("" + n.value)
+    }
+
+    override fun makeInt(i: BigInteger): SExpr {
+        return term.makeInt(i.toString())
+    }
+
+    override fun makeIntVar(): SExpr {
+        val name = "__RAND_" + (++cnt)
+        smtLog.declareConst(name, SmtType.BV32)
+        return term.symbol(name)
+    }
+
+    override fun getPrimitiveType(rType: ResolvedPrimitiveType) = when (rType) {
+        ResolvedPrimitiveType.FLOAT, ResolvedPrimitiveType.DOUBLE -> SmtType.REAL
+        else -> SmtType.INT
+    }
+
+    override fun arrayLength(obj: SExpr): SExpr {
+        return term.list(ResolvedPrimitiveType.INT, SmtType.INT, term.symbol("int\$length"), obj)
+    }
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/JmlExpr2Smt.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/JmlExpr2Smt.kt
new file mode 100644
index 0000000000..86632ec81e
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/JmlExpr2Smt.kt
@@ -0,0 +1,360 @@
+package io.github.jmltoolkit.smt
+
+import com.github.javaparser.ast.ArrayCreationLevel
+import com.github.javaparser.ast.NodeList
+import com.github.javaparser.ast.body.Parameter
+import com.github.javaparser.ast.expr.*
+import com.github.javaparser.ast.jml.NodeWithContracts
+import com.github.javaparser.ast.jml.expr.*
+import com.github.javaparser.ast.jml.expr.JmlQuantifiedExpr.JmlDefaultBinder
+import com.github.javaparser.ast.visitor.GenericVisitorAdapter
+import io.github.jmltoolkit.smt.model.SAtom
+import io.github.jmltoolkit.smt.model.SExpr
+import io.github.jmltoolkit.smt.model.SmtType
+import io.github.jmltoolkit.utils.JMLUtils
+import java.math.BigInteger
+import kotlin.jvm.optionals.getOrNull
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (01.07.22)
+ */
+class JmlExpr2Smt(private val smtLog: SmtQuery, val translator: ArithmeticTranslator) :
+    GenericVisitorAdapter<SExpr, Any?>() {
+
+    private val boundedVars = VariableStack()
+
+    override fun visit(n: ArrayAccessExpr, arg: Any?): SExpr {
+        val array = n.name.accept(this, arg)
+        val index = n.index.accept(this, arg)
+        val rtype = n.calculateResolvedType()
+        val stypes = translator.getType(rtype)
+        return termFactory.select(stypes, rtype, array, index)
+    }
+
+    override fun visit(n: ArrayCreationExpr, arg: Any?): SExpr? {
+        if (n.initializer.isPresent)
+            return n.initializer.get().accept(this, arg)
+
+        val name = "anon_array_" + (++anonCnt)
+        val rType = n.calculateResolvedType()
+        val type = translator.getType(rType)
+        smtLog.declareConst(name, type)
+        val variable: SExpr = termFactory.variable(type, rType, name)
+        val zero: SExpr = translator.makeInt(BigInteger.ZERO)
+        val arrayLength: SExpr = translator.arrayLength(variable)
+
+        val boundedVars = ArrayList<SExpr>()
+        var accessLevel: SExpr = variable
+        for (i in 0 until n.levels.size) {
+            val level: ArrayCreationLevel = n.levels[i]
+            if (i == 0) {
+                if (level.dimension.isPresent) {
+                    val length: SExpr = level.dimension.get().accept(this, arg)!!
+                    smtLog.addAssert(termFactory.equality(arrayLength, length))
+                } else {
+                    smtLog.addAssert(termFactory.lessOrEquals(zero, arrayLength, true))
+                }
+            } else {
+                if (level.dimension.isPresent) {
+                    val length: SExpr = level.dimension.get().accept(this, arg)!!
+                    smtLog.addAssert(
+                        termFactory.forall(
+                            boundedVars,
+                            termFactory.equality(translator.arrayLength(accessLevel), length)
+                        )
+                    )
+                } else {
+                    smtLog.addAssert(
+                        termFactory.forall(
+                            boundedVars,
+                            termFactory.lessOrEquals(zero, translator.arrayLength(accessLevel), true)
+                        )
+                    )
+                }
+            }
+            boundedVars.add(termFactory.binder(SmtType.INT, "idx$i"))
+            accessLevel = termFactory.select(
+                SmtType.JAVA_OBJECT, null, accessLevel,
+                termFactory.variable(SmtType.INT, null, "idx$i")
+            )
+        }
+        return variable
+    }
+
+    override fun visit(n: ArrayInitializerExpr, arg: Any?): SExpr {
+        val name = "anon_array_" + (++anonCnt)
+        val seq = n.values.map { it.accept(this, arg) }
+        val myType: SmtType.Array = SmtType.Array(SmtType.INT, seq.first().smtType!!)
+        smtLog.declareConst(name, myType)
+        val `var`: SExpr = termFactory.variable(myType, null, name)
+        for (i in seq.indices) {
+            smtLog.addAssert( //(store ary idx sub)
+                termFactory.store(`var`, translator.makeInt(i.toLong()), seq[i])
+            )
+        }
+
+        val zero: SExpr = translator.makeInt(0)
+        val length: SExpr = translator.arrayLength(`var`)
+        smtLog.addAssert(termFactory.equality(length, translator.makeInt(n.values.size.toLong())))
+        return `var`
+    }
+
+    override fun visit(n: AssignExpr?, arg: Any?): SExpr? {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: BinaryExpr, arg: Any?): SExpr {
+        val left = n.left.accept(this, arg)
+        val right = n.right.accept(this, arg)
+        return translator.binary(n.operator, left, right)
+    }
+
+    override fun visit(n: ThisExpr?, arg: Any?): SExpr {
+        return termFactory.makeThis()
+    }
+
+    override fun visit(n: SuperExpr?, arg: Any?): SExpr {
+        return termFactory.makeSuper()
+    }
+
+    override fun visit(n: NameExpr, arg: Any?): SExpr {
+        val resolved = n.resolve()
+        val rType = resolved.type
+        val type: SmtType = translator.getType(rType)
+        if (!isBound(n.nameAsString)) {
+            smtLog.declareConst(n.nameAsString, type)
+        }
+        return termFactory.variable(type, rType, n.nameAsString)
+    }
+
+    private fun isBound(nameAsString: String): Boolean {
+        return boundedVars.contains(nameAsString)
+    }
+
+
+    override fun visit(n: NullLiteralExpr?, arg: Any?): SExpr {
+        return termFactory.makeNull()
+    }
+
+    override fun visit(n: BooleanLiteralExpr, arg: Any?): SExpr {
+        return translator.makeBoolean(n.value)
+    }
+
+    override fun visit(n: CastExpr?, arg: Any?): SExpr {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: CharLiteralExpr, arg: Any?): SExpr {
+        return translator.makeChar(n)
+    }
+
+    override fun visit(n: ClassExpr?, arg: Any?): SExpr {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: ConditionalExpr, arg: Any?): SExpr {
+        return termFactory.ite(
+            n.condition.accept(this, arg),
+            n.thenExpr.accept(this, arg),
+            n.elseExpr.accept(this, arg)
+        )
+    }
+
+    override fun visit(n: DoubleLiteralExpr?, arg: Any?): SExpr {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: FieldAccessExpr, arg: Any?): SExpr {
+        val scopeType = n.scope.calculateResolvedType()
+        val javaType = n.calculateResolvedType()
+        val stype: SmtType = translator.getType(javaType)
+        val obj: SExpr = n.scope.accept(this, arg)
+
+        if (n.nameAsString.equals("length") && scopeType.isArray) {
+            return translator.arrayLength(obj)
+        }
+
+        return termFactory.fieldAccess(javaType, stype, n.nameAsString, obj)
+    }
+
+    override fun visit(n: InstanceOfExpr, arg: Any?): SExpr {
+        val leftType = n.expression.calculateResolvedType()
+        val rightType = n.type.resolve()
+
+        //TODO weigl return leftType.asReferenceType()
+        //Pattern matching
+        return termFactory.makeTrue()
+    }
+
+    override fun visit(n: IntegerLiteralExpr, arg: Any?): SExpr {
+        return translator.makeInt(n)
+    }
+
+    override fun visit(n: LongLiteralExpr, arg: Any?): SExpr {
+        return translator.makeLong(n)
+    }
+
+    override fun visit(n: MethodCallExpr, arg: Any?): SExpr {
+        val method = n.resolve()
+        val variable: SExpr = translator.makeVar(method.returnType)
+        val ast = method.toAst().getOrNull()
+        if (ast is NodeWithContracts<*>) {
+            val contract = JMLUtils.createJointContract(ast.contracts)
+            //TODO weigl add assertion for the return variable
+            //TODO weigl add assertion for each parameter
+            // smtLog.addAssert();
+        }
+        return variable
+    }
+
+    private var anonCnt: Int = 0
+
+    override fun visit(n: ObjectCreationExpr?, arg: Any?): SExpr {
+        val name = "anon" + (++anonCnt)
+        smtLog.declareConst(name, SmtType.JAVA_OBJECT)
+        val `var`: SExpr = termFactory.variable(SmtType.JAVA_OBJECT, null, name)
+        smtLog.addAssert(termFactory.nonNull(`var`))
+        return `var`
+    }
+
+    override fun visit(n: StringLiteralExpr, arg: Any?): SExpr {
+        return SAtom(SmtType.STRING, null, ("\"" + n.asString()).toString() + "\"")
+    }
+
+    override fun visit(n: UnaryExpr, arg: Any?): SExpr {
+        return translator.unary(n.operator, n.expression.accept(this, arg))
+    }
+
+    override fun visit(n: LambdaExpr?, arg: Any?): SExpr {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: TypeExpr?, arg: Any?): SExpr {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: SwitchExpr?, arg: Any?): SExpr {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: TextBlockLiteralExpr, arg: Any?): SExpr {
+        return SAtom(SmtType.STRING, null, ("\"" + n.asString()).toString() + "\"")
+    }
+
+
+    override fun visit(n: RecordPatternExpr, arg: Any?): SExpr {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: TypePatternExpr, arg: Any?): SExpr {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlQuantifiedExpr, arg: Any?): SExpr? {
+        return boundedVars.bind(n.variables) {
+            when (n.binder as JmlDefaultBinder) {
+                JmlDefaultBinder.FORALL -> {
+                    val e: Expression =
+                        if (n.expressions.size == 2
+                        ) BinaryExpr(
+                            n.expressions[0],
+                            n.expressions[1],
+                            BinaryExpr.Operator.IMPLICATION
+                        )
+                        else n.expressions[0]
+                    e.setParentNode(n)
+                    return@bind termFactory.forall(
+                        translator.getVariable(n.variables),
+                        e.accept(this, arg)
+                    )
+                }
+
+                JmlDefaultBinder.EXISTS -> {
+                    val e1: Expression =
+                        if (n.expressions.size == 2
+                        ) BinaryExpr(n.expressions[0], n.expressions[1], BinaryExpr.Operator.AND)
+                        else n.expressions[0]
+                    e1.setParentNode(n)
+                    return@bind termFactory.forall(
+                        translator.getVariable(n.variables),
+                        e1.accept(this, arg)
+                    )
+                }
+
+                JmlDefaultBinder.BSUM, JmlDefaultBinder.MIN, JmlDefaultBinder.MAX, JmlDefaultBinder.PRODUCT ->
+                    return@bind translator.makeIntVar()
+
+                else -> return@bind null
+            }
+        }
+    }
+
+    override fun visit(n: JmlLabelExpr, arg: Any?): SExpr {
+        return n.expression.accept(this, arg)
+    }
+
+    override fun visit(n: JmlLetExpr, arg: Any?): SExpr {
+        return boundedVars.bind(n.variables) {
+            val vars = mutableListOf<SExpr>()
+            for (variable in n.variables.variables) {
+                vars.add(
+                    termFactory.list(
+                        null, SmtType.BOOL, variable.nameAsString,
+                        variable.initializer.get().accept(this, arg)
+                    )
+                )
+            }
+            val body: SExpr = n.body.accept(this, arg)
+            return@bind termFactory.let(vars, body)
+        }
+    }
+
+    override fun visit(n: JmlMultiCompareExpr, arg: Any?): SExpr {
+        return JMLUtils.unroll(n).accept(this, arg)
+    }
+
+    override fun visit(n: JmlBinaryInfixExpr, arg: Any?): SExpr {
+        val left: SExpr = n.left.accept(this, arg)
+        val right: SExpr = n.right.accept(this, arg)
+        return termFactory.list(null, SmtType.BOOL, n.operator.identifier, left, right)
+    }
+
+    override fun visit(n: JmlTypeExpr?, arg: Any?): SExpr {
+        return super.visit(n, arg)
+    }
+
+    companion object {
+        private val termFactory: SmtTermFactory = SmtTermFactory
+    }
+}
+
+internal class VariableStack {
+    private val seq = ArrayList<String>(16)
+
+    fun <T> bind(variables: VariableDeclarationExpr, block: () -> T): T {
+        val curPosition = seq.size
+        for (variable in variables.variables) seq.add(variable.nameAsString)
+        val v = block()
+        truncate(curPosition)
+        return v
+    }
+
+    fun <T> bind(variables: NodeList<Parameter>, block: () -> T): T {
+        val curPosition = seq.size
+        for (variable in variables) seq.add(variable.nameAsString)
+        val value = block()
+        truncate(curPosition)
+        return value
+    }
+
+    private fun truncate(curPosition: Int) {
+        while (seq.size > curPosition) {
+            seq.removeAt(seq.size - 1)
+        }
+    }
+
+    fun contains(nameAsString: String): Boolean {
+        return seq.contains(nameAsString)
+    }
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/SMTFacade.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/SMTFacade.kt
new file mode 100644
index 0000000000..6615274acf
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/SMTFacade.kt
@@ -0,0 +1,18 @@
+package io.github.jmltoolkit.smt
+
+import com.github.javaparser.ast.expr.Expression
+import io.github.jmltoolkit.smt.model.SExpr
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (07.08.22)
+ */
+object SMTFacade {
+    fun toSmt(expr: Expression, smtLog: SmtQuery, useInt: Boolean): SExpr {
+        val visitor = JmlExpr2Smt(
+            smtLog, if (useInt) IntArithmeticTranslator(smtLog)
+            else BitVectorArithmeticTranslator(smtLog)
+        )
+        return expr.accept(visitor, null)
+    }
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/SmtQuery.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/SmtQuery.kt
new file mode 100644
index 0000000000..1e86cdf8dc
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/SmtQuery.kt
@@ -0,0 +1,87 @@
+package io.github.jmltoolkit.smt
+
+import io.github.jmltoolkit.smt.model.SExpr
+import io.github.jmltoolkit.smt.model.SmtType
+import io.github.jmltoolkit.smt.solver.AppendableTo
+import java.io.PrintWriter
+import java.io.StringWriter
+import java.util.function.Consumer
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (07.08.22)
+ */
+class SmtQuery : AppendableTo {
+    private val commands: MutableList<SExpr> = ArrayList(1024)
+    private val variableStack: MutableList<MutableMap<String, SmtType>> = ArrayList()
+
+    init {
+        variableStack.add(HashMap())
+    }
+
+    fun declareConst(name: String, type: SmtType): Boolean {
+        if (!declared(name)) {
+            val a = term.list(
+                null, SmtType.COMMAND,
+                "declare-const", name, term.type(type)
+            )
+            commands.add(a)
+            currentFrame[name] = type
+            return true
+        }
+        return false
+    }
+
+    fun push() {
+        variableStack.add(HashMap())
+        commands.add(term.command("push"))
+    }
+
+    fun pop() {
+        variableStack.remove(currentFrame)
+        commands.add(term.command("pop"))
+    }
+
+    private fun declared(name: String): Boolean {
+        return currentFrame.containsKey(name)
+    }
+
+    private val currentFrame
+        get() = variableStack[variableStack.size - 1]
+
+    override fun appendTo(writer: PrintWriter) {
+        for (command in commands) {
+            command.appendTo(writer)
+            writer.println()
+        }
+    }
+
+
+    fun defineThis() {
+        declareConst("this", SmtType.JAVA_OBJECT)
+        addAssert(term.nonNull(term.variable(SmtType.JAVA_OBJECT, null, "this")))
+    }
+
+    fun addAssert(nonNull: SExpr) {
+        commands.add(term.command("assert", nonNull))
+    }
+
+    fun checkSat() {
+        commands.add(term.command("check-sat"))
+    }
+
+
+    override fun toString(): String {
+        val sw = StringWriter()
+        val pw = PrintWriter(sw)
+        commands.forEach(Consumer { a: SExpr ->
+            a.appendTo(pw)
+            pw.println()
+        })
+        return sw.toString()
+    }
+
+    companion object {
+        private val term: SmtTermFactory = SmtTermFactory
+    }
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/SmtTermFactory.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/SmtTermFactory.kt
new file mode 100644
index 0000000000..9638dfabb1
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/SmtTermFactory.kt
@@ -0,0 +1,378 @@
+package io.github.jmltoolkit.smt
+
+import com.github.javaparser.resolution.types.ResolvedPrimitiveType.BOOLEAN
+import com.github.javaparser.resolution.types.ResolvedPrimitiveType.INT
+import com.github.javaparser.resolution.types.ResolvedType
+import com.google.common.cache.Cache
+import com.google.common.cache.CacheBuilder
+import io.github.jmltoolkit.smt.model.SAtom
+import io.github.jmltoolkit.smt.model.SExpr
+import io.github.jmltoolkit.smt.model.SList
+import io.github.jmltoolkit.smt.model.SmtType
+import io.github.jmltoolkit.smt.model.SmtType.BitVec
+import java.math.BigInteger
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (07.08.22)
+ */
+object SmtTermFactory {
+    private val symbolAndValueCache: Cache<String, SAtom> = CacheBuilder.newBuilder().softValues().build()
+
+    //region boolean operators
+    fun and(vararg terms: SExpr): SExpr = and(terms.toList())
+    fun and(seq: List<SExpr>): SExpr = fnApply(BOOLEAN, SmtType.BOOL, "and", seq)
+
+    fun or(vararg terms: SExpr): SExpr = or(terms.toList())
+    fun or(terms: List<SExpr>) = fnApply(BOOLEAN, SmtType.BOOL, "or", terms)
+
+    fun impl(premise: SExpr, concl: SExpr): SExpr = fnApply(BOOLEAN, SmtType.BOOL, "=>", premise, concl)
+
+    //endregion
+    fun ite(cond: SExpr, then: SExpr, otherwise: SExpr): SExpr =
+        fnApply(then.javaType!!, then.smtType!!, "ite", cond, then, otherwise)
+
+    fun fnApply(javaType: ResolvedType?, smtType: SmtType, fn: String, arg: SExpr): SExpr =
+        SList(smtType, javaType, listOf(symbol(fn), arg))
+
+    private fun fnApply(javaType: ResolvedType?, smtType: SmtType, fn: String, arg1: SExpr, arg2: SExpr): SExpr =
+        SList(smtType, javaType, listOf(symbol(fn), arg1, arg2))
+
+    private fun fnApply(
+        javaType: ResolvedType?,
+        smtType: SmtType,
+        fn: String,
+        arg1: SExpr,
+        arg2: SExpr,
+        arg3: SExpr
+    ): SExpr = SList(smtType, javaType, listOf(symbol(fn), arg1, arg2, arg3))
+
+    private fun fnApply(javaType: ResolvedType?, smtType: SmtType, fn: String, args: List<SExpr>): SExpr {
+        val nargs = mutableListOf<SExpr>(symbol(fn))
+        nargs.addAll(args)
+        return SList(smtType, javaType, nargs)
+    }
+
+    fun symbol(fn: String): SAtom = symbolAndValueCache.get(fn) { SAtom(SmtType.SYMBOL, null, fn) }
+
+    fun forall(variables: List<SExpr>, formula: SExpr): SExpr =
+        fnApply(BOOLEAN, SmtType.BOOL, "forall", list(variables), formula)
+
+    fun exists(variables: List<SExpr>, formula: SExpr): SExpr =
+        fnApply(BOOLEAN, SmtType.BOOL, "exists", list(variables), formula)
+
+
+    fun list(javaType: ResolvedType, smtType: SmtType, symbol: SAtom, args: Array<SExpr>): SExpr {
+        val nargs = mutableListOf<SExpr>()
+        nargs.add(symbol)
+        nargs.addAll(args)
+        return SList(smtType, javaType, nargs)
+    }
+
+    //TODO weigl correct?
+    fun list(variables: List<SExpr>): SExpr {
+        return SList(null, null, listOf())
+    }
+
+    //region polymorphic operators
+    fun bor(left: SExpr, right: SExpr): SExpr {
+        if (isBool(left, right)) return or(left, right)
+        if (isBv(left, right)) return bvor(left, right)
+        return typeException()
+    }
+
+
+    fun add(left: SExpr, right: SExpr): SExpr {
+        if (isInt(left, right)) return iadd(left, right)
+        if (isBv(left, right)) return bvadd(left, right)
+        return typeException()
+    }
+
+    fun subtract(left: SExpr, right: SExpr): SExpr {
+        if (isInt(left, right)) return isubstract(left, right)
+        if (isBv(left, right)) return bvsubstract(left, right)
+        return typeException()
+    }
+
+    fun modulo(left: SExpr, right: SExpr, b: Boolean): SExpr {
+        if (isInt(left, right)) return imodulo(left, right)
+        if (isBv(left, right)) return bvmodulo(left, right)
+        return typeException()
+    }
+
+    fun shiftLeft(left: SExpr, right: SExpr): SExpr {
+        if (isBv(left, right)) return bvshiftLeft(left, right)
+        return typeException()
+    }
+
+
+    fun shiftRight(left: SExpr, right: SExpr, sign: Boolean): SExpr {
+        if (isBv(left, right)) return bvshiftRight(left, right, sign)
+        return typeException()
+    }
+
+    fun lessOrEquals(left: SExpr, right: SExpr, sign: Boolean): SExpr {
+        if (isInt(left, right)) return ilessOrEquals(left, right)
+        if (isBv(left, right)) return bvlessOrEquals(left, right)
+        return typeException("Could not handle types '%s <= %s'", left.smtType, right.smtType)
+    }
+
+    fun greaterOrEquals(left: SExpr, right: SExpr, b: Boolean): SExpr {
+        if (isInt(left, right)) return igreaterOrEquals(left, right)
+        if (isBv(left, right)) return bvgreaterOrEquals(left, right)
+        return typeException()
+    }
+
+    fun lessThan(left: SExpr, right: SExpr): SExpr {
+        if (isInt(left, right)) return ilessThan(left, right)
+        if (isBv(left, right)) return bvlessThan(left, right)
+        return typeException("Could not handle types '%s <%s'", left.smtType!!, right.smtType!!)
+    }
+
+    fun equiv(left: SExpr, right: SExpr): SExpr = fnApply(BOOLEAN, SmtType.BOOL, "=", left, right)
+
+    fun not(expr: SExpr): SExpr {
+        if (isBv(expr)) return bvnot(expr)
+        if (isBool(expr)) return fnApply(BOOLEAN, SmtType.BOOL, "not", expr)
+        return typeException()
+    }
+
+
+    fun xor(left: SExpr, right: SExpr): SExpr = fnApply(BOOLEAN, SmtType.BOOL, "xor", left, right)
+
+    fun equality(left: SExpr, right: SExpr): SExpr = fnApply(BOOLEAN, SmtType.BOOL, "=", left, right)
+
+    fun band(left: SExpr, right: SExpr): SExpr {
+        if (isBool(left, right)) return and(left, right)
+
+        if (isBv(left, right)) return bvand(left, right)
+
+        return typeException()
+    }
+
+
+    private fun fnApplyToBool(symbol: String, left: SExpr, right: SExpr): SExpr =
+        fnApply(BOOLEAN, SmtType.BOOL, symbol, left, right)
+
+    fun greaterThan(left: SExpr, right: SExpr): SExpr {
+        if (isInt(left, right)) return igreaterThan(left, right)
+        if (isBv(left, right)) return bvgreaterThan(left, right)
+        return typeException("Could not handle types '%s > %s'", left.smtType, right.smtType)
+    }
+
+
+    fun negate(sexpr: SExpr): SExpr {
+        if (isBool(sexpr)) return not(sexpr)
+        if (isBv(sexpr)) return bvnegate(sexpr)
+        return typeException()
+    }
+
+
+    fun multiply(left: SExpr, right: SExpr): SExpr {
+        if (isInt(left, right)) return imultiply(left, right)
+        if (isBv(left, right)) return bvmultiply(left, right)
+        return typeException()
+    }
+
+    fun divide(left: SExpr, right: SExpr, b: Boolean): SExpr {
+        if (isInt(left, right)) return idivide(left, right)
+        if (isBv(left, right)) return bvdivide(left, right)
+        return typeException()
+    }
+
+
+    //endregion
+    //region integer operations
+    fun intValue(svalue: String): SAtom = symbolAndValueCache.get(svalue) { SAtom(SmtType.INT, INT, svalue) }
+
+    fun intValue(value: Long): SAtom = intValue("" + value)
+
+    fun intValue(value: BigInteger): SAtom = intValue("" + value)
+
+    fun iadd(left: SExpr, right: SExpr): SExpr = fnApplyToInt("+", left, right)
+
+    fun ilessThan(left: SExpr, right: SExpr): SExpr = fnApplyToBool("<", left, right)
+
+    fun ilessOrEquals(left: SExpr, right: SExpr): SExpr = fnApplyToBool("<=", left, right)
+
+    fun igreaterThan(left: SExpr, right: SExpr): SExpr = fnApplyToBool(">", left, right)
+
+    fun igreaterOrEquals(left: SExpr, right: SExpr): SExpr = fnApplyToBool(">=", left, right)
+
+    fun isubstract(left: SExpr, right: SExpr): SExpr = fnApplyToInt("-", left, right)
+
+    fun imultiply(left: SExpr, right: SExpr): SExpr = fnApplyToInt("*", left, right)
+
+    fun intType(): SExpr = symbol("Int")
+
+    fun imodulo(left: SExpr, right: SExpr): SExpr = fnApplyToInt("mod", left, right)
+
+    fun idivide(left: SExpr, right: SExpr): SExpr = fnApplyToInt("/", left, right)
+
+    //endregion
+    //region bit vectors
+    fun bvor(left: SExpr, right: SExpr): SExpr = fnApplyToBV("bvor", left, right)
+
+    fun bvnot(expr: SExpr): SExpr = fnApplyToBV("bvnot", expr)
+
+    fun bvnegate(sexpr: SExpr): SExpr = fnApplyToBV("bvneg", sexpr)
+
+    fun bvlessThan(left: SExpr, right: SExpr): SExpr = fnApplyToBool("bvslt", left, right)
+
+    fun bvlessOrEquals(left: SExpr, right: SExpr): SExpr = fnApplyToBool("bvsle", left, right)
+
+    fun bvgreaterThan(left: SExpr, right: SExpr): SExpr = fnApplyToBool("bvsgt", left, right)
+
+    fun bvgreaterOrEquals(left: SExpr, right: SExpr): SExpr = fnApplyToBool("bvsge", left, right)
+
+    fun bvshiftRight(left: SExpr, right: SExpr, sign: Boolean): SExpr =
+        fnApplyToBV(if (sign) "bvashr" else "bvshr", left, right)
+
+    fun bvshiftLeft(left: SExpr, right: SExpr): SExpr = fnApplyToBV("bvshl", left, right)
+
+    fun bvand(left: SExpr, right: SExpr): SExpr = fnApplyToBV("bvand", left, right)
+
+    fun bvadd(left: SExpr, right: SExpr): SExpr = fnApplyToBV("bvadd", left, right)
+
+    private fun bvsubstract(left: SExpr, right: SExpr): SExpr = fnApplyToBV("bvsub", left, right)
+
+    private fun bvmultiply(left: SExpr, right: SExpr): SExpr = fnApplyToBV("bvmul", left, right)
+
+    private fun bvdivide(left: SExpr, right: SExpr): SExpr = fnApplyToBV("bvsdiv", left, right)
+
+    private fun bvmodulo(left: SExpr, right: SExpr): SExpr = fnApplyToBV("bvsrem", left, right)
+
+    private fun fnApplyToBV(symbol: String, left: SExpr): SExpr = fnApply(null, left.smtType!!, symbol, left)
+
+
+    fun makeBitvector(width: Int, value: Long): SExpr = makeBitvector(width, BigInteger.valueOf(value))
+
+
+    fun makeBitvector(width: Int, value: BigInteger): SExpr {
+        val type = SmtType.getBitVec(width)
+        return SList(
+            type, null,
+            listOf(
+                SList(null, null, listOf(symbol("_"), symbol("int2bv"), symbol("" + width))),
+                intValue(value)
+            )
+        )
+    }
+
+
+    fun bvType(width: Int): SExpr =
+        SList(SmtType.TYPE, null, listOf(symbol("_"), symbol("BitVec"), intValue(width.toLong())))
+
+    //endregion
+    private fun isBool(sexpr: SExpr): Boolean = sexpr.smtType == SmtType.BOOL
+
+    private fun isBool(left: SExpr, right: SExpr): Boolean = left.smtType === right.smtType && isBool(left)
+
+    private fun isBv(left: SExpr, right: SExpr): Boolean = left.smtType === right.smtType && isBv(left)
+
+    private fun isBv(left: SExpr): Boolean = left.smtType is BitVec
+
+    private fun isInt(left: SExpr, right: SExpr): Boolean = left.smtType === right.smtType && isInt(left)
+
+    private fun isInt(left: SExpr): Boolean = left.smtType === SmtType.INT
+
+    private fun typeException(): SExpr {
+        throw RuntimeException("Type mismatch!")
+    }
+
+
+    private fun fnApplyToInt(symbol: String, left: SExpr, right: SExpr): SExpr =
+        fnApply(INT, SmtType.INT, symbol, left, right)
+
+    private fun fnApplyToBV(symbol: String, left: SExpr, right: SExpr): SExpr =
+        fnApply(null, left.smtType!!, symbol, left, right)
+
+
+    fun fpType(width: Int): SExpr =
+        SList(SmtType.TYPE, null, listOf(symbol("_"), symbol("FloatingPoint"), intValue(width.toLong())))
+
+    fun arrayType(from: SExpr, to: SExpr): SExpr = SList(SmtType.TYPE, null, listOf(symbol("Array"), from, to))
+
+
+    fun list(javaType: ResolvedType?, stype: SmtType, vararg args: Any): SExpr {
+        val nargs = mutableListOf<SExpr>()
+        for (i in args.indices) {
+            val arg = args[i]
+            nargs.add(
+                when (arg) {
+                    is SExpr -> arg
+                    is String -> symbol(arg)
+                    else -> typeException("Unhandled type %s", arg.javaClass)
+                }
+            )
+        }
+        return SList(stype, javaType, nargs)
+    }
+
+    fun makeTrue(): SExpr = makeBoolean(true)
+
+
+    fun makeFalse(): SExpr = makeBoolean(false)
+
+    fun makeBoolean(value: Boolean): SExpr {
+        val v = if (value) "true" else "false"
+        return symbolAndValueCache.get(v) { SAtom(SmtType.BOOL, BOOLEAN, v) }
+    }
+
+    fun makeInt(value: String): SExpr = intValue(value)
+
+    fun makeNull(): SExpr = symbol("null")
+
+    fun makeThis(): SExpr = symbol("this")
+
+    fun makeSuper(): SExpr = symbol("super")
+
+    fun boolType(): SExpr = symbol("Bool")
+
+    fun javaObjectType(): SExpr = symbol("Object")
+
+    fun type(type: SmtType): SExpr {
+        if (type === SmtType.JAVA_OBJECT) return javaObjectType()
+        if (type === SmtType.INT) return intType()
+        if (type === SmtType.REAL) return realType()
+        if (type === SmtType.FP32) return fpType(32)
+        if (type === SmtType.FP64) return fpType(64)
+        if (type === SmtType.BOOL) return boolType()
+        if (type is SmtType.Array) return arrayType(
+            type(type.from),
+            type(type.to)
+        )
+        if (type is BitVec) return bvType(type.width)
+
+        return typeException()
+    }
+
+
+    private fun realType(): SExpr = symbol("Int")
+
+    fun variable(type: SmtType, javaType: ResolvedType?, name: String): SExpr =
+        //nocache, conflict in type could be created
+        SAtom(type, javaType, name)
+
+    fun command(symbol: String, vararg args: SExpr): SExpr =
+        fnApply(null, SmtType.COMMAND, symbol, args.toList())
+
+    fun select(stype: SmtType, javaType: ResolvedType?, array: SExpr, index: SExpr): SExpr =
+        list(javaType, stype, symbol("select"), array, index)
+
+    fun store(array: SExpr, index: SExpr, value: SExpr): SExpr =
+        list(array.javaType, array.smtType!!, symbol("store"), array, index, value)
+
+    fun fieldAccess(javaType: ResolvedType?, stype: SmtType, field: String, obj: SExpr): SExpr =
+        fnApply(javaType, stype, field, obj)
+
+    private fun typeException(fmt: String, vararg args: Any?): SExpr {
+        throw RuntimeException(String.format(fmt, *args))
+    }
+
+    fun let(vars: List<SExpr>, body: SExpr): SExpr = list(body.javaType, body.smtType!!, "let", list(vars), body)
+
+    fun nonNull(expr: SExpr): SExpr = not(equality(expr, makeNull()))
+
+    fun binder(type: SmtType, name: String): SExpr = list(null, SmtType.JAVA_OBJECT, name, type(type))
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/Z3.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/Z3.kt
new file mode 100644
index 0000000000..4f716c01f0
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/Z3.kt
@@ -0,0 +1,18 @@
+package io.github.jmltoolkit.smt
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (28.01.24)
+ */
+object Z3 {
+    private var z3Installed: Boolean? = null
+    fun z3Installed(): Boolean {
+        if (z3Installed != null) return z3Installed!!
+        try {
+            return (ProcessBuilder("sh", "-c", "which z3").start().waitFor() == 0).also { z3Installed = it }
+        } catch (e: Exception) {
+        }
+        return false.also { z3Installed = it }
+    }
+}
\ No newline at end of file
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/model/SAtom.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/model/SAtom.kt
new file mode 100644
index 0000000000..224af312ec
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/model/SAtom.kt
@@ -0,0 +1,14 @@
+package io.github.jmltoolkit.smt.model
+
+import com.github.javaparser.resolution.types.ResolvedType
+import java.io.PrintWriter
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (07.08.22)
+ */
+class SAtom(stype: SmtType?, javaType: ResolvedType?, val value: String) : SExpr(javaType, stype) {
+    override fun appendTo(writer: PrintWriter) {
+        writer.write(value)
+    }
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/model/SExpr.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/model/SExpr.kt
new file mode 100644
index 0000000000..2ee0dc3f57
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/model/SExpr.kt
@@ -0,0 +1,30 @@
+package io.github.jmltoolkit.smt.model
+
+import com.github.javaparser.resolution.types.ResolvedType
+import io.github.jmltoolkit.smt.solver.AppendableTo
+import java.io.PrintWriter
+import java.io.StringWriter
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (07.08.22)
+ */
+abstract class SExpr(
+    var javaType: ResolvedType? = null,
+    var smtType: SmtType? = null
+) : AppendableTo {
+
+    fun asList(): SList {
+        return this as SList
+    }
+
+    fun asSymbolValue(): String {
+        return (this as SAtom).value
+    }
+
+    override fun toString(): String {
+        val sw = StringWriter()
+        appendTo(PrintWriter(sw))
+        return sw.toString()
+    }
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/model/SList.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/model/SList.kt
new file mode 100644
index 0000000000..7192796a61
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/model/SList.kt
@@ -0,0 +1,23 @@
+package io.github.jmltoolkit.smt.model
+
+import com.github.javaparser.resolution.types.ResolvedType
+import java.io.PrintWriter
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (07.08.22)
+ */
+class SList(stype: SmtType?, javaType: ResolvedType?, private val value: List<SExpr>) : SExpr(javaType, stype) {
+    override fun appendTo(writer: PrintWriter) {
+        writer.write('('.code)
+        for (i in value.indices) {
+            value[i].appendTo(writer)
+            if (i < value.size - 1) writer.write(' '.code)
+        }
+        writer.write(')'.code)
+    }
+
+    fun get(i: Int): SExpr {
+        return value[i]
+    }
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/model/SmtType.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/model/SmtType.kt
new file mode 100644
index 0000000000..24cf256c7d
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/model/SmtType.kt
@@ -0,0 +1,38 @@
+package io.github.jmltoolkit.smt.model
+
+open class SmtType private constructor(private val name: String) {
+    class BitVec internal constructor(val width: Int) : SmtType("(_ BitVec $width)")
+
+
+    override fun toString(): String {
+        return name
+    }
+
+    class Array(val from: SmtType, val to: SmtType) : SmtType("(Array " + from.name + " " + to.name + ")")
+
+    companion object {
+        val FP32: SmtType = SmtType("(_ FloatingPoint 32)")
+        val FP64: SmtType = SmtType("(_ FloatingPoint 64)")
+        val STRING: SmtType = SmtType("String")
+
+        private val bvCache: MutableMap<Int, BitVec> = HashMap(8)
+
+        val COMMAND: SmtType = SmtType("_COMMAND_")
+        val INT: SmtType = SmtType("Int")
+        val REAL: SmtType = SmtType("Real")
+        val BOOL: SmtType = SmtType("Bool")
+        val BV8: SmtType = getBitVec(8)
+        val BV16: SmtType = getBitVec(16)
+        val BV32: SmtType = getBitVec(32)
+        val BV64: SmtType = getBitVec(64)
+        val SYMBOL: SmtType = SmtType("_SYMBOL_")
+        val TYPE: SmtType = SmtType("_TYPE_")
+
+        val JAVA_OBJECT: SmtType = SmtType("_TYPE_")
+
+
+        fun getBitVec(width: Int): BitVec {
+            return bvCache.computeIfAbsent(width) { width: Int -> BitVec(width) }
+        }
+    }
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/solver/AppendableTo.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/solver/AppendableTo.kt
new file mode 100644
index 0000000000..8fbbf1c9dc
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/solver/AppendableTo.kt
@@ -0,0 +1,11 @@
+package io.github.jmltoolkit.smt.solver
+
+import java.io.PrintWriter
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (08.08.22)
+ */
+fun interface AppendableTo {
+    fun appendTo(writer: PrintWriter)
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/solver/SExprParser.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/solver/SExprParser.kt
new file mode 100644
index 0000000000..ab83575c1d
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/solver/SExprParser.kt
@@ -0,0 +1,173 @@
+package io.github.jmltoolkit.smt.solver
+
+import io.github.jmltoolkit.smt.model.SAtom
+import io.github.jmltoolkit.smt.model.SExpr
+import io.github.jmltoolkit.smt.model.SList
+import java.io.IOException
+import java.io.PushbackReader
+import java.io.Reader
+import java.io.StringReader
+import java.util.function.Predicate
+
+object SExprParser {
+    @Throws(IOException::class)
+    fun parse(input: String): SExpr? {
+        return parse(StringReader(input))
+    }
+
+    @Throws(IOException::class)
+    fun parse(reader: Reader): SExpr? {
+        return parse(PushbackReader(reader))
+    }
+
+    @Throws(IOException::class)
+    fun parse(reader: PushbackReader): SExpr? {
+        val eof = (-1).toChar().code
+        var c = peekChar(reader)
+        if (c == eof) // end of input
+            return null
+        else if (c == '('.code) {
+            consumeChar(reader) // consume '('
+            val seq = arrayListOf<SExpr>()
+            do {
+                c = peekChar(reader)
+                if (c == ')'.code) {
+                    consumeChar(reader)
+                    break
+                }
+                val child: SExpr = parse(reader) ?: throw IllegalArgumentException("List not closed.")
+                seq.add(child)
+            } while (true)
+            return SList(null, null, listOf())
+        } else if (Character.isDigit(c) || c == '-'.code) {
+            return parseNumber(reader)
+        } else if (Character.isAlphabetic(c) || c == ':'.code) {
+            return parseSymbol(reader)
+        } else if (c == '"'.code) {
+            return parseString(reader)
+        } else {
+        }
+        throw IllegalStateException(String.format("Unexpected character: %c (%d)", c, c))
+    }
+
+    @Throws(IOException::class)
+    private fun parseString(reader: PushbackReader): SExpr {
+        val symbol = StringBuilder("\"")
+        consumeChar(reader)
+        var c: Int
+        do {
+            c = reader.read()
+            if (c == -1) throw RuntimeException("String literal early aborted")
+            symbol.append(c.toChar())
+        } while (c != '"'.code)
+        return SAtom(null, null, symbol.toString())
+    }
+
+    @Throws(IOException::class)
+    private fun consumeChar(reader: PushbackReader): Int {
+        return reader.read()
+    }
+
+    @Throws(IOException::class)
+    private fun peekChar(reader: PushbackReader): Int {
+        consumeEmptiness(reader)
+        val c = reader.read()
+        reader.unread(c)
+        return c
+    }
+
+    @Throws(IOException::class)
+    private fun consumeEmptiness(reader: PushbackReader) {
+        var c: Int
+        do {
+            consumeWhitespace(reader)
+            consumeComment(reader)
+            c = reader.read()
+            reader.unread(c)
+        } while (Character.isWhitespace(c) || c == ';'.code)
+    }
+
+    @Throws(IOException::class)
+    private fun consumeWhitespace(reader: PushbackReader) {
+        consumeUntil(reader) { x: Int? ->
+            !Character.isWhitespace(
+                x!!
+            )
+        }
+    }
+
+    @Throws(IOException::class)
+    private fun consumeComment(reader: PushbackReader) {
+        val c: Int = reader.read()
+        if (c == ';'.code) {
+            consumeUntil(reader) { x: Int -> x != '\n'.code }
+        } else {
+            reader.unread(c)
+        }
+    }
+
+    @Throws(IOException::class)
+    private fun consumeUntil(reader: PushbackReader, pred: Predicate<Int>): Int {
+        var c: Int
+        do {
+            c = reader.read()
+        } while (!pred.test(c) && c != -1)
+        reader.unread(c)
+        return c
+    }
+
+    @Throws(IOException::class)
+    private fun parseNumber(reader: PushbackReader): SExpr {
+        var num = 0
+        var factor = 1
+        var c: Int = reader.read()
+        if (c == '-'.code) {
+            factor = -1
+        } else {
+            reader.unread(c)
+        }
+
+        do {
+            c = reader.read()
+            if (c == -1) break
+            if (c == ')'.code || Character.isWhitespace(c) || c == ':'.code) {
+                reader.unread(c)
+                break
+            }
+            if (Character.isDigit(c)) {
+                num = (num * 10) + (c - '0'.code)
+            } else {
+                throw IllegalStateException("Given number is invalid. Char " + c.toChar() + " found")
+            }
+        } while (true)
+        return SAtom(null, null, "" + (num * factor))
+    }
+
+    @Throws(IOException::class)
+    private fun parseSymbol(reader: PushbackReader): SExpr {
+        val symbol = StringBuilder()
+        do {
+            val c: Int = reader.read()
+            if (c == -1) break
+            if (c == ')'.code || Character.isWhitespace(c)) {
+                reader.unread(c)
+                break
+            }
+            symbol.append(c.toChar())
+        } while (true)
+        return SAtom(null, null, symbol.toString())
+    }
+
+    @Throws(IOException::class)
+    fun parseAll(input: Reader): List<SExpr> {
+        val r = PushbackReader(input)
+        val exprs: MutableList<SExpr> = ArrayList(1024)
+        var c: Int
+        while ((r.read().also { c = it }) != -1) {
+            r.unread(c)
+            val sexpr: SExpr = parse(r) ?: break
+            exprs.add(sexpr)
+        }
+        return exprs
+    }
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/solver/Solver.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/solver/Solver.kt
new file mode 100644
index 0000000000..b51fcf0d48
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/solver/Solver.kt
@@ -0,0 +1,44 @@
+package io.github.jmltoolkit.smt.solver
+
+import java.io.IOException
+import java.io.InputStreamReader
+import java.io.PrintWriter
+import java.util.concurrent.ForkJoinPool
+import java.util.concurrent.ForkJoinTask
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (08.08.22)
+ */
+class Solver {
+    fun runAsync(input: String): ForkJoinTask<SolverAnswer> {
+        return ForkJoinPool.commonPool().submit<SolverAnswer> { run(input) }
+    }
+
+    @Throws(IOException::class)
+    fun run(input: String): SolverAnswer {
+        return run { writer: PrintWriter -> writer.println(input) }
+    }
+
+    @Throws(IOException::class)
+    protected fun startSmtSolver(): Process {
+        val pb = ProcessBuilder("sh", "-c", "z3 -smt2 -in")
+        return pb.start()
+    }
+
+    @Throws(IOException::class)
+    fun run(query: AppendableTo): SolverAnswer {
+        val p = startSmtSolver()
+        try {
+            PrintWriter(p.outputStream).use { out ->
+                InputStreamReader(p.inputStream).use {
+                    query.appendTo(out)
+                    out.close()
+                    return SolverAnswer(SExprParser.parseAll(it))
+                }
+            }
+        } finally {
+            p.destroyForcibly()
+        }
+    }
+}
diff --git a/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/solver/SolverAnswer.kt b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/solver/SolverAnswer.kt
new file mode 100644
index 0000000000..a0981e21fe
--- /dev/null
+++ b/tools/smt/src/main/kotlin/io/github/jmltoolkit/smt/solver/SolverAnswer.kt
@@ -0,0 +1,78 @@
+package io.github.jmltoolkit.smt.solver
+
+import io.github.jmltoolkit.smt.model.SAtom
+import io.github.jmltoolkit.smt.model.SExpr
+import java.io.PrintWriter
+import java.io.StringWriter
+import java.util.function.Consumer
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (08.08.22)
+ */
+class SolverAnswer(private val answers: List<SExpr>) {
+    private var currentPos = 0
+    fun expectSat(): SolverAnswer {
+        return expectSymbol("sat")
+    }
+
+    fun expectUnsat(): SolverAnswer {
+        return expectSymbol("unsat")
+    }
+
+    fun expectUnknown(): SolverAnswer {
+        return expectSymbol("unknown")
+    }
+
+    fun expectSymbol(symbol: String): SolverAnswer {
+        if (!isSymbol(symbol)) {
+            throw RuntimeException("Unexpected symbol")
+        }
+        return this
+    }
+
+    fun isSymbol(symbol: String): Boolean {
+        return symbol == (peek() as SAtom).value
+    }
+
+    fun peek(): SExpr {
+        return answers[currentPos]
+    }
+
+    fun consume() {
+        currentPos++
+    }
+
+    fun consumeErrors(): List<String> {
+        val seq: MutableList<String> = ArrayList()
+        while (currentPos < answers.size) {
+            if (isError) {
+                seq.add(errorMessage)
+                consume()
+            } else {
+                break
+            }
+        }
+        return seq
+    }
+
+    private val errorMessage: String
+        get() = peek().asList().get(1).asSymbolValue()
+
+    private val isError: Boolean
+        get() = try {
+            peek().asList().get(0).asSymbolValue().equals("error")
+        } catch (e: ClassCastException) {
+            false
+        }
+
+    override fun toString(): String {
+        val sw = StringWriter()
+        val pw = PrintWriter(sw)
+        answers.forEach(Consumer { a: SExpr ->
+            a.appendTo(pw)
+            pw.println()
+        })
+        return sw.toString()
+    }
+}
diff --git a/tools/smt/src/test/kotlin/SmtTest.kt b/tools/smt/src/test/kotlin/SmtTest.kt
new file mode 100644
index 0000000000..455d45cc75
--- /dev/null
+++ b/tools/smt/src/test/kotlin/SmtTest.kt
@@ -0,0 +1,81 @@
+import com.github.javaparser.JavaParser
+import com.github.javaparser.ParserConfiguration
+import com.github.javaparser.Problem
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.expr.Expression
+import com.github.javaparser.symbolsolver.JavaSymbolSolver
+import com.github.javaparser.symbolsolver.resolution.typesolvers.ClassLoaderTypeSolver
+import com.google.common.truth.Truth
+import io.github.jmltoolkit.smt.SMTFacade
+import io.github.jmltoolkit.smt.SmtQuery
+import io.github.jmltoolkit.smt.model.SExpr
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.DynamicTest
+import org.junit.jupiter.api.TestFactory
+import org.junit.jupiter.api.function.Executable
+import org.yaml.snakeyaml.Yaml
+import java.io.PrintWriter
+import java.io.StringWriter
+import java.util.function.Consumer
+import java.util.function.Function
+import java.util.stream.Stream
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (14.06.22)
+ */
+class SmtTest {
+    private val parser: JavaParser
+    private val parent: Node
+
+    init {
+        val config = ParserConfiguration()
+        config.setSymbolResolver(JavaSymbolSolver(ClassLoaderTypeSolver(ClassLoader.getSystemClassLoader())))
+        parser = JavaParser(config)
+
+        val r = parser.parse(javaClass.getResourceAsStream("Test.java"))
+        if (!r.isSuccessful) {
+            r.problems.forEach(Consumer { x: Problem? -> System.err.println(x) })
+            Assertions.fail<Any>("Error during parsing")
+        }
+        parent = r.result.get().getType(0)
+    }
+
+    @TestFactory
+    fun smtTranslation(): Stream<DynamicTest> {
+        javaClass.getResourceAsStream("expr.yaml").use { inputStream ->
+            val yaml = Yaml()
+            val obj: List<Map<String, Any>> = yaml.load(inputStream)
+            return obj.stream().map<DynamicTest>(Function<Map<String, Any>, DynamicTest> { m: Map<String, Any> ->
+                val a = m["expr"] as String
+                val result = m["result"] as String?
+                val resultInt = m["resultInt"] as String?
+                val resultBv = m["resultBv"] as String?
+                DynamicTest.dynamicTest(a) {
+                    if (resultInt != null) smtTranslation(a, resultInt, true)
+                    if (resultBv != null) smtTranslation(a, resultBv, false)
+                    if (result != null) smtTranslation(a, result, false)
+                }
+            })
+        }
+    }
+
+    fun smtTranslation(input: String?, expected: String, useInt: Boolean) {
+        val e = parser.parseJmlExpression<Expression>(input)
+        if (!e.isSuccessful) {
+            e.problems.forEach(Consumer { x: Problem? -> System.err.println(x) })
+            Assertions.fail<Any>("Error during parsing")
+        }
+        val expr = e.result.get()
+        expr.setParentNode(parent)
+        val smtLog = SmtQuery()
+        val actualExpr: SExpr = SMTFacade.toSmt(expr, smtLog, useInt)
+
+        val sw = StringWriter()
+        val pw = PrintWriter(sw)
+        smtLog.appendTo(pw)
+        actualExpr.appendTo(pw)
+        val actual = sw.toString()
+        Truth.assertThat(actual.trim { it <= ' ' }).isEqualTo(expected.trim { it <= ' ' })
+    }
+}
diff --git a/tools/smt/src/test/kotlin/SolverTest.kt b/tools/smt/src/test/kotlin/SolverTest.kt
new file mode 100644
index 0000000000..e63df712d6
--- /dev/null
+++ b/tools/smt/src/test/kotlin/SolverTest.kt
@@ -0,0 +1,21 @@
+package io.github.jmltoolkit.smt
+
+import io.github.jmltoolkit.smt.solver.*
+import org.junit.jupiter.api.Assumptions
+import org.junit.jupiter.api.Test
+import java.io.IOException
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (08.08.22)
+ */
+class SolverTest {
+    @Test
+    @Throws(IOException::class)
+    fun startZ3Mini() {
+        Assumptions.assumeTrue(Z3.z3Installed())
+        val s = Solver()
+        val result = s.run("(assert (= (* 2 3) 6)) (check-sat) (get-model) (exit)")
+        result.expectSat().consume()
+    }
+}
diff --git a/tools/smt/src/test/resources/Test.java b/tools/smt/src/test/resources/Test.java
new file mode 100644
index 0000000000..019b6b7d2e
--- /dev/null
+++ b/tools/smt/src/test/resources/Test.java
@@ -0,0 +1,5 @@
+public class Test {
+    Test self = new Test();
+    Object a, b;
+    int[] ary;
+}
\ No newline at end of file
diff --git a/tools/smt/src/test/resources/expr.yaml b/tools/smt/src/test/resources/expr.yaml
new file mode 100644
index 0000000000..a0ae652812
--- /dev/null
+++ b/tools/smt/src/test/resources/expr.yaml
@@ -0,0 +1,91 @@
+- expr: |
+    true
+  result: |
+    true
+- expr: |
+    2 + 3
+  resultBv: |
+    (bvadd ((_ int2bv 32) 2) ((_ int2bv 32) 3))
+  resultInt: |
+    (+ 2 3)
+- expr: |
+    a != null && b != null ==> a == b
+  result: |
+    (declare-const a Object)
+    (declare-const b Object)
+    (=> (and (not (= a null)) (not (= b null))) (= a b))
+
+- expr: |
+    ary[2] == 2
+  resultInt: |
+    (declare-const ary (Array Int Int))
+    (= (select ary 2) 2)
+  resultBv: |
+    (declare-const ary (Array (_ BitVec 32) (_ BitVec 32)))
+    (= (select ary ((_ int2bv 32) 2)) ((_ int2bv 32) 2))
+
+- expr: |
+    (\forall int i; 0<=i<ary.length; ary[i] == i)
+  resultInt: |
+    (declare-const ary (Array Int Int))
+    (forall ((i Int)) (=> (and (<= 0 i) (< i (int$length ary))) (= (select ary i) i)))
+  resultBv: |
+    (declare-const ary (Array (_ BitVec 32) (_ BitVec 32)))
+    (forall ((i (_ BitVec 32))) (=> (and (bvsle ((_ int2bv 32) 0) i) (bvslt i (bv$length ary))) (= (select ary i) i)))
+
+- expr: |
+    this.self.self.ary[0] == 1
+  resultInt: |
+    (= (select (ary (self (self this))) 0) 1)
+
+- expr: |
+    this.self.self.ary[0] == 1
+  resultInt: |
+    (= (select (ary (self (self this))) 0) 1)
+
+- expr: |
+    (new int[] {1,2,3}).length == 3
+  resultInt: |
+    (declare-const anon_array_1 (Array Int Int))
+    (assert (store anon_array_1 0 1))
+    (assert (store anon_array_1 1 2))
+    (assert (store anon_array_1 2 3))
+    (assert (= (int$length anon_array_1) 3))
+    (= (int$length anon_array_1) 3)
+
+- expr: |
+    (new int[3]).length == 3
+  resultInt: |
+    (declare-const anon_array_1 (Array Int Int))
+    (assert (= (int$length anon_array_1) 3))
+    (= (int$length anon_array_1) 3)
+
+- expr: |
+    (new int[3][2]).length == 3
+  resultInt: |
+    (declare-const anon_array_1 (Array Int (Array Int Int)))
+    (assert (= (int$length anon_array_1) 3))
+    (assert (forall ((idx0 Int)) (= (int$length (select anon_array_1 idx0)) 2)))
+    (= (int$length anon_array_1) 3)
+
+- expr: |
+    (\let int[][] x = { {1}, {2} }; x.length ) == 2
+  resultInt: |
+    (declare-const anon_array_2 (Array Int Int))
+    (assert (store anon_array_2 0 1))
+    (assert (= (int$length anon_array_2) 1))
+    (declare-const anon_array_3 (Array Int Int))
+    (assert (store anon_array_3 0 2))
+    (assert (= (int$length anon_array_3) 1))
+    (declare-const anon_array_1 (Array Int (Array Int Int)))
+    (assert (store anon_array_1 0 anon_array_2))
+    (assert (store anon_array_1 1 anon_array_3))
+    (assert (= (int$length anon_array_1) 2))
+    (= (let ((x anon_array_1)) (int$length x)) 2)
+
+
+
+- expr: |
+    (\let int x = 5; x)
+  resultInt: |
+    (let ((x 5)) x)
diff --git a/tools/stat/build.gradle.kts b/tools/stat/build.gradle.kts
new file mode 100644
index 0000000000..55d9eba3b3
--- /dev/null
+++ b/tools/stat/build.gradle.kts
@@ -0,0 +1,4 @@
+plugins {
+    id("standard-kotlin")
+}
+
diff --git a/tools/stat/src/main/kotlin/io/github/jmltoolkit/stat/ExpressionCosts.kt b/tools/stat/src/main/kotlin/io/github/jmltoolkit/stat/ExpressionCosts.kt
new file mode 100644
index 0000000000..5a8b9f6314
--- /dev/null
+++ b/tools/stat/src/main/kotlin/io/github/jmltoolkit/stat/ExpressionCosts.kt
@@ -0,0 +1,35 @@
+package io.github.jmltoolkit.stat
+
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (02.06.22)
+ */
+data class ExpressionCosts(
+    val sum: Int = 1,
+    val minus: Int = 1,
+    val divide: Int = 1,
+    val mult: Int = 1,
+    val mod: Int = 1,
+    val land: Int = 1,
+    val lor: Int = 1,
+    val lnot: Int = 1,
+    val band: Int = 1,
+    val bor: Int = 2,
+    val bnot: Int = 1,
+    val quantor: Int = 3,
+    val binderCostsPerVariable: Int = 1,
+    val nullLiteral: Int = 0,
+    val charLiteral: Int = 0,
+    val stringLiteral: Int = 0,
+    val integerLiteral: Int = 0,
+    val longLiteral: Int = 0,
+    val name: Int = 0,
+    val methodCall: Int = 2,
+    val conditional: Int = 2,
+    val cast: Int = 1,
+    val assign: Int = 1,
+    val let: Int = 1,
+    val compare: Int = 1,
+    val instanceof: Int = 1
+)
\ No newline at end of file
diff --git a/tools/stat/src/main/kotlin/io/github/jmltoolkit/stat/StatVisitor.kt b/tools/stat/src/main/kotlin/io/github/jmltoolkit/stat/StatVisitor.kt
new file mode 100644
index 0000000000..06f06327a7
--- /dev/null
+++ b/tools/stat/src/main/kotlin/io/github/jmltoolkit/stat/StatVisitor.kt
@@ -0,0 +1,436 @@
+package io.github.jmltoolkit.stat
+
+import com.github.javaparser.ast.CompilationUnit
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.NodeList
+import com.github.javaparser.ast.body.*
+import com.github.javaparser.ast.expr.*
+import com.github.javaparser.ast.jml.NodeWithJmlTags
+import com.github.javaparser.ast.jml.body.JmlClassExprDeclaration
+import com.github.javaparser.ast.jml.body.JmlFieldDeclaration
+import com.github.javaparser.ast.jml.body.JmlMethodDeclaration
+import com.github.javaparser.ast.jml.body.JmlRepresentsDeclaration
+import com.github.javaparser.ast.jml.clauses.*
+import com.github.javaparser.ast.jml.doc.*
+import com.github.javaparser.ast.jml.expr.*
+import com.github.javaparser.ast.jml.stmt.*
+import com.github.javaparser.ast.modules.ModuleDeclaration
+import com.github.javaparser.ast.nodeTypes.NodeWithModifiers
+import com.github.javaparser.ast.nodeTypes.NodeWithName
+import com.github.javaparser.ast.nodeTypes.NodeWithSimpleName
+import com.github.javaparser.ast.stmt.LocalClassDeclarationStmt
+import com.github.javaparser.ast.visitor.GenericVisitorAdapter
+import com.github.javaparser.ast.visitor.VoidVisitorAdapter
+import com.github.javaparser.jml.JmlDocSanitizer
+import org.w3c.dom.Document
+import org.w3c.dom.Element
+import java.util.*
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (24.05.22)
+ */
+class StatVisitor(
+    private val xmlDocument: Document,
+    private val keys: List<String>,
+    private val expressionCosts: ExpressionCosts
+) : VoidVisitorAdapter<Element>() {
+    //region Java Stuff
+    override fun visit(n: CompilationUnit, arg: Element) {
+        super.visit(n, newJavaContext(arg, n.javaClass.getSimpleName(), n.storage.get().fileName))
+    }
+
+    override fun visit(n: MethodDeclaration, arg: Element) {
+        val arg = newJavaContext(
+            arg, n.javaClass.getSimpleName(),
+            n.getDeclarationAsString(false, false, true)
+        )
+        super.visit(n, arg)
+    }
+
+    override fun visit(n: ClassOrInterfaceDeclaration, arg: Element) {
+        val e = newJavaContext(arg, n)
+        super.visit(n, e)
+    }
+
+    override fun visit(n: ConstructorDeclaration, arg: Element) {
+        var e = newJavaContext(
+            arg, n.javaClass.getSimpleName(),
+            n.getDeclarationAsString(false, false, true)
+        )
+        super.visit(n, e)
+    }
+
+    override fun visit(n: AnnotationDeclaration, arg: Element) {
+        val e = newJavaContext(arg, n)
+        super.visit(n, e)
+    }
+
+    override fun visit(n: AnnotationMemberDeclaration, arg: Element) {
+        super.visit(n, arg)
+    }
+
+    override fun visit(n: EnumDeclaration, arg: Element) {
+        super.visit(n, newJavaContext(arg, n))
+    }
+
+    override fun visit(n: LocalClassDeclarationStmt, arg: Element) {
+        super.visit(n, arg)
+    }
+
+    override fun visit(n: ModuleDeclaration, arg: Element) {
+        super.visit(n, newJavaContext(arg, n))
+    }
+
+    private fun newJavaContext(parent: Element, node: NodeWithName<*>): Element =
+        newJavaContext(parent, node.javaClass.getSimpleName(), node.nameAsString)
+
+    private fun newJavaContext(parent: Element, node: NodeWithSimpleName<*>): Element =
+        newJavaContext(parent, node.javaClass.getSimpleName(), node.nameAsString)
+
+    private fun newJavaContext(parent: Element, simpleName: String, name: String): Element {
+        val e = xmlDocument.createElement(simpleName)
+        e.setAttribute("name", name)
+        parent.appendChild(e)
+        return e
+    }
+
+    //endregion
+    //region plain text reporting
+    override fun visit(n: JmlDocDeclaration, arg: Element) {
+        reportPlainText(n, arg)
+    }
+
+    override fun visit(n: JmlDoc, arg: Element) {
+    }
+
+    override fun visit(n: JmlDocStmt, arg: Element) {
+        reportPlainText(n, arg)
+    }
+
+    override fun visit(n: JmlDocType, arg: Element) {
+        reportPlainText(n, arg)
+    }
+
+    private fun reportPlainText(n: JmlDocContainer, arg: Element) {
+        val doc = JmlDocSanitizer(keys.toSet())
+        val san: String = doc.asString(n.jmlComments, false)
+        val newlines = newlines(san)
+        val e = xmlDocument.createElement("jml-comment")
+        arg.appendChild(e)
+        e.setAttribute("newlines", "" + newlines)
+        e.setAttribute("type", n.javaClass.getSimpleName())
+        e.setAttribute("chars", "" + san.length)
+    }
+
+    //endregion
+    override fun visit(n: JmlClassExprDeclaration, arg: Element) {
+        if (active(n)) {
+            val e = newElement(arg, n.kind.identifier)
+            val expr = getExpressionStat(n.invariant)
+            e.appendChild(expr)
+            if (n.name.isPresent) {
+                e.setAttribute("name", n.name.get().asString())
+            }
+            setModifierAsAttributes(n, e)
+        }
+    }
+
+    private fun setModifierAsAttributes(n: NodeWithModifiers<*>, e: Element) {
+        for (modifier in n.modifiers) {
+            e.setAttribute("has" + modifier.keyword.asString(), "true")
+        }
+    }
+
+    private fun getExpressionStat(expr: Expression): Element {
+        val e = xmlDocument.createElement("expr")
+        val costs: Int = expr.accept(ExpressionComplexity(), expressionCosts)
+        val numOfVariables = numberOfVariables(expr)
+        val length = lengthOf(expr)
+        e.setAttribute("complexity", "" + costs)
+        e.setAttribute("numOfVariables", "" + numOfVariables)
+        e.setAttribute("length", "" + length)
+
+        val map = count(expr)
+        map.forEach { k, v -> e.setAttribute(k.simpleName, "" + v) }
+        return e
+    }
+
+    private fun lengthOf(expr: Expression): Int = expr.toString().length
+
+    private fun numberOfVariables(expr: Expression): Int {
+        var sum = 0
+        for (childNode in expr.childNodes) {
+            if (childNode is NameExpr) sum++
+            else if (childNode is Expression && !childNode.getChildNodes().isEmpty()) {
+                sum += numberOfVariables(childNode)
+            }
+        }
+        return sum
+    }
+
+    private fun newElement(parent: Element, tag: String): Element {
+        val e = xmlDocument.createElement(tag)
+        parent.appendChild(e)
+        return e
+    }
+
+    private fun active(n: NodeWithJmlTags<*>): Boolean = equal(keys, n.jmlTags)
+
+
+    override fun visit(n: JmlRepresentsDeclaration, arg: Element) {
+        if (active(n)) {
+            val a = newElement(arg, "represents")
+            a.setAttribute("name", n.nameAsString)
+            setModifierAsAttributes(n, a)
+        }
+    }
+
+    override fun visit(n: JmlMethodDeclaration, arg: Element) {
+        var e = arg
+        if (active(n)) {
+            e = newJavaContext(e, n.javaClass.getSimpleName(), n.methodDeclaration.nameAsString)
+            setModifierAsAttributes(n.methodDeclaration, e)
+            super.visit(n.methodDeclaration, e)
+        }
+    }
+
+
+    override fun visit(n: JmlContract, arg: Element) {
+        if (active(n)) {
+            var name = "contract_" + n.range.get().begin.line
+            if (n.name.isPresent) {
+                name = n.name.get().identifier
+            }
+            val e = newJavaContext(arg, n.javaClass.getSimpleName(), name)
+            e.setAttribute("type", n.type.toString())
+            setModifierAsAttributes(n, e)
+            e.setAttribute("behavior", "" + n.behavior)
+            super.visit(n, e)
+        }
+    }
+
+    override fun visit(n: JmlExpressionStmt, arg: Element) {
+        if (active(n)) {
+            val e = newElement(arg, n.kind.jmlSymbol())
+            e.appendChild(getExpressionStat(n.expression))
+        }
+    }
+
+    override fun visit(n: JmlUnreachableStmt, arg: Element) {
+        if (active(n)) {
+            val e = newElement(arg, "jml-unreachable")
+        }
+    }
+
+    override fun visit(n: JmlBeginStmt, arg: Element) {
+        if (active(n)) {
+            newElement(arg, "jml-begin")
+        }
+    }
+
+    override fun visit(n: JmlEndStmt, arg: Element) {
+        if (active(n)) {
+            newElement(arg, "jml-end")
+        }
+    }
+
+    override fun visit(n: JmlGhostStmt, arg: Element) {
+        if (active(n)) {
+            val e = newElement(arg, "jml-ghost")
+            e.setAttribute("statements", "")
+            super.visit(n, e)
+        }
+    }
+
+
+    override fun visit(n: JmlLabelStmt, arg: Element) {
+        if (active(n)) {
+            newElement(arg, "jml-label")
+        }
+    }
+
+    override fun visit(n: JmlSimpleExprClause, arg: Element) {
+        val e = newElement(arg, n.kind.jmlSymbol)
+        e.appendChild(getExpressionStat(n.expression))
+    }
+
+    override fun visit(n: JmlSignalsClause, arg: Element) {
+        newElement(arg, n.kind.jmlSymbol)
+    }
+
+    override fun visit(n: JmlSignalsOnlyClause, arg: Element) {
+        val e = newElement(arg, n.kind.jmlSymbol)
+        e.setAttribute("numOfTypes", "" + n.types.size)
+    }
+
+    override fun visit(n: JmlOldClause, arg: Element) {
+        val e = newElement(arg, n.kind.jmlSymbol)
+        e.setAttribute("numOfDecls", "" + n.declarations.variables.size)
+    }
+
+    override fun visit(n: JmlMultiExprClause, arg: Element) {
+        val e = newElement(arg, n.kind.jmlSymbol)
+        for (expression in n.expressions) {
+            e.appendChild(getExpressionStat(expression))
+        }
+    }
+
+    override fun visit(n: JmlCallableClause, arg: Element) {
+        val e = newElement(arg, n.kind.jmlSymbol)
+    }
+
+    override fun visit(n: JmlForallClause, arg: Element) {
+        val e = newElement(arg, n.kind.jmlSymbol)
+        e.setAttribute("numVars", "" + n.boundedVariables.size)
+    }
+
+    override fun visit(n: JmlRefiningStmt, arg: Element) {
+        if (active(n)) {
+            val e = newElement(arg, "jml-refining")
+        }
+    }
+
+    override fun visit(n: JmlConditionalClause, arg: Element) {
+        super.visit(n, arg)
+    }
+
+    override fun visit(n: JmlFieldDeclaration, arg: Element) {
+        //update(n, this::update)
+    }
+
+    interface Update<R> {
+        fun fn(parent: Element, node: R)
+    }
+
+    private fun <R : NodeWithJmlTags<*>> update(n: R, update: Update<R>) {
+    }
+
+    private fun update(parent: JmlFieldDeclaration, n: JmlFieldDeclaration) {
+        /*if (n.getDecl().hasModifier(Modifier.DefaultKeyword.JML_GHOST)) {
+            getClassStat(stat, n).addNumOfGhostFields(1);
+        } else if (n.getDecl().hasModifier(Modifier.DefaultKeyword.JML_MODEL)) {
+            getClassStat(stat, n).addNumOfModelFields(1);
+        }
+         */
+    }
+
+
+    private fun count(e: Expression): Map<Class<*>, Int> {
+        val occCounter: MutableMap<Class<*>, Int> = HashMap()
+        val q: ArrayDeque<Node> = ArrayDeque<Node>()
+        q.add(e)
+
+        while (!q.isEmpty()) {
+            val n: Node = q.pop()
+            occCounter.compute(n.javaClass) { k: Class<*>, i: Int? -> i?.let { it + 1 } ?: 1 }
+            for (childNode in n.childNodes) {
+                if (childNode is Expression) {
+                    q.add(childNode)
+                }
+            }
+        }
+        return occCounter
+    }
+
+    companion object {
+        private fun newlines(text: String): Int {
+            val chars = text.toCharArray()
+            var n = 0
+            for (aChar in chars) {
+                if (aChar == '\n') {
+                    n++
+                }
+            }
+            return n
+        }
+
+
+        private fun equal(keySet: List<String>, jmlTags: NodeList<SimpleName>): Boolean {
+            if (keySet.size != jmlTags.size) {
+                return false
+            }
+
+            for (i in keySet.indices) {
+                if (keySet[i] != jmlTags.get(i).identifier) {
+                    return false
+                }
+            }
+            return true
+        }
+    }
+}
+
+internal class ExpressionComplexity : GenericVisitorAdapter<Int, ExpressionCosts>() {
+    override fun visit(n: ArrayAccessExpr, arg: ExpressionCosts): Int = super.visit(n, arg)
+
+    override fun visit(n: ArrayCreationExpr, arg: ExpressionCosts): Int = super.visit(n, arg)
+
+    override fun visit(n: ArrayInitializerExpr, arg: ExpressionCosts): Int = super.visit(n, arg)
+
+    override fun visit(n: AssignExpr, arg: ExpressionCosts): Int =
+        arg.assign + n.target.accept(this, arg) + n.value.accept(this, arg)
+
+    override fun visit(n: BinaryExpr, arg: ExpressionCosts): Int =
+        //TODO distinguish by operator
+        arg.minus + n.left.accept(this, arg) + n.right.accept(this, arg)
+
+    override fun visit(n: UnaryExpr, arg: ExpressionCosts): Int = super.visit(n, arg)
+
+    override fun visit(n: LambdaExpr, arg: ExpressionCosts): Int = super.visit(n, arg)
+
+    override fun visit(n: CastExpr, arg: ExpressionCosts): Int = arg.cast + n.expression.accept(this, arg)
+
+    override fun visit(n: CharLiteralExpr, arg: ExpressionCosts): Int = arg.charLiteral
+
+    override fun visit(n: ConditionalExpr, arg: ExpressionCosts): Int {
+        return arg.conditional + n.condition.accept(this, arg) + n.thenExpr
+            .accept(this, arg) + n.elseExpr.accept(
+            this, arg
+        )
+    }
+
+    override fun visit(n: EnclosedExpr, arg: ExpressionCosts): Int = n.inner.accept(this, arg)
+
+    override fun visit(n: IntegerLiteralExpr, arg: ExpressionCosts): Int = arg.integerLiteral
+
+    override fun visit(n: LongLiteralExpr, arg: ExpressionCosts): Int = arg.longLiteral
+
+    override fun visit(n: MethodCallExpr, arg: ExpressionCosts): Int = arg.methodCall + sum(n.arguments, arg)
+
+    override fun visit(n: NameExpr, arg: ExpressionCosts): Int = arg.name
+
+    override fun visit(n: NullLiteralExpr, arg: ExpressionCosts): Int = arg.nullLiteral
+
+    override fun visit(n: JmlQuantifiedExpr, arg: ExpressionCosts): Int =
+        arg.quantor + n.variables.size * arg.binderCostsPerVariable + sum(n.expressions, arg)
+
+    private fun sum(n: NodeList<Expression>, arg: ExpressionCosts): Int {
+        return n.stream().mapToInt { it -> Objects.requireNonNull(it.accept(this, arg), it.javaClass.getSimpleName()) }
+            .sum()
+    }
+
+    override fun visit(n: JmlTypeExpr, arg: ExpressionCosts): Int = 1
+
+    override fun visit(n: SuperExpr, arg: ExpressionCosts): Int = 0
+
+    override fun visit(n: SwitchExpr, arg: ExpressionCosts): Int {
+        return n.selector.accept(this, arg) + n.entries.stream()
+            .mapToInt { it -> sum(it.labels, arg) + 1 }
+            .sum()
+    }
+
+    override fun visit(n: TypePatternExpr, arg: ExpressionCosts): Int = 0
+    override fun visit(n: RecordPatternExpr, arg: ExpressionCosts?): Int = super.visit(n, arg)
+
+    override fun visit(n: BooleanLiteralExpr, arg: ExpressionCosts): Int = 0
+
+    override fun visit(n: InstanceOfExpr, arg: ExpressionCosts): Int = arg.instanceof + n.expression.accept(this, arg)
+
+    override fun visit(n: JmlLabelExpr, arg: ExpressionCosts): Int = super.visit(n, arg)
+
+    override fun visit(n: JmlLetExpr, arg: ExpressionCosts): Int =
+        arg.let + arg.binderCostsPerVariable * n.variables.variables.size
+
+    override fun visit(n: JmlMultiCompareExpr, arg: ExpressionCosts): Int = arg.compare * n.operators.size
+}
\ No newline at end of file
diff --git a/tools/utils/build.gradle.kts b/tools/utils/build.gradle.kts
new file mode 100644
index 0000000000..73f6e80c2c
--- /dev/null
+++ b/tools/utils/build.gradle.kts
@@ -0,0 +1,8 @@
+plugins {
+    id("standard-kotlin")
+}
+
+dependencies {
+    api(project(":jmlparser-symbol-solver-core"))
+    testImplementation(libs.snakeyaml)
+}
diff --git a/tools/utils/src/main/kotlin/Helper.kt b/tools/utils/src/main/kotlin/Helper.kt
new file mode 100644
index 0000000000..09bd6fe8f0
--- /dev/null
+++ b/tools/utils/src/main/kotlin/Helper.kt
@@ -0,0 +1,51 @@
+package io.github.jmltoolkit.utils
+
+import com.github.javaparser.ast.Jmlish
+import com.github.javaparser.ast.Node
+import java.util.*
+import java.util.function.Function
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (11.02.23)
+ */
+object Helper {
+    fun <T : Node?> findAndApply(clazz: Class<T>, node: Node, fn: Function<T, Node>): Node {
+        if (clazz.isAssignableFrom(node.javaClass)) {
+            return fn.apply(node as T)
+        }
+
+        val queue: Queue<Node> = ArrayDeque<Node>(1024)
+        queue.add(node)
+
+        while (!queue.isEmpty()) {
+            val n: Node = queue.poll()
+            if (clazz.isAssignableFrom(node.javaClass)) {
+                val other: Node = fn.apply(n as T)
+                if (other !== n) {
+                    n.replace(n, other)
+                }
+            } else {
+                //traverse
+                queue.addAll(node.childNodes)
+            }
+        }
+
+        return node
+    }
+
+    fun findAllJmlContainers(cu: Node): List<Node> {
+        val queue: LinkedList<Node> = LinkedList<Node>()
+        queue.add(cu)
+        val res: MutableList<Node> = ArrayList<Node>(128)
+        while (!queue.isEmpty()) {
+            val n: Node = queue.pollLast()
+            if (n is Jmlish) {
+                res.add(n)
+            } else {
+                queue.addAll(n.childNodes)
+            }
+        }
+        return res
+    }
+}
diff --git a/tools/utils/src/main/kotlin/JMLUtils.kt b/tools/utils/src/main/kotlin/JMLUtils.kt
new file mode 100644
index 0000000000..2ac3de894f
--- /dev/null
+++ b/tools/utils/src/main/kotlin/JMLUtils.kt
@@ -0,0 +1,118 @@
+package io.github.jmltoolkit.utils
+
+import com.github.javaparser.ast.NodeList
+import com.github.javaparser.ast.expr.BinaryExpr
+import com.github.javaparser.ast.expr.BooleanLiteralExpr
+import com.github.javaparser.ast.expr.Expression
+import com.github.javaparser.ast.expr.SimpleName
+import com.github.javaparser.ast.jml.clauses.JmlContract
+import com.github.javaparser.ast.jml.expr.JmlMultiCompareExpr
+import com.github.javaparser.ast.type.ArrayType
+import com.github.javaparser.ast.type.ClassOrInterfaceType
+import com.github.javaparser.ast.type.PrimitiveType
+import com.github.javaparser.ast.type.Type
+import com.github.javaparser.resolution.types.ResolvedArrayType
+import com.github.javaparser.resolution.types.ResolvedPrimitiveType.*
+import com.github.javaparser.resolution.types.ResolvedType
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (02.07.22)
+ */
+object JMLUtils {
+    const val GENERATED_COMBINED: String = "_generated_combined_"
+
+    @Suppress("unused")
+    fun unroll(n: JmlMultiCompareExpr): Expression {
+        val r: Expression =
+            if (n.expressions.isEmpty()) {
+                BooleanLiteralExpr(true)
+            } else if (n.expressions.size == 1) {
+                n.expressions[0]
+            } else {
+                var e: Expression? = null
+                for (i in 0 until n.expressions.size - 1) {
+                    val cmp = BinaryExpr(
+                        n.expressions[i].clone(),
+                        n.expressions[i + 1].clone(),
+                        n.operators[i]
+                    )
+                    e = if (e == null) cmp else BinaryExpr(e, cmp, BinaryExpr.Operator.AND)
+                }
+                e!!
+            }
+        r.setParentNode(n.parentNode.orElse(null))
+        return r
+    }
+
+    fun unroll(old: NodeList<JmlContract>) {
+        if (old.isEmpty()) return
+        val target: ArrayList<JmlContract> = ArrayList<JmlContract>(128)
+        for (c in old) {
+            target.addAll(unroll(c))
+        }
+        old.clear()
+        old.addAll(target)
+    }
+
+    private fun unroll(c: JmlContract): List<JmlContract> {
+        if (c.subContracts.isEmpty()) return listOf<JmlContract>(c)
+        val seq= c.subContracts.stream()
+            .flatMap { e -> unroll(e).stream() }
+            .toList()
+        for (sub in seq) {
+            for (clause in c.clauses) {
+                sub.clauses.add(clause.clone())
+            }
+        }
+        return seq
+    }
+
+    @Suppress("unused")
+    fun createJointContract(m: NodeList<JmlContract>): JmlContract {
+        val find = m.stream()
+            .filter { name ->
+                name.name.map { simpleName -> simpleName.asString().equals(GENERATED_COMBINED) }
+                    .orElse(false)
+            }.findFirst()
+        if (find.isPresent) return find.get()
+
+        unroll(m)
+
+        val contract = JmlContract()
+        contract.setName(SimpleName(GENERATED_COMBINED))
+        //TODO weigl combine all requires, ensures ... clauses
+        m.add(contract)
+        return contract
+    }
+
+    fun resolvedType2Type(type: ResolvedType): Type {
+        if (type.isPrimitive) {
+            val rType = type.asPrimitive()!!
+            return PrimitiveType(
+                when (rType) {
+                    BYTE -> PrimitiveType.Primitive.BYTE
+                    SHORT -> PrimitiveType.Primitive.SHORT
+                    CHAR -> PrimitiveType.Primitive.CHAR
+                    INT -> PrimitiveType.Primitive.INT
+                    LONG -> PrimitiveType.Primitive.LONG
+                    BOOLEAN -> PrimitiveType.Primitive.BOOLEAN
+                    FLOAT -> PrimitiveType.Primitive.FLOAT
+                    DOUBLE -> PrimitiveType.Primitive.DOUBLE
+                }
+            )
+        }
+
+        if (type.isArray) {
+            val aType: ResolvedArrayType = type.asArrayType()
+            return ArrayType(resolvedType2Type(aType.componentType))
+        }
+
+        if (type.isReferenceType) {
+            val rType = type.asReferenceType()
+            return ClassOrInterfaceType(rType.qualifiedName)
+        }
+
+        throw RuntimeException("Unsupported type")
+    }
+}
diff --git a/tools/utils/src/main/kotlin/JavaTemplate.kt b/tools/utils/src/main/kotlin/JavaTemplate.kt
new file mode 100644
index 0000000000..6cc275b1a7
--- /dev/null
+++ b/tools/utils/src/main/kotlin/JavaTemplate.kt
@@ -0,0 +1,70 @@
+package io.github.jmltoolkit.utils
+
+import com.github.javaparser.StaticJavaParser
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.body.BodyDeclaration
+import com.github.javaparser.ast.body.TypeDeclaration
+import com.github.javaparser.ast.expr.SimpleName
+import com.github.javaparser.ast.stmt.BlockStmt
+import com.github.javaparser.ast.stmt.Statement
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (10.10.22)
+ */
+class JavaTemplate<T : Node>(private val template: T) {
+    fun instantiate(substitutionFactory: SubstitutionFactory): T {
+        val copy = template.clone()
+        replace<Node, Node>(copy, substitutionFactory)
+        return copy as T
+    }
+
+    private fun <R : Node?, O : Node?> replace(node: Node, factory: SubstitutionFactory) {
+        for (childNode in node.childNodes) {
+            replace<Node, Node>(childNode, factory)
+            if (factory.replacable(childNode)) {
+                node.replace(childNode, factory.substitutionOf(childNode))
+            }
+        }
+    }
+
+    interface SubstitutionFactory {
+        fun replacable(node: Node): Boolean
+
+        fun substitutionOf(node: Node): Node
+    }
+
+    class IdentifierSubstitution @JvmOverloads constructor(private val map: MutableMap<String?, String?> = HashMap()) :
+        SubstitutionFactory {
+        fun add(name: String?, newName: String?) {
+            map[name] = newName
+        }
+
+        override fun replacable(node: Node): Boolean {
+            return node is SimpleName && map.containsKey(node.asString())
+        }
+
+        override fun substitutionOf(node: Node): Node {
+            if (node is SimpleName) node.setIdentifier(map[node.asString()]!!)
+            return node
+        }
+    }
+
+    companion object {
+        fun fromBlock(javaCode: String?): JavaTemplate<BlockStmt> {
+            return JavaTemplate(StaticJavaParser.parseBlock(javaCode))
+        }
+
+        fun fromStatement(javaCode: String?): JavaTemplate<Statement> {
+            return JavaTemplate(StaticJavaParser.parseStatement(javaCode))
+        }
+
+        fun fromType(javaCode: String?): JavaTemplate<TypeDeclaration<*>> {
+            return JavaTemplate(StaticJavaParser.parseTypeDeclaration(javaCode))
+        }
+
+        fun fromBodyDecl(javaCode: String?): JavaTemplate<BodyDeclaration<*>> {
+            return JavaTemplate(StaticJavaParser.parseBodyDeclaration(javaCode))
+        }
+    }
+}
diff --git a/tools/utils/src/main/kotlin/LineColumnIndex.kt b/tools/utils/src/main/kotlin/LineColumnIndex.kt
new file mode 100644
index 0000000000..a1617d377e
--- /dev/null
+++ b/tools/utils/src/main/kotlin/LineColumnIndex.kt
@@ -0,0 +1,45 @@
+package io.github.jmltoolkit.utils
+
+import com.github.javaparser.Position
+import com.github.javaparser.Range
+
+/**
+ * The index is 1-based. The first character also begins in line 1 and column 1.
+ *
+ * @author Alexander Weigl
+ * @version 1 (18.10.22)
+ */
+class LineColumnIndex(private val content: String) {
+    var lineOffsets: IntArray =
+        IntArray(1 + content.chars().filter { it: Int -> it == '\n'.code }.count().toInt())
+
+    init {
+        var cur = 1
+        val chars = content.toCharArray()
+        for (i in chars.indices) {
+            if (chars[i] == '\n') lineOffsets[cur++] = i + 1
+        }
+    }
+
+    fun substring(range: Range): String {
+        return substring(range.begin, range.end)
+    }
+
+    private fun substring(begin: Position, end: Position): String {
+        return substring(begin.line, begin.column, end.line, end.column)
+    }
+
+    fun substring(beginLine: Int, beginColumn: Int, endLine: Int, endColumn: Int): String {
+        val a = positionToOffset(beginLine, beginColumn)
+        val b = positionToOffset(endLine, endColumn)
+        return content.substring(a, b + 1)
+    }
+
+    fun positionToOffset(p: Position): Int {
+        return positionToOffset(p.line, p.column)
+    }
+
+    fun positionToOffset(line: Int, column: Int): Int {
+        return lineOffsets[line - 1] + column - 1
+    }
+}
diff --git a/tools/utils/src/main/kotlin/Pattern.kt b/tools/utils/src/main/kotlin/Pattern.kt
new file mode 100644
index 0000000000..402b93e9e2
--- /dev/null
+++ b/tools/utils/src/main/kotlin/Pattern.kt
@@ -0,0 +1,84 @@
+package io.github.jmltoolkit.utils
+
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.NodeList
+import java.util.*
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (11.10.22)
+ */
+class Pattern<T : Node?>(private val pattern: T) {
+    private val placeholders: MutableMap<Node, String> = IdentityHashMap()
+    fun match(tree: Node?): Map<String, Node>? {
+        return match(pattern, tree, HashMap<String, Node>())
+    }
+
+    private fun match(pattern: Node?, tree: Node?, map: MutableMap<String, Node>): MutableMap<String, Node>? {
+        if (pattern == null && tree == null)
+            return map
+
+        if ((pattern != null) xor (tree != null))
+            return null
+
+        require(pattern != null)
+        require(tree != null)
+
+        var rmap: MutableMap<String, Node>? = map
+
+        if (placeholders.containsKey(pattern)) {
+            val key = placeholders[pattern]
+            if (map.containsKey(key) && map[key] != tree) return null
+            else {
+                map[key!!] = tree
+            }
+            return map
+        }
+
+        if (pattern.javaClass !== tree.javaClass) return null
+
+
+        for (prop in pattern.metaModel.allPropertyMetaModels) {
+            val childPattern = prop.getValue(pattern)
+            val childTree = prop.getValue(tree)
+
+            if (prop.isNode) {
+                rmap = match(childPattern as Node?, childTree as Node?, map)
+                if (rmap == null)
+                    return null
+            } else if (prop.isNodeList) {
+                val a = childPattern as NodeList<out Node?>
+                val b = childTree as NodeList<out Node?>
+                if (a.size != b.size) return null
+
+                for (i in 0 until a.size) {
+                    rmap = match(a[i], b[i], map)
+                    if (rmap == null)
+                        return null
+                }
+            } else {
+                if (!childPattern.equals(childTree)) return null
+            }
+        }
+
+        return rmap
+    }
+
+
+    fun find(n: Node): Map<String, Node>? {
+        val queue: ArrayDeque<Node> = ArrayDeque<Node>()
+        queue.add(n)
+        while (!queue.isEmpty()) {
+            val e: Node = queue.pop()
+            val r = match(e)
+            if (r != null)
+                return r
+            queue.addAll(e.childNodes)
+        }
+        return null
+    }
+
+    fun addPlaceholder(placeholder: Node, label: String) {
+        placeholders[placeholder] = label
+    }
+}
diff --git a/tools/utils/src/main/kotlin/TestWithJavaParser.kt b/tools/utils/src/main/kotlin/TestWithJavaParser.kt
new file mode 100644
index 0000000000..4a9ad94897
--- /dev/null
+++ b/tools/utils/src/main/kotlin/TestWithJavaParser.kt
@@ -0,0 +1,37 @@
+package io.github.jmltoolkit.utils
+
+import com.github.javaparser.JavaParser
+import com.github.javaparser.ParserConfiguration
+import com.github.javaparser.Problem
+import com.github.javaparser.ast.Node
+import com.github.javaparser.symbolsolver.JavaSymbolSolver
+import com.github.javaparser.symbolsolver.resolution.typesolvers.ClassLoaderTypeSolver
+import java.util.function.Consumer
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (14.10.22)
+ */
+open class TestWithJavaParser {
+    protected val parser: JavaParser
+    protected var parent: Node? = null
+
+    init {
+        val config = ParserConfiguration()
+        config.setProcessJml(true)
+        config.setSymbolResolver(JavaSymbolSolver(ClassLoaderTypeSolver(ClassLoader.getSystemClassLoader())))
+        parser = JavaParser(config)
+
+        val resourceAsStream = javaClass.getResourceAsStream("Test.java")
+        if (resourceAsStream != null) {
+            val r = parser.parse(resourceAsStream)
+            if (!r.isSuccessful) {
+                r.problems.forEach(Consumer { x: Problem? -> System.err.println(x) })
+                error("Error during parsing")
+            }
+            parent = r.result.get().getType(0)
+        } else {
+            parent = null
+        }
+    }
+}
diff --git a/tools/utils/src/test/kotlin/TestTokenRangesPreciseness.kt b/tools/utils/src/test/kotlin/TestTokenRangesPreciseness.kt
new file mode 100644
index 0000000000..515c3b0a87
--- /dev/null
+++ b/tools/utils/src/test/kotlin/TestTokenRangesPreciseness.kt
@@ -0,0 +1,98 @@
+import com.github.javaparser.GeneratedJavaParserConstants
+import com.github.javaparser.TokenRange
+import com.github.javaparser.ast.CompilationUnit
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.jml.NodeWithJmlTags
+import com.github.javaparser.jml.JmlUtility
+import com.google.common.collect.Streams
+import com.google.common.truth.Truth
+import io.github.jmltoolkit.utils.LineColumnIndex
+import io.github.jmltoolkit.utils.TestWithJavaParser
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.DynamicTest
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestFactory
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.stream.Stream
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (18.10.22)
+ */
+internal class TestTokenRangesPreciseness : TestWithJavaParser() {
+    @Test
+    fun lineColumnIndex() {
+        val lci = LineColumnIndex(
+            """
+                Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam
+                nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
+                    At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea
+                  takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet,
+                   consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore
+                 et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo 
+                  duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est 
+                Lorem ipsum dolor sit amet.
+                
+                """.trimIndent()
+        )
+
+
+        Truth.assertThat(lci.substring(1, 1, 1, 5))
+            .isEqualTo("Lorem")
+
+        Truth.assertThat(lci.substring(2, 1, 2, 6))
+            .isEqualTo("nonumy")
+
+        Truth.assertThat(lci.substring(6, 18, 6, 25))
+            .isEqualTo("aliquyam")
+    }
+
+    @TestFactory
+    @Throws(Throwable::class)
+    fun ihm(): Stream<DynamicTest> {
+        val content =
+            Files.readString(Paths.get("../examples/ihm/VerifiedIdentityHashMap.java"))
+        val result = parser.parse(content)
+        Assertions.assertTrue(result.isSuccessful)
+        return testTokenRanges(result.result.get(), content)
+    }
+
+
+    @TestFactory
+    @Throws(Throwable::class)
+    fun test(): Stream<DynamicTest> {
+        val content = Files.readString(Paths.get("src/test/kotlin/TokenTest.java"))
+        val result = parser.parse(content)
+        Assertions.assertTrue(result.isSuccessful)
+        return testTokenRanges(result.result.get(), content)
+    }
+
+    private fun testTokenRanges(node: CompilationUnit, content: String): Stream<DynamicTest> {
+        val lci = LineColumnIndex(content)
+        return JmlUtility.getAllNodes(node)
+            .filter { it: Node? -> it is NodeWithJmlTags<*> }
+            .flatMap { it: Node -> checkTokenRange(lci, it) }
+        //checkTokenRange(lci, node);
+    }
+
+    private fun checkTokenRange(lci: LineColumnIndex, it: Node): Stream<DynamicTest?> {
+        val tr = it.tokenRange
+        return tr.map { javaTokens: TokenRange -> checkTokenRange(lci, javaTokens) }
+            .orElse(Stream.empty<DynamicTest?>())
+    }
+
+    private fun checkTokenRange(lci: LineColumnIndex, javaTokens: TokenRange): Stream<DynamicTest?> {
+        return Streams.stream(javaTokens)
+            .filter { it.kind != GeneratedJavaParserConstants.EOF }
+            .map { javaToken ->
+                DynamicTest.dynamicTest(javaToken.toString()) {
+                    val substring = lci.substring(javaToken.range.get())
+                    val text = javaToken.text
+                    if (!(substring == "@" && text == " ")) {
+                        Truth.assertThat(substring).isEqualTo(text)
+                    }
+                }
+            }
+    }
+}
diff --git a/tools/utils/src/test/kotlin/TokenTest.java b/tools/utils/src/test/kotlin/TokenTest.java
new file mode 100644
index 0000000000..504d94ec5a
--- /dev/null
+++ b/tools/utils/src/test/kotlin/TokenTest.java
@@ -0,0 +1,10 @@
+class TokenTest {
+    //@ invariant test : x == x;
+
+    /*@ private normal_behavior
+      @   ensures key == null ==> \result == NULL_KEY;
+      @   ensures key != null ==> \result == key;
+      @*/
+    public void foo() {
+    }
+}
\ No newline at end of file
diff --git a/tools/wd/build.gradle.kts b/tools/wd/build.gradle.kts
new file mode 100644
index 0000000000..d11ae09831
--- /dev/null
+++ b/tools/wd/build.gradle.kts
@@ -0,0 +1,8 @@
+plugins {
+    id("standard-kotlin")
+}
+
+dependencies {
+    api(project(":jmlparser-symbol-solver-core"))
+    api(project(":tools:smt"))
+}
diff --git a/tools/wd/src/main/kotlin/WDVisitor.kt b/tools/wd/src/main/kotlin/WDVisitor.kt
new file mode 100644
index 0000000000..e87bb0850e
--- /dev/null
+++ b/tools/wd/src/main/kotlin/WDVisitor.kt
@@ -0,0 +1,252 @@
+package io.github.jmltoolkit.wd
+
+import com.github.javaparser.ast.expr.*
+import com.github.javaparser.ast.jml.body.JmlClassExprDeclaration
+import com.github.javaparser.ast.jml.clauses.JmlMultiExprClause
+import com.github.javaparser.ast.jml.expr.JmlLabelExpr
+import com.github.javaparser.ast.jml.expr.JmlLetExpr
+import com.github.javaparser.ast.jml.expr.JmlQuantifiedExpr
+import com.github.javaparser.ast.jml.expr.JmlTypeExpr
+import com.github.javaparser.ast.jml.stmt.JmlExpressionStmt
+import com.github.javaparser.ast.visitor.GenericVisitorAdapter
+import com.github.javaparser.ast.visitor.VoidVisitorAdapter
+import io.github.jmltoolkit.smt.ArithmeticTranslator
+import io.github.jmltoolkit.smt.JmlExpr2Smt
+import io.github.jmltoolkit.smt.SmtQuery
+import io.github.jmltoolkit.smt.SmtTermFactory
+import io.github.jmltoolkit.smt.model.SExpr
+import java.math.BigInteger
+
+/**
+ *
+ * @author Alexander Weigl
+ * @version 1 (14.06.22)
+ */
+class WDVisitor : VoidVisitorAdapter<Any?>() {
+    override fun visit(n: JmlExpressionStmt, arg: Any?) {
+        n.expression.accept<Any>(this, arg)
+    }
+}
+
+class WDVisitorExpr(smtLog: SmtQuery, private val translator: ArithmeticTranslator) :
+    GenericVisitorAdapter<SExpr, Any?>() {
+    private val smtFormula: JmlExpr2Smt = JmlExpr2Smt(smtLog, translator)
+
+    override fun visit(n: NameExpr, arg: Any?): SExpr {
+        val name = n.nameAsString
+        return when (name) {
+            "\\result", "\\exception" -> term.makeTrue()
+            else -> term.makeTrue()
+        }
+    }
+
+    override fun visit(n: ArrayAccessExpr, arg: Any?): SExpr {
+        return term.and(
+            n.name.accept(this, arg),
+            n.index.accept(this, arg)
+        )
+    }
+
+    override fun visit(n: ArrayCreationExpr, arg: Any?): SExpr {
+        //TODO
+        return n.initializer.get().accept(this, arg)
+    }
+
+    override fun visit(n: ArrayInitializerExpr, arg: Any?): SExpr {
+        val seq = n.values.map { it.accept(this, arg) }
+        return term.and(seq)
+    }
+
+    override fun visit(n: AssignExpr, arg: Any?): SExpr {
+        return term.makeFalse()
+    }
+
+    override fun visit(n: BinaryExpr, arg: Any?): SExpr {
+        when (n.operator) {
+            BinaryExpr.Operator.IMPLICATION -> {
+                val be = BinaryExpr(
+                    UnaryExpr(n.left, UnaryExpr.Operator.LOGICAL_COMPLEMENT),
+                    n.right, BinaryExpr.Operator.OR
+                )
+                return be.accept(this, arg)
+            }
+
+            BinaryExpr.Operator.DIVIDE, BinaryExpr.Operator.REMAINDER -> {
+                val fml = n.right.accept(smtFormula, arg)
+                return term.and(
+                    n.right.accept(this, arg),
+                    n.left.accept(this, arg),
+                    term.not(
+                        translator.binary(
+                            BinaryExpr.Operator.EQUALS,
+                            fml, smtFormula.translator.makeInt(BigInteger.ZERO)
+                        )
+                    )
+                )
+            }
+
+            else -> return term.and(
+                n.right.accept(this, arg),
+                n.left.accept(this, arg)
+            )
+        }
+    }
+
+    override fun visit(n: BooleanLiteralExpr, arg: Any?): SExpr {
+        return term.makeTrue()
+    }
+
+    override fun visit(n: CastExpr, arg: Any?): SExpr {
+        //TODO Type-check?
+        return n.expression.accept(this, arg)
+    }
+
+    override fun visit(n: CharLiteralExpr, arg: Any?): SExpr {
+        return term.makeTrue()
+    }
+
+    override fun visit(n: ClassExpr, arg: Any?): SExpr {
+        return term.makeFalse()
+    }
+
+    override fun visit(n: DoubleLiteralExpr, arg: Any?): SExpr {
+        return term.makeTrue()
+    }
+
+    override fun visit(n: EnclosedExpr, arg: Any?): SExpr {
+        return wd(n.inner)
+    }
+
+    override fun visit(n: FieldAccessExpr, arg: Any?): SExpr {
+        return wd(n.scope)
+    }
+
+    override fun visit(n: InstanceOfExpr, arg: Any?): SExpr {
+        return n.expression.accept(this, arg)
+    }
+
+    override fun visit(n: IntegerLiteralExpr, arg: Any?): SExpr {
+        return term.makeTrue()
+    }
+
+    override fun visit(n: StringLiteralExpr, arg: Any?): SExpr {
+        return term.makeTrue()
+    }
+
+    override fun visit(n: SuperExpr, arg: Any?): SExpr {
+        return term.makeTrue()
+    }
+
+    override fun visit(n: ThisExpr, arg: Any?): SExpr {
+        return term.makeTrue()
+    }
+
+    override fun visit(n: UnaryExpr, arg: Any?): SExpr {
+        return n.expression.accept(this, arg)
+    }
+
+    override fun visit(n: LambdaExpr, arg: Any?): SExpr {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: MethodReferenceExpr, arg: Any?): SExpr {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: TypeExpr, arg: Any?): SExpr {
+        return super.visit(n, arg)
+    }
+
+    override fun visit(n: SwitchExpr, arg: Any?): SExpr {
+        return term.and(wd(n.selector))
+    }
+
+    override fun visit(n: TextBlockLiteralExpr, arg: Any?): SExpr {
+        return term.makeTrue()
+    }
+
+    override fun visit(n: RecordPatternExpr, arg: Any?): SExpr {
+        return term.makeTrue()
+    }
+
+    override fun visit(n: TypePatternExpr, arg: Any?): SExpr {
+        return term.makeTrue()
+    }
+
+    override fun visit(n: JmlQuantifiedExpr, arg: Any?): SExpr {
+        /*The quantified-expression is well-defined iff the two sub-expressions are well-defined. For a quantifier Q*/
+        val seq: List<SExpr> = n.expressions.map { it.accept(this, arg) }
+        val r: Expression = n.expressions[0]
+        val v: Expression = n.expressions[0]
+
+        val args: List<SExpr> = ArrayList<SExpr>()
+
+        if (JmlQuantifiedExpr.JmlDefaultBinder.CHOOSE == n.binder) {
+            return term.and(
+                term.forall(args, wd(r)),
+                term.forall(args, term.impl(valueOf(r), wd(v))),
+                term.exists(
+                    args, term.and(
+                        valueOf(r),
+                        valueOf(v)
+                    )
+                )
+            )
+        }
+        return term.and(
+            term.forall(args, wd(r)),
+            term.forall(args, term.impl(valueOf(r), wd(v)))
+        )
+    }
+
+    private fun valueOf(e: Expression): SExpr {
+        return e.accept(smtFormula, null)
+    }
+
+    private fun wd(e: Expression): SExpr {
+        return e.accept(this, null)
+    }
+
+    override fun visit(n: JmlExpressionStmt, arg: Any?): SExpr {
+        return wd(n.expression)
+    }
+
+    override fun visit(n: JmlLabelExpr, arg: Any?): SExpr {
+        return wd(n.expression)
+    }
+
+    override fun visit(n: JmlLetExpr, arg: Any?): SExpr {
+        return term.and(wd(n.body),  /* TODO  arguments */term.makeTrue())
+    }
+
+    override fun visit(n: JmlClassExprDeclaration, arg: Any?): SExpr {
+        return term.makeTrue()
+    }
+
+    override fun visit(n: JmlTypeExpr, arg: Any?): SExpr {
+        return term.makeTrue()
+    }
+
+    override fun visit(n: JmlMultiExprClause, arg: Any?) =
+        term.and(n.expressions.map { e: Expression -> this.wd(e) })
+
+    override fun visit(n: MethodCallExpr, arg: Any?): SExpr {
+        val name = n.nameAsString
+        when (name) {
+            "\\old", "\\pre", "\\past" ->                 /* Well-definedness: The expression is well-defined if the first argument is well-defined
+                   and any label argument names either a built-in label (§11.611.6) or an in-scope Java or
+                   JML ghost label (S11.511.5).*/
+                return n.arguments[0].accept(this, arg)
+
+            "\\fresh" ->                 /* Well-definedness: The argument must be well-defined and non-null. The second argument,
+                   if present, must be the identifier corresponding to an in-scope label or a built-in label. */
+                return n.arguments[0].accept(this, arg)
+        }
+        val seq = n.arguments.map { it: Expression -> it.accept(this, arg) }
+        return term.and(seq)
+    }
+
+    companion object {
+        private val term: SmtTermFactory = SmtTermFactory
+    }
+}
diff --git a/tools/wd/src/main/kotlin/WdFacade.kt b/tools/wd/src/main/kotlin/WdFacade.kt
new file mode 100644
index 0000000000..27199b0dbe
--- /dev/null
+++ b/tools/wd/src/main/kotlin/WdFacade.kt
@@ -0,0 +1,52 @@
+package io.github.jmltoolkit.wd
+
+import com.github.javaparser.JavaParser
+import com.github.javaparser.ParserConfiguration
+import com.github.javaparser.ast.expr.Expression
+import io.github.jmltoolkit.smt.ArithmeticTranslator
+import io.github.jmltoolkit.smt.BitVectorArithmeticTranslator
+import io.github.jmltoolkit.smt.SmtQuery
+import io.github.jmltoolkit.smt.SmtTermFactory
+import io.github.jmltoolkit.smt.model.SExpr
+import io.github.jmltoolkit.smt.solver.SolverAnswer
+
+/**
+ * Facade to dive into *well-definedness* checks.
+ *
+ * @author Alexander Weigl
+ * @version 1 (28.01.24)
+ */
+object WdFacade {
+    fun isWelldefined(expr: String): Boolean {
+        val config = ParserConfiguration()
+        config.setProcessJml(false)
+        val parser = JavaParser(config)
+        return isWelldefined(parser, expr)
+    }
+
+    fun isWelldefined(parser: JavaParser, expr: String): Boolean {
+        val e = parser.parseJmlExpression<Expression>(expr)
+        if (e.isSuccessful && e.result.isPresent) {
+            return isWelldefined(e.result.get())
+        }
+        return false
+    }
+
+    private fun isWelldefined(e: Expression): Boolean {
+        val query = SmtQuery()
+        val translator: ArithmeticTranslator = BitVectorArithmeticTranslator(query)
+        val visitor = WDVisitorExpr(query, translator)
+        val res: SExpr = e.accept(visitor, null)
+        if ("true" == res.toString()) {
+            return true
+        }
+        query.addAssert(SmtTermFactory.not(res))
+        query.checkSat()
+        val solver = io.github.jmltoolkit.smt.solver.Solver()
+        val ans: SolverAnswer = solver.run(query)
+        println(query.toString())
+        println(ans.toString())
+        ans.consumeErrors()
+        return ans.isSymbol("unsat")
+    }
+}
\ No newline at end of file
diff --git a/tools/wd/src/test/kotlin/WDVisitorExprTest.kt b/tools/wd/src/test/kotlin/WDVisitorExprTest.kt
new file mode 100644
index 0000000000..3fcfb7307f
--- /dev/null
+++ b/tools/wd/src/test/kotlin/WDVisitorExprTest.kt
@@ -0,0 +1,29 @@
+import com.github.javaparser.JavaParser
+import io.github.jmltoolkit.smt.Z3
+import io.github.jmltoolkit.wd.WdFacade.isWelldefined
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Assumptions
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvFileSource
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (14.06.22)
+ */
+internal class WDVisitorExprTest {
+    private val parser = JavaParser()
+
+    @ParameterizedTest
+    @CsvFileSource(resources = ["wd-expr.csv"], delimiterString = "§")
+    fun wdExpression(expr: String) {
+        Assumptions.assumeTrue(Z3.z3Installed())
+        Assertions.assertTrue(isWelldefined(parser, expr))
+    }
+
+    @ParameterizedTest
+    @CsvFileSource(resources = ["not-wd-expr.csv"], delimiterString = "§")
+    fun wdExpressionError(expr: String) {
+        Assumptions.assumeTrue(Z3.z3Installed())
+        Assertions.assertFalse(isWelldefined(parser, expr))
+    }
+}
diff --git a/tools/wd/src/test/resources/not-wd-expr.csv b/tools/wd/src/test/resources/not-wd-expr.csv
new file mode 100644
index 0000000000..d056a94578
--- /dev/null
+++ b/tools/wd/src/test/resources/not-wd-expr.csv
@@ -0,0 +1,2 @@
+x / 0
+x / (1 - 1)
\ No newline at end of file
diff --git a/tools/wd/src/test/resources/wd-expr.csv b/tools/wd/src/test/resources/wd-expr.csv
new file mode 100644
index 0000000000..cf92a05bda
--- /dev/null
+++ b/tools/wd/src/test/resources/wd-expr.csv
@@ -0,0 +1,12 @@
+true
+false
+1 == 2
+5 * 2 == 2
+42 / 2
+"""a"" + 'c'"
+x - 2 == 3
+'x' == 65
+
+
+'x' != 65
+'x' != 65
diff --git a/tools/web/build.gradle.kts b/tools/web/build.gradle.kts
new file mode 100644
index 0000000000..9bf448b653
--- /dev/null
+++ b/tools/web/build.gradle.kts
@@ -0,0 +1,16 @@
+plugins {
+    id("standard-kotlin")
+}
+
+
+dependencies {
+    testImplementation("org.jetbrains.kotlin:kotlin-test")
+    api(project(":jmlparser-symbol-solver-core"))
+
+    implementation(libs.ktor.core)
+    implementation(libs.ktor.html)
+    implementation(libs.ktor.netty)
+    implementation(libs.ktor.statuspages)
+    implementation(libs.ktor.severhtml)
+    implementation(libs.logback)
+}
diff --git a/tools/web/src/main/kotlin/main.kt b/tools/web/src/main/kotlin/main.kt
new file mode 100644
index 0000000000..239a07dbb8
--- /dev/null
+++ b/tools/web/src/main/kotlin/main.kt
@@ -0,0 +1,357 @@
+import com.github.javaparser.JavaParser
+import com.github.javaparser.JavaParserBuild
+import com.github.javaparser.ParserConfiguration
+import com.github.javaparser.Problem
+import com.github.javaparser.ast.Jmlish
+import com.github.javaparser.ast.Node
+import com.github.javaparser.metamodel.NodeMetaModel
+import com.github.javaparser.metamodel.PropertyMetaModel
+import com.github.javaparser.printer.DefaultPrettyPrinter
+import com.github.javaparser.printer.configuration.DefaultPrinterConfiguration
+import io.ktor.html.*
+import io.ktor.html.Placeholder
+import io.ktor.http.*
+import io.ktor.server.application.*
+import io.ktor.server.engine.*
+import io.ktor.server.html.*
+import io.ktor.server.http.content.*
+import io.ktor.server.netty.*
+import io.ktor.server.plugins.statuspages.*
+import io.ktor.server.request.*
+import io.ktor.server.routing.*
+import kotlinx.html.*
+import java.io.StringReader
+import java.util.*
+import java.util.stream.Collectors
+
+const val version = "${JavaParserBuild.PROJECT_VERSION}"
+
+fun main() {
+    embeddedServer(Netty, port = 8000, watchPaths = listOf("classes", "resources")) {
+        install(StatusPages)
+        routing {
+            get("/") { renderPage() }
+            post("parse") {
+                val params = call.receiveParameters()
+                renderPage(params)
+            }
+            staticResources("assets", "assets")
+        }
+    }.start(wait = true)
+}
+
+private suspend fun RoutingContext.renderPage(params: Parameters? = null) {
+    val inputText = params?.get("input")
+    val keyKey = params?.get("keyKey")
+    val keyOpenJml = params?.get("keyOpenJml")
+    val keyESC = params?.get("keyESC")
+    val keyRAC = params?.get("keyRAC")
+    val doNotProcessJml = params?.get("doNotProcessJml") != null
+
+    call.respondHtmlTemplate(DefaultPage()) {
+        body {
+            div("form-group") {
+                form(action = "/parse", method = FormMethod.post) {
+                    div {
+                        spectreCheckBox(name = "doNotProcessJml") { +"Do not process JML" }
+                        span { +" Active keys: " }
+                        spectreCheckBox(name = "keyKey") { +"KEY" }
+                        spectreCheckBox(name = "keyOpenJml") { +"OpenJml" }
+                        spectreCheckBox(name = "keyESC") { +"ESC" }
+                        spectreCheckBox(name = "keyRAC") { +"RAC" }
+                        submitInput(classes = "btn btn-primary") { }
+                    }
+                    textArea {
+                        name = "input"
+                        id = "input"
+                        rows = "100"
+                        cols = "120"
+                        if (inputText != null) {
+                            +inputText
+                        } else {
+                            +
+                                """
+                                public class JmlTest {
+                                    /*@
+                                        requires true;
+                                        ensures true;
+                                        assignable \strictly_nothing;
+                                    */
+                                    public void foo() {
+                                    
+                                    }
+                                }
+                                """.trimIndent()
+                        }
+                    }
+                }
+            }
+        }
+        right {
+            if (inputText != null) {
+                val config = ParserConfiguration()
+
+                config.isProcessJml = !doNotProcessJml
+
+                if (keyKey != null) {
+                    config.jmlKeys.add(arrayListOf("key"))
+                }
+                if (keyESC != null) {
+                    config.jmlKeys.add(arrayListOf("openjml"))
+                }
+                if (keyOpenJml != null) {
+                    config.jmlKeys.add(arrayListOf("ESC"))
+                }
+                if (keyRAC != null) {
+                    config.jmlKeys.add(arrayListOf("RAC"))
+                }
+
+                val jpb = JavaParser(config)
+
+                val startTime = System.nanoTime()
+                val result = jpb.parse(StringReader(inputText))
+                val stopTime = System.nanoTime()
+                val durationNano = stopTime - startTime
+
+                accordion("Processing Information") {
+                    ul {
+                        li { +"Activated keys: ${config.jmlKeys}" }
+                        li { +"Parsing took: ${durationNano / 1000.0 / 1000.0} ms     " }
+                        li { if (result.isSuccessful) +"Parsing was successful" else +"Parsing has errors" }
+                    }
+                }
+
+                accordion("Parse Issues (${result.problems.size})", isOpen = result.problems.isNotEmpty()) {
+                    if (!result.isSuccessful) {
+                        code {
+                            pre {
+                                result.problems.forEach {
+                                    +it.toString()
+                                }
+                            }
+                        }
+                    } else {
+                        +"No issues detected"
+                    }
+                }
+
+                val problems = Collections.emptyList<Problem>()
+                /*if (result.isSuccessful)
+                    //JmlLintingFacade.lint(JmlLintingConfig(), Collections.singleton(result.result.get()))
+                else
+                    Collections.emptyList()*/
+
+                accordion("Linting Issues (${problems.size})", isOpen = problems.isNotEmpty()) {
+                    if (result.isSuccessful) {
+                        code {
+                            pre {
+                                problems.forEach {
+                                    +it.toString()
+                                }
+                            }
+                        }
+                    } else {
+                        +"Linting issues skipped due to parsing errors."
+                    }
+                }
+
+                result.result.ifPresent {
+                    val c = DefaultPrinterConfiguration()
+                    val v = DefaultPrettyPrinter(c)
+                    val pp = v.print(it)
+                    accordion("Pretty Printed") {
+                        code { pre { +pp } }
+                    }
+                }
+
+                accordion("AST", isOpen = true) {
+                    val cu = result.result.get()
+                    ul("ast") {
+                        this.printNode(cu, "[0]")
+                    }
+                }
+
+                /*accordion("Original sources") {
+                    textArea {
+                        name = "input"
+                        id = "input"
+                        rows = "100"
+                        cols = "120"
+                        +inputText
+                    }
+                    //code { pre { +inputText } }
+                }*/
+            }
+        }
+    }
+}
+
+@HtmlTagMarker
+inline fun FlowContent.accordion(
+    title: String = "",
+    icon: String = "",
+    isOpen: Boolean = false,
+    crossinline block: DIV.() -> Unit,
+) {
+    details("accordion") {
+        open = isOpen
+        summary("accordion-header") {
+            i(classes = "icon icon-arrow-right mr-1 $icon") {}
+            +title
+        }
+        div("accordion-body") {
+            block(this)
+        }
+    }
+}
+
+@HtmlTagMarker
+inline fun FlowOrInteractiveOrPhrasingContent.spectreCheckBox(
+    name: String? = null,
+    label: String = "",
+    crossinline block: INPUT.() -> Unit,
+) {
+    label("form-checkbox d-inline-block") {
+        input(type = InputType.checkBox, name = name) { block(this) }
+        i("form-icon") { +label }
+    }
+}
+
+open class DefaultPage : io.ktor.server.html.Template<HTML> {
+    val body = Placeholder<FlowContent>()
+    val right = Placeholder<FlowContent>()
+    val top = Placeholder<FlowContent>()
+
+    override fun HTML.apply() {
+        head {
+            title("JmlParser -- Playground")
+
+            styleLink("/assets/spectre.min.css")
+            // styleLink("/assets/spectre-exp.min.css")
+            styleLink("/assets/spectre-icons.min.css")
+            styleLink("/assets/style.css")
+
+            script { src = "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.32.0/codemirror.min.js" }
+            script { src = "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.62.0/mode/clike/clike.min.js" }
+
+            link {
+                rel = "stylesheet"
+                href = "https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.32.0/codemirror.min.css"
+            }
+        }
+
+        body {
+            div("content")
+            h1 {
+                +"JmlParser — Playground"
+                span("version label label-rounded label-secondary") {
+                    +version
+                }
+            }
+
+            div("inner") {
+                div("container") {
+                    div("column col-12") { insert(top) }
+                }
+                div("container") {
+                    div("columns") {
+                        div("column col-5") { insert(body) }
+                        div("divider-vert") { /*attributes["data-content"] = "|"*/ }
+                        div("column col-5") { insert(right) }
+                    }
+                }
+            }
+            script {
+                unsafe {
+                    +"""
+                        var editor = CodeMirror.fromTextArea(document.getElementById('input'), 
+                            { lineNumbers: true, mode: "text/x-java", matchBrackets: true });
+                        editor.setSize("100%", "90%");
+                        function select(l1, c1, l2, c2) {
+                            editor.doc.setSelection({'line':l1-1, 'ch':c1-1}, {'line':l2-1, 'ch':c2}, {'scroll': true});
+                        }
+                     """
+                }
+            }
+        }
+    }
+}
+
+private fun UL.printNode(
+    n: Node,
+    text: String = "",
+) {
+    val isJml = n is Jmlish
+    val clazz = if (isJml) "jmlish" else ""
+
+    li(clazz) {
+        span("attrib-name") { +text }
+        +": "
+        span("type-name") { +n.metaModel.typeName }
+
+        n.range.ifPresent {
+            span("range label") {
+                a {
+                    val l1 = it.begin.line
+                    val c1 = it.begin.column
+                    val l2 = it.end.line
+                    val c2 = it.end.column
+                    onClick = "javascript:select($l1,$c1, $l2, $c2);"
+                    +"$l1/$c1 - $l2/$c2"
+                }
+            }
+        }
+
+        ul {
+            val metaModel: NodeMetaModel = n.metaModel
+            val allPropertyMetaModels = metaModel.allPropertyMetaModels
+            val attributes =
+                allPropertyMetaModels
+                    .filter { obj: PropertyMetaModel -> obj.isAttribute }
+                    .filter { obj: PropertyMetaModel -> obj.isSingular }
+            val subNodes =
+                allPropertyMetaModels
+                    .filter { obj: PropertyMetaModel -> obj.isNode }
+                    .filter { obj: PropertyMetaModel -> obj.isSingular }
+            val subLists =
+                allPropertyMetaModels
+                    .filter { obj: PropertyMetaModel -> obj.isNodeList }
+
+            for (attributeMetaModel in attributes) {
+                li {
+                    span("attrib-name") { +attributeMetaModel.name }
+                    +": "
+                    span("type-name") { +attributeMetaModel.typeName }
+                    +" = "
+                    span("value") {
+                        attributeMetaModel.getValue(n)?.let { +it.toString() } ?: +"value is null"
+                    }
+                }
+            }
+
+            for (subNodeMetaModel in subNodes) {
+                val value = subNodeMetaModel.getValue(n) as Node?
+                if (value != null) {
+                    printNode(value, subNodeMetaModel.name)
+                }
+            }
+
+            for (subListMetaModel in subLists) {
+                val subList = subListMetaModel.getValue(n) as com.github.javaparser.ast.NodeList<out Node>
+                if (!subList.isEmpty()) {
+                    val listName = subListMetaModel.name
+                    li {
+                        span("attrib-name") { +listName }
+                        +": "
+                        span("type-name") { +subListMetaModel.typeName }
+                        ul {
+                            subList.forEachIndexed { idx, it ->
+                                printNode(it, "[$idx]")
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/tools/web/src/main/resources/assets/spectre-exp.min.css b/tools/web/src/main/resources/assets/spectre-exp.min.css
new file mode 100644
index 0000000000..d3137743a6
--- /dev/null
+++ b/tools/web/src/main/resources/assets/spectre-exp.min.css
@@ -0,0 +1 @@
+/*! Spectre.css Experimentals v0.5.9 | MIT License | github.com/picturepan2/spectre */.form-autocomplete{position:relative}.form-autocomplete .form-autocomplete-input{align-content:flex-start;display:-ms-flexbox;display:flex;-ms-flex-line-pack:start;-ms-flex-wrap:wrap;flex-wrap:wrap;height:auto;min-height:1.6rem;padding:.1rem}.form-autocomplete .form-autocomplete-input.is-focused{border-color:#5755d9;box-shadow:0 0 0 .1rem rgba(87,85,217,.2)}.form-autocomplete .form-autocomplete-input .form-input{border-color:transparent;box-shadow:none;display:inline-block;-ms-flex:1 0 auto;flex:1 0 auto;height:1.2rem;line-height:.8rem;margin:.1rem;width:auto}.form-autocomplete .menu{left:0;position:absolute;top:100%;width:100%}.form-autocomplete.autocomplete-oneline .form-autocomplete-input{-ms-flex-wrap:nowrap;flex-wrap:nowrap;overflow-x:auto}.form-autocomplete.autocomplete-oneline .chip{-ms-flex:1 0 auto;flex:1 0 auto}.calendar{border:.05rem solid #dadee4;border-radius:.1rem;display:block;min-width:280px}.calendar .calendar-nav{align-items:center;background:#f7f8f9;border-top-left-radius:.1rem;border-top-right-radius:.1rem;display:-ms-flexbox;display:flex;-ms-flex-align:center;font-size:.9rem;padding:.4rem}.calendar .calendar-body,.calendar .calendar-header{display:-ms-flexbox;display:flex;-ms-flex-pack:center;-ms-flex-wrap:wrap;flex-wrap:wrap;justify-content:center;padding:.4rem 0}.calendar .calendar-body .calendar-date,.calendar .calendar-header .calendar-date{-ms-flex:0 0 14.28%;flex:0 0 14.28%;max-width:14.28%}.calendar .calendar-header{background:#f7f8f9;border-bottom:.05rem solid #dadee4;color:#bcc3ce;font-size:.7rem;text-align:center}.calendar .calendar-body{color:#66758c}.calendar .calendar-date{border:0;padding:.2rem}.calendar .calendar-date .date-item{-webkit-appearance:none;-moz-appearance:none;appearance:none;background:0 0;border:.05rem solid transparent;border-radius:50%;color:#66758c;cursor:pointer;font-size:.7rem;height:1.4rem;line-height:1rem;outline:0;padding:.1rem;position:relative;text-align:center;text-decoration:none;transition:background .2s,border .2s,box-shadow .2s,color .2s;vertical-align:middle;white-space:nowrap;width:1.4rem}.calendar .calendar-date .date-item.date-today{border-color:#e5e5f9;color:#5755d9}.calendar .calendar-date .date-item:focus{box-shadow:0 0 0 .1rem rgba(87,85,217,.2)}.calendar .calendar-date .date-item:focus,.calendar .calendar-date .date-item:hover{background:#fefeff;border-color:#e5e5f9;color:#5755d9;text-decoration:none}.calendar .calendar-date .date-item.active,.calendar .calendar-date .date-item:active{background:#4b48d6;border-color:#3634d2;color:#fff}.calendar .calendar-date .date-item.badge::after{position:absolute;right:3px;top:3px;transform:translate(50%,-50%)}.calendar .calendar-date .calendar-event.disabled,.calendar .calendar-date .calendar-event:disabled,.calendar .calendar-date .date-item.disabled,.calendar .calendar-date .date-item:disabled{cursor:default;opacity:.25;pointer-events:none}.calendar .calendar-date.next-month .calendar-event,.calendar .calendar-date.next-month .date-item,.calendar .calendar-date.prev-month .calendar-event,.calendar .calendar-date.prev-month .date-item{opacity:.25}.calendar .calendar-range{position:relative}.calendar .calendar-range::before{background:#f1f1fc;content:"";height:1.4rem;left:0;position:absolute;right:0;top:50%;transform:translateY(-50%)}.calendar .calendar-range.range-start::before{left:50%}.calendar .calendar-range.range-end::before{right:50%}.calendar .calendar-range.range-end .date-item,.calendar .calendar-range.range-start .date-item{background:#4b48d6;border-color:#3634d2;color:#fff}.calendar .calendar-range .date-item{color:#5755d9}.calendar.calendar-lg .calendar-body{padding:0}.calendar.calendar-lg .calendar-body .calendar-date{border-bottom:.05rem solid #dadee4;border-right:.05rem solid #dadee4;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:5.5rem;padding:0}.calendar.calendar-lg .calendar-body .calendar-date:nth-child(7n){border-right:0}.calendar.calendar-lg .calendar-body .calendar-date:nth-last-child(-n+7){border-bottom:0}.calendar.calendar-lg .date-item{align-self:flex-end;-ms-flex-item-align:end;height:1.4rem;margin-right:.2rem;margin-top:.2rem}.calendar.calendar-lg .calendar-range::before{top:19px}.calendar.calendar-lg .calendar-range.range-start::before{left:auto;width:19px}.calendar.calendar-lg .calendar-range.range-end::before{right:19px}.calendar.calendar-lg .calendar-events{flex-grow:1;-ms-flex-positive:1;line-height:1;overflow-y:auto;padding:.2rem}.calendar.calendar-lg .calendar-event{border-radius:.1rem;display:block;font-size:.7rem;margin:.1rem auto;overflow:hidden;padding:3px 4px;text-overflow:ellipsis;white-space:nowrap}.carousel .carousel-locator:nth-of-type(1):checked~.carousel-container .carousel-item:nth-of-type(1),.carousel .carousel-locator:nth-of-type(2):checked~.carousel-container .carousel-item:nth-of-type(2),.carousel .carousel-locator:nth-of-type(3):checked~.carousel-container .carousel-item:nth-of-type(3),.carousel .carousel-locator:nth-of-type(4):checked~.carousel-container .carousel-item:nth-of-type(4),.carousel .carousel-locator:nth-of-type(5):checked~.carousel-container .carousel-item:nth-of-type(5),.carousel .carousel-locator:nth-of-type(6):checked~.carousel-container .carousel-item:nth-of-type(6),.carousel .carousel-locator:nth-of-type(7):checked~.carousel-container .carousel-item:nth-of-type(7),.carousel .carousel-locator:nth-of-type(8):checked~.carousel-container .carousel-item:nth-of-type(8){animation:carousel-slidein .75s ease-in-out 1;opacity:1;z-index:100}.carousel .carousel-locator:nth-of-type(1):checked~.carousel-nav .nav-item:nth-of-type(1),.carousel .carousel-locator:nth-of-type(2):checked~.carousel-nav .nav-item:nth-of-type(2),.carousel .carousel-locator:nth-of-type(3):checked~.carousel-nav .nav-item:nth-of-type(3),.carousel .carousel-locator:nth-of-type(4):checked~.carousel-nav .nav-item:nth-of-type(4),.carousel .carousel-locator:nth-of-type(5):checked~.carousel-nav .nav-item:nth-of-type(5),.carousel .carousel-locator:nth-of-type(6):checked~.carousel-nav .nav-item:nth-of-type(6),.carousel .carousel-locator:nth-of-type(7):checked~.carousel-nav .nav-item:nth-of-type(7),.carousel .carousel-locator:nth-of-type(8):checked~.carousel-nav .nav-item:nth-of-type(8){color:#f7f8f9}.carousel{background:#f7f8f9;display:block;overflow:hidden;-webkit-overflow-scrolling:touch;position:relative;width:100%;z-index:1}.carousel .carousel-container{height:100%;left:0;position:relative}.carousel .carousel-container::before{content:"";display:block;padding-bottom:56.25%}.carousel .carousel-container .carousel-item{animation:carousel-slideout 1s ease-in-out 1;height:100%;left:0;margin:0;opacity:0;position:absolute;top:0;width:100%}.carousel .carousel-container .carousel-item:hover .item-next,.carousel .carousel-container .carousel-item:hover .item-prev{opacity:1}.carousel .carousel-container .item-next,.carousel .carousel-container .item-prev{background:rgba(247,248,249,.25);border-color:rgba(247,248,249,.5);color:#f7f8f9;opacity:0;position:absolute;top:50%;transform:translateY(-50%);transition:all .4s;z-index:100}.carousel .carousel-container .item-prev{left:1rem}.carousel .carousel-container .item-next{right:1rem}.carousel .carousel-nav{bottom:.4rem;display:-ms-flexbox;display:flex;-ms-flex-pack:center;justify-content:center;left:50%;position:absolute;transform:translateX(-50%);width:10rem;z-index:100}.carousel .carousel-nav .nav-item{color:rgba(247,248,249,.5);display:block;-ms-flex:1 0 auto;flex:1 0 auto;height:1.6rem;margin:.2rem;max-width:2.5rem;position:relative}.carousel .carousel-nav .nav-item::before{background:currentColor;content:"";display:block;height:.1rem;position:absolute;top:.5rem;width:100%}@keyframes carousel-slidein{0%{transform:translateX(100%)}100%{transform:translateX(0)}}@keyframes carousel-slideout{0%{opacity:1;transform:translateX(0)}100%{opacity:1;transform:translateX(-50%)}}.comparison-slider{height:50vh;overflow:hidden;-webkit-overflow-scrolling:touch;position:relative;width:100%}.comparison-slider .comparison-after,.comparison-slider .comparison-before{height:100%;left:0;margin:0;overflow:hidden;position:absolute;top:0}.comparison-slider .comparison-after img,.comparison-slider .comparison-before img{height:100%;object-fit:cover;object-position:left center;position:absolute;width:100%}.comparison-slider .comparison-before{width:100%;z-index:1}.comparison-slider .comparison-before .comparison-label{right:.8rem}.comparison-slider .comparison-after{max-width:100%;min-width:0;z-index:2}.comparison-slider .comparison-after::before{background:0 0;content:"";cursor:default;height:100%;left:0;position:absolute;right:.8rem;top:0;z-index:1}.comparison-slider .comparison-after::after{background:currentColor;border-radius:50%;box-shadow:0 -5px,0 5px;color:#fff;content:"";height:3px;pointer-events:none;position:absolute;right:.4rem;top:50%;transform:translate(50%,-50%);width:3px}.comparison-slider .comparison-after .comparison-label{left:.8rem}.comparison-slider .comparison-resizer{animation:first-run 1.5s 1 ease-in-out;cursor:ew-resize;height:.8rem;left:0;max-width:100%;min-width:.8rem;opacity:0;outline:0;position:relative;resize:horizontal;top:50%;transform:translateY(-50%) scaleY(30);width:0}.comparison-slider .comparison-label{background:rgba(48,55,66,.5);bottom:.8rem;color:#fff;padding:.2rem .4rem;position:absolute;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}@keyframes first-run{0%{width:0}25%{width:2.4rem}50%{width:.8rem}75%{width:1.2rem}100%{width:0}}.filter .filter-tag#tag-0:checked~.filter-nav .chip[for=tag-0],.filter .filter-tag#tag-1:checked~.filter-nav .chip[for=tag-1],.filter .filter-tag#tag-2:checked~.filter-nav .chip[for=tag-2],.filter .filter-tag#tag-3:checked~.filter-nav .chip[for=tag-3],.filter .filter-tag#tag-4:checked~.filter-nav .chip[for=tag-4],.filter .filter-tag#tag-5:checked~.filter-nav .chip[for=tag-5],.filter .filter-tag#tag-6:checked~.filter-nav .chip[for=tag-6],.filter .filter-tag#tag-7:checked~.filter-nav .chip[for=tag-7],.filter .filter-tag#tag-8:checked~.filter-nav .chip[for=tag-8]{background:#5755d9;color:#fff}.filter .filter-tag#tag-1:checked~.filter-body .filter-item:not([data-tag~=tag-1]),.filter .filter-tag#tag-2:checked~.filter-body .filter-item:not([data-tag~=tag-2]),.filter .filter-tag#tag-3:checked~.filter-body .filter-item:not([data-tag~=tag-3]),.filter .filter-tag#tag-4:checked~.filter-body .filter-item:not([data-tag~=tag-4]),.filter .filter-tag#tag-5:checked~.filter-body .filter-item:not([data-tag~=tag-5]),.filter .filter-tag#tag-6:checked~.filter-body .filter-item:not([data-tag~=tag-6]),.filter .filter-tag#tag-7:checked~.filter-body .filter-item:not([data-tag~=tag-7]),.filter .filter-tag#tag-8:checked~.filter-body .filter-item:not([data-tag~=tag-8]){display:none}.filter .filter-nav{margin:.4rem 0}.filter .filter-body{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.meter{-webkit-appearance:none;-moz-appearance:none;appearance:none;background:#f7f8f9;border:0;border-radius:.1rem;display:block;height:.8rem;width:100%}.meter::-webkit-meter-inner-element{display:block}.meter::-webkit-meter-bar,.meter::-webkit-meter-even-less-good-value,.meter::-webkit-meter-optimum-value,.meter::-webkit-meter-suboptimum-value{border-radius:.1rem}.meter::-webkit-meter-bar{background:#f7f8f9}.meter::-webkit-meter-optimum-value{background:#32b643}.meter::-webkit-meter-suboptimum-value{background:#ffb700}.meter::-webkit-meter-even-less-good-value{background:#e85600}.meter:-moz-meter-optimum,.meter:-moz-meter-sub-optimum,.meter:-moz-meter-sub-sub-optimum,.meter::-moz-meter-bar{border-radius:.1rem}.meter:-moz-meter-optimum::-moz-meter-bar{background:#32b643}.meter:-moz-meter-sub-optimum::-moz-meter-bar{background:#ffb700}.meter:-moz-meter-sub-sub-optimum::-moz-meter-bar{background:#e85600}.off-canvas{display:-ms-flexbox;display:flex;-ms-flex-flow:nowrap;flex-flow:nowrap;height:100%;position:relative;width:100%}.off-canvas .off-canvas-toggle{display:block;left:.4rem;position:absolute;top:.4rem;transition:none;z-index:1}.off-canvas .off-canvas-sidebar{background:#f7f8f9;bottom:0;left:0;min-width:10rem;overflow-y:auto;position:fixed;top:0;transform:translateX(-100%);transition:transform .25s;z-index:200}.off-canvas .off-canvas-content{-ms-flex:1 1 auto;flex:1 1 auto;height:100%;padding:.4rem .4rem .4rem 4rem}.off-canvas .off-canvas-overlay{background:rgba(48,55,66,.1);border-color:transparent;border-radius:0;bottom:0;display:none;height:100%;left:0;position:fixed;right:0;top:0;width:100%}.off-canvas .off-canvas-sidebar.active,.off-canvas .off-canvas-sidebar:target{transform:translateX(0)}.off-canvas .off-canvas-sidebar.active~.off-canvas-overlay,.off-canvas .off-canvas-sidebar:target~.off-canvas-overlay{display:block;z-index:100}@media (min-width:960px){.off-canvas.off-canvas-sidebar-show .off-canvas-toggle{display:none}.off-canvas.off-canvas-sidebar-show .off-canvas-sidebar{-ms-flex:0 0 auto;flex:0 0 auto;position:relative;transform:none}.off-canvas.off-canvas-sidebar-show .off-canvas-overlay{display:none!important}}.parallax{display:block;height:auto;position:relative;width:auto}.parallax .parallax-content{box-shadow:0 1rem 2.1rem rgba(48,55,66,.3);height:auto;transform:perspective(1000px);transform-style:preserve-3d;transition:all .4s ease;width:100%}.parallax .parallax-content::before{content:"";display:block;height:100%;left:0;position:absolute;top:0;width:100%}.parallax .parallax-front{align-items:center;color:#fff;display:-ms-flexbox;display:flex;-ms-flex-align:center;-ms-flex-pack:center;height:100%;justify-content:center;left:0;position:absolute;text-align:center;text-shadow:0 0 20px rgba(48,55,66,.75);top:0;transform:translateZ(50px) scale(.95);transition:transform .4s;width:100%;z-index:1}.parallax .parallax-top-left{height:50%;left:0;outline:0;position:absolute;top:0;width:50%;z-index:100}.parallax .parallax-top-left:focus~.parallax-content,.parallax .parallax-top-left:hover~.parallax-content{transform:perspective(1000px) rotateX(3deg) rotateY(-3deg)}.parallax .parallax-top-left:focus~.parallax-content::before,.parallax .parallax-top-left:hover~.parallax-content::before{background:linear-gradient(135deg,rgba(255,255,255,.35) 0,transparent 50%)}.parallax .parallax-top-left:focus~.parallax-content .parallax-front,.parallax .parallax-top-left:hover~.parallax-content .parallax-front{transform:translate3d(4.5px,4.5px,50px) scale(.95)}.parallax .parallax-top-right{height:50%;outline:0;position:absolute;right:0;top:0;width:50%;z-index:100}.parallax .parallax-top-right:focus~.parallax-content,.parallax .parallax-top-right:hover~.parallax-content{transform:perspective(1000px) rotateX(3deg) rotateY(3deg)}.parallax .parallax-top-right:focus~.parallax-content::before,.parallax .parallax-top-right:hover~.parallax-content::before{background:linear-gradient(-135deg,rgba(255,255,255,.35) 0,transparent 50%)}.parallax .parallax-top-right:focus~.parallax-content .parallax-front,.parallax .parallax-top-right:hover~.parallax-content .parallax-front{transform:translate3d(-4.5px,4.5px,50px) scale(.95)}.parallax .parallax-bottom-left{bottom:0;height:50%;left:0;outline:0;position:absolute;width:50%;z-index:100}.parallax .parallax-bottom-left:focus~.parallax-content,.parallax .parallax-bottom-left:hover~.parallax-content{transform:perspective(1000px) rotateX(-3deg) rotateY(-3deg)}.parallax .parallax-bottom-left:focus~.parallax-content::before,.parallax .parallax-bottom-left:hover~.parallax-content::before{background:linear-gradient(45deg,rgba(255,255,255,.35) 0,transparent 50%)}.parallax .parallax-bottom-left:focus~.parallax-content .parallax-front,.parallax .parallax-bottom-left:hover~.parallax-content .parallax-front{transform:translate3d(4.5px,-4.5px,50px) scale(.95)}.parallax .parallax-bottom-right{bottom:0;height:50%;outline:0;position:absolute;right:0;width:50%;z-index:100}.parallax .parallax-bottom-right:focus~.parallax-content,.parallax .parallax-bottom-right:hover~.parallax-content{transform:perspective(1000px) rotateX(-3deg) rotateY(3deg)}.parallax .parallax-bottom-right:focus~.parallax-content::before,.parallax .parallax-bottom-right:hover~.parallax-content::before{background:linear-gradient(-45deg,rgba(255,255,255,.35) 0,transparent 50%)}.parallax .parallax-bottom-right:focus~.parallax-content .parallax-front,.parallax .parallax-bottom-right:hover~.parallax-content .parallax-front{transform:translate3d(-4.5px,-4.5px,50px) scale(.95)}.progress{-webkit-appearance:none;-moz-appearance:none;appearance:none;background:#eef0f3;border:0;border-radius:.1rem;color:#5755d9;height:.2rem;position:relative;width:100%}.progress::-webkit-progress-bar{background:0 0;border-radius:.1rem}.progress::-webkit-progress-value{background:#5755d9;border-radius:.1rem}.progress::-moz-progress-bar{background:#5755d9;border-radius:.1rem}.progress:indeterminate{animation:progress-indeterminate 1.5s linear infinite;background:#eef0f3 linear-gradient(to right,#5755d9 30%,#eef0f3 30%) top left/150% 150% no-repeat}.progress:indeterminate::-moz-progress-bar{background:0 0}@keyframes progress-indeterminate{0%{background-position:200% 0}100%{background-position:-200% 0}}.slider{-webkit-appearance:none;-moz-appearance:none;appearance:none;background:0 0;display:block;height:1.2rem;width:100%}.slider:focus{box-shadow:0 0 0 .1rem rgba(87,85,217,.2);outline:0}.slider.tooltip:not([data-tooltip])::after{content:attr(value)}.slider::-webkit-slider-thumb{-webkit-appearance:none;background:#5755d9;border:0;border-radius:50%;height:.6rem;margin-top:-.25rem;-webkit-transition:transform .2s;transition:transform .2s;width:.6rem}.slider::-moz-range-thumb{background:#5755d9;border:0;border-radius:50%;height:.6rem;-moz-transition:transform .2s;transition:transform .2s;width:.6rem}.slider::-ms-thumb{background:#5755d9;border:0;border-radius:50%;height:.6rem;-ms-transition:transform .2s;transition:transform .2s;width:.6rem}.slider:active::-webkit-slider-thumb{transform:scale(1.25)}.slider:active::-moz-range-thumb{transform:scale(1.25)}.slider:active::-ms-thumb{transform:scale(1.25)}.slider.disabled::-webkit-slider-thumb,.slider:disabled::-webkit-slider-thumb{background:#f7f8f9;transform:scale(1)}.slider.disabled::-moz-range-thumb,.slider:disabled::-moz-range-thumb{background:#f7f8f9;transform:scale(1)}.slider.disabled::-ms-thumb,.slider:disabled::-ms-thumb{background:#f7f8f9;transform:scale(1)}.slider::-webkit-slider-runnable-track{background:#eef0f3;border-radius:.1rem;height:.1rem;width:100%}.slider::-moz-range-track{background:#eef0f3;border-radius:.1rem;height:.1rem;width:100%}.slider::-ms-track{background:#eef0f3;border-radius:.1rem;height:.1rem;width:100%}.slider::-ms-fill-lower{background:#5755d9}.timeline .timeline-item{display:-ms-flexbox;display:flex;margin-bottom:1.2rem;position:relative}.timeline .timeline-item::before{background:#dadee4;content:"";height:100%;left:11px;position:absolute;top:1.2rem;width:2px}.timeline .timeline-item .timeline-left{-ms-flex:0 0 auto;flex:0 0 auto}.timeline .timeline-item .timeline-content{-ms-flex:1 1 auto;flex:1 1 auto;padding:2px 0 2px .8rem}.timeline .timeline-item .timeline-icon{align-items:center;border-radius:50%;color:#fff;display:-ms-flexbox;display:flex;-ms-flex-align:center;-ms-flex-pack:center;height:1.2rem;justify-content:center;text-align:center;width:1.2rem}.timeline .timeline-item .timeline-icon::before{border:.1rem solid #5755d9;border-radius:50%;content:"";display:block;height:.4rem;left:.4rem;position:absolute;top:.4rem;width:.4rem}.timeline .timeline-item .timeline-icon.icon-lg{background:#5755d9;line-height:1.2rem}.timeline .timeline-item .timeline-icon.icon-lg::before{content:none}.viewer-360{align-items:center;display:-ms-flexbox;display:flex;-ms-flex-align:center;-ms-flex-direction:column;flex-direction:column}.viewer-360 .viewer-slider[max="36"][value="1"]+.viewer-image{background-position-y:0}.viewer-360 .viewer-slider[max="36"][value="2"]+.viewer-image{background-position-y:2.8571428571%}.viewer-360 .viewer-slider[max="36"][value="3"]+.viewer-image{background-position-y:5.7142857143%}.viewer-360 .viewer-slider[max="36"][value="4"]+.viewer-image{background-position-y:8.5714285714%}.viewer-360 .viewer-slider[max="36"][value="5"]+.viewer-image{background-position-y:11.4285714286%}.viewer-360 .viewer-slider[max="36"][value="6"]+.viewer-image{background-position-y:14.2857142857%}.viewer-360 .viewer-slider[max="36"][value="7"]+.viewer-image{background-position-y:17.1428571429%}.viewer-360 .viewer-slider[max="36"][value="8"]+.viewer-image{background-position-y:20%}.viewer-360 .viewer-slider[max="36"][value="9"]+.viewer-image{background-position-y:22.8571428571%}.viewer-360 .viewer-slider[max="36"][value="10"]+.viewer-image{background-position-y:25.7142857143%}.viewer-360 .viewer-slider[max="36"][value="11"]+.viewer-image{background-position-y:28.5714285714%}.viewer-360 .viewer-slider[max="36"][value="12"]+.viewer-image{background-position-y:31.4285714286%}.viewer-360 .viewer-slider[max="36"][value="13"]+.viewer-image{background-position-y:34.2857142857%}.viewer-360 .viewer-slider[max="36"][value="14"]+.viewer-image{background-position-y:37.1428571429%}.viewer-360 .viewer-slider[max="36"][value="15"]+.viewer-image{background-position-y:40%}.viewer-360 .viewer-slider[max="36"][value="16"]+.viewer-image{background-position-y:42.8571428571%}.viewer-360 .viewer-slider[max="36"][value="17"]+.viewer-image{background-position-y:45.7142857143%}.viewer-360 .viewer-slider[max="36"][value="18"]+.viewer-image{background-position-y:48.5714285714%}.viewer-360 .viewer-slider[max="36"][value="19"]+.viewer-image{background-position-y:51.4285714286%}.viewer-360 .viewer-slider[max="36"][value="20"]+.viewer-image{background-position-y:54.2857142857%}.viewer-360 .viewer-slider[max="36"][value="21"]+.viewer-image{background-position-y:57.1428571429%}.viewer-360 .viewer-slider[max="36"][value="22"]+.viewer-image{background-position-y:60%}.viewer-360 .viewer-slider[max="36"][value="23"]+.viewer-image{background-position-y:62.8571428571%}.viewer-360 .viewer-slider[max="36"][value="24"]+.viewer-image{background-position-y:65.7142857143%}.viewer-360 .viewer-slider[max="36"][value="25"]+.viewer-image{background-position-y:68.5714285714%}.viewer-360 .viewer-slider[max="36"][value="26"]+.viewer-image{background-position-y:71.4285714286%}.viewer-360 .viewer-slider[max="36"][value="27"]+.viewer-image{background-position-y:74.2857142857%}.viewer-360 .viewer-slider[max="36"][value="28"]+.viewer-image{background-position-y:77.1428571429%}.viewer-360 .viewer-slider[max="36"][value="29"]+.viewer-image{background-position-y:80%}.viewer-360 .viewer-slider[max="36"][value="30"]+.viewer-image{background-position-y:82.8571428571%}.viewer-360 .viewer-slider[max="36"][value="31"]+.viewer-image{background-position-y:85.7142857143%}.viewer-360 .viewer-slider[max="36"][value="32"]+.viewer-image{background-position-y:88.5714285714%}.viewer-360 .viewer-slider[max="36"][value="33"]+.viewer-image{background-position-y:91.4285714286%}.viewer-360 .viewer-slider[max="36"][value="34"]+.viewer-image{background-position-y:94.2857142857%}.viewer-360 .viewer-slider[max="36"][value="35"]+.viewer-image{background-position-y:97.1428571429%}.viewer-360 .viewer-slider[max="36"][value="36"]+.viewer-image{background-position-y:100%}.viewer-360 .viewer-slider{cursor:ew-resize;-ms-flex-order:2;margin:1rem;order:2;width:60%}.viewer-360 .viewer-image{background-position-y:0;background-repeat:no-repeat;background-size:100%;-ms-flex-order:1;max-width:100%;order:1}
\ No newline at end of file
diff --git a/tools/web/src/main/resources/assets/spectre-icons.min.css b/tools/web/src/main/resources/assets/spectre-icons.min.css
new file mode 100644
index 0000000000..0276f7b848
--- /dev/null
+++ b/tools/web/src/main/resources/assets/spectre-icons.min.css
@@ -0,0 +1 @@
+/*! Spectre.css Icons v0.5.9 | MIT License | github.com/picturepan2/spectre */.icon{box-sizing:border-box;display:inline-block;font-size:inherit;font-style:normal;height:1em;position:relative;text-indent:-9999px;vertical-align:middle;width:1em}.icon::after,.icon::before{content:"";display:block;left:50%;position:absolute;top:50%;transform:translate(-50%,-50%)}.icon.icon-2x{font-size:1.6rem}.icon.icon-3x{font-size:2.4rem}.icon.icon-4x{font-size:3.2rem}.accordion .icon,.btn .icon,.menu .icon,.toast .icon{vertical-align:-10%}.btn-lg .icon{vertical-align:-15%}.icon-arrow-down::before,.icon-arrow-left::before,.icon-arrow-right::before,.icon-arrow-up::before,.icon-back::before,.icon-downward::before,.icon-forward::before,.icon-upward::before{border:.1rem solid currentColor;border-bottom:0;border-right:0;height:.65em;width:.65em}.icon-arrow-down::before{transform:translate(-50%,-75%) rotate(225deg)}.icon-arrow-left::before{transform:translate(-25%,-50%) rotate(-45deg)}.icon-arrow-right::before{transform:translate(-75%,-50%) rotate(135deg)}.icon-arrow-up::before{transform:translate(-50%,-25%) rotate(45deg)}.icon-back::after,.icon-forward::after{background:currentColor;height:.1rem;width:.8em}.icon-downward::after,.icon-upward::after{background:currentColor;height:.8em;width:.1rem}.icon-back::after{left:55%}.icon-back::before{transform:translate(-50%,-50%) rotate(-45deg)}.icon-downward::after{top:45%}.icon-downward::before{transform:translate(-50%,-50%) rotate(-135deg)}.icon-forward::after{left:45%}.icon-forward::before{transform:translate(-50%,-50%) rotate(135deg)}.icon-upward::after{top:55%}.icon-upward::before{transform:translate(-50%,-50%) rotate(45deg)}.icon-caret::before{border-left:.3em solid transparent;border-right:.3em solid transparent;border-top:.3em solid currentColor;height:0;transform:translate(-50%,-25%);width:0}.icon-menu::before{background:currentColor;box-shadow:0 -.35em,0 .35em;height:.1rem;width:100%}.icon-apps::before{background:currentColor;box-shadow:-.35em -.35em,-.35em 0,-.35em .35em,0 -.35em,0 .35em,.35em -.35em,.35em 0,.35em .35em;height:3px;width:3px}.icon-resize-horiz::after,.icon-resize-horiz::before,.icon-resize-vert::after,.icon-resize-vert::before{border:.1rem solid currentColor;border-bottom:0;border-right:0;height:.45em;width:.45em}.icon-resize-horiz::before,.icon-resize-vert::before{transform:translate(-50%,-90%) rotate(45deg)}.icon-resize-horiz::after,.icon-resize-vert::after{transform:translate(-50%,-10%) rotate(225deg)}.icon-resize-horiz::before{transform:translate(-90%,-50%) rotate(-45deg)}.icon-resize-horiz::after{transform:translate(-10%,-50%) rotate(135deg)}.icon-more-horiz::before,.icon-more-vert::before{background:currentColor;border-radius:50%;box-shadow:-.4em 0,.4em 0;height:3px;width:3px}.icon-more-vert::before{box-shadow:0 -.4em,0 .4em}.icon-cross::before,.icon-minus::before,.icon-plus::before{background:currentColor;height:.1rem;width:100%}.icon-cross::after,.icon-plus::after{background:currentColor;height:100%;width:.1rem}.icon-cross::before{width:100%}.icon-cross::after{height:100%}.icon-cross::after,.icon-cross::before{transform:translate(-50%,-50%) rotate(45deg)}.icon-check::before{border:.1rem solid currentColor;border-right:0;border-top:0;height:.5em;transform:translate(-50%,-75%) rotate(-45deg);width:.9em}.icon-stop{border:.1rem solid currentColor;border-radius:50%}.icon-stop::before{background:currentColor;height:.1rem;transform:translate(-50%,-50%) rotate(45deg);width:1em}.icon-shutdown{border:.1rem solid currentColor;border-radius:50%;border-top-color:transparent}.icon-shutdown::before{background:currentColor;content:"";height:.5em;top:.1em;width:.1rem}.icon-refresh::before{border:.1rem solid currentColor;border-radius:50%;border-right-color:transparent;height:1em;width:1em}.icon-refresh::after{border:.2em solid currentColor;border-left-color:transparent;border-top-color:transparent;height:0;left:80%;top:20%;width:0}.icon-search::before{border:.1rem solid currentColor;border-radius:50%;height:.75em;left:5%;top:5%;transform:translate(0,0) rotate(45deg);width:.75em}.icon-search::after{background:currentColor;height:.1rem;left:80%;top:80%;transform:translate(-50%,-50%) rotate(45deg);width:.4em}.icon-edit::before{border:.1rem solid currentColor;height:.4em;transform:translate(-40%,-60%) rotate(-45deg);width:.85em}.icon-edit::after{border:.15em solid currentColor;border-right-color:transparent;border-top-color:transparent;height:0;left:5%;top:95%;transform:translate(0,-100%);width:0}.icon-delete::before{border:.1rem solid currentColor;border-bottom-left-radius:.1rem;border-bottom-right-radius:.1rem;border-top:0;height:.75em;top:60%;width:.75em}.icon-delete::after{background:currentColor;box-shadow:-.25em .2em,.25em .2em;height:.1rem;top:.05rem;width:.5em}.icon-share{border:.1rem solid currentColor;border-radius:.1rem;border-right:0;border-top:0}.icon-share::before{border:.1rem solid currentColor;border-left:0;border-top:0;height:.4em;left:100%;top:.25em;transform:translate(-125%,-50%) rotate(-45deg);width:.4em}.icon-share::after{border:.1rem solid currentColor;border-bottom:0;border-radius:75% 0;border-right:0;height:.5em;width:.6em}.icon-flag::before{background:currentColor;height:1em;left:15%;width:.1rem}.icon-flag::after{border:.1rem solid currentColor;border-bottom-right-radius:.1rem;border-left:0;border-top-right-radius:.1rem;height:.65em;left:60%;top:35%;width:.8em}.icon-bookmark::before{border:.1rem solid currentColor;border-bottom:0;border-top-left-radius:.1rem;border-top-right-radius:.1rem;height:.9em;width:.8em}.icon-bookmark::after{border:.1rem solid currentColor;border-bottom:0;border-left:0;border-radius:.1rem;height:.5em;transform:translate(-50%,35%) rotate(-45deg) skew(15deg,15deg);width:.5em}.icon-download,.icon-upload{border-bottom:.1rem solid currentColor}.icon-download::before,.icon-upload::before{border:.1rem solid currentColor;border-bottom:0;border-right:0;height:.5em;transform:translate(-50%,-60%) rotate(-135deg);width:.5em}.icon-download::after,.icon-upload::after{background:currentColor;height:.6em;top:40%;width:.1rem}.icon-upload::before{transform:translate(-50%,-60%) rotate(45deg)}.icon-upload::after{top:50%}.icon-copy::before{border:.1rem solid currentColor;border-bottom:0;border-radius:.1rem;border-right:0;height:.8em;left:40%;top:35%;width:.8em}.icon-copy::after{border:.1rem solid currentColor;border-radius:.1rem;height:.8em;left:60%;top:60%;width:.8em}.icon-time{border:.1rem solid currentColor;border-radius:50%}.icon-time::before{background:currentColor;height:.4em;transform:translate(-50%,-75%);width:.1rem}.icon-time::after{background:currentColor;height:.3em;transform:translate(-50%,-75%) rotate(90deg);transform-origin:50% 90%;width:.1rem}.icon-mail::before{border:.1rem solid currentColor;border-radius:.1rem;height:.8em;width:1em}.icon-mail::after{border:.1rem solid currentColor;border-right:0;border-top:0;height:.5em;transform:translate(-50%,-90%) rotate(-45deg) skew(10deg,10deg);width:.5em}.icon-people::before{border:.1rem solid currentColor;border-radius:50%;height:.45em;top:25%;width:.45em}.icon-people::after{border:.1rem solid currentColor;border-radius:50% 50% 0 0;height:.4em;top:75%;width:.9em}.icon-message{border:.1rem solid currentColor;border-bottom:0;border-radius:.1rem;border-right:0}.icon-message::before{border:.1rem solid currentColor;border-bottom-right-radius:.1rem;border-left:0;border-top:0;height:.8em;left:65%;top:40%;width:.7em}.icon-message::after{background:currentColor;border-radius:.1rem;height:.3em;left:10%;top:100%;transform:translate(0,-90%) rotate(45deg);width:.1rem}.icon-photo{border:.1rem solid currentColor;border-radius:.1rem}.icon-photo::before{border:.1rem solid currentColor;border-radius:50%;height:.25em;left:35%;top:35%;width:.25em}.icon-photo::after{border:.1rem solid currentColor;border-bottom:0;border-left:0;height:.5em;left:60%;transform:translate(-50%,25%) rotate(-45deg);width:.5em}.icon-link::after,.icon-link::before{border:.1rem solid currentColor;border-radius:5em 0 0 5em;border-right:0;height:.5em;width:.75em}.icon-link::before{transform:translate(-70%,-45%) rotate(-45deg)}.icon-link::after{transform:translate(-30%,-55%) rotate(135deg)}.icon-location::before{border:.1rem solid currentColor;border-radius:50% 50% 50% 0;height:.8em;transform:translate(-50%,-60%) rotate(-45deg);width:.8em}.icon-location::after{border:.1rem solid currentColor;border-radius:50%;height:.2em;transform:translate(-50%,-80%);width:.2em}.icon-emoji{border:.1rem solid currentColor;border-radius:50%}.icon-emoji::before{border-radius:50%;box-shadow:-.17em -.1em,.17em -.1em;height:.15em;width:.15em}.icon-emoji::after{border:.1rem solid currentColor;border-bottom-color:transparent;border-radius:50%;border-right-color:transparent;height:.5em;transform:translate(-50%,-40%) rotate(-135deg);width:.5em}
\ No newline at end of file
diff --git a/tools/web/src/main/resources/assets/spectre.min.css b/tools/web/src/main/resources/assets/spectre.min.css
new file mode 100644
index 0000000000..0fe23d9c09
--- /dev/null
+++ b/tools/web/src/main/resources/assets/spectre.min.css
@@ -0,0 +1 @@
+/*! Spectre.css v0.5.9 | MIT License | github.com/picturepan2/spectre */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,footer,header,nav,section{display:block}h1{font-size:2em;margin:.67em 0}figcaption,figure,main{display:block}hr{box-sizing:content-box;height:0;overflow:visible}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}address{font-style:normal}b,strong{font-weight:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:"SF Mono","Segoe UI Mono","Roboto Mono",Menlo,Courier,monospace;font-size:1em}dfn{font-style:italic}small{font-size:80%;font-weight:400}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}audio,video{display:inline-block}audio:not([controls]){display:none;height:0}img{border-style:none}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}fieldset{border:0;margin:0;padding:0}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{display:inline-block;vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details,menu{display:block}summary{display:list-item;outline:0}canvas{display:inline-block}template{display:none}[hidden]{display:none}*,::after,::before{box-sizing:inherit}html{box-sizing:border-box;font-size:20px;line-height:1.5;-webkit-tap-highlight-color:transparent}body{background:#fff;color:#3b4351;font-family:-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",sans-serif;font-size:.8rem;overflow-x:hidden;text-rendering:optimizeLegibility}a{color:#5755d9;outline:0;text-decoration:none}a:focus{box-shadow:0 0 0 .1rem rgba(87,85,217,.2)}a.active,a:active,a:focus,a:hover{color:#302ecd;text-decoration:underline}a:visited{color:#807fe2}h1,h2,h3,h4,h5,h6{color:inherit;font-weight:500;line-height:1.2;margin-bottom:.5em;margin-top:0}.h1,.h2,.h3,.h4,.h5,.h6{font-weight:500}.h1,h1{font-size:2rem}.h2,h2{font-size:1.6rem}.h3,h3{font-size:1.4rem}.h4,h4{font-size:1.2rem}.h5,h5{font-size:1rem}.h6,h6{font-size:.8rem}p{margin:0 0 1.2rem}a,ins,u{-webkit-text-decoration-skip:ink edges;text-decoration-skip:ink edges}abbr[title]{border-bottom:.05rem dotted;cursor:help;text-decoration:none}kbd{background:#303742;border-radius:.1rem;color:#fff;font-size:.7rem;line-height:1.25;padding:.1rem .2rem}mark{background:#ffe9b3;border-bottom:.05rem solid #ffd367;border-radius:.1rem;color:#3b4351;padding:.05rem .1rem 0}blockquote{border-left:.1rem solid #dadee4;margin-left:0;padding:.4rem .8rem}blockquote p:last-child{margin-bottom:0}ol,ul{margin:.8rem 0 .8rem .8rem;padding:0}ol ol,ol ul,ul ol,ul ul{margin:.8rem 0 .8rem .8rem}ol li,ul li{margin-top:.4rem}ul{list-style:disc inside}ul ul{list-style-type:circle}ol{list-style:decimal inside}ol ol{list-style-type:lower-alpha}dl dt{font-weight:700}dl dd{margin:.4rem 0 .8rem 0}.lang-zh,.lang-zh-hans,html:lang(zh),html:lang(zh-Hans){font-family:-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","Helvetica Neue",sans-serif}.lang-zh-hant,html:lang(zh-Hant){font-family:-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"PingFang TC","Hiragino Sans CNS","Microsoft JhengHei","Helvetica Neue",sans-serif}.lang-ja,html:lang(ja){font-family:-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Hiragino Sans","Hiragino Kaku Gothic Pro","Yu Gothic",YuGothic,Meiryo,"Helvetica Neue",sans-serif}.lang-ko,html:lang(ko){font-family:-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Malgun Gothic","Helvetica Neue",sans-serif}.lang-cjk ins,.lang-cjk u,:lang(ja) ins,:lang(ja) u,:lang(zh) ins,:lang(zh) u{border-bottom:.05rem solid;text-decoration:none}.lang-cjk del+del,.lang-cjk del+s,.lang-cjk ins+ins,.lang-cjk ins+u,.lang-cjk s+del,.lang-cjk s+s,.lang-cjk u+ins,.lang-cjk u+u,:lang(ja) del+del,:lang(ja) del+s,:lang(ja) ins+ins,:lang(ja) ins+u,:lang(ja) s+del,:lang(ja) s+s,:lang(ja) u+ins,:lang(ja) u+u,:lang(zh) del+del,:lang(zh) del+s,:lang(zh) ins+ins,:lang(zh) ins+u,:lang(zh) s+del,:lang(zh) s+s,:lang(zh) u+ins,:lang(zh) u+u{margin-left:.125em}.table{border-collapse:collapse;border-spacing:0;text-align:left;width:100%}.table.table-striped tbody tr:nth-of-type(odd){background:#f7f8f9}.table tbody tr.active,.table.table-striped tbody tr.active{background:#eef0f3}.table.table-hover tbody tr:hover{background:#eef0f3}.table.table-scroll{display:block;overflow-x:auto;padding-bottom:.75rem;white-space:nowrap}.table td,.table th{border-bottom:.05rem solid #dadee4;padding:.6rem .4rem}.table th{border-bottom-width:.1rem}.btn{-webkit-appearance:none;-moz-appearance:none;appearance:none;background:#fff;border:.05rem solid #5755d9;border-radius:.1rem;color:#5755d9;cursor:pointer;display:inline-block;font-size:.8rem;height:1.8rem;line-height:1.2rem;outline:0;padding:.25rem .4rem;text-align:center;text-decoration:none;transition:background .2s,border .2s,box-shadow .2s,color .2s;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;vertical-align:middle;white-space:nowrap}.btn:focus{box-shadow:0 0 0 .1rem rgba(87,85,217,.2)}.btn:focus,.btn:hover{background:#f1f1fc;border-color:#4b48d6;text-decoration:none}.btn.active,.btn:active{background:#4b48d6;border-color:#3634d2;color:#fff;text-decoration:none}.btn.active.loading::after,.btn:active.loading::after{border-bottom-color:#fff;border-left-color:#fff}.btn.disabled,.btn:disabled,.btn[disabled]{cursor:default;opacity:.5;pointer-events:none}.btn.btn-primary{background:#5755d9;border-color:#4b48d6;color:#fff}.btn.btn-primary:focus,.btn.btn-primary:hover{background:#4240d4;border-color:#3634d2;color:#fff}.btn.btn-primary.active,.btn.btn-primary:active{background:#3a38d2;border-color:#302ecd;color:#fff}.btn.btn-primary.loading::after{border-bottom-color:#fff;border-left-color:#fff}.btn.btn-success{background:#32b643;border-color:#2faa3f;color:#fff}.btn.btn-success:focus{box-shadow:0 0 0 .1rem rgba(50,182,67,.2)}.btn.btn-success:focus,.btn.btn-success:hover{background:#30ae40;border-color:#2da23c;color:#fff}.btn.btn-success.active,.btn.btn-success:active{background:#2a9a39;border-color:#278e34;color:#fff}.btn.btn-success.loading::after{border-bottom-color:#fff;border-left-color:#fff}.btn.btn-error{background:#e85600;border-color:#d95000;color:#fff}.btn.btn-error:focus{box-shadow:0 0 0 .1rem rgba(232,86,0,.2)}.btn.btn-error:focus,.btn.btn-error:hover{background:#de5200;border-color:#cf4d00;color:#fff}.btn.btn-error.active,.btn.btn-error:active{background:#c44900;border-color:#b54300;color:#fff}.btn.btn-error.loading::after{border-bottom-color:#fff;border-left-color:#fff}.btn.btn-link{background:0 0;border-color:transparent;color:#5755d9}.btn.btn-link.active,.btn.btn-link:active,.btn.btn-link:focus,.btn.btn-link:hover{color:#302ecd}.btn.btn-sm{font-size:.7rem;height:1.4rem;padding:.05rem .3rem}.btn.btn-lg{font-size:.9rem;height:2rem;padding:.35rem .6rem}.btn.btn-block{display:block;width:100%}.btn.btn-action{padding-left:0;padding-right:0;width:1.8rem}.btn.btn-action.btn-sm{width:1.4rem}.btn.btn-action.btn-lg{width:2rem}.btn.btn-clear{background:0 0;border:0;color:currentColor;height:1rem;line-height:.8rem;margin-left:.2rem;margin-right:-2px;opacity:1;padding:.1rem;text-decoration:none;width:1rem}.btn.btn-clear:focus,.btn.btn-clear:hover{background:rgba(247,248,249,.5);opacity:.95}.btn.btn-clear::before{content:"\2715"}.btn-group{display:-ms-inline-flexbox;display:inline-flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.btn-group .btn{-ms-flex:1 0 auto;flex:1 0 auto}.btn-group .btn:first-child:not(:last-child){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group .btn:not(:first-child):not(:last-child){border-radius:0;margin-left:-.05rem}.btn-group .btn:last-child:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0;margin-left:-.05rem}.btn-group .btn.active,.btn-group .btn:active,.btn-group .btn:focus,.btn-group .btn:hover{z-index:1}.btn-group.btn-group-block{display:-ms-flexbox;display:flex}.btn-group.btn-group-block .btn{-ms-flex:1 0 0;flex:1 0 0}.form-group:not(:last-child){margin-bottom:.4rem}fieldset{margin-bottom:.8rem}legend{font-size:.9rem;font-weight:500;margin-bottom:.8rem}.form-label{display:block;line-height:1.2rem;padding:.3rem 0}.form-label.label-sm{font-size:.7rem;padding:.1rem 0}.form-label.label-lg{font-size:.9rem;padding:.4rem 0}.form-input{-webkit-appearance:none;-moz-appearance:none;appearance:none;background:#fff;background-image:none;border:.05rem solid #bcc3ce;border-radius:.1rem;color:#3b4351;display:block;font-size:.8rem;height:1.8rem;line-height:1.2rem;max-width:100%;outline:0;padding:.25rem .4rem;position:relative;transition:background .2s,border .2s,box-shadow .2s,color .2s;width:100%}.form-input:focus{border-color:#5755d9;box-shadow:0 0 0 .1rem rgba(87,85,217,.2)}.form-input:-ms-input-placeholder{color:#bcc3ce}.form-input::-ms-input-placeholder{color:#bcc3ce}.form-input::placeholder{color:#bcc3ce}.form-input.input-sm{font-size:.7rem;height:1.4rem;padding:.05rem .3rem}.form-input.input-lg{font-size:.9rem;height:2rem;padding:.35rem .6rem}.form-input.input-inline{display:inline-block;vertical-align:middle;width:auto}.form-input[type=file]{height:auto}textarea.form-input,textarea.form-input.input-lg,textarea.form-input.input-sm{height:auto}.form-input-hint{color:#bcc3ce;font-size:.7rem;margin-top:.2rem}.has-success .form-input-hint,.is-success+.form-input-hint{color:#32b643}.has-error .form-input-hint,.is-error+.form-input-hint{color:#e85600}.form-select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background:#fff;border:.05rem solid #bcc3ce;border-radius:.1rem;color:inherit;font-size:.8rem;height:1.8rem;line-height:1.2rem;outline:0;padding:.25rem .4rem;vertical-align:middle;width:100%}.form-select:focus{border-color:#5755d9;box-shadow:0 0 0 .1rem rgba(87,85,217,.2)}.form-select::-ms-expand{display:none}.form-select.select-sm{font-size:.7rem;height:1.4rem;padding:.05rem 1.1rem .05rem .3rem}.form-select.select-lg{font-size:.9rem;height:2rem;padding:.35rem 1.4rem .35rem .6rem}.form-select[multiple],.form-select[size]{height:auto;padding:.25rem .4rem}.form-select[multiple] option,.form-select[size] option{padding:.1rem .2rem}.form-select:not([multiple]):not([size]){background:#fff url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%204%205'%3E%3Cpath%20fill='%23667189'%20d='M2%200L0%202h4zm0%205L0%203h4z'/%3E%3C/svg%3E") no-repeat right .35rem center/.4rem .5rem;padding-right:1.2rem}.has-icon-left,.has-icon-right{position:relative}.has-icon-left .form-icon,.has-icon-right .form-icon{height:.8rem;margin:0 .25rem;position:absolute;top:50%;transform:translateY(-50%);width:.8rem;z-index:2}.has-icon-left .form-icon{left:.05rem}.has-icon-left .form-input{padding-left:1.3rem}.has-icon-right .form-icon{right:.05rem}.has-icon-right .form-input{padding-right:1.3rem}.form-checkbox,.form-radio,.form-switch{display:block;line-height:1.2rem;margin:.2rem 0;min-height:1.4rem;padding:.1rem .4rem .1rem 1.2rem;position:relative}.form-checkbox input,.form-radio input,.form-switch input{clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;position:absolute;width:1px}.form-checkbox input:focus+.form-icon,.form-radio input:focus+.form-icon,.form-switch input:focus+.form-icon{border-color:#5755d9;box-shadow:0 0 0 .1rem rgba(87,85,217,.2)}.form-checkbox input:checked+.form-icon,.form-radio input:checked+.form-icon,.form-switch input:checked+.form-icon{background:#5755d9;border-color:#5755d9}.form-checkbox .form-icon,.form-radio .form-icon,.form-switch .form-icon{border:.05rem solid #bcc3ce;cursor:pointer;display:inline-block;position:absolute;transition:background .2s,border .2s,box-shadow .2s,color .2s}.form-checkbox.input-sm,.form-radio.input-sm,.form-switch.input-sm{font-size:.7rem;margin:0}.form-checkbox.input-lg,.form-radio.input-lg,.form-switch.input-lg{font-size:.9rem;margin:.3rem 0}.form-checkbox .form-icon,.form-radio .form-icon{background:#fff;height:.8rem;left:0;top:.3rem;width:.8rem}.form-checkbox input:active+.form-icon,.form-radio input:active+.form-icon{background:#eef0f3}.form-checkbox .form-icon{border-radius:.1rem}.form-checkbox input:checked+.form-icon::before{background-clip:padding-box;border:.1rem solid #fff;border-left-width:0;border-top-width:0;content:"";height:9px;left:50%;margin-left:-3px;margin-top:-6px;position:absolute;top:50%;transform:rotate(45deg);width:6px}.form-checkbox input:indeterminate+.form-icon{background:#5755d9;border-color:#5755d9}.form-checkbox input:indeterminate+.form-icon::before{background:#fff;content:"";height:2px;left:50%;margin-left:-5px;margin-top:-1px;position:absolute;top:50%;width:10px}.form-radio .form-icon{border-radius:50%}.form-radio input:checked+.form-icon::before{background:#fff;border-radius:50%;content:"";height:6px;left:50%;position:absolute;top:50%;transform:translate(-50%,-50%);width:6px}.form-switch{padding-left:2rem}.form-switch .form-icon{background:#bcc3ce;background-clip:padding-box;border-radius:.45rem;height:.9rem;left:0;top:.25rem;width:1.6rem}.form-switch .form-icon::before{background:#fff;border-radius:50%;content:"";display:block;height:.8rem;left:0;position:absolute;top:0;transition:background .2s,border .2s,box-shadow .2s,color .2s,left .2s;width:.8rem}.form-switch input:checked+.form-icon::before{left:14px}.form-switch input:active+.form-icon::before{background:#f7f8f9}.input-group{display:-ms-flexbox;display:flex}.input-group .input-group-addon{background:#f7f8f9;border:.05rem solid #bcc3ce;border-radius:.1rem;line-height:1.2rem;padding:.25rem .4rem;white-space:nowrap}.input-group .input-group-addon.addon-sm{font-size:.7rem;padding:.05rem .3rem}.input-group .input-group-addon.addon-lg{font-size:.9rem;padding:.35rem .6rem}.input-group .form-input,.input-group .form-select{-ms-flex:1 1 auto;flex:1 1 auto;width:1%}.input-group .input-group-btn{z-index:1}.input-group .form-input:first-child:not(:last-child),.input-group .form-select:first-child:not(:last-child),.input-group .input-group-addon:first-child:not(:last-child),.input-group .input-group-btn:first-child:not(:last-child){border-bottom-right-radius:0;border-top-right-radius:0}.input-group .form-input:not(:first-child):not(:last-child),.input-group .form-select:not(:first-child):not(:last-child),.input-group .input-group-addon:not(:first-child):not(:last-child),.input-group .input-group-btn:not(:first-child):not(:last-child){border-radius:0;margin-left:-.05rem}.input-group .form-input:last-child:not(:first-child),.input-group .form-select:last-child:not(:first-child),.input-group .input-group-addon:last-child:not(:first-child),.input-group .input-group-btn:last-child:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0;margin-left:-.05rem}.input-group .form-input:focus,.input-group .form-select:focus,.input-group .input-group-addon:focus,.input-group .input-group-btn:focus{z-index:2}.input-group .form-select{width:auto}.input-group.input-inline{display:-ms-inline-flexbox;display:inline-flex}.form-input.is-success,.form-select.is-success,.has-success .form-input,.has-success .form-select{background:#f9fdfa;border-color:#32b643}.form-input.is-success:focus,.form-select.is-success:focus,.has-success .form-input:focus,.has-success .form-select:focus{box-shadow:0 0 0 .1rem rgba(50,182,67,.2)}.form-input.is-error,.form-select.is-error,.has-error .form-input,.has-error .form-select{background:#fffaf7;border-color:#e85600}.form-input.is-error:focus,.form-select.is-error:focus,.has-error .form-input:focus,.has-error .form-select:focus{box-shadow:0 0 0 .1rem rgba(232,86,0,.2)}.form-checkbox.is-error .form-icon,.form-radio.is-error .form-icon,.form-switch.is-error .form-icon,.has-error .form-checkbox .form-icon,.has-error .form-radio .form-icon,.has-error .form-switch .form-icon{border-color:#e85600}.form-checkbox.is-error input:checked+.form-icon,.form-radio.is-error input:checked+.form-icon,.form-switch.is-error input:checked+.form-icon,.has-error .form-checkbox input:checked+.form-icon,.has-error .form-radio input:checked+.form-icon,.has-error .form-switch input:checked+.form-icon{background:#e85600;border-color:#e85600}.form-checkbox.is-error input:focus+.form-icon,.form-radio.is-error input:focus+.form-icon,.form-switch.is-error input:focus+.form-icon,.has-error .form-checkbox input:focus+.form-icon,.has-error .form-radio input:focus+.form-icon,.has-error .form-switch input:focus+.form-icon{border-color:#e85600;box-shadow:0 0 0 .1rem rgba(232,86,0,.2)}.form-checkbox.is-error input:indeterminate+.form-icon,.has-error .form-checkbox input:indeterminate+.form-icon{background:#e85600;border-color:#e85600}.form-input:not(:-ms-input-placeholder):invalid{border-color:#e85600}.form-input:not(:placeholder-shown):invalid{border-color:#e85600}.form-input:not(:-ms-input-placeholder):invalid:focus{background:#fffaf7;box-shadow:0 0 0 .1rem rgba(232,86,0,.2)}.form-input:not(:placeholder-shown):invalid:focus{background:#fffaf7;box-shadow:0 0 0 .1rem rgba(232,86,0,.2)}.form-input:not(:-ms-input-placeholder):invalid+.form-input-hint{color:#e85600}.form-input:not(:placeholder-shown):invalid+.form-input-hint{color:#e85600}.form-input.disabled,.form-input:disabled,.form-select.disabled,.form-select:disabled{background-color:#eef0f3;cursor:not-allowed;opacity:.5}.form-input[readonly]{background-color:#f7f8f9}input.disabled+.form-icon,input:disabled+.form-icon{background:#eef0f3;cursor:not-allowed;opacity:.5}.form-switch input.disabled+.form-icon::before,.form-switch input:disabled+.form-icon::before{background:#fff}.form-horizontal{padding:.4rem 0}.form-horizontal .form-group{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.form-inline{display:inline-block}.label{background:#eef0f3;border-radius:.1rem;color:#455060;display:inline-block;line-height:1.25;padding:.1rem .2rem}.label.label-rounded{border-radius:5rem;padding-left:.4rem;padding-right:.4rem}.label.label-primary{background:#5755d9;color:#fff}.label.label-secondary{background:#f1f1fc;color:#5755d9}.label.label-success{background:#32b643;color:#fff}.label.label-warning{background:#ffb700;color:#fff}.label.label-error{background:#e85600;color:#fff}code{background:#fcf2f2;border-radius:.1rem;color:#d73e48;font-size:85%;line-height:1.25;padding:.1rem .2rem}.code{border-radius:.1rem;color:#3b4351;position:relative}.code::before{color:#bcc3ce;content:attr(data-lang);font-size:.7rem;position:absolute;right:.4rem;top:.1rem}.code code{background:#f7f8f9;color:inherit;display:block;line-height:1.5;overflow-x:auto;padding:1rem;width:100%}.img-responsive{display:block;height:auto;max-width:100%}.img-fit-cover{object-fit:cover}.img-fit-contain{object-fit:contain}.video-responsive{display:block;overflow:hidden;padding:0;position:relative;width:100%}.video-responsive::before{content:"";display:block;padding-bottom:56.25%}.video-responsive embed,.video-responsive iframe,.video-responsive object{border:0;bottom:0;height:100%;left:0;position:absolute;right:0;top:0;width:100%}video.video-responsive{height:auto;max-width:100%}video.video-responsive::before{content:none}.video-responsive-4-3::before{padding-bottom:75%}.video-responsive-1-1::before{padding-bottom:100%}.figure{margin:0 0 .4rem 0}.figure .figure-caption{color:#66758c;margin-top:.4rem}.container{margin-left:auto;margin-right:auto;padding-left:.4rem;padding-right:.4rem;width:100%}.container.grid-xl{max-width:1296px}.container.grid-lg{max-width:976px}.container.grid-md{max-width:856px}.container.grid-sm{max-width:616px}.container.grid-xs{max-width:496px}.show-lg,.show-md,.show-sm,.show-xl,.show-xs{display:none!important}.cols,.columns{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-left:-.4rem;margin-right:-.4rem}.cols.col-gapless,.columns.col-gapless{margin-left:0;margin-right:0}.cols.col-gapless>.column,.columns.col-gapless>.column{padding-left:0;padding-right:0}.cols.col-oneline,.columns.col-oneline{-ms-flex-wrap:nowrap;flex-wrap:nowrap;overflow-x:auto}.column,[class~=col-]{-ms-flex:1;flex:1;max-width:100%;padding-left:.4rem;padding-right:.4rem}.column.col-1,.column.col-10,.column.col-11,.column.col-12,.column.col-2,.column.col-3,.column.col-4,.column.col-5,.column.col-6,.column.col-7,.column.col-8,.column.col-9,.column.col-auto,[class~=col-].col-1,[class~=col-].col-10,[class~=col-].col-11,[class~=col-].col-12,[class~=col-].col-2,[class~=col-].col-3,[class~=col-].col-4,[class~=col-].col-5,[class~=col-].col-6,[class~=col-].col-7,[class~=col-].col-8,[class~=col-].col-9,[class~=col-].col-auto{-ms-flex:none;flex:none}.col-12{width:100%}.col-11{width:91.66666667%}.col-10{width:83.33333333%}.col-9{width:75%}.col-8{width:66.66666667%}.col-7{width:58.33333333%}.col-6{width:50%}.col-5{width:41.66666667%}.col-4{width:33.33333333%}.col-3{width:25%}.col-2{width:16.66666667%}.col-1{width:8.33333333%}.col-auto{-ms-flex:0 0 auto;flex:0 0 auto;max-width:none;width:auto}.col-mx-auto{margin-left:auto;margin-right:auto}.col-ml-auto{margin-left:auto}.col-mr-auto{margin-right:auto}@media (max-width:1280px){.col-xl-1,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-auto{-ms-flex:none;flex:none}.col-xl-12{width:100%}.col-xl-11{width:91.66666667%}.col-xl-10{width:83.33333333%}.col-xl-9{width:75%}.col-xl-8{width:66.66666667%}.col-xl-7{width:58.33333333%}.col-xl-6{width:50%}.col-xl-5{width:41.66666667%}.col-xl-4{width:33.33333333%}.col-xl-3{width:25%}.col-xl-2{width:16.66666667%}.col-xl-1{width:8.33333333%}.col-xl-auto{width:auto}.hide-xl{display:none!important}.show-xl{display:block!important}}@media (max-width:960px){.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-auto{-ms-flex:none;flex:none}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-auto{width:auto}.hide-lg{display:none!important}.show-lg{display:block!important}}@media (max-width:840px){.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-auto{-ms-flex:none;flex:none}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-auto{width:auto}.hide-md{display:none!important}.show-md{display:block!important}}@media (max-width:600px){.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-auto{-ms-flex:none;flex:none}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-auto{width:auto}.hide-sm{display:none!important}.show-sm{display:block!important}}@media (max-width:480px){.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-auto{-ms-flex:none;flex:none}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-auto{width:auto}.hide-xs{display:none!important}.show-xs{display:block!important}}.hero{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:justify;justify-content:space-between;padding-bottom:4rem;padding-top:4rem}.hero.hero-sm{padding-bottom:2rem;padding-top:2rem}.hero.hero-lg{padding-bottom:8rem;padding-top:8rem}.hero .hero-body{padding:.4rem}.navbar{align-items:stretch;display:-ms-flexbox;display:flex;-ms-flex-align:stretch;-ms-flex-pack:justify;-ms-flex-wrap:wrap;flex-wrap:wrap;justify-content:space-between}.navbar .navbar-section{align-items:center;display:-ms-flexbox;display:flex;-ms-flex:1 0 0;flex:1 0 0;-ms-flex-align:center}.navbar .navbar-section:not(:first-child):last-child{-ms-flex-pack:end;justify-content:flex-end}.navbar .navbar-center{align-items:center;display:-ms-flexbox;display:flex;-ms-flex:0 0 auto;flex:0 0 auto;-ms-flex-align:center}.navbar .navbar-brand{font-size:.9rem;text-decoration:none}.accordion input:checked~.accordion-header>.icon:first-child,.accordion[open] .accordion-header>.icon:first-child{transform:rotate(90deg)}.accordion input:checked~.accordion-body,.accordion[open] .accordion-body{max-height:50rem}.accordion .accordion-header{display:block;padding:.2rem .4rem}.accordion .accordion-header .icon{transition:transform .25s}.accordion .accordion-body{margin-bottom:.4rem;max-height:0;overflow:hidden;transition:max-height .25s}summary.accordion-header::-webkit-details-marker{display:none}.avatar{background:#5755d9;border-radius:50%;color:rgba(255,255,255,.85);display:inline-block;font-size:.8rem;font-weight:300;height:1.6rem;line-height:1.25;margin:0;position:relative;vertical-align:middle;width:1.6rem}.avatar.avatar-xs{font-size:.4rem;height:.8rem;width:.8rem}.avatar.avatar-sm{font-size:.6rem;height:1.2rem;width:1.2rem}.avatar.avatar-lg{font-size:1.2rem;height:2.4rem;width:2.4rem}.avatar.avatar-xl{font-size:1.6rem;height:3.2rem;width:3.2rem}.avatar img{border-radius:50%;height:100%;position:relative;width:100%;z-index:1}.avatar .avatar-icon,.avatar .avatar-presence{background:#fff;bottom:14.64%;height:50%;padding:.1rem;position:absolute;right:14.64%;transform:translate(50%,50%);width:50%;z-index:2}.avatar .avatar-presence{background:#bcc3ce;border-radius:50%;box-shadow:0 0 0 .1rem #fff;height:.5em;width:.5em}.avatar .avatar-presence.online{background:#32b643}.avatar .avatar-presence.busy{background:#e85600}.avatar .avatar-presence.away{background:#ffb700}.avatar[data-initial]::before{color:currentColor;content:attr(data-initial);left:50%;position:absolute;top:50%;transform:translate(-50%,-50%);z-index:1}.badge{position:relative;white-space:nowrap}.badge:not([data-badge])::after,.badge[data-badge]::after{background:#5755d9;background-clip:padding-box;border-radius:.5rem;box-shadow:0 0 0 .1rem #fff;color:#fff;content:attr(data-badge);display:inline-block;transform:translate(-.05rem,-.5rem)}.badge[data-badge]::after{font-size:.7rem;height:.9rem;line-height:1;min-width:.9rem;padding:.1rem .2rem;text-align:center;white-space:nowrap}.badge:not([data-badge])::after,.badge[data-badge=""]::after{height:6px;min-width:6px;padding:0;width:6px}.badge.btn::after{position:absolute;right:0;top:0;transform:translate(50%,-50%)}.badge.avatar::after{position:absolute;right:14.64%;top:14.64%;transform:translate(50%,-50%);z-index:100}.breadcrumb{list-style:none;margin:.2rem 0;padding:.2rem 0}.breadcrumb .breadcrumb-item{color:#66758c;display:inline-block;margin:0;padding:.2rem 0}.breadcrumb .breadcrumb-item:not(:last-child){margin-right:.2rem}.breadcrumb .breadcrumb-item:not(:last-child) a{color:#66758c}.breadcrumb .breadcrumb-item:not(:first-child)::before{color:#66758c;content:"/";padding-right:.4rem}.bar{background:#eef0f3;border-radius:.1rem;display:-ms-flexbox;display:flex;-ms-flex-wrap:nowrap;flex-wrap:nowrap;height:.8rem;width:100%}.bar.bar-sm{height:.2rem}.bar .bar-item{background:#5755d9;color:#fff;display:block;-ms-flex-negative:0;flex-shrink:0;font-size:.7rem;height:100%;line-height:.8rem;position:relative;text-align:center;width:0}.bar .bar-item:first-child{border-bottom-left-radius:.1rem;border-top-left-radius:.1rem}.bar .bar-item:last-child{border-bottom-right-radius:.1rem;border-top-right-radius:.1rem;-ms-flex-negative:1;flex-shrink:1}.bar-slider{height:.1rem;margin:.4rem 0;position:relative}.bar-slider .bar-item{left:0;padding:0;position:absolute}.bar-slider .bar-item:not(:last-child):first-child{background:#eef0f3;z-index:1}.bar-slider .bar-slider-btn{background:#5755d9;border:0;border-radius:50%;height:.6rem;padding:0;position:absolute;right:0;top:50%;transform:translate(50%,-50%);width:.6rem}.bar-slider .bar-slider-btn:active{box-shadow:0 0 0 .1rem #5755d9}.card{background:#fff;border:.05rem solid #dadee4;border-radius:.1rem;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column}.card .card-body,.card .card-footer,.card .card-header{padding:.8rem;padding-bottom:0}.card .card-body:last-child,.card .card-footer:last-child,.card .card-header:last-child{padding-bottom:.8rem}.card .card-body{-ms-flex:1 1 auto;flex:1 1 auto}.card .card-image{padding-top:.8rem}.card .card-image:first-child{padding-top:0}.card .card-image:first-child img{border-top-left-radius:.1rem;border-top-right-radius:.1rem}.card .card-image:last-child img{border-bottom-left-radius:.1rem;border-bottom-right-radius:.1rem}.chip{align-items:center;background:#eef0f3;border-radius:5rem;display:-ms-inline-flexbox;display:inline-flex;-ms-flex-align:center;font-size:90%;height:1.2rem;line-height:.8rem;margin:.1rem;max-width:320px;overflow:hidden;padding:.2rem .4rem;text-decoration:none;text-overflow:ellipsis;vertical-align:middle;white-space:nowrap}.chip.active{background:#5755d9;color:#fff}.chip .avatar{margin-left:-.4rem;margin-right:.2rem}.chip .btn-clear{border-radius:50%;transform:scale(.75)}.dropdown{display:inline-block;position:relative}.dropdown .menu{animation:slide-down .15s ease 1;display:none;left:0;max-height:50vh;overflow-y:auto;position:absolute;top:100%}.dropdown.dropdown-right .menu{left:auto;right:0}.dropdown .dropdown-toggle:focus+.menu,.dropdown .menu:hover,.dropdown.active .menu{display:block}.dropdown .btn-group .dropdown-toggle:nth-last-child(2){border-bottom-right-radius:.1rem;border-top-right-radius:.1rem}.empty{background:#f7f8f9;border-radius:.1rem;color:#66758c;padding:3.2rem 1.6rem;text-align:center}.empty .empty-icon{margin-bottom:.8rem}.empty .empty-subtitle,.empty .empty-title{margin:.4rem auto}.empty .empty-action{margin-top:.8rem}.menu{background:#fff;border-radius:.1rem;box-shadow:0 .05rem .2rem rgba(48,55,66,.3);list-style:none;margin:0;min-width:180px;padding:.4rem;transform:translateY(.2rem);z-index:300}.menu.menu-nav{background:0 0;box-shadow:none}.menu .menu-item{margin-top:0;padding:0 .4rem;position:relative;text-decoration:none}.menu .menu-item>a{border-radius:.1rem;color:inherit;display:block;margin:0 -.4rem;padding:.2rem .4rem;text-decoration:none}.menu .menu-item>a:focus,.menu .menu-item>a:hover{background:#f1f1fc;color:#5755d9}.menu .menu-item>a.active,.menu .menu-item>a:active{background:#f1f1fc;color:#5755d9}.menu .menu-item .form-checkbox,.menu .menu-item .form-radio,.menu .menu-item .form-switch{margin:.1rem 0}.menu .menu-item+.menu-item{margin-top:.2rem}.menu .menu-badge{align-items:center;display:-ms-flexbox;display:flex;-ms-flex-align:center;height:100%;position:absolute;right:0;top:0}.menu .menu-badge .label{margin-right:.4rem}.modal{align-items:center;bottom:0;display:none;-ms-flex-align:center;-ms-flex-pack:center;justify-content:center;left:0;opacity:0;overflow:hidden;padding:.4rem;position:fixed;right:0;top:0}.modal.active,.modal:target{display:-ms-flexbox;display:flex;opacity:1;z-index:400}.modal.active .modal-overlay,.modal:target .modal-overlay{background:rgba(247,248,249,.75);bottom:0;cursor:default;display:block;left:0;position:absolute;right:0;top:0}.modal.active .modal-container,.modal:target .modal-container{animation:slide-down .2s ease 1;z-index:1}.modal.modal-sm .modal-container{max-width:320px;padding:0 .4rem}.modal.modal-lg .modal-overlay{background:#fff}.modal.modal-lg .modal-container{box-shadow:none;max-width:960px}.modal-container{background:#fff;border-radius:.1rem;box-shadow:0 .2rem .5rem rgba(48,55,66,.3);display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;max-height:75vh;max-width:640px;padding:0 .8rem;width:100%}.modal-container.modal-fullheight{max-height:100vh}.modal-container .modal-header{color:#303742;padding:.8rem}.modal-container .modal-body{overflow-y:auto;padding:.8rem;position:relative}.modal-container .modal-footer{padding:.8rem;text-align:right}.nav{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;list-style:none;margin:.2rem 0}.nav .nav-item a{color:#66758c;padding:.2rem .4rem;text-decoration:none}.nav .nav-item a:focus,.nav .nav-item a:hover{color:#5755d9}.nav .nav-item.active>a{color:#505c6e;font-weight:700}.nav .nav-item.active>a:focus,.nav .nav-item.active>a:hover{color:#5755d9}.nav .nav{margin-bottom:.4rem;margin-left:.8rem}.pagination{display:-ms-flexbox;display:flex;list-style:none;margin:.2rem 0;padding:.2rem 0}.pagination .page-item{margin:.2rem .05rem}.pagination .page-item span{display:inline-block;padding:.2rem .2rem}.pagination .page-item a{border-radius:.1rem;display:inline-block;padding:.2rem .4rem;text-decoration:none}.pagination .page-item a:focus,.pagination .page-item a:hover{color:#5755d9}.pagination .page-item.disabled a{cursor:default;opacity:.5;pointer-events:none}.pagination .page-item.active a{background:#5755d9;color:#fff}.pagination .page-item.page-next,.pagination .page-item.page-prev{-ms-flex:1 0 50%;flex:1 0 50%}.pagination .page-item.page-next{text-align:right}.pagination .page-item .page-item-title{margin:0}.pagination .page-item .page-item-subtitle{margin:0;opacity:.5}.panel{border:.05rem solid #dadee4;border-radius:.1rem;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column}.panel .panel-footer,.panel .panel-header{-ms-flex:0 0 auto;flex:0 0 auto;padding:.8rem}.panel .panel-nav{-ms-flex:0 0 auto;flex:0 0 auto}.panel .panel-body{-ms-flex:1 1 auto;flex:1 1 auto;overflow-y:auto;padding:0 .8rem}.popover{display:inline-block;position:relative}.popover .popover-container{left:50%;opacity:0;padding:.4rem;position:absolute;top:0;transform:translate(-50%,-50%) scale(0);transition:transform .2s;width:320px;z-index:300}.popover :focus+.popover-container,.popover:hover .popover-container{display:block;opacity:1;transform:translate(-50%,-100%) scale(1)}.popover.popover-right .popover-container{left:100%;top:50%}.popover.popover-right :focus+.popover-container,.popover.popover-right:hover .popover-container{transform:translate(0,-50%) scale(1)}.popover.popover-bottom .popover-container{left:50%;top:100%}.popover.popover-bottom :focus+.popover-container,.popover.popover-bottom:hover .popover-container{transform:translate(-50%,0) scale(1)}.popover.popover-left .popover-container{left:0;top:50%}.popover.popover-left :focus+.popover-container,.popover.popover-left:hover .popover-container{transform:translate(-100%,-50%) scale(1)}.popover .card{border:0;box-shadow:0 .2rem .5rem rgba(48,55,66,.3)}.step{display:-ms-flexbox;display:flex;-ms-flex-wrap:nowrap;flex-wrap:nowrap;list-style:none;margin:.2rem 0;width:100%}.step .step-item{-ms-flex:1 1 0;flex:1 1 0;margin-top:0;min-height:1rem;position:relative;text-align:center}.step .step-item:not(:first-child)::before{background:#5755d9;content:"";height:2px;left:-50%;position:absolute;top:9px;width:100%}.step .step-item a{color:#5755d9;display:inline-block;padding:20px 10px 0;text-decoration:none}.step .step-item a::before{background:#5755d9;border:.1rem solid #fff;border-radius:50%;content:"";display:block;height:.6rem;left:50%;position:absolute;top:.2rem;transform:translateX(-50%);width:.6rem;z-index:1}.step .step-item.active a::before{background:#fff;border:.1rem solid #5755d9}.step .step-item.active~.step-item::before{background:#dadee4}.step .step-item.active~.step-item a{color:#bcc3ce}.step .step-item.active~.step-item a::before{background:#dadee4}.tab{align-items:center;border-bottom:.05rem solid #dadee4;display:-ms-flexbox;display:flex;-ms-flex-align:center;-ms-flex-wrap:wrap;flex-wrap:wrap;list-style:none;margin:.2rem 0 .15rem 0}.tab .tab-item{margin-top:0}.tab .tab-item a{border-bottom:.1rem solid transparent;color:inherit;display:block;margin:0 .4rem 0 0;padding:.4rem .2rem .3rem .2rem;text-decoration:none}.tab .tab-item a:focus,.tab .tab-item a:hover{color:#5755d9}.tab .tab-item a.active,.tab .tab-item.active a{border-bottom-color:#5755d9;color:#5755d9}.tab .tab-item.tab-action{-ms-flex:1 0 auto;flex:1 0 auto;text-align:right}.tab .tab-item .btn-clear{margin-top:-.2rem}.tab.tab-block .tab-item{-ms-flex:1 0 0;flex:1 0 0;text-align:center}.tab.tab-block .tab-item a{margin:0}.tab.tab-block .tab-item .badge[data-badge]::after{position:absolute;right:.1rem;top:.1rem;transform:translate(0,0)}.tab:not(.tab-block) .badge{padding-right:0}.tile{align-content:space-between;align-items:flex-start;display:-ms-flexbox;display:flex;-ms-flex-align:start;-ms-flex-line-pack:justify}.tile .tile-action,.tile .tile-icon{-ms-flex:0 0 auto;flex:0 0 auto}.tile .tile-content{-ms-flex:1 1 auto;flex:1 1 auto}.tile .tile-content:not(:first-child){padding-left:.4rem}.tile .tile-content:not(:last-child){padding-right:.4rem}.tile .tile-subtitle,.tile .tile-title{line-height:1.2rem}.tile.tile-centered{align-items:center;-ms-flex-align:center}.tile.tile-centered .tile-content{overflow:hidden}.tile.tile-centered .tile-subtitle,.tile.tile-centered .tile-title{margin-bottom:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.toast{background:rgba(48,55,66,.95);border:.05rem solid #303742;border-color:#303742;border-radius:.1rem;color:#fff;display:block;padding:.4rem;width:100%}.toast.toast-primary{background:rgba(87,85,217,.95);border-color:#5755d9}.toast.toast-success{background:rgba(50,182,67,.95);border-color:#32b643}.toast.toast-warning{background:rgba(255,183,0,.95);border-color:#ffb700}.toast.toast-error{background:rgba(232,86,0,.95);border-color:#e85600}.toast a{color:#fff;text-decoration:underline}.toast a.active,.toast a:active,.toast a:focus,.toast a:hover{opacity:.75}.toast .btn-clear{margin:.1rem}.toast p:last-child{margin-bottom:0}.tooltip{position:relative}.tooltip::after{background:rgba(48,55,66,.95);border-radius:.1rem;bottom:100%;color:#fff;content:attr(data-tooltip);display:block;font-size:.7rem;left:50%;max-width:320px;opacity:0;overflow:hidden;padding:.2rem .4rem;pointer-events:none;position:absolute;text-overflow:ellipsis;transform:translate(-50%,.4rem);transition:opacity .2s,transform .2s;white-space:pre;z-index:300}.tooltip:focus::after,.tooltip:hover::after{opacity:1;transform:translate(-50%,-.2rem)}.tooltip.disabled,.tooltip[disabled]{pointer-events:auto}.tooltip.tooltip-right::after{bottom:50%;left:100%;transform:translate(-.2rem,50%)}.tooltip.tooltip-right:focus::after,.tooltip.tooltip-right:hover::after{transform:translate(.2rem,50%)}.tooltip.tooltip-bottom::after{bottom:auto;top:100%;transform:translate(-50%,-.4rem)}.tooltip.tooltip-bottom:focus::after,.tooltip.tooltip-bottom:hover::after{transform:translate(-50%,.2rem)}.tooltip.tooltip-left::after{bottom:50%;left:auto;right:100%;transform:translate(.4rem,50%)}.tooltip.tooltip-left:focus::after,.tooltip.tooltip-left:hover::after{transform:translate(-.2rem,50%)}@keyframes loading{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}@keyframes slide-down{0%{opacity:0;transform:translateY(-1.6rem)}100%{opacity:1;transform:translateY(0)}}.text-primary{color:#5755d9!important}a.text-primary:focus,a.text-primary:hover{color:#4240d4}a.text-primary:visited{color:#6c6ade}.text-secondary{color:#e5e5f9!important}a.text-secondary:focus,a.text-secondary:hover{color:#d1d0f4}a.text-secondary:visited{color:#fafafe}.text-gray{color:#bcc3ce!important}a.text-gray:focus,a.text-gray:hover{color:#adb6c4}a.text-gray:visited{color:#cbd0d9}.text-light{color:#fff!important}a.text-light:focus,a.text-light:hover{color:#f2f2f2}a.text-light:visited{color:#fff}.text-dark{color:#3b4351!important}a.text-dark:focus,a.text-dark:hover{color:#303742}a.text-dark:visited{color:#455060}.text-success{color:#32b643!important}a.text-success:focus,a.text-success:hover{color:#2da23c}a.text-success:visited{color:#39c94b}.text-warning{color:#ffb700!important}a.text-warning:focus,a.text-warning:hover{color:#e6a500}a.text-warning:visited{color:#ffbe1a}.text-error{color:#e85600!important}a.text-error:focus,a.text-error:hover{color:#cf4d00}a.text-error:visited{color:#ff6003}.bg-primary{background:#5755d9!important;color:#fff}.bg-secondary{background:#f1f1fc!important}.bg-dark{background:#303742!important;color:#fff}.bg-gray{background:#f7f8f9!important}.bg-success{background:#32b643!important;color:#fff}.bg-warning{background:#ffb700!important;color:#fff}.bg-error{background:#e85600!important;color:#fff}.c-hand{cursor:pointer}.c-move{cursor:move}.c-zoom-in{cursor:zoom-in}.c-zoom-out{cursor:zoom-out}.c-not-allowed{cursor:not-allowed}.c-auto{cursor:auto}.d-block{display:block}.d-inline{display:inline}.d-inline-block{display:inline-block}.d-flex{display:-ms-flexbox;display:flex}.d-inline-flex{display:-ms-inline-flexbox;display:inline-flex}.d-hide,.d-none{display:none!important}.d-visible{visibility:visible}.d-invisible{visibility:hidden}.text-hide{background:0 0;border:0;color:transparent;font-size:0;line-height:0;text-shadow:none}.text-assistive{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.divider,.divider-vert{display:block;position:relative}.divider-vert[data-content]::after,.divider[data-content]::after{background:#fff;color:#bcc3ce;content:attr(data-content);display:inline-block;font-size:.7rem;padding:0 .4rem;transform:translateY(-.65rem)}.divider{border-top:.05rem solid #f1f3f5;height:.05rem;margin:.4rem 0}.divider[data-content]{margin:.8rem 0}.divider-vert{display:block;padding:.8rem}.divider-vert::before{border-left:.05rem solid #dadee4;bottom:.4rem;content:"";display:block;left:50%;position:absolute;top:.4rem;transform:translateX(-50%)}.divider-vert[data-content]::after{left:50%;padding:.2rem 0;position:absolute;top:50%;transform:translate(-50%,-50%)}.loading{color:transparent!important;min-height:.8rem;pointer-events:none;position:relative}.loading::after{animation:loading .5s infinite linear;background:0 0;border:.1rem solid #5755d9;border-radius:50%;border-right-color:transparent;border-top-color:transparent;content:"";display:block;height:.8rem;left:50%;margin-left:-.4rem;margin-top:-.4rem;opacity:1;padding:0;position:absolute;top:50%;width:.8rem;z-index:1}.loading.loading-lg{min-height:2rem}.loading.loading-lg::after{height:1.6rem;margin-left:-.8rem;margin-top:-.8rem;width:1.6rem}.clearfix::after{clear:both;content:"";display:table}.float-left{float:left!important}.float-right{float:right!important}.p-relative{position:relative!important}.p-absolute{position:absolute!important}.p-fixed{position:fixed!important}.p-sticky{position:-webkit-sticky!important;position:sticky!important}.p-centered{display:block;float:none;margin-left:auto;margin-right:auto}.flex-centered{align-items:center;display:-ms-flexbox;display:flex;-ms-flex-align:center;-ms-flex-pack:center;justify-content:center}.m-0{margin:0!important}.mb-0{margin-bottom:0!important}.ml-0{margin-left:0!important}.mr-0{margin-right:0!important}.mt-0{margin-top:0!important}.mx-0{margin-left:0!important;margin-right:0!important}.my-0{margin-bottom:0!important;margin-top:0!important}.m-1{margin:.2rem!important}.mb-1{margin-bottom:.2rem!important}.ml-1{margin-left:.2rem!important}.mr-1{margin-right:.2rem!important}.mt-1{margin-top:.2rem!important}.mx-1{margin-left:.2rem!important;margin-right:.2rem!important}.my-1{margin-bottom:.2rem!important;margin-top:.2rem!important}.m-2{margin:.4rem!important}.mb-2{margin-bottom:.4rem!important}.ml-2{margin-left:.4rem!important}.mr-2{margin-right:.4rem!important}.mt-2{margin-top:.4rem!important}.mx-2{margin-left:.4rem!important;margin-right:.4rem!important}.my-2{margin-bottom:.4rem!important;margin-top:.4rem!important}.p-0{padding:0!important}.pb-0{padding-bottom:0!important}.pl-0{padding-left:0!important}.pr-0{padding-right:0!important}.pt-0{padding-top:0!important}.px-0{padding-left:0!important;padding-right:0!important}.py-0{padding-bottom:0!important;padding-top:0!important}.p-1{padding:.2rem!important}.pb-1{padding-bottom:.2rem!important}.pl-1{padding-left:.2rem!important}.pr-1{padding-right:.2rem!important}.pt-1{padding-top:.2rem!important}.px-1{padding-left:.2rem!important;padding-right:.2rem!important}.py-1{padding-bottom:.2rem!important;padding-top:.2rem!important}.p-2{padding:.4rem!important}.pb-2{padding-bottom:.4rem!important}.pl-2{padding-left:.4rem!important}.pr-2{padding-right:.4rem!important}.pt-2{padding-top:.4rem!important}.px-2{padding-left:.4rem!important;padding-right:.4rem!important}.py-2{padding-bottom:.4rem!important;padding-top:.4rem!important}.s-rounded{border-radius:.1rem}.s-circle{border-radius:50%}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-normal{font-weight:400}.text-bold{font-weight:700}.text-italic{font-style:italic}.text-large{font-size:1.2em}.text-small{font-size:.9em}.text-tiny{font-size:.8em}.text-muted{opacity:.8}.text-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-clip{overflow:hidden;text-overflow:clip;white-space:nowrap}.text-break{-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto;word-break:break-word;word-wrap:break-word}
\ No newline at end of file
diff --git a/tools/web/src/main/resources/assets/style.css b/tools/web/src/main/resources/assets/style.css
new file mode 100644
index 0000000000..b9ece19779
--- /dev/null
+++ b/tools/web/src/main/resources/assets/style.css
@@ -0,0 +1,56 @@
+.version {
+    font-size: 80%;
+    margin: 1em;
+}
+
+.ast {
+    font-family: monospace;
+}
+
+.code {
+    font-family: monospace;
+    white-space: pre;
+}
+
+.ast li {
+    line-height: 180%;
+}
+
+.value {
+    background: rgb(133 88 255 / 30%);
+    border: 1px solid rgb(133 88 255 / 80%);
+    border-radius: 2px;
+    padding: .1ex;
+}
+
+.type-name {
+    background: rgb(109 248 46 / 30%);
+    border: 1px solid rgb(109 248 46 / 80%);
+    border-radius: 2px;
+    padding: .1ex;
+}
+
+.attrib-name {
+    background: rgb(251 78 251 / 30%);
+    border: 1px solid rgb(251 78 251 / 80%);
+    border-radius: 2px;
+    padding: .1ex;
+}
+
+.range {
+    background: #888;
+    color: white;
+    border-radius: 2px;
+    padding: .1ex;
+    margin-left: 2em;
+}
+
+.jmlish {
+    background: rgba(100, 150, 250, .3);
+    margin: 1em;
+}
+
+
+.accordion input:checked ~ .accordion-body, .accordion[open] .accordion-body {
+    overflow: scroll;
+}
\ No newline at end of file
diff --git a/tools/xpath/build.gradle.kts b/tools/xpath/build.gradle.kts
new file mode 100644
index 0000000000..0cdd8f85b9
--- /dev/null
+++ b/tools/xpath/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    id("standard-kotlin")
+}
+
+dependencies {
+}
+
diff --git a/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/AttribModifier.kt b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/AttribModifier.kt
new file mode 100644
index 0000000000..3a86b81200
--- /dev/null
+++ b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/AttribModifier.kt
@@ -0,0 +1,20 @@
+package io.github.jmltoolkit.xpath
+
+import com.github.javaparser.ast.Modifier.DefaultKeyword
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.nodeTypes.NodeWithModifiers
+import org.w3c.dom.Element
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (11.02.23)
+ */
+class AttribModifier : PseudoAttributeProvider {
+    override fun attributeForNode(node: Node, owner: Element): Collection<JPAttrPseudo> {
+        if (node is NodeWithModifiers<*>) {
+            return DefaultKeyword.entries
+                .map { JPAttrPseudo(it.name, { "" + node.hasModifier(it) }, owner) }
+        }
+        return listOf()
+    }
+}
diff --git a/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/AttribNodeWithName.kt b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/AttribNodeWithName.kt
new file mode 100644
index 0000000000..dc9e9921bd
--- /dev/null
+++ b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/AttribNodeWithName.kt
@@ -0,0 +1,18 @@
+package io.github.jmltoolkit.xpath
+
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.nodeTypes.NodeWithName
+import org.w3c.dom.Element
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (11.02.23)
+ */
+class AttribNodeWithName : PseudoAttributeProvider {
+    override fun attributeForNode(node: Node, owner: Element): Collection<JPAttrPseudo> {
+        if (node is NodeWithName<*>) {
+            return setOf(JPAttrPseudo("name", { node.nameAsString }, owner))
+        }
+        return listOf()
+    }
+}
diff --git a/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/DocumentFactories.kt b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/DocumentFactories.kt
new file mode 100644
index 0000000000..dea6cf0be8
--- /dev/null
+++ b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/DocumentFactories.kt
@@ -0,0 +1,97 @@
+package io.github.jmltoolkit.xpath
+
+import com.github.javaparser.ast.CompilationUnit
+import com.github.javaparser.ast.Node
+import com.github.javaparser.metamodel.PropertyMetaModel
+import org.w3c.dom.*
+import java.util.*
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (30.11.22)
+ */
+object DocumentFactories {
+    val attributeProviders by lazy {
+        ServiceLoader.load(PseudoAttributeProvider::class.java).toList()
+    }
+
+    fun isNodeProperty(mm: PropertyMetaModel): Boolean = mm.isNode || mm.isNodeList
+
+    fun getDocument(node: CompilationUnit): Document = JPDocument(node)
+
+    fun getElement(it: Node, parent: Element): JPElement = JPElement(it, parent)
+
+
+    fun <T : org.w3c.dom.Node> wrap(list: List<T>): NodeList {
+        return object : NodeList {
+            override fun item(index: Int): org.w3c.dom.Node = list[index]
+
+            override fun getLength(): Int = list.size
+        }
+    }
+
+    fun wrap(vararg seq: Element): NodeList = wrap(listOf(*seq))
+
+    fun emptyNodeMap(): NamedNodeMap {
+        return object : NamedNodeMap {
+            override fun getNamedItem(name: String): org.w3c.dom.Node? = null
+
+            @Throws(DOMException::class)
+            override fun setNamedItem(arg: org.w3c.dom.Node): org.w3c.dom.Node? = null
+
+            @Throws(DOMException::class)
+            override fun removeNamedItem(name: String): org.w3c.dom.Node? = null
+
+            override fun item(index: Int): org.w3c.dom.Node? = null
+
+            override fun getLength(): Int = 0
+
+            @Throws(DOMException::class)
+            override fun getNamedItemNS(namespaceURI: String, localName: String): org.w3c.dom.Node? = null
+
+            @Throws(DOMException::class)
+            override fun setNamedItemNS(arg: org.w3c.dom.Node): org.w3c.dom.Node? = null
+
+            @Throws(DOMException::class)
+            override fun removeNamedItemNS(namespaceURI: String, localName: String): org.w3c.dom.Node? = null
+        }
+    }
+
+    fun getAttribute(jpElement: JPElement, it: PropertyMetaModel): Attr = JPAttr(jpElement, it)
+
+    fun nodeMap(jpElement: JPElement): NamedNodeMap {
+        return object : NamedNodeMap {
+            override fun getNamedItem(name: String) =
+                jpElement.attributes.firstOrNull { it.name.equals(name) }
+
+            @Throws(DOMException::class)
+            override fun setNamedItem(arg: org.w3c.dom.Node): org.w3c.dom.Node {
+                throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+            }
+
+            @Throws(DOMException::class)
+            override fun removeNamedItem(name: String): org.w3c.dom.Node {
+                throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+            }
+
+            override fun item(index: Int): org.w3c.dom.Node = jpElement.attributes[index]
+
+            override fun getLength(): Int = jpElement.attributes.size
+
+            @Throws(DOMException::class)
+            override fun getNamedItemNS(namespaceURI: String, localName: String): org.w3c.dom.Node {
+                throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+            }
+
+            @Throws(DOMException::class)
+            override fun setNamedItemNS(arg: org.w3c.dom.Node): org.w3c.dom.Node {
+                throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+            }
+
+            @Throws(DOMException::class)
+            override fun removeNamedItemNS(namespaceURI: String, localName: String): org.w3c.dom.Node {
+                throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+            }
+        }
+    }
+}
diff --git a/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPAttr.kt b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPAttr.kt
new file mode 100644
index 0000000000..e27b3b470b
--- /dev/null
+++ b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPAttr.kt
@@ -0,0 +1,122 @@
+package io.github.jmltoolkit.xpath
+
+import com.github.javaparser.metamodel.PropertyMetaModel
+import org.w3c.dom.*
+
+/**
+ * Wraps a class attribute into the XML world.
+ *
+ * @author Alexander Weigl
+ * @version 1 (30.11.22)
+ */
+internal class JPAttr(element: JPElement, metaModel: PropertyMetaModel) : Attr {
+    private val attr: PropertyMetaModel = metaModel
+    private val parent: JPElement = element
+
+    override fun getName(): String = attr.name
+
+    override fun getSpecified(): Boolean = true
+
+    override fun getValue(): String = attr.getValue(parent.astNode).toString()
+
+    @Throws(DOMException::class)
+    override fun setValue(value: String) {
+        throw DOMException(0.toShort(), "read-only")
+    }
+
+    override fun getOwnerElement(): Element = parent
+
+    override fun getSchemaTypeInfo(): TypeInfo? = null
+
+    override fun isId(): Boolean = false
+
+    override fun getNodeName(): String = name
+
+    @Throws(DOMException::class)
+    override fun getNodeValue(): String = attr.getValue(parent.astNode).toString()
+
+    @Throws(DOMException::class)
+    override fun setNodeValue(nodeValue: String) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+    }
+
+    override fun getNodeType(): Short = 0
+
+    override fun getParentNode(): Node? = null
+
+    override fun getChildNodes(): NodeList = DocumentFactories.wrap()
+
+    override fun getFirstChild(): Node? = null
+
+    override fun getLastChild(): Node? = null
+
+    override fun getPreviousSibling(): Node? = null
+
+    override fun getNextSibling(): Node? = null
+
+    override fun getAttributes(): NamedNodeMap? = null
+
+    override fun getOwnerDocument(): Document? = null
+
+    @Throws(DOMException::class)
+    override fun insertBefore(newChild: Node, refChild: Node): Node? = null
+
+    @Throws(DOMException::class)
+    override fun replaceChild(newChild: Node, oldChild: Node): Node? = null
+
+    @Throws(DOMException::class)
+    override fun removeChild(oldChild: Node): Node? = null
+
+    @Throws(DOMException::class)
+    override fun appendChild(newChild: Node): Node? = null
+
+    override fun hasChildNodes(): Boolean = false
+
+    override fun cloneNode(deep: Boolean): Node? = null
+
+    override fun normalize() {
+    }
+
+    override fun isSupported(feature: String, version: String): Boolean = false
+
+    override fun getNamespaceURI(): String? = null
+
+    override fun getPrefix(): String? = null
+
+    @Throws(DOMException::class)
+    override fun setPrefix(prefix: String) {
+    }
+
+    override fun getLocalName(): String? = null
+
+    override fun hasAttributes(): Boolean = false
+
+    override fun getBaseURI(): String? = null
+
+    @Throws(DOMException::class)
+    override fun compareDocumentPosition(other: Node): Short = 0
+
+    @Throws(DOMException::class)
+    override fun getTextContent(): String = value
+
+    @Throws(DOMException::class)
+    override fun setTextContent(textContent: String) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+    }
+
+    override fun isSameNode(other: Node): Boolean = false
+
+    override fun lookupPrefix(namespaceURI: String): String? = null
+
+    override fun isDefaultNamespace(namespaceURI: String): Boolean = false
+
+    override fun lookupNamespaceURI(prefix: String): String? = null
+
+    override fun isEqualNode(arg: Node): Boolean = false
+
+    override fun getFeature(feature: String, version: String): Any? = null
+
+    override fun setUserData(key: String, data: Any, handler: UserDataHandler): Any? = null
+
+    override fun getUserData(key: String): Any? = null
+}
diff --git a/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPAttrPseudo.kt b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPAttrPseudo.kt
new file mode 100644
index 0000000000..909a88b4ff
--- /dev/null
+++ b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPAttrPseudo.kt
@@ -0,0 +1,116 @@
+package io.github.jmltoolkit.xpath
+
+import org.w3c.dom.*
+import java.util.function.Supplier
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (01.12.22)
+ */
+class JPAttrPseudo(private val _name: String, private val supplier: Supplier<String>, private val owner: Element) : Attr {
+    override fun getName(): String = _name
+
+    override fun getSpecified(): Boolean = true
+
+    override fun getValue(): String = supplier.get()
+
+    @Throws(DOMException::class)
+    override fun setValue(value: String) {
+        throw IllegalStateException()
+    }
+
+    override fun getOwnerElement(): Element = owner
+
+    override fun getSchemaTypeInfo(): TypeInfo? = null
+
+    override fun isId(): Boolean = false
+
+    override fun getNodeName(): String = getName()
+
+    @Throws(DOMException::class)
+    override fun getNodeValue(): String = value
+
+    @Throws(DOMException::class)
+    override fun setNodeValue(nodeValue: String) {
+        throw RuntimeException()
+    }
+
+    override fun getNodeType(): Short = Node.ATTRIBUTE_NODE
+
+    override fun getParentNode(): Node = ownerElement
+
+    override fun getChildNodes(): NodeList = DocumentFactories.wrap()
+
+    override fun getFirstChild(): Node? = null
+
+    override fun getLastChild(): Node? = null
+
+    override fun getPreviousSibling(): Node? = null
+
+    override fun getNextSibling(): Node? = null
+
+    override fun getAttributes(): NamedNodeMap? = null
+
+    override fun getOwnerDocument(): Document = parentNode.ownerDocument
+
+    @Throws(DOMException::class)
+    override fun insertBefore(newChild: Node, refChild: Node): Node? = null
+
+    @Throws(DOMException::class)
+    override fun replaceChild(newChild: Node, oldChild: Node): Node? = null
+
+    @Throws(DOMException::class)
+    override fun removeChild(oldChild: Node): Node? = null
+
+    @Throws(DOMException::class)
+    override fun appendChild(newChild: Node): Node? = null
+
+    override fun hasChildNodes(): Boolean = false
+
+    override fun cloneNode(deep: Boolean): Node? = null
+
+    override fun normalize() {
+    }
+
+    override fun isSupported(feature: String, version: String): Boolean = false
+
+    override fun getNamespaceURI(): String? = null
+
+    override fun getPrefix(): String? = null
+
+    @Throws(DOMException::class)
+    override fun setPrefix(prefix: String) {
+    }
+
+    override fun getLocalName(): String? = null
+
+    override fun hasAttributes(): Boolean = false
+
+    override fun getBaseURI(): String? = null
+
+    @Throws(DOMException::class)
+    override fun compareDocumentPosition(other: Node): Short = 0
+
+    @Throws(DOMException::class)
+    override fun getTextContent(): String = value
+
+    @Throws(DOMException::class)
+    override fun setTextContent(textContent: String) {
+    }
+
+    override fun isSameNode(other: Node): Boolean = false
+
+    override fun lookupPrefix(namespaceURI: String): String? = null
+
+    override fun isDefaultNamespace(namespaceURI: String): Boolean = false
+
+    override fun lookupNamespaceURI(prefix: String): String? = null
+
+    override fun isEqualNode(arg: Node): Boolean = false
+
+    override fun getFeature(feature: String, version: String): Any? = null
+
+    override fun setUserData(key: String, data: Any, handler: UserDataHandler): Any? = null
+
+    override fun getUserData(key: String): Any? = null
+}
diff --git a/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPDocument.kt b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPDocument.kt
new file mode 100644
index 0000000000..37f4cbfbfd
--- /dev/null
+++ b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPDocument.kt
@@ -0,0 +1,213 @@
+package io.github.jmltoolkit.xpath
+
+import com.github.javaparser.ast.CompilationUnit
+import org.w3c.dom.*
+
+class JPDocument(node: CompilationUnit) : Document {
+    private val root: JPRootElement = JPRootElement(listOf(node), this)
+
+    override fun getDoctype(): DocumentType? = null
+
+    override fun getImplementation(): DOMImplementation? = null
+
+    override fun getDocumentElement(): Element = root
+
+    @Throws(DOMException::class)
+    override fun createElement(tagName: String): Element {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun createDocumentFragment(): DocumentFragment? = null
+
+    override fun createTextNode(data: String): Text? = null
+
+    override fun createComment(data: String): Comment? = null
+
+    @Throws(DOMException::class)
+    override fun createCDATASection(data: String): CDATASection {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun createProcessingInstruction(target: String, data: String): ProcessingInstruction {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun createAttribute(name: String): Attr {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun createEntityReference(name: String): EntityReference {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getElementsByTagName(tagname: String): NodeList {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun importNode(importedNode: Node, deep: Boolean): Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun createElementNS(namespaceURI: String, qualifiedName: String): Element {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun createAttributeNS(namespaceURI: String, qualifiedName: String): Attr {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getElementsByTagNameNS(namespaceURI: String, localName: String): NodeList {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getElementById(elementId: String): Element? = null
+
+    override fun getInputEncoding(): String = "utf-8"
+
+    override fun getXmlEncoding(): String = "utf-8"
+
+    override fun getXmlStandalone(): Boolean = true
+
+    @Throws(DOMException::class)
+    override fun setXmlStandalone(xmlStandalone: Boolean) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getXmlVersion(): String = "1.0"
+
+    @Throws(DOMException::class)
+    override fun setXmlVersion(xmlVersion: String) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getStrictErrorChecking(): Boolean = false
+
+    override fun setStrictErrorChecking(strictErrorChecking: Boolean) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getDocumentURI(): String? = null
+
+    override fun setDocumentURI(documentURI: String) {
+    }
+
+    @Throws(DOMException::class)
+    override fun adoptNode(source: Node): Node? = null
+
+    override fun getDomConfig(): DOMConfiguration? = null
+
+    override fun normalizeDocument() {
+    }
+
+    @Throws(DOMException::class)
+    override fun renameNode(n: Node, namespaceURI: String, qualifiedName: String): Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getNodeName(): String = "#document"
+
+    @Throws(DOMException::class)
+    override fun getNodeValue(): String {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun setNodeValue(nodeValue: String) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getNodeType(): Short = Node.DOCUMENT_TYPE_NODE
+
+    override fun getParentNode(): Node? = null
+
+    override fun getChildNodes(): NodeList = DocumentFactories.wrap(root)
+
+    override fun getFirstChild(): Node = root
+
+    override fun getLastChild(): Node = root
+
+    override fun getPreviousSibling(): Node? = null
+
+    override fun getNextSibling(): Node? = null
+
+    override fun getAttributes(): NamedNodeMap? = null
+
+    override fun getOwnerDocument(): Document = this
+
+    @Throws(DOMException::class)
+    override fun insertBefore(newChild: Node, refChild: Node): Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun replaceChild(newChild: Node, oldChild: Node): Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun removeChild(oldChild: Node): Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun appendChild(newChild: Node): Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun hasChildNodes(): Boolean = root != null
+
+    override fun cloneNode(deep: Boolean): Node? = null
+
+    override fun normalize() {
+    }
+
+    override fun isSupported(feature: String, version: String): Boolean = false
+
+    override fun getNamespaceURI(): String? = null
+
+    override fun getPrefix(): String? = null
+
+    @Throws(DOMException::class)
+    override fun setPrefix(prefix: String) {
+    }
+
+    override fun getLocalName(): String? = null
+
+    override fun hasAttributes(): Boolean = false
+
+    override fun getBaseURI(): String? = null
+
+    @Throws(DOMException::class)
+    override fun compareDocumentPosition(other: Node): Short {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun getTextContent(): String? = null
+
+    @Throws(DOMException::class)
+    override fun setTextContent(textContent: String) {
+    }
+
+    override fun isSameNode(other: Node): Boolean = false
+
+    override fun lookupPrefix(namespaceURI: String): String? = null
+
+    override fun isDefaultNamespace(namespaceURI: String): Boolean = false
+
+    override fun lookupNamespaceURI(prefix: String): String? = null
+
+    override fun isEqualNode(arg: Node): Boolean = false
+
+    override fun getFeature(feature: String, version: String): Any? = null
+
+    override fun setUserData(key: String, data: Any, handler: UserDataHandler): Any? = null
+
+    override fun getUserData(key: String): Any? = null
+}
diff --git a/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPElement.kt b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPElement.kt
new file mode 100644
index 0000000000..487dfef19f
--- /dev/null
+++ b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPElement.kt
@@ -0,0 +1,242 @@
+package io.github.jmltoolkit.xpath
+
+import com.github.javaparser.ast.Node
+import com.github.javaparser.ast.NodeList
+import com.github.javaparser.metamodel.NodeMetaModel
+import com.github.javaparser.metamodel.PropertyMetaModel
+import org.w3c.dom.*
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (30.11.22)
+ */
+class JPElement(val astNode: Node, private val parent: Element) : Element {
+    private val meta: NodeMetaModel = astNode.metaModel
+    private var posInParent: Int = 0
+
+    val children: List<JPElement> by lazy {
+        meta.allPropertyMetaModels
+            .filter(DocumentFactories::isNodeProperty)
+            .map { it.getValue(this.astNode) }
+            .flatMap {
+                when (it) {
+                    is NodeList<*> -> it.map { n -> DocumentFactories.getElement(n, this) }
+                    is Node -> listOf(DocumentFactories.getElement(it, this))
+                    else -> listOf()
+                }
+            }
+            .map { it }
+            .also {
+                for (i in children.indices) {
+                    children[i].posInParent = i
+                }
+            }
+    }
+
+    val attributes: List<Attr> by lazy {
+        val attr = meta.allPropertyMetaModels
+            .filter { !DocumentFactories.isNodeProperty(it) }
+            .map { DocumentFactories.getAttribute(this, it) }
+            .toMutableList()
+
+        for (provider in DocumentFactories.attributeProviders) {
+            val seq = provider.attributeForNode(astNode, this)
+            attr.addAll(seq)
+        }
+        attr
+    }
+
+    override fun getTagName(): String = meta.typeName
+
+    override fun getAttribute(name: String): String {
+        val prop = getProperty(name)
+        return prop.getValue(astNode).toString()
+    }
+
+    fun getProperty(name: String): PropertyMetaModel {
+        return meta.allPropertyMetaModels.stream()
+            .filter { it: PropertyMetaModel -> it.name == name }
+            .findFirst().orElse(null)
+    }
+
+    @Throws(DOMException::class)
+    override fun setAttribute(name: String, value: String) {
+        throw IllegalStateException()
+    }
+
+    @Throws(DOMException::class)
+    override fun removeAttribute(name: String) {
+        throw IllegalStateException()
+    }
+
+    override fun getAttributeNode(name: String) = attributes.asSequence()
+        .filter { it: Attr -> it.name == name }
+        .firstOrNull()
+
+    @Throws(DOMException::class)
+    override fun setAttributeNode(newAttr: Attr): Attr? = null
+
+    @Throws(DOMException::class)
+    override fun removeAttributeNode(oldAttr: Attr): Attr? = null
+
+    override fun getElementsByTagName(name: String): org.w3c.dom.NodeList {
+        throw IllegalStateException()
+    }
+
+    @Throws(DOMException::class)
+    override fun getAttributeNS(namespaceURI: String, localName: String): String {
+        throw IllegalStateException()
+    }
+
+    @Throws(DOMException::class)
+    override fun setAttributeNS(namespaceURI: String, qualifiedName: String, value: String) {
+        throw IllegalStateException()
+    }
+
+    @Throws(DOMException::class)
+    override fun removeAttributeNS(namespaceURI: String, localName: String) {
+        throw IllegalStateException()
+    }
+
+    @Throws(DOMException::class)
+    override fun getAttributeNodeNS(namespaceURI: String, localName: String): Attr {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+    }
+
+    @Throws(DOMException::class)
+    override fun setAttributeNodeNS(newAttr: Attr): Attr {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+    }
+
+    @Throws(DOMException::class)
+    override fun getElementsByTagNameNS(namespaceURI: String, localName: String): org.w3c.dom.NodeList {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+    }
+
+    override fun hasAttribute(name: String): Boolean = !meta.allPropertyMetaModels.isEmpty()
+
+    @Throws(DOMException::class)
+    override fun hasAttributeNS(namespaceURI: String, localName: String): Boolean {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+    }
+
+    override fun getSchemaTypeInfo(): TypeInfo? = null
+
+    @Throws(DOMException::class)
+    override fun setIdAttribute(name: String, isId: Boolean) {
+    }
+
+    @Throws(DOMException::class)
+    override fun setIdAttributeNS(namespaceURI: String, localName: String, isId: Boolean) {
+    }
+
+    @Throws(DOMException::class)
+    override fun setIdAttributeNode(idAttr: Attr, isId: Boolean) {
+    }
+
+    override fun getNodeName(): String = tagName
+
+    @Throws(DOMException::class)
+    override fun getNodeValue(): String = ""
+
+    @Throws(DOMException::class)
+    override fun setNodeValue(nodeValue: String) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+    }
+
+    override fun getNodeType(): Short = org.w3c.dom.Node.ELEMENT_NODE
+
+    override fun getParentNode(): org.w3c.dom.Node = parent
+
+    override fun getChildNodes(): org.w3c.dom.NodeList = DocumentFactories.wrap(children)
+
+    override fun getFirstChild() = children.firstOrNull()
+    override fun getLastChild() = children.lastOrNull()
+
+    override fun getPreviousSibling(): org.w3c.dom.Node? {
+        if (posInParent != 0) {
+            return parent.childNodes.item(posInParent - 1)
+        }
+        return null
+    }
+
+    override fun getNextSibling(): org.w3c.dom.Node? {
+        if (posInParent + 1 < parent.childNodes.length) {
+            return parent.childNodes.item(posInParent + 1)
+        }
+        return null
+    }
+
+    override fun getAttributes(): NamedNodeMap = DocumentFactories.nodeMap(this)
+
+    override fun getOwnerDocument(): Document? = parent.ownerDocument
+
+    @Throws(DOMException::class)
+    override fun insertBefore(newChild: org.w3c.dom.Node, refChild: org.w3c.dom.Node): org.w3c.dom.Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+    }
+
+    @Throws(DOMException::class)
+    override fun replaceChild(newChild: org.w3c.dom.Node, oldChild: org.w3c.dom.Node): org.w3c.dom.Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+    }
+
+    @Throws(DOMException::class)
+    override fun removeChild(oldChild: org.w3c.dom.Node): org.w3c.dom.Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+    }
+
+    @Throws(DOMException::class)
+    override fun appendChild(newChild: org.w3c.dom.Node): org.w3c.dom.Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "")
+    }
+
+    override fun hasChildNodes(): Boolean = children.isNotEmpty()
+
+    override fun cloneNode(deep: Boolean): org.w3c.dom.Node? = null
+
+    override fun normalize() {
+    }
+
+    override fun isSupported(feature: String, version: String): Boolean = false
+
+    override fun getNamespaceURI(): String? = null
+
+    override fun getPrefix(): String? = null
+
+    @Throws(DOMException::class)
+    override fun setPrefix(prefix: String) {
+    }
+
+    override fun getLocalName(): String? = null
+
+    override fun hasAttributes(): Boolean = false
+
+    override fun getBaseURI(): String? = null
+
+    @Throws(DOMException::class)
+    override fun compareDocumentPosition(other: org.w3c.dom.Node): Short = 0
+
+    @Throws(DOMException::class)
+    override fun getTextContent(): String? = null
+
+    @Throws(DOMException::class)
+    override fun setTextContent(textContent: String) {
+    }
+
+    override fun isSameNode(other: org.w3c.dom.Node): Boolean = false
+
+    override fun lookupPrefix(namespaceURI: String): String? = null
+
+    override fun isDefaultNamespace(namespaceURI: String): Boolean = false
+
+    override fun lookupNamespaceURI(prefix: String): String? = null
+
+    override fun isEqualNode(arg: org.w3c.dom.Node): Boolean = false
+
+    override fun getFeature(feature: String, version: String): Any? = null
+
+    override fun setUserData(key: String, data: Any, handler: UserDataHandler): Any? = null
+
+    override fun getUserData(key: String): Any? = null
+}
diff --git a/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPRootElement.kt b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPRootElement.kt
new file mode 100644
index 0000000000..5552a4d552
--- /dev/null
+++ b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/JPRootElement.kt
@@ -0,0 +1,193 @@
+package io.github.jmltoolkit.xpath
+
+import com.github.javaparser.ast.CompilationUnit
+import org.w3c.dom.*
+
+
+class JPRootElement(private val nodes: List<CompilationUnit>, private val document: JPDocument) : Element {
+    private val elements: List<Element> by lazy {
+        nodes.map { DocumentFactories.getElement(it, this) }
+    }
+
+    override fun getTagName(): String = "project"
+
+    override fun getAttribute(name: String): String = ""
+
+    @Throws(DOMException::class)
+    override fun setAttribute(name: String, value: String) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun removeAttribute(name: String) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getAttributeNode(name: String): Attr? = null
+
+    @Throws(DOMException::class)
+    override fun setAttributeNode(newAttr: Attr): Attr {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun removeAttributeNode(oldAttr: Attr): Attr {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getElementsByTagName(name: String): NodeList {
+        throw IllegalStateException()
+    }
+
+    @Throws(DOMException::class)
+    override fun getAttributeNS(namespaceURI: String, localName: String): String = ""
+
+    @Throws(DOMException::class)
+    override fun setAttributeNS(namespaceURI: String, qualifiedName: String, value: String) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun removeAttributeNS(namespaceURI: String, localName: String) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun getAttributeNodeNS(namespaceURI: String, localName: String): Attr? = null
+
+    @Throws(DOMException::class)
+    override fun setAttributeNodeNS(newAttr: Attr): Attr {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun getElementsByTagNameNS(namespaceURI: String, localName: String): NodeList {
+        throw IllegalStateException()
+    }
+
+    override fun hasAttribute(name: String): Boolean = false
+
+    @Throws(DOMException::class)
+    override fun hasAttributeNS(namespaceURI: String, localName: String): Boolean = false
+
+    override fun getSchemaTypeInfo(): TypeInfo? = null
+
+    @Throws(DOMException::class)
+    override fun setIdAttribute(name: String, isId: Boolean) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun setIdAttributeNS(namespaceURI: String, localName: String, isId: Boolean) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun setIdAttributeNode(idAttr: Attr, isId: Boolean) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getNodeName(): String = tagName
+
+    @Throws(DOMException::class)
+    override fun getNodeValue(): String {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun setNodeValue(nodeValue: String) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getNodeType(): Short = Node.ELEMENT_NODE
+
+    override fun getParentNode(): Node = document
+
+    override fun getChildNodes(): NodeList = DocumentFactories.wrap(elements)
+
+    override fun getFirstChild(): Node = elements.first()
+
+    override fun getLastChild(): Node = elements.last()
+
+    override fun getPreviousSibling(): Node? = null
+
+    override fun getNextSibling(): Node? = null
+
+    override fun getAttributes(): NamedNodeMap = DocumentFactories.emptyNodeMap()
+
+    override fun getOwnerDocument(): Document = document
+
+    @Throws(DOMException::class)
+    override fun insertBefore(newChild: Node, refChild: Node): Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun replaceChild(newChild: Node, oldChild: Node): Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun removeChild(oldChild: Node): Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    @Throws(DOMException::class)
+    override fun appendChild(newChild: Node): Node {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun hasChildNodes(): Boolean = elements.isNotEmpty()
+
+    override fun cloneNode(deep: Boolean): Node? = null
+
+    override fun normalize() {
+    }
+
+    override fun isSupported(feature: String, version: String): Boolean = false
+
+    override fun getNamespaceURI(): String? = null
+
+    override fun getPrefix(): String? = null
+
+    @Throws(DOMException::class)
+    override fun setPrefix(prefix: String) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun getLocalName(): String? = null
+
+    override fun hasAttributes(): Boolean = false
+
+    override fun getBaseURI(): String? = null
+
+    @Throws(DOMException::class)
+    override fun compareDocumentPosition(other: Node): Short = 0
+
+    @Throws(DOMException::class)
+    override fun getTextContent(): String = ""
+
+    @Throws(DOMException::class)
+    override fun setTextContent(textContent: String) {
+        throw DOMException(DOMException.NOT_SUPPORTED_ERR, "Not Supported")
+    }
+
+    override fun isSameNode(other: Node): Boolean {
+        return other is JPRootElement &&
+                this.document === other.document
+    }
+
+    override fun lookupPrefix(namespaceURI: String): String = ""
+
+    override fun isDefaultNamespace(namespaceURI: String): Boolean = false
+
+    override fun lookupNamespaceURI(prefix: String): String? = null
+
+    override fun isEqualNode(arg: Node): Boolean = false
+
+    override fun getFeature(feature: String, version: String): Any? = null
+
+    override fun setUserData(key: String, data: Any, handler: UserDataHandler): Any? = null
+
+    override fun getUserData(key: String): Any? = null
+}
\ No newline at end of file
diff --git a/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/PseudoAttributeHelper.kt b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/PseudoAttributeHelper.kt
new file mode 100644
index 0000000000..4495142fdf
--- /dev/null
+++ b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/PseudoAttributeHelper.kt
@@ -0,0 +1,21 @@
+package io.github.jmltoolkit.xpath
+
+import com.github.javaparser.ast.Node
+import org.w3c.dom.Element
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (11.02.23)
+ */
+abstract class PseudoAttributeHelper<T : Node?> protected constructor(private val clazz: Class<T>) :
+    PseudoAttributeProvider {
+    @Suppress("UNCHECKED_CAST")
+    override fun attributeForNode(node: Node, owner: Element): Collection<JPAttrPseudo> {
+        if (clazz == node.javaClass) {
+            return attributes(node as T, owner)
+        }
+        return listOf()
+    }
+
+    protected abstract fun attributes(node: T, owner: Element?): Collection<JPAttrPseudo>
+}
diff --git a/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/PseudoAttributeProvider.kt b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/PseudoAttributeProvider.kt
new file mode 100644
index 0000000000..55fbdaf042
--- /dev/null
+++ b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/PseudoAttributeProvider.kt
@@ -0,0 +1,12 @@
+package io.github.jmltoolkit.xpath
+
+import com.github.javaparser.ast.Node
+import org.w3c.dom.Element
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (11.02.23)
+ */
+interface PseudoAttributeProvider {
+    fun attributeForNode(node: Node, owner: Element): Collection<JPAttrPseudo>
+}
diff --git a/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/XPathFacade.kt b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/XPathFacade.kt
new file mode 100644
index 0000000000..930138d440
--- /dev/null
+++ b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/XPathFacade.kt
@@ -0,0 +1,44 @@
+package io.github.jmltoolkit.xpath
+
+import com.github.javaparser.ast.CompilationUnit
+import org.w3c.dom.Document
+import org.w3c.dom.NodeList
+import java.io.StringWriter
+import javax.xml.transform.OutputKeys
+import javax.xml.transform.Source
+import javax.xml.transform.TransformerException
+import javax.xml.transform.TransformerFactory
+import javax.xml.transform.dom.DOMSource
+import javax.xml.transform.stream.StreamResult
+import javax.xml.xpath.XPathConstants
+import javax.xml.xpath.XPathExpressionException
+import javax.xml.xpath.XPathFactory
+
+/**
+ * @author Alexander Weigl
+ * @version 1 (11.02.23)
+ */
+object XPathFacade {
+    @Throws(TransformerException::class)
+    fun printXml(n: CompilationUnit): String {
+        val xmlDocument: Document = DocumentFactories.getDocument(n)
+        val transformerFactory = TransformerFactory.newInstance()
+        val transformer = transformerFactory.newTransformer()
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes")
+        val source: Source = DOMSource(xmlDocument.documentElement)
+        val sw = StringWriter()
+        val result = StreamResult(sw)
+        transformer.transform(source, result)
+        return sw.buffer.toString()
+    }
+
+    @Throws(XPathExpressionException::class)
+    fun query(n: CompilationUnit, query: String?) {
+        val xmlDocument: Document = DocumentFactories.getDocument(n)
+        val xPath = XPathFactory.newInstance().newXPath()
+        val res = xPath.compile(query).evaluate(xmlDocument, XPathConstants.NODESET) as NodeList
+        for (i in 0 until res.length) {
+            println((res.item(i) as JPElement).astNode)
+        }
+    }
+}
diff --git a/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/package-info.kt b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/package-info.kt
new file mode 100644
index 0000000000..0a606ceb6c
--- /dev/null
+++ b/tools/xpath/src/main/kotlin/io/github/jmltoolkit/xpath/package-info.kt
@@ -0,0 +1,16 @@
+/**
+ * XPath query on the AST.
+ *
+ *
+ * This package provides the possibility to apply an XPath query on AST nodes. It wraps the existing classes
+ * into XML documents and elements of type `org.w3c.dom`. This allows you to also use them in nearly
+ * every system that expect a DOM, e.g., you can print AST as an XML document or xquery.
+ *
+ *
+ * This DOM is immutable.
+ *
+ * @author Alexander Weigl
+ * @version 1 (11.02.23)
+ */
+package io.github.jmltoolkit.xpath
+
diff --git a/tools/xpath/src/main/resources/META-INF/services/io.github.jmltoolkit.xpath.PseudoAttributeProvider b/tools/xpath/src/main/resources/META-INF/services/io.github.jmltoolkit.xpath.PseudoAttributeProvider
new file mode 100644
index 0000000000..edbc52c1f9
--- /dev/null
+++ b/tools/xpath/src/main/resources/META-INF/services/io.github.jmltoolkit.xpath.PseudoAttributeProvider
@@ -0,0 +1,2 @@
+io.github.jmltoolkit.xpath.AttribNodeWithName
+io.github.jmltoolkit.xpath.AttribModifier
\ No newline at end of file